Merge branch 'cs/#6985-zend-mvc-psr2-compliance' into develop

Close #6985 Forward port #6985
zendframework · Dec 9, 2014 · 3c15251 · 3c15251
2 parents b4aa270 + a977a0f
commit 3c15251
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 9 deletions.
diff --git a/library/Zend/Mvc/DispatchListener.php b/library/Zend/Mvc/DispatchListener.php
@@ -15,7 +15,6 @@
 use Zend\Mvc\Exception\InvalidControllerException;
 use Zend\Stdlib\ArrayUtils;
 
-
 /**
  * Default dispatch listener
  *

diff --git a/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php b/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Mvc\ResponseSender;
 
-
 interface ResponseSenderInterface
 {
     /**

diff --git a/library/Zend/Mvc/Router/Console/Simple.php b/library/Zend/Mvc/Router/Console/Simple.php
@@ -112,7 +112,6 @@ public static function factory($options = array())
             $options['filters'] = null;
         }
 
-
         return new static(
             $options['route'],
             $options['constraints'],

diff --git a/library/Zend/Mvc/SendResponseListener.php b/library/Zend/Mvc/SendResponseListener.php
@@ -65,7 +65,6 @@ public function getEventManager()
         return $this->eventManager;
     }
 
-
     /**
      * Attach the aggregate to the specified event manager
      *

diff --git a/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php b/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
@@ -87,7 +87,6 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
             throw new Exception\InvalidServiceNameException('Service "' . $requestedName . '" is not whitelisted');
         }
 
-
         if ($serviceLocator instanceof AbstractPluginManager) {
             /* @var $serviceLocator AbstractPluginManager */
             $this->serviceLocator = $serviceLocator->getServiceLocator();

diff --git a/library/Zend/Mvc/Service/HydratorManagerFactory.php b/library/Zend/Mvc/Service/HydratorManagerFactory.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Mvc\Service;
 
-
 class HydratorManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\Stdlib\Hydrator\HydratorPluginManager';

diff --git a/library/Zend/Mvc/Service/InputFilterManagerFactory.php b/library/Zend/Mvc/Service/InputFilterManagerFactory.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Mvc\Service;
 
-
 class InputFilterManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\InputFilter\InputFilterPluginManager';

diff --git a/library/Zend/Mvc/Service/LogProcessorManagerFactory.php b/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
@@ -9,7 +9,6 @@
 
 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
@@ -9,7 +9,6 @@
 
 namespace Zend\Mvc\Service;
 
-
 class LogWriterManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\Log\WriterPluginManager';
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
     use Zend\Mvc\Exception\InvalidControllerException;
     use Zend\Stdlib\ArrayUtils;
     /**
      * Default dispatch listener
      *
@@ Expand Down @@