Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Update library/Zend/ServiceManager/Config.php #2372

Closed
wants to merge 1 commit into from

2 participants

@gerardroche

Refactor; Improve readablility.

@weierophinney weierophinney referenced this pull request from a commit
@weierophinney weierophinney [#2372] CS fixes
- Trailing whitespace
d18089a
@weierophinney

I fixed the CS issues reported by Travis-CI. Merged to develop and master.

@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney [#2372] CS fixes
- Trailing whitespace
dc352cd
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2372'
Close #2372
533b5ea
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2372' into develop
Close #2372
8e27c8b
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-servicemanager
@weierophinney weierophinney [zendframework/zf2#2372] CS fixes
- Trailing whitespace
ed5aa48
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-servicemanager
@weierophinney weierophinney Merge branch 'hotfix/2372' ceec2bd
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-servicemanager
@weierophinney weierophinney Merge branch 'hotfix/2372' into develop d951c2b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 17, 2012
  1. @gerardroche

    Update library/Zend/ServiceManager/Config.php

    gerardroche authored
    Refactor; Improve readablility.
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 3 deletions.
  1. +4 −3 library/Zend/ServiceManager/Config.php
View
7 library/Zend/ServiceManager/Config.php
@@ -61,9 +61,10 @@ public function getShared()
public function configureServiceManager(ServiceManager $serviceManager)
{
- $allowOverride = $this->getAllowOverride();
- isset($allowOverride) ? $serviceManager->setAllowOverride($allowOverride) : null;
-
+ if (($allowOverride = $this->getAllowOverride()) !== null) {
+ $serviceManager->setAllowOverride($allowOverride);
+ }
+
foreach ($this->getFactories() as $name => $factory) {
$serviceManager->setFactory($name, $factory);
}
Something went wrong with that request. Please try again.