Merge branch 'master' into xxx_getPhpDocFixersPriorityGraph

PHP-CS-Fixer · Oct 24, 2023 · b8eb999 · b8eb999
2 parents d275682 + 25da939
commit b8eb999
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,11 +34,11 @@ jobs:
 
           - operating-system: 'ubuntu-20.04'
             php-version: '8.0'
-            job-description: 'with Symfony ^6'
-            execute-flex-with-symfony-version: '^6' # explicit check for Symfony 6.x compatibility
 
           - operating-system: 'ubuntu-20.04'
             php-version: '8.1'
+            job-description: 'with Symfony ^6'
+            execute-flex-with-symfony-version: '^6' # explicit check for Symfony 6.x compatibility
 
           - operating-system: 'ubuntu-20.04'
             php-version: '8.2'

diff --git a/doc/rules/language_construct/nullable_type_declaration.rst b/doc/rules/language_construct/nullable_type_declaration.rst
@@ -30,8 +30,8 @@ Example #1
    --- Original
    +++ New
     <?php
-   -function bar(null|int $value, null|\Closure $callable): void {}
-   +function bar(?int $value, ?\Closure $callable): void {}
+   -function bar(null|int $value, null|\Closure $callable): int|null {}
+   +function bar(?int $value, ?\Closure $callable): ?int {}
 
 Example #2
 ~~~~~~~~~~

diff --git a/src/Fixer/LanguageConstruct/NullableTypeDeclarationFixer.php b/src/Fixer/LanguageConstruct/NullableTypeDeclarationFixer.php
@@ -47,7 +47,7 @@ public function getDefinition(): FixerDefinitionInterface
             'Nullable single type declaration should be standardised using configured syntax.',
             [
                 new VersionSpecificCodeSample(
-                    "<?php\nfunction bar(null|int \$value, null|\\Closure \$callable): void {}\n",
+                    "<?php\nfunction bar(null|int \$value, null|\\Closure \$callable): int|null {}\n",
                     new VersionSpecification(8_00_00)
                 ),
                 new VersionSpecificCodeSample(