Merge pull request #4 from picamator/dev

Added class_exists check. Fixed bug in readme example.

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+1.2.0 (2017-04-04)
+------------------
+* Added ``class_exists`` check for creating object with construct's arguments
+* Fixed bug in readme example
+
 1.1.0 (2017-04-01)
 ------------------
 * Optimized performance. Moved result of ``__construct`` method exist check to internal cache.

README.md

@@ -70,7 +70,7 @@ class UserRepository
 
     public function __construct() 
     {
-        $this->connection = ObjectManagerSingleton::getInstance()->create();    
+        $this->connection = ObjectManagerSingleton::getInstance()->create('Connection');    
     }
 }
 ```

src/ObjectManager.php

@@ -22,6 +22,7 @@ class ObjectManager implements ObjectManagerInterface
     public function create($className, array $arguments = [])
     {
         if (empty($arguments)) {
+            // for performance reason ``class_exists`` is not checked here
             return new $className();
         }
 
@@ -42,8 +43,11 @@ private function getReflection($className)
             return $this->reflectionContainer[$className];
         }
 
-        // construction does not available
-        if (method_exists($className, '__construct') === false) {
+        if (!class_exists($className)) {
+            throw new RuntimeException(sprintf('Class "%s" does not exist', $className));
+        }
+
+        if (!method_exists($className, '__construct')) {
             throw new RuntimeException(sprintf('Class "%s" does not have __construct', $className));
         }
 

tests/unit/src/ObjectManagerTest.php

@@ -35,7 +35,15 @@ public function testCreate(array $arguments)
     /**
      * @expectedException \Picamator\ObjectManager\Exception\RuntimeException
      */
-    public function testFailCreate()
+    public function testFailNoClassCreate()
+    {
+        $this->objectManager->create('NotExistingClass', [1, 2]);
+    }
+
+    /**
+     * @expectedException \Picamator\ObjectManager\Exception\RuntimeException
+     */
+    public function testFailNoConstructCreate()
     {
         $this->objectManager->create('Picamator\ObjectManager\ObjectManager', [1, 2]);
     }