Merge branch 'hotfix/268' into develop

Forward port #268

Author: Xerkus

CHANGELOG.md

@@ -54,7 +54,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#268](https://github.com/zendframework/zend-servicemanager/pull/268) Fixes
+  ReflectionBasedAbstractFactory trying to instantiate classes with private
+  constructors
 
 ## 3.3.2 - 2018-01-29
 

src/AbstractFactory/ReflectionBasedAbstractFactory.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-servicemanager for the canonical source repository
- * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2016-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\ServiceManager\AbstractFactory;
@@ -138,7 +138,14 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
      */
     public function canCreate(ContainerInterface $container, $requestedName)
     {
-        return class_exists($requestedName);
+        return class_exists($requestedName) && $this->canCallConstructor($requestedName);
+    }
+
+    private function canCallConstructor(string $requestedName) : bool
+    {
+        $constructor = (new ReflectionClass($requestedName))->getConstructor();
+
+        return $constructor === null || $constructor->isPublic();
     }
 
     /**

test/AbstractFactory/ReflectionBasedAbstractFactoryTest.php

@@ -1,14 +1,15 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-servicemanager for the canonical source repository
- * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2016-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\ServiceManager\AbstractFactory;
 
 use ArrayAccess;
 use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\AbstractFactory\ReflectionBasedAbstractFactory;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
@@ -17,6 +18,9 @@
 
 class ReflectionBasedAbstractFactoryTest extends TestCase
 {
+    /** @var ContainerInterface|ObjectProphecy */
+    private $container;
+
     public function setUp()
     {
         $this->container = $this->prophesize(ContainerInterface::class);
@@ -38,6 +42,28 @@ public function testCanCreateReturnsFalseForNonClassRequestedNames($requestedNam
         self::assertFalse($factory->canCreate($this->container->reveal(), $requestedName));
     }
 
+    public function testCanCreateReturnsFalseWhenConstructorIsPrivate() : void
+    {
+        self::assertFalse(
+            (new ReflectionBasedAbstractFactory())->canCreate(
+                $this->container->reveal(),
+                TestAsset\ClassWithPrivateConstructor::class
+            ),
+            'ReflectionBasedAbstractFactory should not be able to instantiate a class with a private constructor'
+        );
+    }
+
+    public function testCanCreateReturnsTrueWhenClassHasNoConstructor() : void
+    {
+        self::assertTrue(
+            (new ReflectionBasedAbstractFactory())->canCreate(
+                $this->container->reveal(),
+                TestAsset\ClassWithNoConstructor::class
+            ),
+            'ReflectionBasedAbstractFactory should be able to instantiate a class without a constructor'
+        );
+    }
+
     public function testFactoryInstantiatesClassDirectlyIfItHasNoConstructor()
     {
         $factory = new ReflectionBasedAbstractFactory();

test/AbstractFactory/TestAsset/ClassWithPrivateConstructor.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-servicemanager/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\ServiceManager\AbstractFactory\TestAsset;
+
+class ClassWithPrivateConstructor
+{
+    private function __construct()
+    {
+    }
+}