From 8c2ece87b172ef1b273749e40d1456a06ad27263 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 5 Mar 2014 14:22:47 -0600
Subject: [PATCH] [#4455] Wire log-related service config listeners

- LogWriterManager and LogProcessorManager services.
- Wired into base service manager configuration, as well as
  ModuleManager feature provider system.
---
 .../Feature/LogProcessorProviderInterface.php | 21 +++++++++++++++++++
 .../Feature/LogWriterProviderInterface.php    | 21 +++++++++++++++++++
 .../Service/LogProcessorManagerFactory.php    | 16 ++++++++++++++
 .../Mvc/Service/LogWriterManagerFactory.php   | 16 ++++++++++++++
 .../Zend/Mvc/Service/ModuleManagerFactory.php | 12 +++++++++++
 .../Mvc/Service/ServiceListenerFactory.php    |  2 ++
 6 files changed, 88 insertions(+)
 create mode 100644 library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
 create mode 100644 library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
 create mode 100644 library/Zend/Mvc/Service/LogProcessorManagerFactory.php
 create mode 100644 library/Zend/Mvc/Service/LogWriterManagerFactory.php

diff --git a/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php b/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
new file mode 100644
index 00000000000..c5561139f33
--- /dev/null
+++ b/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface LogProcessorProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Config object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Config
+     */
+    public function getLogProcessorConfig();
+}
diff --git a/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php b/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
new file mode 100644
index 00000000000..251edad18f2
--- /dev/null
+++ b/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface LogWriterProviderInterface
+{
+    /**
+     * Expected to return \Zend\ServiceManager\Config object or array to
+     * seed such an object.
+     *
+     * @return array|\Zend\ServiceManager\Config
+     */
+    public function getLogWriterConfig();
+}
diff --git a/library/Zend/Mvc/Service/LogProcessorManagerFactory.php b/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
new file mode 100644
index 00000000000..8339068633b
--- /dev/null
+++ b/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+
+class LogProcessorManagerFactory extends AbstractPluginManagerFactory
+{
+    const PLUGIN_MANAGER_CLASS = 'Zend\Log\ProcessorPluginManager';
+}
diff --git a/library/Zend/Mvc/Service/LogWriterManagerFactory.php b/library/Zend/Mvc/Service/LogWriterManagerFactory.php
new file mode 100644
index 00000000000..a9e39a2870b
--- /dev/null
+++ b/library/Zend/Mvc/Service/LogWriterManagerFactory.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+
+class LogWriterManagerFactory extends AbstractPluginManagerFactory
+{
+    const PLUGIN_MANAGER_CLASS = 'Zend\Log\WriterPluginManager';
+}
diff --git a/library/Zend/Mvc/Service/ModuleManagerFactory.php b/library/Zend/Mvc/Service/ModuleManagerFactory.php
index e8acea5e01d..f9d02cb1f24 100644
--- a/library/Zend/Mvc/Service/ModuleManagerFactory.php
+++ b/library/Zend/Mvc/Service/ModuleManagerFactory.php
@@ -109,6 +109,18 @@ public function createService(ServiceLocatorInterface $serviceLocator)
             'Zend\ModuleManager\Feature\InputFilterProviderInterface',
             'getInputFilterConfig'
         );
+        $serviceListener->addServiceManager(
+            'LogProcessorManager',
+            'log_processors',
+            'Zend\ModuleManager\Feature\LogProcessorProviderInterface',
+            'getLogProcessorConfig'
+        );
+        $serviceListener->addServiceManager(
+            'LogWriterManager',
+            'log_writers',
+            'Zend\ModuleManager\Feature\LogWritersProviderInterface',
+            'getLogWriterConfig'
+        );
 
         $events = $serviceLocator->get('EventManager');
         $events->attach($defaultListeners);
diff --git a/library/Zend/Mvc/Service/ServiceListenerFactory.php b/library/Zend/Mvc/Service/ServiceListenerFactory.php
index fa660f11582..6686a4dcaad 100644
--- a/library/Zend/Mvc/Service/ServiceListenerFactory.php
+++ b/library/Zend/Mvc/Service/ServiceListenerFactory.php
@@ -57,6 +57,8 @@ class ServiceListenerFactory implements FactoryInterface
             'HttpViewManager'                => 'Zend\Mvc\Service\HttpViewManagerFactory',
             'HydratorManager'                => 'Zend\Mvc\Service\HydratorManagerFactory',
             'InputFilterManager'             => 'Zend\Mvc\Service\InputFilterManagerFactory',
+            'LogProcessorManager'            => 'Zend\Mvc\Service\LogProcessorManagerFactory',
+            'LogWriterManager'               => 'Zend\Mvc\Service\LogWriterManagerFactory',
             'MvcTranslator'                  => 'Zend\Mvc\Service\TranslatorServiceFactory',
             'PaginatorPluginManager'         => 'Zend\Mvc\Service\PaginatorPluginManagerFactory',
             'Request'                        => 'Zend\Mvc\Service\RequestFactory',