Fix for issue #5395 #5396

Merged
merged 6 commits into from Nov 1, 2013

Projects

None yet

2 participants

@franz-deleon
Contributor

@Ocramius has noted the method is going to be depracte but i thought id try to do a quick patch

@franz-deleon franz-deleon commented on the diff Nov 1, 2013
library/Zend/ServiceManager/ServiceManager.php
* @param bool $checkAbstractFactories
* @param bool $usePeeringServiceManagers
* @return bool
*/
public function has($name, $checkAbstractFactories = true, $usePeeringServiceManagers = true)
{
- if ($this->canCreate($name, $checkAbstractFactories)) {
+ if (is_string($name)) {
@franz-deleon
franz-deleon Nov 1, 2013 Contributor

move the is_string check first since most usage of this function are string based

@weierophinney weierophinney added a commit that referenced this pull request Nov 1, 2013
@weierophinney weierophinney [#5396] CS fixes
- Move opening conditional statement to same line as condition
- s/name/rName/ in string check for canonical name
- Trigger E_USER_DEPRECATED error from canCreate()
1dda94c
@weierophinney weierophinney added a commit that referenced this pull request Nov 1, 2013
@weierophinney weierophinney Merge branch 'feature/5396' into develop
Close #5396
1bb45f3
@weierophinney weierophinney merged commit c6f2af4 into zendframework:develop Nov 1, 2013

1 check failed

default The Travis CI build failed
Details
@weierophinney weierophinney was assigned Nov 1, 2013
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney Merge pull request zendframework/zendframework#5396 from franz-deleon…
…/develop

Fix for issue zendframework/zendframework#5395
be837f8
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney [zendframework/zendframework#5396] CS fixes
- Move opening conditional statement to same line as condition
- s/name/rName/ in string check for canonical name
- Trigger E_USER_DEPRECATED error from canCreate()
9545e2d
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney Merge branch 'feature/5396' into develop e60ed4a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment