Merge pull request #70 from samsonasik/drop-support-elie29-zend-phpdi-config-less-than-40

drop support for "elie29/zend-phpdi-config":"<4.0"

Author: samsonasik

composer.json

@@ -53,15 +53,15 @@
     },
     "conflict": {
         "doctrine/doctrine-orm-module": "<2.1",
-        "elie29/zend-phpdi-config":"<3.0.8",
+        "elie29/zend-phpdi-config":"<4.0",
         "zendframework/zend-expressive": "<3.0 >=4.0",
         "zendframework/zend-mvc": "<3.0 >=4.0",
         "zendframework/zend-servicemanager": "<3.3"
     },
     "require-dev": {
         "aura/di": "^3.4",
         "doctrine/doctrine-orm-module": "^2.1",
-        "elie29/zend-phpdi-config":"^3.0.9|^4.0",
+        "elie29/zend-phpdi-config":"^4.0",
         "kahlan/kahlan": "^4.1.1",
         "northwoods/container": "^3.0",
         "php-coveralls/php-coveralls": "^2.0",

phpstan.neon

@@ -5,6 +5,4 @@ parameters:
 	excludes_analyse:
 		- src/Controller/ErrorPreviewConsoleController.php
 		- src/Controller/ErrorPreviewController.php
-		- src/Middleware/Routed/Preview/ErrorPreviewAction.php
-	ignoreErrors:
-		- '#ContainerWrapper not found#'
+		- src/Middleware/Routed/Preview/ErrorPreviewAction.php

spec/Middleware/ExpressiveFactorySpec.php

@@ -9,7 +9,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\PDOMySql\Driver;
 use Doctrine\ORM\EntityManager;
-use Elie\PHPDI\Config\ContainerWrapper as EliePHPDIv4ContainerWrapper;
+use Elie\PHPDI\Config\ContainerWrapper as PHPDIContainerWrapper;
 use ErrorHeroModule\Handler\Logging;
 use ErrorHeroModule\Middleware\Expressive;
 use ErrorHeroModule\Middleware\ExpressiveFactory;
@@ -20,7 +20,6 @@
 use Pimple\Psr11\Container as Psr11PimpleContainer;
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder;
-use Zend\DI\Config\ContainerWrapper as EliePHPDIv3ContainerWrapper;
 use Zend\Expressive\Template\TemplateRendererInterface;
 use Zend\ServiceManager\ServiceManager;
 
@@ -31,20 +30,13 @@
     });
 
     given('mapCreateContainers', function () {
-        $map = [
+        return [
             AuraContainer::class               => (new AuraContainerBuilder())->newInstance(),
             SymfonyContainerBuilder::class     => new SymfonyContainerBuilder(),
             AurynInjectorContainer::class      => new AurynInjectorContainer(new AurynInjector()),
             Psr11PimpleContainer::class        => new Psr11PimpleContainer(new PimpleContainer()),
+            PHPDIContainerWrapper::class       => new PHPDIContainerWrapper(),
         ];
-
-        $elie29zendphpdiconfigVersion = str_replace('v', '', \PackageVersions\Versions::getVersion("elie29/zend-phpdi-config"));
-        $phpDI = [
-            $elie29zendphpdiconfigVersion >= 4 ? EliePHPDIv4ContainerWrapper::class : EliePHPDIv3ContainerWrapper::class
-                => $elie29zendphpdiconfigVersion >= 4 ? new EliePHPDIv4ContainerWrapper() : new EliePHPDIv3ContainerWrapper()
-        ];
-
-        return $phpDI + $map;
     });
 
     given('config', function () {

src/Middleware/ExpressiveFactory.php

@@ -7,7 +7,7 @@
 use ArrayObject;
 use Aura\Di\Container as AuraContainer;
 use Doctrine\ORM\EntityManager;
-use Elie\PHPDI\Config\ContainerWrapper as EliePHPDIv4ContainerWrapper;
+use Elie\PHPDI\Config\ContainerWrapper as PHPDIContainerWrapper;
 use ErrorHeroModule\Handler\Logging;
 use ErrorHeroModule\Transformer\AuraService;
 use ErrorHeroModule\Transformer\AurynService;
@@ -21,21 +21,17 @@
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder;
 use Webmozart\Assert\Assert;
-use Zend\DI\Config\ContainerWrapper as EliePHPDIv3ContainerWrapper;
 use Zend\Expressive\Template\TemplateRendererInterface;
 use Zend\ServiceManager\ServiceManager;
 
 class ExpressiveFactory
 {
     private const CONTAINERS_TRANSFORM = [
-        SymfonyContainerBuilder::class     => SymfonyService::class,
-        AuraContainer::class               => AuraService::class,
-        AurynInjectorContainer::class      => AurynService::class,
-        Psr11PimpleContainer::class        => PimpleService::class,
-        // elie29/zend-phpdi-config ^v3.0.9
-        EliePHPDIv3ContainerWrapper::class => PHPDIService::class,
-        // elie29/zend-phpdi-config ^v4.0.0
-        EliePHPDIv4ContainerWrapper::class => PHPDIService::class,
+        SymfonyContainerBuilder::class => SymfonyService::class,
+        AuraContainer::class           => AuraService::class,
+        AurynInjectorContainer::class  => AurynService::class,
+        Psr11PimpleContainer::class    => PimpleService::class,
+        PHPDIContainerWrapper::class   => PHPDIService::class,
     ];
 
     private function createMiddlewareInstance(ContainerInterface $container, array $configuration) : Expressive