add more tests

Author: felds

tests/ExpressionParserTest.php

@@ -244,16 +244,6 @@ public function testStringExpression($template, $expected)
         $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode('0')->getNode('expr'));
     }
 
-    public function testNullSafeOperator()
-    {
-        $env = new Environment(new ArrayLoader([
-            'template' => '{{ foo?.bar }}',
-        ]));
-
-        $this->assertSame('baz', $env->render('template', ['foo' => (object) ['bar' => 'baz']]));
-        $this->assertSame('', $env->render('template', ['foo' => null]));
-    }
-
     public static function getTestsForString()
     {
         return [
@@ -298,6 +288,62 @@ public static function getTestsForString()
         ];
     }
 
+    /**
+     * @dataProvider getTestsForNullSafeOperator
+     */
+    public function testNullSafeOperator($template, $data, $expected)
+    {
+        $env = new Environment(new ArrayLoader(['template' => $template]));
+
+        $this->assertSame($expected, $env->render('template', $data));
+    }
+
+    public static function getTestsForNullSafeOperator()
+    {
+        return [
+            [
+                '{{ foo?.bar }}',
+                ['foo' => (object)['bar' => 'baz']],
+                'baz',
+            ],
+            [
+                '{{ foo?.bar }}',
+                ['foo' => null],
+                '',
+            ],
+            [
+                '{{ foo?.bar?.baz }}',
+                ['foo' => (object)['bar' => (object)['baz' => 'qux']]],
+                'qux',
+            ],
+            [
+                '{{ foo?.bar?.baz }}',
+                ['foo' => (object)['bar' => null]],
+                '',
+            ],
+            [
+                '{{ foo?.bar?.baz }}',
+                ['foo' => null],
+                '',
+            ],
+            [
+                '{{ foo?.bar?.baz ?? "qux" }}',
+                ['foo' => null],
+                'qux',
+            ],
+            [
+                '{{ foo?.bar ?? "qux" }}',
+                ['foo' => (object)['bar' => 0]],
+                '0',
+            ],
+            [
+                '{{ foo?.bar ?? "qux" }}',
+                ['foo' => (object)['bar' => false]],
+                '',
+            ],
+        ];
+    }
+
     public function testMacroDefinitionDoesNotSupportNonNameVariableName()
     {
         $env = new Environment(new ArrayLoader(), ['cache' => false, 'autoescape' => false]);