satisfying static analysis

SignpostMarv · Feb 20, 2019 · 3732d8e · SignpostMarv · Feb 20, 2019 · weirdan
1 parent 0fd0d8e
commit 3732d8e
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 71 deletions.
diff --git a/Tests/AbstractDaftObject/AbstractDaftObjectImplementationTest.php b/Tests/AbstractDaftObject/AbstractDaftObjectImplementationTest.php
@@ -21,6 +21,9 @@
 */
 class AbstractDaftObjectImplementationTest extends DaftObjectImplementationTest
 {
+    /**
+    * @return Generator<int, array{0:class-string<AbstractDaftObject>, 1:string}, mixed, void>
+    */
     public function dataProvider_FuzzingImplementations_NotPublicGetter() : Generator
     {
         foreach ($this->dataProviderNonAbstractGoodFuzzing() as $args) {
@@ -38,6 +41,9 @@ public function dataProvider_FuzzingImplementations_NotPublicGetter() : Generato
         }
     }
 
+    /**
+    * @return Generator<int, array{0:class-string<AbstractDaftObject>, 1:string}, mixed, void>
+    */
     public function dataProvider_FuzzingImplementations_NotPublicSetter() : Generator
     {
         foreach ($this->dataProviderNonAbstractGoodFuzzing() as $args) {
@@ -55,6 +61,9 @@ public function dataProvider_FuzzingImplementations_NotPublicSetter() : Generato
         }
     }
 
+    /**
+    * @return Generator<int, array{0:class-string<AbstractDaftObject>, 1:string}, mixed, void>
+    */
     public function dataProvider_FuzzingImplementations_NotDefined() : Generator
     {
         foreach ($this->dataProviderNonAbstractGoodFuzzing() as $args) {

diff --git a/Tests/DaftJson/DaftJsonExceptionTest.php b/Tests/DaftJson/DaftJsonExceptionTest.php
@@ -22,6 +22,9 @@
 */
 class DaftJsonExceptionTest extends TestCase
 {
+    /**
+    * @psalm-return array<int, array{0:class-string<DaftObject>, 1:string, 2:array<string, scalar|array|object|null>, 3:bool}>
+    */
     public function dataProviderClassDoesNotImplementClassException() : array
     {
         return [
@@ -43,6 +46,9 @@ public function dataProviderClassDoesNotImplementClassException() : array
         ];
     }
 
+    /**
+    * @psalm-return array<int, array{0:class-string<DaftObject>, 1:class-string<DaftObject>, 2:string, 3:class-string<\Throwable>, 4:string, 5:array<string, scalar|array|object|null>, 6:bool}>
+    */
     public function dataProviderPropertyNotThingableException() : array
     {
         return [

diff --git a/Tests/DaftJson/JsonTypeUtilitiesExceptionsTest.php b/Tests/DaftJson/JsonTypeUtilitiesExceptionsTest.php
@@ -32,7 +32,7 @@ public function test_DaftObjectFromJsonTypeArray_fails_with_non_array() : void
     }
 
     /**
-    * @psalm-return array<int, array{0:class-string<DaftJson>, 1:array, 2:class-string<\Throwable>, 2:string}>
+    * @psalm-return array<int, array{0:class-string<DaftJson>, 1:array, 2:class-string<\Throwable>, 3:string}>
     */
     public function dataProvider_ThrowIfJsonDefNotValid_fails() : array
     {

diff --git a/Tests/DaftObject/DaftObjectImplementationTest.php b/Tests/DaftObject/DaftObjectImplementationTest.php
@@ -1252,21 +1252,9 @@ final public function testNonAbstractGoodFuzzingHasSettersPerPropertyNotNullable
         }
     }
 
-    final public function dataProviderDaftObjectCreatedByArray() : Generator
-    {
-        foreach ($this->dataProviderNonAbstractGoodImplementations() as $args) {
-            if (
-                is_array($args) &&
-                count($args) >= 1 &&
-                is_string($args[0]) &&
-                is_a($args[0], DaftObjectCreatedByArray::class, true)
-            ) {
-                yield [$args[0], true];
-                yield [$args[0], false];
-            }
-        }
-    }
-
+    /**
+    * @return Generator<int, array{0:class-string<AbstractDaftObject>}, mixed, void>
+    */
     final public function DataProviderNotDaftObjectHasPropertiesWithMultiTypedArraysOfUniqueValues(
     ) : Generator {
         foreach ($this->dataProviderImplementations() as $args) {
@@ -1853,18 +1841,4 @@ protected function FuzzingImplementationsViaGenerator() : Generator
     {
         yield from $this->FuzzingImplementationsViaArray();
     }
-
-    /**
-    * @psalm-return Generator<int, array{0:class-string<T&DaftSortableObject>, 1:ReflectionClass, 2:array<string, scalar|array|object|null>, 3:array<int, string>, 4:array<int, string>}, mixed, void>
-    */
-    protected function SortableFuzzingImplementationsViaGenerator() : Generator
-    {
-        foreach ($this->dataProviderNonAbstractGoodFuzzing() as $args) {
-            if (
-                is_a($args[0], DaftSortableObject::class)
-            ) {
-                yield $args;
-            }
-        }
-    }
 }
diff --git a/Tests/DaftObject/MultiTypedArrayPropertyImplementationTest.php b/Tests/DaftObject/MultiTypedArrayPropertyImplementationTest.php
@@ -17,6 +17,9 @@
 
 class MultiTypedArrayPropertyImplementationTest extends TestCase
 {
+    /**
+    * @return Generator<int, array{0: MultiTypedArrayPropertiesTester, 1:string, 2:scalar|array|object|null, 3:class-string<\Throwable>, 4:string}, mixed, void>
+    */
     public function DataProviderObjectPropertyValueException() : Generator
     {
         yield from [
@@ -58,21 +61,26 @@ public function DataProviderObjectPropertyValueException() : Generator
         ];
     }
 
+    /**
+    * @return Generator<int, array{0:MultiTypedArrayPropertiesTester, 1:string, 2:array<int, mixed>}, mixed, void>
+    */
     public function DataProviderObjectPropertyValueNotUniqueAutoDouble() : Generator
     {
-        /**
-        * @var iterable<array<int, mixed>>
-        */
-        $sources = $this->DataProviderObjectPropertyValueNotUnique();
-
-        foreach ($sources as $args) {
+        foreach ($this->DataProviderObjectPropertyValueNotUnique() as $args) {
             static::assertIsArray($args[2] ?? null);
-            $args[2] = array_merge(array_values((array) $args[2]), array_values((array) $args[2]));
+            /**
+            * @var array<int, mixed>
+            */
+            $args_2 = array_merge(array_values((array) $args[2]), array_values((array) $args[2]));
+            $args[2] = $args_2;
 
             yield $args;
         }
     }
 
+    /**
+    * @return Generator<int, array{0:MultiTypedArrayPropertiesTester, 1:string, 2:scalar|array|object|null, 3:scalar|array|object|null}, mixed, void>
+    */
     public function DataProviderObjectPropertyValueTrimmedStrings() : Generator
     {
         yield from [
@@ -146,6 +154,9 @@ public function testAutoTrimmedStrings(
         static::assertSame($expected, $obj->__get($property));
     }
 
+    /**
+    * @return Generator<int, array{0:MultiTypedArrayPropertiesTester, 1:string, 2:scalar|array|object|null}, mixed, void>
+    */
     protected function DataProviderObjectPropertyValueNotUnique() : Generator
     {
         yield from [

diff --git a/Tests/TestCase.php b/Tests/TestCase.php
@@ -346,6 +346,9 @@ final public function dataProvider_DaftObject__interface__has_properties() : Gen
         }
     }
 
+    /**
+    * @psalm-return Generator<int, array{0:class-string<DaftObject>}, mixed, void>
+    */
     public function dataProvider_DaftObject__has_properties() : Generator
     {
         yield from $this->dataProvider_AbstractDaftObject__has_properties();
@@ -403,6 +406,9 @@ final public function dataProvider_DaftObject__interface__has_properties_each_de
         }
     }
 
+    /**
+    * @psalm-return Generator<string, array{0:class-string<AbstractDaftObject>, 1:string}, mixed, void>
+    */
     public function dataProvider_DaftObject__has_properties_each_defined_property() : Generator
     {
         yield from $this->dataProvider_AbstractDaftObject__has_properties_each_defined_property();

diff --git a/psalm.baseline.xml b/psalm.baseline.xml
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files>
-  <file src="Tests\AbstractDaftObject\AbstractDaftObjectImplementationTest.php">
-    <InvalidReturnType occurrences="3">
-      <code>Generator</code>
-      <code>Generator</code>
-      <code>Generator</code>
-    </InvalidReturnType>
-  </file>
   <file src="Tests\DaftJson\DaftJsonExceptionTest.php">
-    <InvalidReturnType occurrences="2">
-      <code>array</code>
-      <code>array</code>
-    </InvalidReturnType>
-  </file>
-  <file src="Tests\DaftJson\JsonTypeUtilitiesExceptionsTest.php">
-    <InvalidArgument occurrences="1">
-      <code>@dataProvider dataProvider_ThrowIfJsonDefNotValid_fails</code>
+    <InvalidArgument occurrences="2">
+      <code>@dataProvider dataProviderClassDoesNotImplementClassException</code>
+      <code>@dataProvider dataProviderPropertyNotThingableException</code>
     </InvalidArgument>
-    <TooFewArguments occurrences="1">
-      <code>@dataProvider dataProvider_ThrowIfJsonDefNotValid_fails</code>
-    </TooFewArguments>
   </file>
   <file src="Tests\DaftObject\DaftObjectImplementationTest.php">
     <InvalidArgument occurrences="6">
@@ -30,20 +15,11 @@
       <code>@dataProvider dataProviderNonAbstractGoodFuzzingHasSettersPerPropertyNotNullable</code>
       <code>@dataProvider dataProviderNonAbstractGoodSortableImplementations</code>
     </InvalidArgument>
-    <InvalidReturnType occurrences="1">
-      <code>Generator</code>
-    </InvalidReturnType>
-    <PossiblyUnusedMethod occurrences="2">
-      <code>final public function dataProviderDaftObjectCreatedByArray() : Generator</code>
-      <code>protected function SortableFuzzingImplementationsViaGenerator() : Generator</code>
-    </PossiblyUnusedMethod>
   </file>
   <file src="Tests\DaftObject\MultiTypedArrayPropertyImplementationTest.php">
-    <InvalidReturnType occurrences="3">
-      <code>Generator</code>
-      <code>Generator</code>
-      <code>Generator</code>
-    </InvalidReturnType>
+    <MoreSpecificReturnType occurrences="1">
+      <code>@return Generator&lt;int, array{0:MultiTypedArrayPropertiesTester, 1:string, 2:array&lt;int, mixed&gt;}, mixed, void&gt;</code>
+    </MoreSpecificReturnType>
   </file>
   <file src="Tests\DaftSortableObject\DaftSortableObjectTest.php">
     <InvalidArgument occurrences="1">
@@ -74,10 +50,6 @@
     </InvalidArgument>
   </file>
   <file src="Tests\TestCase.php">
-    <InvalidReturnType occurrences="2">
-      <code>Generator</code>
-      <code>Generator</code>
-    </InvalidReturnType>
     <UnusedProperty occurrences="3">
       <code>$backupGlobals</code>
       <code>$backupStaticAttributes</code>