Merge pull request #48 from samsonasik/php-di-support

samsonasik · web-flow · commit a6279900b9e5 · 2018-06-29T23:36:26.000+07:00
PHP DI support
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "samsonasik/error-hero-module",
     "type": "library",
     "description": "A Hero for your Zend Framework application to trap php errors & exceptions",
-    "keywords": ["zf2", "zf3", "error", "expressive", "hero", "log", "logger", "logging", "mail", "db", "doctrine", "handler", "psr3", "psr7", "psr11", "psr15", "zend-view", "twig", "plates", "symfony", "aura", "auryn", "pimple"],
+    "keywords": ["zf2", "zf3", "error", "expressive", "hero", "log", "logger", "logging", "mail", "db", "doctrine", "handler", "psr3", "psr7", "psr11", "psr15", "zend-view", "twig", "plates", "symfony", "aura", "auryn", "pimple", "php-di"],
     "homepage": "https://github.com/samsonasik/ErrorHeroModule",
     "license": "MIT",
     "authors": [
@@ -30,6 +30,7 @@
         "kahlan/kahlan": "^4.1.1",
         "northwoods/container": "^3.0",
         "php-coveralls/php-coveralls": "^2.0",
+        "php-di/php-di": "^6.0",
         "phpstan/phpstan": "^0.10",
         "phpstan/phpstan-beberlei-assert": "^0.10",
         "pimple/pimple": "^3.2",
diff --git a/spec/Handler/Formatter/JsonSpec.php b/spec/Handler/Formatter/JsonSpec.php
@@ -4,7 +4,6 @@
 
 use DateTime;
 use ErrorHeroModule\Handler\Formatter\Json;
-use Zend\Http\Header\Cookie;
 
 describe('Json', function () {
 
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForCannotConnecttoDBSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForCannotConnecttoDBSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Zend\Console\Console;
 use Zend\Mvc\Application;
 
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForErrorShownSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForErrorShownSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec\Integration;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Zend\Console\Console;
 use Zend\Mvc\Application;
 
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForHasCookieSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForHasCookieSpec.php
@@ -3,12 +3,10 @@
 namespace ErrorHeroModule\Spec;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Zend\Console\Console;
 use Zend\Db\Adapter\Adapter;
 use Zend\Db\ResultSet\ResultSet;
 use Zend\Db\TableGateway\TableGateway;
-use Zend\Http\Header\Cookie;
 use Zend\Mvc\Application;
 
 describe('Integration via ErrorPreviewController for has cookie', function () {
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForIdempotentSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForIdempotentSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Zend\Console\Console;
 use Zend\Mvc\Application;
 
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec\Integration;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Zend\Console\Console;
 use Zend\Http\PhpEnvironment\Request;
 use Zend\Http\PhpEnvironment\Response;
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestWithNonJsonMessageSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerForXmlHttpRequestWithNonJsonMessageSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec\Integration;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Zend\Console\Console;
 use Zend\Http\PhpEnvironment\Request;
 use Zend\Http\PhpEnvironment\Response;
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Zend\Console\Console;
 use Zend\Db\Adapter\Adapter;
 use Zend\Db\ResultSet\ResultSet;
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Kahlan\Plugin\Quit;
 use Zend\Console\Console;
 use Zend\Db\Adapter\Adapter;
diff --git a/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailWithEmptyReceiversSpec.php b/spec/Integration/IntegrationViaErrorPreviewControllerWithEnableSendMailWithEmptyReceiversSpec.php
@@ -3,7 +3,6 @@
 namespace ErrorHeroModule\Spec;
 
 use ErrorHeroModule;
-use ErrorHeroModule\Controller\ErrorPreviewController;
 use Kahlan\Plugin\Quit;
 use Zend\Console\Console;
 use Zend\Db\Adapter\Adapter;
diff --git a/spec/Middleware/ExpressiveFactorySpec.php b/spec/Middleware/ExpressiveFactorySpec.php
@@ -5,6 +5,7 @@
 use Aura\Di\Container as AuraContainer;
 use Aura\Di\ContainerBuilder as AuraContainerBuilder;
 use Auryn\Injector as AurynInjector;
+use DI\Container as PHPDIContainer;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\PDOMySql\Driver;
 use Doctrine\ORM\EntityManager;
@@ -34,6 +35,7 @@
             SymfonyContainerBuilder::class => new SymfonyContainerBuilder(),
             AurynInjectorContainer::class => new AurynInjectorContainer(new AurynInjector()),
             Psr11PimpleContainer::class => new Psr11PimpleContainer(new PimpleContainer()),
+            PHPDIContainer::class => new PHPDIContainer(),
         ];
     });
 
diff --git a/spec/Middleware/ExpressiveSpec.php b/spec/Middleware/ExpressiveSpec.php
@@ -11,7 +11,6 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Uri;
-use Zend\Expressive\Template\TemplateRendererInterface;
 use Zend\Expressive\ZendView\ZendViewRenderer;
 use Zend\Http\PhpEnvironment\Request;
 use Zend\Log\Logger;
diff --git a/src/Middleware/ExpressiveFactory.php b/src/Middleware/ExpressiveFactory.php
@@ -5,11 +5,13 @@
 namespace ErrorHeroModule\Middleware;
 
 use Aura\Di\Container as AuraContainer;
+use DI\Container as PHPDIContainer;
 use Doctrine\ORM\EntityManager;
 use ErrorHeroModule\Handler\Logging;
 use ErrorHeroModule\Transformer\AuraService;
 use ErrorHeroModule\Transformer\AurynService;
 use ErrorHeroModule\Transformer\Doctrine;
+use ErrorHeroModule\Transformer\PHPDIService;
 use ErrorHeroModule\Transformer\PimpleService;
 use ErrorHeroModule\Transformer\SymfonyService;
 use Northwoods\Container\InjectorContainer as AurynInjectorContainer;
@@ -27,6 +29,7 @@ class ExpressiveFactory
         AuraContainer::class           => AuraService::class,
         AurynInjectorContainer::class  => AurynService::class,
         Psr11PimpleContainer::class    => PimpleService::class,
+        PHPDIContainer::class          => PHPDIService::class,
     ];
 
     private function createMiddlewareInstance(ContainerInterface $container, array $configuration) : Expressive
diff --git a/src/Transformer/PHPDIService.php b/src/Transformer/PHPDIService.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ErrorHeroModule\Transformer;
+
+use Assert\Assertion;
+use DI\Container as PHPDIContainer;
+use Psr\Container\ContainerInterface;
+
+class PHPDIService extends TransformerAbstract implements TransformerInterface
+{
+    public static function transform(ContainerInterface $container, array $configuration) : ContainerInterface
+    {
+        Assertion::isInstanceOf($container, PHPDIContainer::class);
+
+        $dbAdapterConfig = parent::getDbAdapterConfig($configuration);
+        $logger          = parent::getLoggerInstance($configuration, $dbAdapterConfig);
+
+        $container->set('ErrorHeroModuleLogger', $logger);
+
+        return $container;
+    }
+}
