refactor #204 Replace AbstractController with ControllerTrait & Conta…

…inerAwareInterface (pamil) This PR was merged into the 1.7-dev branch. Discussion ---------- We can't use `AbstractController` if we want to keep BC - `AbstractController` requires a service locator with predefined dependencies and `ResourceController` requires a container with all public services for BC purposes. Commits ------- 3cf7a05 Replace AbstractController with ControllerTrait & ContainerAwareInterface
Sylius · Oct 15, 2020 · 71da2eb · 71da2eb
2 parents 671d393 + 3cf7a05
commit 71da2eb
Show file tree

Hide file tree

Showing 7 changed files with 465 additions and 10 deletions.
diff --git a/easy-coding-standard.yml b/easy-coding-standard.yml
@@ -17,6 +17,7 @@ services:
 
 parameters:
     exclude_files:
+        - 'src/Bundle/Controller/ControllerTrait.php'
         - 'src/Bundle/test/app/cache/*'
         - 'src/Bundle/test/var/*'
 

diff --git a/phpstan.neon b/phpstan.neon
@@ -10,6 +10,7 @@ parameters:
     reportUnmatchedIgnoredErrors: false
 
     excludes_analyse:
+        - %currentWorkingDirectory%/src/Bundle/Controller/ControllerTrait.php
         - %currentWorkingDirectory%/src/Bundle/DependencyInjection/Configuration.php
         - %currentWorkingDirectory%/src/Bundle/DependencyInjection/PagerfantaConfiguration.php
         - %currentWorkingDirectory%/src/Bundle/DependencyInjection/Driver/Doctrine/DoctrineODMDriver.php

diff --git a/psalm.xml b/psalm.xml
@@ -15,6 +15,7 @@
             <directory name="src/Bundle/Tests" />
             <directory name="src/Component/spec" />
             <directory name="src/Component/vendor" />
+            <file name="src/Bundle/Controller/ControllerTrait.php" />
             <file name="src/Bundle/DependencyInjection/Driver/Doctrine/DoctrineODMDriver.php" />
             <file name="src/Bundle/DependencyInjection/Driver/Doctrine/DoctrinePHPCRDriver.php" />
             <file name="src/Bundle/EventListener/ODM*.php" />