Merge pull request #1086 from MPC-khajiit/fix/1.3/constants

Fix: array to string conversion in ConstantsPass [1.3]
mockery · Jul 29, 2020 · db6e1dd · db6e1dd
2 parents 9b6f117 + 8c654cf
commit db6e1dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php b/library/Mockery/Generator/StringManipulation/Pass/ConstantsPass.php
@@ -21,7 +21,7 @@ public function apply($code, MockConfiguration $config)
 
         $constantsCode = '';
         foreach ($cm as $constant => $value) {
-            $constantsCode .= sprintf("\n    const %s = '%s';\n", $constant, $value);
+            $constantsCode .= sprintf("\n    const %s = %s;\n", $constant, var_export($value, true));
         }
 
         $i = strrpos($code, '}');

diff --git a/tests/Mockery/Fixtures/ClassWithConstants.php b/tests/Mockery/Fixtures/ClassWithConstants.php
@@ -26,4 +26,8 @@ class ClassWithConstants
     const FOO = 'bar';
 
     const X = 1;
+
+    const BAZ = [
+        'qux' => 'quux'
+    ];
 }
diff --git a/tests/Mockery/MockingClassConstantsTest.php b/tests/Mockery/MockingClassConstantsTest.php
@@ -32,12 +32,16 @@ public function itShouldAllowToMockClassConstants()
             'ClassWithConstants' => [
                 'FOO' => 'baz',
                 'X' => 2,
+                'BAZ' => [
+                    'qux' => 'daz'
+                ]
             ]
         ]);
 
         $mock = \Mockery::mock('overload:ClassWithConstants');
 
         self::assertEquals('baz', $mock::FOO);
         self::assertEquals(2, $mock::X);
+        self::assertEquals(['qux' => 'daz'], $mock::BAZ);
     }
 }