Skip to content
This repository has been archived by the owner on Feb 6, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/zendframework/zendframework#6785-remove-version-…
Browse files Browse the repository at this point in the history
…checks-for-incompatible-versions'

Close zendframework/zendframework#6785
  • Loading branch information
Ocramius committed Nov 27, 2014
2 parents 9438dd7 + 12492f0 commit 6a142a2
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions src/ServiceManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

namespace Zend\ServiceManager;

use ReflectionClass;

class ServiceManager implements ServiceLocatorInterface
{
/**@#+
Expand Down Expand Up @@ -1189,6 +1187,8 @@ protected function createDelegatorFromFactory($canonicalName, $requestedName)
* @see https://bugs.php.net/bug.php?id=53727
* @see https://github.com/zendframework/zf2/pull/1807
*
* @deprecated since zf 2.3 requires PHP >= 5.3.23
*
* @param string $className
* @param string $type
* @return bool
Expand All @@ -1197,17 +1197,7 @@ protected function createDelegatorFromFactory($canonicalName, $requestedName)
*/
protected static function isSubclassOf($className, $type)
{
if (is_subclass_of($className, $type)) {
return true;
}
if (PHP_VERSION_ID >= 50307) {
return false;
}
if (!interface_exists($type)) {
return false;
}
$r = new ReflectionClass($className);
return $r->implementsInterface($type);
return is_subclass_of($className, $type);
}

/**
Expand Down

0 comments on commit 6a142a2

Please sign in to comment.