Merge pull request #8 from dotkernel/issue-5

updated composer, badges
dotkernel · Feb 11, 2022 · c85dd5b · c85dd5b
2 parents 6716d50 + 27f31d5
commit c85dd5b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/OSSMETADATA b/OSSMETADATA
@@ -0,0 +1 @@
+osslifecycle=active
diff --git a/README.md b/README.md
@@ -2,6 +2,15 @@
 
 Logging Error Handler for DotKernel
 
+![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-errorhandler)
+
+[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-debugbar/issues)
+[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-debugbar/network)
+[![GitHub stars](https://img.shields.io/github/stars/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-debugbar/stargazers)
+[![GitHub license](https://img.shields.io/github/license/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-debugbar/blob/main/LICENSE.md)
+
+![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/3.1.1)
+
 ## Adding the error handler
 
 * Add the composer package:

diff --git a/composer.json b/composer.json
@@ -21,13 +21,12 @@
     ],
     "require": {
         "php": "^7.4",
+        "dotkernel/dot-log": "^3.0",
+        "laminas/laminas-dependency-plugin": "^2.0",
         "laminas/laminas-diactoros": "^2.2",
-        "mezzio/mezzio": "^3.2",
         "laminas/laminas-log": "^2.12",
-        "dotkernel/dot-log": "^3.0",
         "psr/http-message": "^1.0",
-        "psr/container": "^1.0",
-        "laminas/laminas-dependency-plugin": "^2.0"
+        "psr/container": "^1.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/ErrorHandlerFactory.php b/src/ErrorHandlerFactory.php
@@ -11,15 +11,13 @@
 
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
-use Mezzio\Middleware\ErrorResponseGenerator;
-// use Dot\ErrorHandler\ErrorHandler;
 
 class ErrorHandlerFactory
 {
     public function __invoke(ContainerInterface $container) : ErrorHandler
     {
-        $generator = $container->has(ErrorResponseGenerator::class)
-            ? $container->get(ErrorResponseGenerator::class)
+        $generator = $container->has(\Mezzio\Middleware\ErrorResponseGenerator::class)
+            ? $container->get(\Mezzio\Middleware\ErrorResponseGenerator::class)
             : null;
 
         return new ErrorHandler($container->get(ResponseInterface::class), $generator);

diff --git a/src/LogErrorHandlerFactory.php b/src/LogErrorHandlerFactory.php
@@ -8,7 +8,6 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\MiddlewareInterface;
-use Mezzio\Middleware\ErrorResponseGenerator;
 use Laminas\Log\LoggerInterface;
 
 class LogErrorHandlerFactory
@@ -33,8 +32,8 @@ public function __invoke(ContainerInterface $container) : MiddlewareInterface
             $logger = $container->get($errorHandlerConfig['logger']);
         }
 
-        $generator = $container->has(ErrorResponseGenerator::class)
-            ? $container->get(ErrorResponseGenerator::class)
+        $generator = $container->has(\Mezzio\Middleware\ErrorResponseGenerator::class)
+            ? $container->get(\Mezzio\Middleware\ErrorResponseGenerator::class)
             : null;
 
         return new LogErrorHandler($container->get(ResponseInterface::class), $generator, $logger);