Merge pull request #27 from llaski/bug-undefined-variable-when-null-e…

…rror Fixed bug when variable is null throwing undefined error
jeremeamia · Jan 10, 2015 · 4d89ca7 · 4d89ca7
2 parents 0d5d21d + 6a414c8
commit 4d89ca7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Jeremeamia/SuperClosure/ClosureParser.php b/src/Jeremeamia/SuperClosure/ClosureParser.php
@@ -150,7 +150,7 @@ public function getUsedVariables()
             // Combine the two arrays to create a canonical hash of variable names and values
             $this->usedVariables = array();
             foreach ($usedVarNames as $name) {
-                if (isset($usedVarValues[$name])) {
+                if (array_key_exists($name, $usedVarValues)) {
                     $this->usedVariables[$name] = $usedVarValues[$name];
                 }
             }

diff --git a/tests/Jeremeamia/SuperClosure/Test/ClosureParserTest.php b/tests/Jeremeamia/SuperClosure/Test/ClosureParserTest.php
@@ -68,6 +68,21 @@ public function testCanGetUsedVariablesFromParser()
         $this->assertEquals($expectedVars, $actualVars);
     }
 
+    /**
+     * @covers \Jeremeamia\SuperClosure\ClosureParser::getUsedVariables
+     */
+    public function testCanGetUsedVariablesWhenOneIsNullFromParser()
+    {
+        $foo = null;
+        $bar = 2;
+        $closure = function () use ($foo, $bar) {};
+        $expectedVars = array('foo' => null, 'bar' => 2);
+        $parser = new ClosureParser(new \ReflectionFunction($closure));
+        $actualVars = $parser->getUsedVariables();
+
+        $this->assertEquals($expectedVars, $actualVars);
+    }
+
     /**
      * @covers \Jeremeamia\SuperClosure\ClosureParser::clearCache
      */