Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

[application] Remove unused attribute configuration #54

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ class Application implements
const ERROR_EXCEPTION = 'error-exception';
const ERROR_ROUTER_NO_MATCH = 'error-router-no-match';

/**
* @var array
*/
protected $configuration = null;

/**
* Default application event listeners
*
Expand Down Expand Up @@ -100,12 +95,11 @@ class Application implements
/**
* Constructor
*
* @param mixed $configuration
* @param null $configuration. To be removed on future releases
* @param ServiceManager $serviceManager
*/
public function __construct($configuration, ServiceManager $serviceManager)
{
$this->configuration = $configuration;
$this->serviceManager = $serviceManager;

$this->setEventManager($serviceManager->get('EventManager'));
Expand Down
2 changes: 1 addition & 1 deletion src/Service/ApplicationFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ class ApplicationFactory implements FactoryInterface
*/
public function createService(ServiceLocatorInterface $serviceLocator)
{
return new Application($serviceLocator->get('Config'), $serviceLocator);
return new Application(null, $serviceLocator);
}
}
4 changes: 2 additions & 2 deletions test/View/Console/ViewManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function testConsoleKeyWillOverrideDisplayExceptionAndDisplayNotFoundReas

$manager = $this->factory->createService($this->services);

$application = new Application($config, $this->services);
$application = new Application(null, $this->services);

$event = new MvcEvent();
$event->setApplication($application);
Expand All @@ -142,7 +142,7 @@ public function testConsoleDisplayExceptionIsTrue()

$manager = $this->factory->createService($this->services);

$application = new Application([], $this->services);
$application = new Application(null, $this->services);

$event = new MvcEvent();
$event->setApplication($application);
Expand Down
2 changes: 1 addition & 1 deletion test/View/DefaultRendereringStrategyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public function testTriggersRenderErrorEventInCaseOfRenderingException()
return $events;
}, false);

$application = new Application([], $services);
$application = new Application(null, $services);
$this->event->setApplication($application);

$test = (object) ['flag' => false];
Expand Down