Add phpstan-strict-rules extension

Author: yguedidi

composer.json

@@ -24,6 +24,7 @@
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-strict-rules": "^1.5",
         "phpstan/phpstan-symfony": "^1.3",
         "symfony/mime": "^5.4 || ^6.0 || ^7.0",
         "symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1",

phpstan.neon

@@ -8,5 +8,6 @@ includes:
     - vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
+    - vendor/phpstan/phpstan-strict-rules/rules.neon
     - vendor/phpstan/phpstan-symfony/extension.neon
     - vendor/phpstan/phpstan-symfony/rules.neon

src/EventListener/BlameListener.php

@@ -51,9 +51,6 @@ public function onKernelRequest(RequestEvent $event): void
         }
     }
 
-    /**
-     * @return string[]
-     */
     public static function getSubscribedEvents()
     {
         return array(

src/EventListener/LocaleListener.php

@@ -30,9 +30,6 @@ public function onKernelRequest(RequestEvent $event): void
         $this->translatableListener->setTranslatableLocale($event->getRequest()->getLocale());
     }
 
-    /**
-     * @return string[]
-     */
     public static function getSubscribedEvents()
     {
         return array(

src/EventListener/LoggerListener.php

@@ -57,9 +57,6 @@ public function onKernelRequest(RequestEvent $event): void
         }
     }
 
-    /**
-     * @return string[]
-     */
     public static function getSubscribedEvents()
     {
         return array(

src/Uploadable/UploadedFileInfo.php

@@ -32,11 +32,13 @@ public function getName()
     }
 
     /**
-     * @return int|false
+     * @return int|null
      */
     public function getSize()
     {
-        return $this->uploadedFile->getSize();
+        $size = $this->uploadedFile->getSize();
+
+        return $size !== false ? $size : null;
     }
 
     /**

tests/DependencyInjection/StofDoctrineExtensionsExtensionTest.php

@@ -45,16 +45,16 @@ public function testLoadORMConfig(string $listener): void
 
         $extension->load(array($config), $container);
 
-        $this->assertTrue($container->hasDefinition('stof_doctrine_extensions.listener.'.$listener));
+        self::assertTrue($container->hasDefinition('stof_doctrine_extensions.listener.'.$listener));
 
         $def = $container->getDefinition('stof_doctrine_extensions.listener.'.$listener);
 
-        $this->assertTrue($def->hasTag('doctrine.event_listener'));
+        self::assertTrue($def->hasTag('doctrine.event_listener'));
 
         $tags = $def->getTag('doctrine.event_listener');
         $configuredManagers = array_unique(array_column($tags, 'connection'));
 
-        $this->assertCount(2, $configuredManagers);
+        self::assertCount(2, $configuredManagers);
     }
 
     /**
@@ -72,16 +72,16 @@ public function testLoadMongodbConfig(string $listener): void
 
         $extension->load(array($config), $container);
 
-        $this->assertTrue($container->hasDefinition('stof_doctrine_extensions.listener.'.$listener));
+        self::assertTrue($container->hasDefinition('stof_doctrine_extensions.listener.'.$listener));
 
         $def = $container->getDefinition('stof_doctrine_extensions.listener.'.$listener);
 
-        $this->assertTrue($def->hasTag('doctrine_mongodb.odm.event_listener'));
+        self::assertTrue($def->hasTag('doctrine_mongodb.odm.event_listener'));
 
         $tags = $def->getTag('doctrine_mongodb.odm.event_listener');
         $configuredManagers = array_unique(array_column($tags, 'connection'));
 
-        $this->assertCount(2, $configuredManagers);
+        self::assertCount(2, $configuredManagers);
     }
 
     /**
@@ -99,15 +99,15 @@ public function testLoadBothConfig(string $listener): void
 
         $extension->load(array($config), $container);
 
-        $this->assertTrue($container->hasDefinition('stof_doctrine_extensions.listener.'.$listener));
+        self::assertTrue($container->hasDefinition('stof_doctrine_extensions.listener.'.$listener));
 
         $def = $container->getDefinition('stof_doctrine_extensions.listener.'.$listener);
 
-        $this->assertTrue($def->hasTag('doctrine.event_listener'));
-        $this->assertTrue($def->hasTag('doctrine_mongodb.odm.event_listener'));
+        self::assertTrue($def->hasTag('doctrine.event_listener'));
+        self::assertTrue($def->hasTag('doctrine_mongodb.odm.event_listener'));
 
-        $this->assertCount(1, array_unique(array_column($def->getTag('doctrine.event_listener'), 'connection')));
-        $this->assertCount(1, array_unique(array_column($def->getTag('doctrine_mongodb.odm.event_listener'), 'connection')));
+        self::assertCount(1, array_unique(array_column($def->getTag('doctrine.event_listener'), 'connection')));
+        self::assertCount(1, array_unique(array_column($def->getTag('doctrine_mongodb.odm.event_listener'), 'connection')));
     }
 
     /**
@@ -131,9 +131,9 @@ public function testEventConsistency(string $listener): void
         $listenerInstance = $container->get('stof_doctrine_extensions.listener.'.$listener);
 
         if (!$listenerInstance instanceof EventSubscriber) {
-            $this->markTestSkipped(sprintf('The listener for "%s" is not a Doctrine event subscriber.', $listener));
+            self::markTestSkipped(sprintf('The listener for "%s" is not a Doctrine event subscriber.', $listener));
         }
 
-        $this->assertEqualsCanonicalizing($listenerInstance->getSubscribedEvents(), $configuredEvents);
+        self::assertEqualsCanonicalizing($listenerInstance->getSubscribedEvents(), $configuredEvents);
     }
 }