Skip to content

Commit d4cef62

Browse files
mitchmacmitchmac
committed
Automated WordPress version update
1 parent a639f81 commit d4cef62

59 files changed

Lines changed: 18557 additions & 1749 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎wp/wp-content/plugins/sqlite-database-integration/.gitattributes‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
composer.json export-ignore
66
phpcs.xml.dist export-ignore
77
phpunit.xml.dist export-ignore
8+
wp-setup.sh export-ignore
89
/.github export-ignore
910
/grammar-tools export-ignore
1011
/tests export-ignore
11-
/wip export-ignore
12-
/wp-includes/mysql export-ignore
13-
/wp-includes/parser export-ignore
1412
/wp-includes/sqlite/class-wp-sqlite-crosscheck-db.php export-ignore
13+
/wordpress export-ignore

‎wp/wp-content/plugins/sqlite-database-integration/.github/workflows/phpunit-tests.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os: [ ubuntu-latest ]
20-
# NOTE: There does not appear to be a single phpunit version that supports all
21-
# PHP versions tested here. For now, we are removing PHP 7.0. and 7.1 tests
22-
# in order to run a single phpunit version for PHP 7.2 and up.
23-
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
20+
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
2421

2522
with:
2623
os: ${{ matrix.os }}

‎wp/wp-content/plugins/sqlite-database-integration/.github/workflows/verify-version.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Verify plugin version
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
jobs:
10+
verify-version:
11+
name: Assert the WordPress plugin header declares the same version as the SQLITE_DRIVER_VERSION constant
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Extract version from "load.php"
17+
id: load_version
18+
run: |
19+
VERSION=$(grep "Version:" load.php | sed "s/.*Version: \([^ ]*\).*/\1/")
20+
echo "load_version=$VERSION" >> $GITHUB_OUTPUT
21+
22+
- name: Extract version from "version.php"
23+
id: const_version
24+
run: |
25+
VERSION=$(php -r "require 'version.php'; echo SQLITE_DRIVER_VERSION;")
26+
echo "const_version=$VERSION" >> $GITHUB_OUTPUT
27+
28+
- name: Compare versions
29+
run: |
30+
if [ "${{ steps.load_version.outputs.load_version }}" != "${{ steps.const_version.outputs.const_version }}" ]; then
31+
echo "Version mismatch detected!"
32+
echo " load.php version: ${{ steps.load_version.outputs.load_version }}"
33+
echo " version.php constant: ${{ steps.const_version.outputs.const_version }}"
34+
exit 1
35+
fi

