Merge branch 'WordPress:main' into main

Author: OllieJones

wp-includes/sqlite/class-wp-sqlite-lexer.php

@@ -6,8 +6,6 @@
  * @see https://github.com/phpmyadmin/sql-parser
  */
 
-declare(strict_types=1);
-
 /**
  * Performs lexical analysis over a SQL statement and splits it in multiple tokens.
  */
@@ -2533,7 +2531,7 @@ public function tokens( array $tokens = array(), $count = -1 ) {
 	 * @param int $type The type of the token.
 	 * @param int $flag The flag of the token.
 	 */
-	public function tokens_get_next_of_type_and_flag( int $type, int $flag ) {
+	public function tokens_get_next_of_type_and_flag( $type, $flag ) {
 		for ( ; $this->tokens_index < $this->tokens_count; ++$this->tokens_index ) {
 			if ( ( $this->tokens[ $this->tokens_index ]->type === $type ) && ( $this->tokens[ $this->tokens_index ]->flags === $flag ) ) {
 				return $this->tokens[ $this->tokens_index++ ];

wp-includes/sqlite/class-wp-sqlite-token.php

@@ -6,8 +6,6 @@
  * @see https://github.com/phpmyadmin/sql-parser
  */
 
-declare(strict_types=1);
-
 /**
  * Defines a token along with a set of types and flags and utility functions.
  *
@@ -213,7 +211,7 @@ public function __construct( $token, $type = 0, $flags = 0 ) {
 	 *
 	 * @return bool
 	 */
-	public function matches( $type = null, $flags = null, ?array $values = null ) {
+	public function matches( $type = null, $flags = null, $values = null ) {
 		if ( null === $type && null === $flags && ( null === $values || array() === $values ) ) {
 			return ! $this->is_semantically_void();
 		}

wp-includes/sqlite/install-functions.php

@@ -140,7 +140,7 @@ function wp_install( $blog_title, $user_name, $user_email, $is_public, $deprecat
 	wp_check_mysql_version();
 	wp_cache_flush();
 	/* SQLite changes: Replace the call to make_db_current_silent() with sqlite_make_db_sqlite(). */
-	sqlite_make_db_sqlite();
+	sqlite_make_db_sqlite(); // phpcs:ignore PHPCompatibility.Extensions.RemovedExtensions.sqliteRemoved
 	populate_options();
 	populate_roles();