Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 8, 2020. It is now read-only.
Merged
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
6 changes: 3 additions & 3 deletions library/Zend/ServiceManager/ServiceManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ public function get($name, $usePeeringServiceManagers = true)
}

// Still no instance? raise an exception
if (!$instance && !is_array($instance)) {
if ($instance === null && !is_array($instance)) {
if ($isAlias) {
throw new Exception\ServiceNotFoundException(sprintf(
'An alias "%s" was requested but no service could be found.',
Expand Down Expand Up @@ -494,11 +494,11 @@ public function create($name)
$instance = $this->createFromFactory($cName, $rName);
}

if (!$instance && isset($this->invokableClasses[$cName])) {
if ($instance === false && isset($this->invokableClasses[$cName])) {
$instance = $this->createFromInvokable($cName, $rName);
}

if (!$instance && $this->canCreateFromAbstractFactory($cName, $rName)) {
if ($instance === false && $this->canCreateFromAbstractFactory($cName, $rName)) {
$instance = $this->createFromAbstractFactory($cName, $rName);
}

Expand Down
12 changes: 12 additions & 0 deletions tests/ZendTest/ServiceManager/ServiceManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,18 @@ public function testShouldRaiseExceptionIfInitializerClassIsNotAnInitializerInte
$result = $this->serviceManager->addInitializer(get_class($this));
}

public function testGetGlobIteratorServiceWorksProperly()
{
$config = new Config(array(
'invokables' => array(
'foo' => 'ZendTest\ServiceManager\TestAsset\GlobIteratorService',
),
));
$serviceManager = new ServiceManager($config);
$foo = $serviceManager->get('foo');
$this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\GlobIteratorService', $foo);
}

public function duplicateService()
{
$self = $this;
Expand Down
19 changes: 19 additions & 0 deletions tests/ZendTest/ServiceManager/TestAsset/GlobIteratorService.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ServiceManager
*/

namespace ZendTest\ServiceManager\TestAsset;

class GlobIteratorService extends \GlobIterator
{
public function __construct()
{
}
}