‎wp/wp-content/plugins/sqlite-database-integration/.github/workflows/wp-tests-phpunit-run.js‎

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
/*
2+
* Wrap the "composer run wp-tests-phpunit" command to process tests
3+
* that are expected to error and fail at the moment.
4+
*
5+
* This makes sure that the CI job passes, while explicitly tracking
6+
* the issues that need to be addressed. Ideally, over time this script
7+
* will become obsolete when all errors and failures are resolved.
8+
*/
9+
const { execSync } = require( 'child_process' );
10+
const fs = require( 'fs' );
11+
const path = require( 'path' );
12+
13+
const expectedErrors = [
14+
'Tests_DB_Charset::test_invalid_characters_in_query',
15+
'Tests_DB_Charset::test_set_charset_changes_the_connection_collation',
16+
'Tests_DB::test_get_col_info',
17+
];
18+
19+
const expectedFailures = [
20+
'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #2',
21+
'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #3',
22+
'Tests_Comment::test_wp_new_comment_respects_comment_field_lengths',
23+
'Tests_Comment::test_wp_update_comment',
24+
'Tests_DB_Charset::test_get_column_charset with data set #0',
25+
'Tests_DB_Charset::test_get_column_charset with data set #1',
26+
'Tests_DB_Charset::test_get_column_charset with data set #2',
27+
'Tests_DB_Charset::test_get_column_charset with data set #3',
28+
'Tests_DB_Charset::test_get_column_charset with data set #4',
29+
'Tests_DB_Charset::test_get_column_charset with data set #5',
30+
'Tests_DB_Charset::test_get_column_charset with data set #6',
31+
'Tests_DB_Charset::test_get_column_charset with data set #7',
32+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #0',
33+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #1',
34+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #2',
35+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #3',
36+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #4',
37+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #5',
38+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #6',
39+
'Tests_DB_Charset::test_get_column_charset_is_mysql_undefined with data set #7',
40+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #0',
41+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #1',
42+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #2',
43+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #3',
44+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #4',
45+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #5',
46+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #6',
47+
'Tests_DB_Charset::test_get_column_charset_non_mysql with data set #7',
48+
'Tests_DB_Charset::test_get_table_charset with data set #1',
49+
'Tests_DB_Charset::test_get_table_charset with data set #4',
50+
'Tests_DB_Charset::test_get_table_charset with data set #5',
51+
'Tests_DB_Charset::test_get_table_charset with data set #6',
52+
'Tests_DB_Charset::test_get_table_charset with data set #7',
53+
'Tests_DB_Charset::test_process_field_charsets_on_nonexistent_table',
54+
'Tests_DB_Charset::test_strip_invalid_text with data set #21',
55+
'Tests_DB_Charset::test_strip_invalid_text with data set #22',
56+
'Tests_DB_Charset::test_strip_invalid_text with data set #23',
57+
'Tests_DB_Charset::test_strip_invalid_text with data set #24',
58+
'Tests_DB_Charset::test_strip_invalid_text with data set #25',
59+
'Tests_DB_Charset::test_strip_invalid_text with data set #26',
60+
'Tests_DB_Charset::test_strip_invalid_text with data set #27',
61+
'Tests_DB_Charset::test_strip_invalid_text with data set #28',
62+
'Tests_DB_Charset::test_strip_invalid_text with data set #30',
63+
'Tests_DB_Charset::test_strip_invalid_text with data set #31',
64+
'Tests_DB_Charset::test_strip_invalid_text with data set #32',
65+
'Tests_DB_Charset::test_strip_invalid_text with data set #33',
66+
'Tests_DB_Charset::test_strip_invalid_text with data set #34',
67+
'Tests_DB_Charset::test_strip_invalid_text with data set #35',
68+
'Tests_DB_Charset::test_strip_invalid_text with data set #36',
69+
'Tests_DB_Charset::test_strip_invalid_text with data set #37',
70+
'Tests_DB_Charset::test_strip_invalid_text with data set #39',
71+
'Tests_DB_Charset::test_strip_invalid_text with data set #40',
72+
'Tests_DB_Charset::test_strip_invalid_text with data set #41',
73+
'Tests_DB_Charset::test_strip_invalid_text_for_column_bails_if_ascii_input_too_long',
74+
'Tests_DB_Charset::test_strip_invalid_text_from_query with data set "utf8 + utf8mb4"',
75+
'Tests_DB_Charset::test_table_collation_check with data set "utf8_bin + big5_chinese_ci"',
76+
'Tests_DB_Charset::test_table_collation_check with data set "utf8_unicode_ci"',
77+
'Tests_DB_dbDelta::test_spatial_indices',
78+
'Tests_DB::test_charset_switched_to_utf8mb4',
79+
'Tests_DB::test_close',
80+
'Tests_DB::test_delete_value_too_long_for_field with data set "too long"',
81+
'Tests_DB::test_has_cap',
82+
'Tests_DB::test_insert_value_too_long_for_field with data set "too long"',
83+
'Tests_DB::test_mysqli_flush_sync',
84+
'Tests_DB::test_non_unicode_collations',
85+
'Tests_DB::test_pre_get_col_charset_filter',
86+
'Tests_DB::test_process_fields_on_nonexistent_table',
87+
'Tests_DB::test_process_fields_value_too_long_for_field with data set "too long"',
88+
'Tests_DB::test_query_value_contains_invalid_chars',
89+
'Tests_DB::test_replace_value_too_long_for_field with data set "too long"',
90+
'Tests_DB::test_replace',
91+
'Tests_DB::test_supports_collation',
92+
'Tests_DB::test_update_value_too_long_for_field with data set "too long"',
93+
'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #1',
94+
'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #2',
95+
'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #3',
96+
'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #4',
97+
'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #5',
98+
'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #6',
99+
'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #7',
100+
'Tests_Menu_wpNavMenu::test_wp_nav_menu_should_not_have_has_children_class_with_custom_depth',
101+
'WP_Test_REST_Posts_Controller::test_get_items_orderby_modified_query',
102+
];
103+
104+
console.log( 'Running WordPress PHPUnit tests with expected failures tracking...' );
105+
console.log( 'Expected errors:', expectedErrors );
106+
console.log( 'Expected failures:', expectedFailures );
107+
108+
try {
109+
try {
110+
execSync(
111+
`composer run wp-test-phpunit -- --log-junit=phpunit-results.xml --verbose`,
112+
{ stdio: 'inherit' }
113+
);
114+
console.log( '\n⚠️ All tests passed, checking if expected errors/failures occurred...' );
115+
} catch ( error ) {
116+
console.log( '\n⚠️ Some tests errored/failed (expected). Analyzing results...' );
117+
}
118+
119+
// Read the JUnit XML test output:
120+
const junitOutputFile = path.join( __dirname, '..', '..', 'wordpress', 'phpunit-results.xml' );
121+
if ( ! fs.existsSync( junitOutputFile ) ) {
122+
console.error( 'Error: JUnit output file not found!' );
123+
process.exit( 1 );
124+
}
125+
const junitXml = fs.readFileSync( junitOutputFile, 'utf8' );
126+
127+
// Extract test info from the XML:
128+
const actualErrors = [];
129+
const actualFailures = [];
130+
for ( const testcase of junitXml.matchAll( /<testcase([^>]*)\/>|<testcase([^>]*)>([\s\S]*?)<\/testcase>/g ) ) {
131+
const attributes = {};
132+
const attributesString = testcase[2] ?? testcase[1];
133+
for ( const attribute of attributesString.matchAll( /(\w+)="([^"]*)"/g ) ) {
134+
attributes[attribute[1]] = attribute[2];
135+
}
136+
137+
const content = testcase[3] ?? '';
138+
const fqn = attributes.class ? `${attributes.class}::${attributes.name}` : attributes.name;
139+
const hasError = content.includes( '<error' );
140+
const hasFailure = content.includes( '<failure' );
141+
142+
if ( hasError ) {
143+
actualErrors.push( fqn );
144+
}
145+
146+
if ( hasFailure ) {
147+
actualFailures.push( fqn );
148+
}
149+
}
150+
151+
let isSuccess = true;
152+
153+
// Check if all expected errors actually errored
154+
const unexpectedNonErrors = expectedErrors.filter( test => ! actualErrors.includes( test ) );
155+
if ( unexpectedNonErrors.length > 0 ) {
156+
console.error( '\n❌ The following tests were expected to error but did not:' );
157+
unexpectedNonErrors.forEach( test => console.error( ` - ${test}` ) );
158+
isSuccess = false;
159+
}
160+
161+
// Check if all expected failures actually failed
162+
const unexpectedPasses = expectedFailures.filter( test => ! actualFailures.includes( test ) );
163+
if ( unexpectedPasses.length > 0 ) {
164+
console.error( '\n❌ The following tests were expected to fail but passed:' );
165+
unexpectedPasses.forEach( test => console.error( ` - ${test}` ) );
166+
isSuccess = false;
167+
}
168+
169+
// Check for unexpected errors
170+
const unexpectedErrors = actualErrors.filter( test => ! expectedErrors.includes( test ) );
171+
if ( unexpectedErrors.length > 0 ) {
172+
console.error( '\n❌ The following tests errored unexpectedly:' );
173+
unexpectedErrors.forEach( test => console.error( ` - ${test}` ) );
174+
isSuccess = false;
175+
}
176+
177+
// Check for unexpected failures
178+
const unexpectedFailures = actualFailures.filter( test => ! expectedFailures.includes( test ) );
179+
if ( unexpectedFailures.length > 0 ) {
180+
console.error( '\n❌ The following tests failed unexpectedly:' );
181+
unexpectedFailures.forEach( test => console.error( ` - ${test}` ) );
182+
isSuccess = false;
183+
}
184+
185+
if ( isSuccess ) {
186+
console.log( '\n✅ All tests behaved as expected!' );
187+
process.exit( 0 );
188+
} else {
189+
console.log( '\n❌ Some tests did not behave as expected!' );
190+
process.exit( 1 );
191+
}
192+
} catch ( error ) {
193+
console.error( '\n❌ Script execution error:', error.message );
194+
process.exit( 1 );
195+
}

