Merge branch 'feature/54' into develop

Close #54

Author: weierophinney

CHANGELOG.md

@@ -71,6 +71,12 @@ for full details on how to migrate your v2 application.
   functionality related to exposing and configuring the zend-hydrator
   `HydratorManager`. That functionality is now exposed directly by the
   zend-hydrator component.
+- [#54](https://github.com/zendframework/zend-mvc/pull/54) removes the
+  `$configuration` argument (first required argument) from the
+  `Zend\Mvc\Application` constructor. If you were directly instantiating an
+  `Application` instance previously (whether in your bootstrap, a factory, or
+  tests), you will need to update how you instantiate the instance. (The
+  argument was removed as the value was never used.)
 
 ### Fixed
 

doc/book/migration/to-v3-0.md

@@ -34,6 +34,21 @@ your application configuration. Components are pushed to the top of the module
 list, while modules are pushed to the end. As a development component, it will
 not be installed in your production distributions.
 
+## Application class
+
+The following changes were made to the `Zend\Mvc\Application` constructor:
+
+- The first `$configuration` argument was removed, as it was not used.
+- Three additional, optional arguments were added:
+  - `Zend\EventManager\EventManagerInterface $events = null`
+  - `Zend\Stdlib\RequestInterface $request = null`
+  - `Zend\Stdlib\ResponseInterface $response = null`
+
+End-users using the skeleton application and the default `Application` factory
+will not notice a change. Those who are directly instantiating the `Application`
+instance (in production or test code) or who have created their own factory for
+the class will need to update their code.
+
 ## DI-ServiceManager integration
 
 The integration between [zend-servicemanager](https://zendframework.github.io/zend-servicemanager) and

src/Application.php

@@ -56,11 +56,6 @@ class Application implements
     const ERROR_ROUTER_NO_MATCH            = 'error-router-no-match';
     const ERROR_MIDDLEWARE_CANNOT_DISPATCH = 'error-middleware-cannot-dispatch';
 
-    /**
-     * @var array
-     */
-    protected $configuration = null;
-
     /**
      * Default application event listeners
      *
@@ -104,20 +99,17 @@ class Application implements
     /**
      * Constructor
      *
-     * @param mixed $configuration
      * @param ServiceManager $serviceManager
      * @param null|EventManagerInterface $events
      * @param null|RequestInterface $request
      * @param null|ResponseInterface $response
      */
     public function __construct(
-        $configuration,
         ServiceManager $serviceManager,
         EventManagerInterface $events = null,
         RequestInterface $request = null,
         ResponseInterface $response = null
     ) {
-        $this->configuration  = $configuration;
         $this->serviceManager = $serviceManager;
         $this->setEventManager($events ?: $serviceManager->get('EventManager'));
         $this->request        = $request ?: $serviceManager->get('Request');

src/Service/ApplicationFactory.php

@@ -30,7 +30,6 @@ class ApplicationFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $name, array $options = null)
     {
         return new Application(
-            $container->get('config'),
             $container,
             $container->get('EventManager'),
             $container->get('Request'),

test/View/DefaultRendereringStrategyTest.php

@@ -156,7 +156,7 @@ public function testTriggersRenderErrorEventInCaseOfRenderingException()
             ],
         ]))->configureServiceManager($services);
 
-        $application = new Application([], $services, $services->get('EventManager'), $this->request, $this->response);
+        $application = new Application($services, $services->get('EventManager'), $this->request, $this->response);
         $this->event->setApplication($application);
 
         $test = (object) ['flag' => false];