Merge pull request #679 from ergebnis/dependabot/composer/ergebnis/ph…

…p-cs-fixer-config-6.19.0 composer(deps-dev): Bump ergebnis/php-cs-fixer-config from 6.17.0 to 6.19.0
ergebnis · Jan 6, 2024 · 8c198ef · 8c198ef
2 parents 1920fbe + 0ee6152
commit 8c198ef
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 36 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -18,7 +18,7 @@
     __DIR__ . '/LICENSE.md',
     License\Range::since(
         License\Year::fromString('2020'),
-        new \DateTimeZone('UTC'),
+        new DateTimeZone('UTC'),
     ),
     License\Holder::fromString('Andreas Möller'),
     License\Url::fromString('https://github.com/ergebnis/environment-variables'),

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "ergebnis/composer-normalize": "^2.41.1",
     "ergebnis/data-provider": "^3.2.0",
     "ergebnis/license": "^2.4.0",
-    "ergebnis/php-cs-fixer-config": "^6.17.0",
+    "ergebnis/php-cs-fixer-config": "^6.19.0",
     "ergebnis/phpunit-slow-test-detector": "^2.9.0",
     "infection/infection": "~0.27.9",
     "phpunit/phpunit": "^10.5.5",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
+<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
   <file src="src/FakeVariables.php">
     <DocblockTypeContradiction>
       <code>!\is_string($name)</code>
@@ -32,9 +32,7 @@
     </UnnecessaryVarAnnotation>
   </file>
   <file src="test/DataProvider/Name.php">
-    <MixedReturnTypeCoercion>
-      <code><![CDATA[\Generator<string, array<int>>]]></code>
-      <code><![CDATA[\Generator<string, array<string>>]]></code>
+    <LessSpecificReturnStatement>
       <code><![CDATA[self::provideDataForValues([
             'int-greater-than-one' => $faker->numberBetween(2),
             'int-less-than-minus-one' => -1 * $faker->numberBetween(2),
@@ -50,16 +48,24 @@
                 self::faker()->sentence(),
             ),
         ])]]></code>
-    </MixedReturnTypeCoercion>
+    </LessSpecificReturnStatement>
+    <MoreSpecificReturnType>
+      <code><![CDATA[\Generator<string, list<int>>]]></code>
+      <code><![CDATA[\Generator<string, list<string>>]]></code>
+    </MoreSpecificReturnType>
     <PossiblyUnusedMethod>
       <code>invalidType</code>
       <code>invalidValue</code>
     </PossiblyUnusedMethod>
   </file>
   <file src="test/DataProvider/Value.php">
+    <LessSpecificReturnStatement>
+      <code><![CDATA[self::provideDataForValues([
+            'bool-true' => true,
+        ])]]></code>
+    </LessSpecificReturnStatement>
     <MixedReturnTypeCoercion>
       <code><![CDATA[\Generator<string, array<int, null|array|float|int|resource|\stdClass|true>>]]></code>
-      <code><![CDATA[\Generator<string, array<null|int|object|true>>]]></code>
       <code><![CDATA[self::provideDataForValues([
             'array' => $faker->words(),
             'float' => $faker->randomFloat(),
@@ -68,10 +74,10 @@
             'object' => new \stdClass(),
             'resource' => $resource,
         ])]]></code>
-      <code><![CDATA[self::provideDataForValues([
-            'bool-true' => true,
-        ])]]></code>
     </MixedReturnTypeCoercion>
+    <MoreSpecificReturnType>
+      <code><![CDATA[\Generator<string, list<null|int|object|true>>]]></code>
+    </MoreSpecificReturnType>
     <PossiblyUnusedMethod>
       <code>invalidType</code>
       <code>invalidValue</code>

diff --git a/test/DataProvider/Name.php b/test/DataProvider/Name.php
@@ -18,7 +18,7 @@
 final class Name extends DataProvider\AbstractProvider
 {
     /**
-     * @return \Generator<string, array<int>>
+     * @return \Generator<string, list<int>>
      */
     public static function invalidType(): \Generator
     {
@@ -34,7 +34,7 @@ public static function invalidType(): \Generator
     }
 
     /**
-     * @return \Generator<string, array<string>>
+     * @return \Generator<string, list<string>>
      */
     public static function invalidValue(): \Generator
     {

diff --git a/test/DataProvider/Value.php b/test/DataProvider/Value.php
@@ -38,7 +38,7 @@ public static function invalidType(): \Generator
     }
 
     /**
-     * @return \Generator<string, array<null|int|object|true>>
+     * @return \Generator<string, list<null|int|object|true>>
      */
     public static function invalidValue(): \Generator
     {

diff --git a/test/Unit/Exception/NotBackedUpTest.php b/test/Unit/Exception/NotBackedUpTest.php
@@ -24,7 +24,7 @@ final class NotBackedUpTest extends Framework\TestCase
 
     public function testNamesReturnsException(): void
     {
-        /** @var array<string> $names */
+        /** @var list<string> $names */
         $names = self::faker()->words();
 
         $exception = Exception\NotBackedUp::names(...$names);
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ public static function invalidType(): \Generator @@
         }
         /**
-         * @return \Generator<string, array<null|int|object|true>>
+         * @return \Generator<string, list<null|int|object|true>>
          */
         public static function invalidValue(): \Generator
         {
@@ Expand Down @@