‎wp/wp-content/plugins/sqlite-database-integration/.github/workflows/wp-tests-phpunit.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: WordPress Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
jobs:
10+
test:
11+
name: WordPress PHPUnit Tests
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 20
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v3
21+
22+
- name: Set UID and GID for PHP in WordPress images
23+
run: |
24+
echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
25+
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
26+
27+
- name: Setup WordPress test environment
28+
run: composer run wp-setup
29+
30+
- name: Start WordPress test environment
31+
run: composer run wp-test-start
32+
33+
- name: Run WordPress PHPUnit tests
34+
run: node .github/workflows/wp-tests-phpunit-run.js
35+
36+
- name: Stop Docker containers
37+
if: always()
38+
run: composer run wp-test-clean

‎wp/wp-content/plugins/sqlite-database-integration/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ composer.lock
55
._.DS_Store
66
.DS_Store
77
._*
8+
/wordpress

‎wp/wp-content/plugins/sqlite-database-integration/activate.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ function ( $result ) {
7575
* When the plugin gets merged in wp-core, this is not to be ported.
7676
*/
7777
function sqlite_plugin_copy_db_file() {
78-
// Bail early if the SQLite3 class does not exist.
79-
if ( ! class_exists( 'SQLite3' ) ) {
78+
// Bail early if the PDO SQLite extension is not loaded.
79+
if ( ! extension_loaded( 'pdo_sqlite' ) ) {
8080
return;
8181
}
8282

‎wp/wp-content/plugins/sqlite-database-integration/admin-notices.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ function sqlite_plugin_admin_notice() {
1919
return;
2020
}
2121

22-
// If SQLite is not detected, bail early.
23-
if ( ! class_exists( 'SQLite3' ) ) {
22+
// If PDO SQLite is not loaded, bail early.
23+
if ( ! extension_loaded( 'pdo_sqlite' ) ) {
2424
printf(
2525
'<div class="notice notice-error"><p>%s</p></div>',
26-
esc_html__( 'The SQLite Integration plugin is active, but the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
26+
esc_html__( 'The SQLite Integration plugin is active, but the PDO SQLite extension is missing from your server. Please make sure that PDO SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
2727
);
2828
return;
2929
}

‎wp/wp-content/plugins/sqlite-database-integration/admin-page.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ function sqlite_integration_admin_screen() {
4747
?>
4848
</p>
4949
<?php else : ?>
50-
<?php if ( ! class_exists( 'SQLite3' ) ) : ?>
51-
<div class="notice notice-error">
52-
<p><?php esc_html_e( 'We detected that the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
53-
</div>
54-
<?php elseif ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
50+
<?php if ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
5551
<div class="notice notice-error">
5652
<p><?php esc_html_e( 'We detected that the PDO SQLite driver is missing from your server (the pdo_sqlite extension is not loaded). Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
5753
</div>
@@ -130,7 +126,8 @@ function sqlite_plugin_adminbar_item( $admin_bar ) {
130126
global $wpdb;
131127

132128
if ( defined( 'SQLITE_DB_DROPIN_VERSION' ) && defined( 'DB_ENGINE' ) && 'sqlite' === DB_ENGINE ) {
133-
$title = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . '</span>';
129+
$suffix = defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ? ' (AST)' : '';
130+
$title = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . $suffix . '</span>';
134131
} elseif ( stripos( $wpdb->db_server_info(), 'maria' ) !== false ) {
135132
$title = '<span style="color:#DC3232;">' . __( 'Database: MariaDB', 'sqlite-database-integration' ) . '</span>';
136133
} else {

‎wp/wp-content/plugins/sqlite-database-integration/composer.json‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"issues": "https://github.com/wordpress/sqlite-database-integration/issues"
99
},
1010
"require": {
11-
"php": ">=7.0"
11+
"php": ">=7.2",
12+
"ext-pdo": "*",
13+
"ext-pdo_sqlite": "*"
1214
},
1315
"require-dev": {
1416
"ext-mbstring": "*",
@@ -24,7 +26,8 @@
2426
"allow-plugins": {
2527
"dealerdirect/phpcodesniffer-composer-installer": true,
2628
"phpstan/extension-installer": true
27-
}
29+
},
30+
"process-timeout": 3600
2831
},
2932
"scripts": {
3033
"check-cs": [
@@ -35,6 +38,22 @@
3538
],
3639
"test": [
3740
"phpunit"
41+
],
42+
"wp-setup": [
43+
"./wp-setup.sh"
44+
],
45+
"wp-run": [
46+
"npm --prefix wordpress run"
47+
],
48+
"wp-test-start": [
49+
"npm --prefix wordpress run env:start",
50+
"npm --prefix wordpress run env:install"
51+
],
52+
"wp-test-phpunit": [
53+
"npm --prefix wordpress run test:php --"
54+
],
55+
"wp-test-clean": [
56+
"npm --prefix wordpress run env:clean"
3857
]
3958
}
4059
}

0 commit comments

Comments
 (0)