Bugfix: Allow for arbitrary values to be stored (Resolves #24)

thephpleague · Feb 21, 2015 · 6cbb3d8 · 6cbb3d8
1 parent c1994f4
commit 6cbb3d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All Notable changes to `League\Container` will be documented in this file
 
+## 1.3.1 - 2015-02-21
+
+### Fixed
+- Fixed bug where arbitrary values were attempted to be resolved as classes.
+
 ## 1.3.0 - 2015-02-09
 
 ### Added

diff --git a/src/Container.php b/src/Container.php
@@ -72,7 +72,7 @@ public function add($alias, $concrete = null, $singleton = false)
 
         // if the concrete is an already instantiated object, we just store it
         // as a singleton
-        if (is_object($concrete) && ! $concrete instanceof \Closure) {
+        if ((is_object($concrete) && ! $concrete instanceof \Closure)) {
             $this->singletons[$alias] = $concrete;
             return null;
         }
@@ -81,12 +81,17 @@ public function add($alias, $concrete = null, $singleton = false)
         $factory    = $this->getDefinitionFactory();
         $definition = $factory($alias, $concrete, $this);
 
-        $this->items[$alias] = [
-            'definition' => $definition,
-            'singleton'  => (boolean) $singleton
-        ];
+        if ($definition instanceof DefinitionInterface) {
+            $this->items[$alias] = [
+                'definition' => $definition,
+                'singleton'  => (boolean) $singleton
+            ];
 
-        return $definition;
+            return $definition;
+        }
+
+        // dealing with an arbitrary value so just store as singleton
+        $this->singletons[$alias] = $concrete;
     }
 
     /**