Merge branch 'hotfix/206' into develop

Forward port #206

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#206](https://github.com/zendframework/zend-servicemanager/pull/206) fixes an
+  issue where by callables in `Class::method` notation were not being honored
+  under PHP 5.6.
 
 ## 3.3.0 - 2017-03-01
 

src/ServiceManager.php

@@ -684,6 +684,12 @@ private function getFactory($name)
             if ($lazyLoaded) {
                 $this->factories[$name] = $factory;
             }
+            // PHP 5.6 fails on 'class::method' callables unless we explode them:
+            if (PHP_MAJOR_VERSION < 7
+                && is_string($factory) && strpos($factory, '::') !== false
+            ) {
+                $factory = explode('::', $factory);
+            }
             return $factory;
         }
 

test/ServiceManagerTest.php

@@ -267,4 +267,20 @@ public function testSetAliasShouldWorkWithRecursiveAlias()
         self::assertSame($service, $alias);
         self::assertSame($service, $headAlias);
     }
+
+    public static function sampleFactory()
+    {
+        return new stdClass();
+    }
+
+    public function testFactoryMayBeStaticMethodDescribedByCallableString()
+    {
+        $config = [
+            'factories' => [
+                stdClass::class => 'ZendTest\ServiceManager\ServiceManagerTest::sampleFactory',
+            ]
+        ];
+        $serviceManager = new SimpleServiceManager($config);
+        $this->assertEquals(stdClass::class, get_class($serviceManager->get(stdClass::class)));
+    }
 }