setup phpstan

composer.json

@@ -26,6 +26,11 @@
         "doctrine/phpcr-bundle": "^3.0",
         "doctrine/phpcr-odm": "^2.0",
         "jackalope/jackalope-doctrine-dbal": "^2.0",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-doctrine": "^1.3",
+        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-symfony": "^1.3",
+        "phpunit/phpunit": "^9.5",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1.0 || ^5.1.0",
         "matthiasnoback/symfony-config-test": "^4.1.0 || ^5.1.0",
         "symfony/phpunit-bridge": "^7.0.3",

phpstan.neon.dist

@@ -0,0 +1,15 @@
+includes:
+  - vendor/phpstan/phpstan-doctrine/extension.neon
+  - vendor/phpstan/phpstan-doctrine/rules.neon
+  - vendor/phpstan/phpstan-phpunit/extension.neon
+  - vendor/phpstan/phpstan-symfony/extension.neon
+  - vendor/phpstan/phpstan-symfony/rules.neon
+parameters:
+    level: 2
+    paths:
+        - src/
+        - tests/
+    excludePaths:
+        - tests/Fixtures/App/var/
+        - tests/Fixtures/App/config/
+        - tests/Fixtures/fixtures/config/

src/Doctrine/Orm/RouteProvider.php

@@ -52,8 +52,8 @@ public function getRouteCollectionForRequest(Request $request): RouteCollection
         if (0 === \count($candidates)) {
             return $collection;
         }
-        $routes = $this->getRouteRepository()->findByStaticPrefix($candidates, ['position' => 'ASC']);
-        /** @var $route Route */
+        $routes = $this->getRouteRepository()->findByStaticPrefix($candidates, ['position' => 'ASC']); /** @phpstan-ignore-line */
+        /** @var Route $route */
         foreach ($routes as $route) {
             $collection->add($route->getName(), $route);
         }

src/Doctrine/Phpcr/ContentRepository.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr;
 
+use Doctrine\ODM\PHPCR\DocumentManagerInterface;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\DoctrineProvider;
 use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
 
@@ -48,4 +49,17 @@ public function getContentId($content): ?string
             return null;
         }
     }
+
+    /**
+     * Make sure the manager is a PHPCR-ODM manager.
+     */
+    protected function getObjectManager(): DocumentManagerInterface
+    {
+        $dm = parent::getObjectManager();
+        if (!$dm instanceof DocumentManagerInterface) {
+            throw new \LogicException(sprintf('Expected %s, got %s', DocumentManagerInterface::class, get_class($dm)));
+        }
+
+        return $dm;
+    }
 }

src/Doctrine/Phpcr/RouteProvider.php

@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\ODM\PHPCR\DocumentManager;
+use Doctrine\ODM\PHPCR\DocumentManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use PHPCR\RepositoryException;
 use PHPCR\Util\UUIDHelper;
@@ -85,7 +86,6 @@ public function getRouteCollectionForRequest(Request $request): RouteCollection
         }
 
         try {
-            /** @var $dm DocumentManager */
             $dm = $this->getObjectManager();
             $routes = $dm->findMany($this->className, $candidates);
             // filter for valid route objects
@@ -151,7 +151,6 @@ private function getAllRoutes(): iterable
         }
 
         try {
-            /** @var $dm DocumentManager */
             $dm = $this->getObjectManager();
         } catch (RepositoryException $e) {
             // special case: there is not even a database existing. this means there are no routes.
@@ -192,7 +191,6 @@ public function getRoutesByNames(?array $names = null): iterable
             return [];
         }
 
-        /** @var $dm DocumentManager */
         $dm = $this->getObjectManager();
         $documents = $dm->findMany($this->className, $candidates);
         foreach ($documents as $key => $document) {
@@ -210,4 +208,17 @@ public function getRoutesByNames(?array $names = null): iterable
 
         return $documents;
     }
