vanilla / garden-container

src/Container.php

Doc Comments +2 added lines, -2 removed lines

@@ -212,7 +212,7 @@ 
      *
      * @param string $nid The normalized ID of the container item.
      * @param array $rule The resolved rule for the ID.
-     * @return callable Returns a function that when called will create a new instance of the class.
+     * @return \Closure Returns a function that when called will create a new instance of the class.
      * @throws NotFoundException No entry was found for this identifier.
      */
     private function makeFactory($nid, array $rule) {
@@ -356,7 +356,7 @@ 
      * @param array $defaultArgs The default arguments from {@link Container::makeDefaultArgs()}.
      * @param array $args The arguments passed into a creation.
      * @param mixed $instance An object instance if the arguments are being resolved on an already constructed object.
-     * @return array Returns an array suitable to be applied to a function call.
+     * @return null|callable Returns an array suitable to be applied to a function call.
      */
     private function resolveArgs(array $defaultArgs, array $args, $instance = null) {
         $args = array_change_key_case($args);

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
      */
     public function __construct() {
         $this->rules = ['*' => ['inherit' => true, 'constructorArgs' => []]];
-        $this->currentRule =& $this->rules['*'];
+        $this->currentRule = & $this->rules['*'];
         $this->instances = [];
         $this->factories = [];
     }
@@ -44,7 +44,7 @@ 
      * @return $this
      */
     public function defaultRule() {
-        $this->currentRule =& $this->rules['*'];
+        $this->currentRule = & $this->rules['*'];
         return $this;
     }
 
@@ -60,7 +60,7 @@ 
         if (!isset($this->rules[$id])) {
             $this->rules[$id] = [];
         }
-        $this->currentRule =& $this->rules[$id];
+        $this->currentRule = & $this->rules[$id];
         return $this;
     }
 
@@ -191,7 +191,7 @@ 
             $interfaces = class_implements($nid);
             foreach ($interfaces as $interface) {
                 if (!empty($this->rules[$interface]['calls'])
-                    && (!isset($this->rules[$interface]['inherit'])|| $this->rules[$interface]['inherit'] !== false)) {
+                    && (!isset($this->rules[$interface]['inherit']) || $this->rules[$interface]['inherit'] !== false)) {
 
                     $rule['calls'] = array_merge(
                         isset($rule['calls']) ? $rule['calls'] : [],
@@ -226,11 +226,11 @@ 
         if ($constructor && $constructor->getNumberOfParameters() > 0) {
             $constructorArgs = $this->makeDefaultArgs($constructor, $rule['constructorArgs'], $rule);
 
-            $factory = function ($args) use ($class, $constructorArgs) {
+            $factory = function($args) use ($class, $constructorArgs) {
                 return $class->newInstanceArgs($this->resolveArgs($constructorArgs, $args));
             };
         } else {
-            $factory = function () use ($className) {
+            $factory = function() use ($className) {
                 return new $className;
             };
         }
@@ -247,7 +247,7 @@ 
             }
 
             // Wrap the factory in one that makes the calls.
-            $factory = function ($args) use ($factory, $calls) {
+            $factory = function($args) use ($factory, $calls) {
                 $instance = $factory($args);
 
                 foreach ($calls as $call) {

src/DefaultReference.php

Doc Comments +3 added lines

@@ -27,6 +27,9 @@
         return $this->name;
     }
 
+    /**
+     * @param string $name
+     */
     public function setName($name) {
         $this->name = $name;
     }