Upgrade PHPStan (#1033)

- Upgrade to PHPStan 0.12 - Fix a few errors reported
nelmio · May 15, 2020 · fd8f9a4 · fd8f9a4
2 parents 8e83109 + cda58df
commit fd8f9a4
Show file tree

Hide file tree

Showing 35 changed files with 41 additions and 370 deletions.
diff --git a/fixtures/Definition/Object/ImmutableByCloneObject.php b/fixtures/Definition/Object/ImmutableByCloneObject.php
@@ -29,9 +29,8 @@ class ImmutableByCloneObject implements ObjectInterface
 
     /**
      * @param string $id
-     * @param object $instance
      */
-    public function __construct(string $id, $instance)
+    public function __construct(string $id, object $instance)
     {
         $this->id = $id;
         $this->instance = $instance;
@@ -56,7 +55,7 @@ public function getInstance()
     /**
      * @inheritdoc
      */
-    public function withInstance($newInstance)
+    public function withInstance(object $newInstance)
     {
         return new self($this->id, $newInstance);
     }

diff --git a/src/Definition/Object/CompleteObject.php b/src/Definition/Object/CompleteObject.php
@@ -50,7 +50,7 @@ public function getInstance()
     /**
      * @inheritdoc
      */
-    public function withInstance($newInstance)
+    public function withInstance(object $newInstance)
     {
         throw new LogicException('Cannot create a new object from a complete object.');
     }

diff --git a/src/Definition/Object/SimpleObject.php b/src/Definition/Object/SimpleObject.php
@@ -14,7 +14,6 @@
 namespace Nelmio\Alice\Definition\Object;
 
 use Nelmio\Alice\ObjectInterface;
-use Nelmio\Alice\Throwable\Error\TypeErrorFactory;
 
 /**
  * Minimalist implementation of ObjectInterface.
@@ -31,15 +30,8 @@ final class SimpleObject implements ObjectInterface
      */
     private $instance;
 
-    /**
-     * @param object $instance
-     */
-    public function __construct(string $id, $instance)
+    public function __construct(string $id, object $instance)
     {
-        if (false === is_object($instance)) {
-            throw TypeErrorFactory::createForObjectArgument($instance);
-        }
-
         $this->reference = $id;
         $this->instance = $instance;
     }

diff --git a/src/Generator/Resolver/Value/Chainable/FixtureReferenceResolver.php b/src/Generator/Resolver/Value/Chainable/FixtureReferenceResolver.php
@@ -156,7 +156,9 @@ private function resolveReferredFixture(
                 $fixtureSet
             );
         } catch (CircularReferenceException $exception) {
-            if (false === $needsCompleteGeneration && null !== $passIncompleteObject) {
+            if (!isset($needsCompleteGeneration)
+                || (false === $needsCompleteGeneration && null !== $passIncompleteObject)
+            ) {
                 throw $exception;
             }
 

diff --git a/src/Loader/NativeLoader.php b/src/Loader/NativeLoader.php
@@ -182,7 +182,7 @@
  * @method GeneratorInterface getGenerator()
  * @method ParserInterface getParser()
  * @method DenormalizerInterface getDenormalizer()
- * @method FixtureBagDenormalizerInterface getFixtureBagDenormalizer
+ * @method FixtureBagDenormalizerInterface getFixtureBagDenormalizer()
  * @method FixtureDenormalizerInterface getFixtureDenormalizer()
  * @method FlagParserInterface getFlagParser()
  * @method ConstructorDenormalizerInterface getConstructorDenormalizer()

diff --git a/src/Loader/SimpleFilesLoader.php b/src/Loader/SimpleFilesLoader.php
@@ -18,7 +18,6 @@
 use Nelmio\Alice\IsAServiceTrait;
 use Nelmio\Alice\ObjectSet;
 use Nelmio\Alice\Parser\IncludeProcessor\IncludeDataMerger;
-use Nelmio\Alice\Parser\IncludeProcessorInterface;
 use Nelmio\Alice\ParserInterface;
 
 final class SimpleFilesLoader implements FilesLoaderInterface
@@ -31,7 +30,7 @@ final class SimpleFilesLoader implements FilesLoaderInterface
     private $dataLoader;
 
     /**
-     * @var IncludeProcessorInterface
+     * @var IncludeDataMerger
      */
     private $dataMerger;
 

diff --git a/src/ObjectInterface.php b/src/ObjectInterface.php
@@ -32,9 +32,7 @@ public function getId(): string;
     public function getInstance();
 
     /**
-     * @param object $newInstance
-     *
      * @return static
      */
-    public function withInstance($newInstance);
+    public function withInstance(object $newInstance);
 }
diff --git a/src/Parser/IncludeProcessor/DefaultIncludeProcessor.php b/src/Parser/IncludeProcessor/DefaultIncludeProcessor.php
@@ -104,9 +104,6 @@ public function process(ParserInterface $parser, string $file, array $data): arr
         return $this->dataMerger->mergeInclude($data, $includeData);
     }
 
-    /**
-     * @param string[] $include
-     */
     private function retrieveIncludeData(ParserInterface $parser, string $file, array $include): array
     {
         $data = [];

diff --git a/src/Throwable/Error/TypeErrorFactory.php b/src/Throwable/Error/TypeErrorFactory.php
@@ -23,16 +23,6 @@
  */
 final class TypeErrorFactory
 {
-    public static function createForObjectArgument($instance): TypeError
-    {
-        return new TypeError(
-            sprintf(
-                'Expected instance argument to be an object. Got "%s" instead.',
-                gettype($instance)
-            )
-        );
-    }
-
     public static function createForDynamicArrayQuantifier($quantifier): TypeError
     {
         return new TypeError(

diff --git a/src/Throwable/Exception/Generator/Instantiator/InstantiationExceptionFactory.php b/src/Throwable/Exception/Generator/Instantiator/InstantiationExceptionFactory.php
@@ -69,10 +69,7 @@ public static function createForCouldNotGetConstructorData(
         );
     }
 
-    /**
-     * @param object           $instance
-     */
-    public static function createForInvalidInstanceType(FixtureInterface $fixture, $instance): InstantiationException
+    public static function createForInvalidInstanceType(FixtureInterface $fixture, ?object $instance): InstantiationException
     {
         return new InstantiationException(
             sprintf(

diff --git a/src/Throwable/LoadingThrowable.php b/src/Throwable/LoadingThrowable.php
@@ -13,6 +13,8 @@
 
 namespace Nelmio\Alice\Throwable;
 
-interface LoadingThrowable
+use Throwable;
+
+interface LoadingThrowable extends Throwable
 {
 }
diff --git a/tests/Definition/Fixture/TemplatingTest.php b/tests/Definition/Fixture/TemplatingTest.php
@@ -27,7 +27,7 @@
 class TemplatingTest extends TestCase
 {
     /**
-     * @depends Nelmio\Alice\Definition\ServiceReference\FixtureReferenceTest::testIsImmutable
+     * @depends \Nelmio\Alice\Definition\ServiceReference\FixtureReferenceTest::testIsImmutable
      */
     public function testIsImmutable()
     {

diff --git a/tests/Definition/Object/CompleteObjectTest.php b/tests/Definition/Object/CompleteObjectTest.php
@@ -18,6 +18,7 @@
 use Nelmio\Alice\ObjectInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use stdClass;
 
 /**
  * @covers \Nelmio\Alice\Definition\Object\CompleteObject
@@ -129,6 +130,6 @@ public function testCannotCreateANewInstance()
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Cannot create a new object from a complete object.');
 
-        $object->withInstance(null);
+        $object->withInstance(new stdClass());
     }
 }
diff --git a/tests/Definition/Object/SimpleObjectTest.php b/tests/Definition/Object/SimpleObjectTest.php
@@ -85,25 +85,4 @@ public function testNamedConstructor()
         $this->assertEquals(new SimpleObject($reference, $originalInstance), $object);
         $this->assertEquals(new SimpleObject($reference, $originalNewInstance), $newObject);
     }
-
-    /**
-     * @dataProvider provideInvalidInstances
-     */
-    public function testThrowsAnErrorIfInstanceIsNotAnObject($instance)
-    {
-        $this->expectException(\TypeError::class);
-        $this->expectExceptionMessageMatches('/^Expected instance argument to be an object. Got ".+?" instead\.$/');
-
-        new SimpleObject('user0', $instance);
-    }
-
-    public function provideInvalidInstances()
-    {
-        return [
-            'null' => [null],
-            'string' => ['string value'],
-            'int' => [10],
-            'float' => [1.01],
-        ];
-    }
 }
diff --git a/tests/Definition/Value/FixtureMethodCallValueTest.php b/tests/Definition/Value/FixtureMethodCallValueTest.php
@@ -39,8 +39,8 @@ public function testReadAccessorsReturnPropertiesValues()
     }
 
     /**
-     * @depends Nelmio\Alice\Definition\ServiceReference\FixtureReferenceTest::testIsImmutable
-     * @depends Nelmio\Alice\Definition\Value\FunctionCallValueTest::testIsImmutable
+     * @depends \Nelmio\Alice\Definition\ServiceReference\FixtureReferenceTest::testIsImmutable
+     * @depends \Nelmio\Alice\Definition\Value\FunctionCallValueTest::testIsImmutable
      */
     public function testIsImmutable()
     {

diff --git a/tests/Definition/Value/FixturePropertyValueTest.php b/tests/Definition/Value/FixturePropertyValueTest.php
@@ -39,7 +39,7 @@ public function testReadAccessorsReturnPropertiesValues()
     }
 
     /**
-     * @depends Nelmio\Alice\Definition\Value\FixtureReferenceValueTest::testIsImmutable
+     * @depends \Nelmio\Alice\Definition\Value\FixtureReferenceValueTest::testIsImmutable
      */
     public function testIsImmutable()
     {

diff --git a/tests/FixtureBuilder/BareFixtureSetTest.php b/tests/FixtureBuilder/BareFixtureSetTest.php
@@ -36,8 +36,8 @@ public function testReadAccessorsReturnPropertiesValues()
     }
 
     /**
-     * @depends Nelmio\Alice\ParameterBagTest::testIsImmutable
-     * @depends Nelmio\Alice\FixtureBagTest::testIsImmutable
+     * @depends \Nelmio\Alice\ParameterBagTest::testIsImmutable
+     * @depends \Nelmio\Alice\FixtureBagTest::testIsImmutable
      */
     public function testIsImmutable()
     {

diff --git a/...normalizer/SimpleDenormalizerTestTest.php → ...r/Denormalizer/SimpleDenormalizerTest.php b/...normalizer/SimpleDenormalizerTestTest.php → ...r/Denormalizer/SimpleDenormalizerTest.php
diff --git a/tests/FixtureBuilder/ExpressionLanguage/TokenTest.php b/tests/FixtureBuilder/ExpressionLanguage/TokenTest.php
@@ -33,7 +33,7 @@ public function testReadAccessorsReturnPropertiesValues()
     }
 
     /**
-     * @depends Nelmio\Alice\FixtureBuilder\ExpressionLanguage\TokenTypeTest::testIsImmutable
+     * @depends \Nelmio\Alice\FixtureBuilder\ExpressionLanguage\TokenTypeTest::testIsImmutable
      */
     public function testIsImmutable()
     {

diff --git a/tests/Generator/Instantiator/InstantiatorRegistryTest.php b/tests/Generator/Instantiator/InstantiatorRegistryTest.php
@@ -66,15 +66,15 @@ public function testPassValueResolverAwarenessPropertyToItsInstantiator()
         $newRegistry = $registry->withValueResolver($resolver);
 
         $this->assertEquals(new InstantiatorRegistry([]), $registry);
-        $this->assertEquals(new InstantiatorRegistry([], $resolver), $newRegistry);
+        $this->assertEquals(new InstantiatorRegistry([]), $newRegistry);
 
 
         $registry = new InstantiatorRegistry([new FakeChainableInstantiator()]);
         $newRegistry = $registry->withValueResolver($resolver);
 
         $this->assertEquals(new InstantiatorRegistry([new FakeChainableInstantiator()]), $registry);
         $this->assertEquals(
-            new InstantiatorRegistry([new FakeChainableInstantiator()], $resolver),
+            new InstantiatorRegistry([new FakeChainableInstantiator()]),
             $newRegistry
         );
 
@@ -94,7 +94,7 @@ public function testPassValueResolverAwarenessPropertyToItsInstantiator()
 
         $this->assertEquals(new InstantiatorRegistry([$nonAwareInstantiator, $instantiator]), $registry);
         $this->assertEquals(
-            new InstantiatorRegistry([$nonAwareInstantiator, new FakeChainableInstantiator()], $resolver),
+            new InstantiatorRegistry([$nonAwareInstantiator, new FakeChainableInstantiator()]),
             $newRegistry
         );