+
+    /**
+     * Make sure the manager is a PHPCR-ODM manager.
+     */
+    protected function getObjectManager(): DocumentManagerInterface
+    {
+        $dm = parent::getObjectManager();
+        if (!$dm instanceof DocumentManagerInterface) {
+            throw new \LogicException(sprintf('Expected %s, got %s', DocumentManagerInterface::class, get_class($dm)));
+        }
+
+        return $dm;
+    }
 }

src/Validator/Constraints/RouteDefaultsTwigValidator.php

@@ -33,6 +33,9 @@ public function __construct(ControllerResolverInterface $controllerResolver, ?Lo
 
     public function validate($defaults, Constraint $constraint)
     {
+        if (!$constraint instanceof RouteDefaults) {
+            throw new \InvalidArgumentException(sprintf('Expected %s, got %s', RouteDefaults::class, get_class($constraint)));
+        }
         if (\array_key_exists('_controller', $defaults) && null !== $defaults['_controller']) {
             $controller = $defaults['_controller'];
 

tests/Fixtures/App/DataFixtures/Phpcr/LoadRouteData.php

@@ -13,6 +13,7 @@
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\ODM\PHPCR\Document\Generic;
+use Doctrine\ODM\PHPCR\DocumentManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use PHPCR\Util\NodeHelper;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute;
@@ -22,6 +23,9 @@ class LoadRouteData implements FixtureInterface
 {
     public function load(ObjectManager $manager)
     {
+        if (!$manager instanceof DocumentManagerInterface) {
+            throw new \InvalidArgumentException(sprintf('Expected %s, got %s', DocumentManagerInterface::class, get_class($manager)));
+        }
         NodeHelper::createPath($manager->getPhpcrSession(), '/test');
 
         $root = $manager->find(null, '/test');

tests/Fixtures/App/Document/Content.php

@@ -22,7 +22,7 @@ class Content
     #[PHPCRODM\ParentDocument]
     private $parent;
 
-    #[PHPCRODM\NodeName]
+    #[PHPCRODM\Nodename]
     private $name;
 
     #[PHPCRODM\Field(type: 'string')]

tests/Fixtures/App/Kernel.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App;
 
+use Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle;
 use Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle;
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
@@ -31,10 +32,10 @@ public function configure(): void
 
         $this->registerConfiguredBundles();
 
-        if (class_exists(CmfResourceRestBundle::class)) {
+        if (class_exists(CmfResourceBundle::class) && class_exists(CmfResourceRestBundle::class)) {
             $this->addBundles([
-                new \Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle(),
-                new \Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle(),
+                new CmfResourceBundle(),
+                new CmfResourceRestBundle(),
             ]);
         }
     }

tests/Functional/Doctrine/Phpcr/RedirectRouteTest.php

@@ -51,9 +51,8 @@ public function testRedirectDoctrine()
         $route = $this->getDm()->find(null, self::ROUTE_ROOT.'/testroute');
         $redirect = $this->getDm()->find(null, self::ROUTE_ROOT.'/redirect');
 
-        $this->assertInstanceOf(RedirectRouteInterface::class, $redirect);
+        $this->assertInstanceOf(RedirectRoute::class, $redirect);
         $this->assertSame($redirect, $redirect->getContent());
-        $params = $redirect->getParameters();
         $this->assertSame($route, $redirect->getRouteTarget());
         $defaults = $redirect->getDefaults();
         $this->assertEquals(['test' => 'toast'], $defaults);

tests/Unit/Doctrine/Phpcr/RouteTest.php

@@ -33,15 +33,14 @@ public function testGetRouteChildren(): void
     {
         $refl = new \ReflectionClass($this->route);
         $prop = $refl->getProperty('children');
-        $prop->setAccessible(true);
         $prop->setValue($this->route, new ArrayCollection([
             new \stdClass(),
             $this->childRoute1,
         ]));
 
         $res = $this->route->getRouteChildren();
         $this->assertCount(1, $res);
-        $this->assertEquals('child route1', $res[0]->getName());
+        $this->assertSame($this->childRoute1, $res[0]);
     }
 
     public function testGetRouteChildrenNull(): void