Merge pull request #1 from phphacks/OV-12

Ov 12

composer.json

@@ -5,10 +5,12 @@
     "require": {
         "zendframework/zend-mvc": "^3.1",
         "respect/validation": "^1.1",
-        "zendframework/zend-log": "^2.10"
+        "zendframework/zend-log": "^2.10",
+        "phphacks/zend-mvc-di": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.2"
+        "phpunit/phpunit": "^7.2",
+        "zendframework/zend-test": "^3.2"
     },
     "license": "MIT",
     "autoload": {

config/module.config.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'listeners' => [
+        "Zend\Mvc\ErrorInterceptor\Listener\ErrorEventListener"
+    ],
+    'service_manager' => [
+        'factories' => [
+            "Zend\Mvc\ErrorInterceptor\Listener\ErrorEventListener" => Zend\Mvc\ErrorInterceptor\Factory\ErrorEventListenerFactory::class
+        ]
+    ]
+];

src/Common/Enums/Configuration.php

@@ -11,7 +11,5 @@ interface Configuration
     const LOGGER = 'logger';
     const TYPEOF = 'typeof';
     const IGNORED = 'ignored';
-    const CONFIG = 'config';
-    const CONFIG_ADAPTER = 'adapter';
-    const CONFIG_SUBJECTS = 'subjects';
+    const FACTORY = 'factory';
 }

src/Common/ErrorLogging.php

@@ -52,6 +52,4 @@ public function addLogger(LoggerDefinition $logger)
         $this->loggers[] = $logger;
     }
 
-
-
 }

src/Common/LoggerDefinition.php

@@ -2,6 +2,8 @@
 
 namespace Zend\Mvc\ErrorInterceptor\Common;
 
+use Exception;
+
 class LoggerDefinition
 {
     /**
@@ -20,9 +22,9 @@ class LoggerDefinition
     protected $ignored = [];
 
     /**
-     * @var string[]
+     * @var string
      */
-    protected $parameters = [];
+    protected $factoryName;
 
     /**
      * @return string
@@ -73,20 +75,34 @@ public function setIgnored(array $ignored)
     }
 
     /**
-     * @return string[]
+     * @return string
+     */
+    public function getFactoryName(): string
+    {
+        return $this->factoryName;
+    }
+
+    /**
+     * @param string $factoryName
      */
-    public function getParameters(): array
+    public function setFactoryName(string $factoryName)
     {
-        return $this->parameters;
+        $this->factoryName = $factoryName;
     }
 
     /**
-     * @param string[] $parameters
+     * @param Exception $exception
+     * @return bool
      */
-    public function setParameters(array $parameters)
+    public function canLog(Exception $exception): bool
     {
-        $this->parameters = $parameters;
+        if (in_array(get_class($exception), $this->exceptions) && !in_array(get_class($exception), $this->ignored)){
+            return true;
+        }
+
+        return false;
     }
 
 
+
 }