Merge remote-tracking branch 'upstream/master'

.gitattributes

@@ -1,7 +1,6 @@
 /.gitattributes export-ignore
 /.editorconfig export-ignore
 /.gitignore export-ignore
-/.travis.yml export-ignore
 /README.md export-ignore
 /finder.php export-ignore
 /functionMap.php export-ignore

composer.json

@@ -16,7 +16,7 @@
         "phpdocumentor/reflection-docblock": "^5.4.1",
         "phpstan/phpstan": "^1.10.49",
         "phpunit/phpunit": "^9.5",
-        "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^1.0",
+        "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^1.1.1",
         "wp-coding-standards/wpcs": "3.1.0 as 2.3.0"
     },
     "suggest": {

phpcs.xml.dist

@@ -12,13 +12,6 @@
         <exclude name="PEAR.Commenting.FileComment"/>
     </rule>
 
-    <rule ref="Squiz.WhiteSpace.FunctionSpacing">
-        <properties>
-            <property name="spacingBeforeFirst" value="0"/>
-            <property name="spacingAfterLast" value="0"/>
-        </properties>
-    </rule>
-
     <!-- Rules not applied to tests -->
     <rule ref="SlevomatCodingStandard.Functions.FunctionLength.FunctionLength">
         <exclude-pattern>tests/TypeInferenceTest.php</exclude-pattern>

source/composer.json

@@ -7,7 +7,7 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-sodium": "*",
-        "johnpbloch/wordpress": "6.6.0"
+        "johnpbloch/wordpress": "6.6.2"
     },
     "minimum-stability": "stable",
     "config": {

tests/data/Faker.php

@@ -6,7 +6,7 @@
 
 use function PHPStan\Testing\assertType;
 
-// Boleans
+// Booleans
 assertType('bool', Faker::bool());
 assertType('true', Faker::true());
 assertType('false', Faker::false());

wordpress-stubs.php

@@ -89743,9 +89743,8 @@ function _wp_admin_bar_init()
      * the function is also called late on {@see 'wp_footer'}.
      *
      * It includes the {@see 'admin_bar_menu'} action which should be used to hook in and
-     * add new menus to the admin bar. That way you can be sure that you are adding at most
-     * optimal point, right before the admin bar is rendered. This also gives you access to
-     * the `$post` global, among others.
+     * add new menus to the admin bar. This also gives you access to the `$post` global,
+     * among others.
      *
      * @since 3.1.0
      * @since 5.4.0 Called on 'wp_body_open' action first, with 'wp_footer' as a fallback.
@@ -110300,9 +110299,13 @@ function get_tag_regex($tag)
      *     $is_utf8 = is_utf8_charset();
      *
      * @since 6.6.0
+     * @since 6.6.1 A wrapper for _is_utf8_charset
      *
-     * @param ?string $blog_charset Slug representing a text character encoding, or "charset".
-     *                              E.g. "UTF-8", "Windows-1252", "ISO-8859-1", "SJIS".
+     * @see _is_utf8_charset
+     *
+     * @param string|null $blog_charset Optional. Slug representing a text character encoding, or "charset".
+     *                                  E.g. "UTF-8", "Windows-1252", "ISO-8859-1", "SJIS".
+     *                                  Default value is to infer from "blog_charset" option.
      * @return bool Whether the slug represents the UTF-8 encoding.
      */
     function is_utf8_charset($blog_charset = \null)