Merge pull request #184 from adrienbrault/gh-183

Fix ExpressionEvaluator::evaluate with non strings, fixed #183

Author: adrienbrault

src/Hateoas/Expression/ExpressionEvaluator.php

@@ -50,7 +50,7 @@ public function setContextVariable($name, $value)
      */
     public function evaluate($expression, $data)
     {
-        if (is_bool($expression)) {
+        if (!is_string($expression)) {
             return $expression;
         }
 

tests/Hateoas/Tests/Expression/ExpressionEvaluatorTest.php

@@ -117,6 +117,29 @@ public function testRegisterFunction()
             ->isEqualTo('Hello, toto!')
         ;
     }
+
+    /**
+     * @dataProvider getTestEvaluateNonStringData
+     */
+    public function testEvaluateNonString($value)
+    {
+        $expressionEvaluator = new ExpressionEvaluator(new ExpressionLanguage());
+
+        $this
+            ->variable($expressionEvaluator->evaluate($value, array()))
+                ->isIdenticalTo($value)
+        ;
+    }
+
+    public function getTestEvaluateNonStringData()
+    {
+        return array(
+            array(true),
+            array(1.0),
+            array(new \StdClass),
+            array(array('foo' => 'bar')),
+        );
+    }
 }
 
 class HelloExpressionFunction implements ExpressionFunctionInterface

tests/Hateoas/Tests/Fixtures/AdrienBrault.php

@@ -56,7 +56,7 @@ public function getWindowsComputer()
     public function getRelations()
     {
         return array(
-            new Relation('dynamic-relation', 'awesome!!!'),
+            new Relation('dynamic-relation', 'awesome!!!', array('wowowow')),
         );
     }
 }

tests/Hateoas/Tests/Serializer/JsonHalSerializerTest.php

@@ -190,7 +190,10 @@ public function testSerializeAdrienBrault()
         },
         "broken-computer": {
             "name": "Windows Computer"
-        }
+        },
+        "dynamic-relation": [
+            "wowowow"
+        ]
     }
 }
 JSON

tests/Hateoas/Tests/Serializer/XmlHalSerializerTest.php

@@ -31,6 +31,7 @@ public function testSerializeAdrienBrault()
   <resource rel="broken-computer">
     <name><![CDATA[Windows Computer]]></name>
   </resource>
+  <resource rel="dynamic-relation"><![CDATA[wowowow]]></resource>
 </result>
 
 XML

tests/Hateoas/Tests/Serializer/XmlSerializerTest.php

@@ -95,6 +95,9 @@ public function testSerializeAdrienBrault()
   <computer rel="broken-computer">
     <name><![CDATA[Windows Computer]]></name>
   </computer>
+  <entry rel="dynamic-relation">
+    <entry><![CDATA[wowowow]]></entry>
+  </entry>
 </result>
 
 XML