Security update for Core, with self-updated composer

[yaffs-website] / vendor / psy / psysh / test / Psy / Test / CodeCleaner / RequirePassTest.php

diff --git a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/RequirePassTest.php b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/RequirePassTest.php
index bf17632870ff14197cc3a718f54eee308defb08a..c7a68f249b58c7ca987079bb0d0252e9a989e291 100644 (file)
--- a/vendor/psy/psysh/test/Psy/Test/CodeCleaner/RequirePassTest.php
+++ b/vendor/psy/psysh/test/Psy/Test/CodeCleaner/RequirePassTest.php
@@ -34,29 +34,29 @@ class RequirePassTest extends CodeCleanerTestCase
 
         if (version_compare(PHP_VERSION, '5.4', '<')) {
             return array(
-                array('require $foo', "$resolve(\$foo, 1);"),
-                array('$bar = require $baz', "\$bar = $resolve(\$baz, 1);"),
+                array('require $foo', "require $resolve(\$foo, 1);"),
+                array('$bar = require $baz', "\$bar = (require $resolve(\$baz, 1));"),
             );
         }
 
         return array(
             // The basics
-            array('require "a"', "$resolve(\"a\", 1);"),
-            array('require "b.php"', "$resolve(\"b.php\", 1);"),
-            array('require_once "c"', "$resolve(\"c\", 1);"),
-            array('require_once "d.php"', "$resolve(\"d.php\", 1);"),
+            array('require "a"', "require $resolve(\"a\", 1);"),
+            array('require "b.php"', "require $resolve(\"b.php\", 1);"),
+            array('require_once "c"', "require_once $resolve(\"c\", 1);"),
+            array('require_once "d.php"', "require_once $resolve(\"d.php\", 1);"),
 
             // Ensure that line numbers work correctly
-            array("null;\nrequire \"e.php\"", "null;\n$resolve(\"e.php\", 2);"),
-            array("null;\nrequire_once \"f.php\"", "null;\n$resolve(\"f.php\", 2);"),
+            array("null;\nrequire \"e.php\"", "null;\nrequire $resolve(\"e.php\", 2);"),
+            array("null;\nrequire_once \"f.php\"", "null;\nrequire_once $resolve(\"f.php\", 2);"),
 
             // Things with expressions
-            array('require $foo', "$resolve(\$foo, 1);"),
-            array('require_once $foo', "$resolve(\$foo, 1);"),
-            array('require ($bar = "g.php")', "$resolve(\$bar = \"g.php\", 1);"),
-            array('require_once ($bar = "h.php")', "$resolve(\$bar = \"h.php\", 1);"),
-            array('$bar = require ($baz = "i.php")', "\$bar = $resolve(\$baz = \"i.php\", 1);"),
-            array('$bar = require_once ($baz = "j.php")', "\$bar = $resolve(\$baz = \"j.php\", 1);"),
+            array('require $foo', "require $resolve(\$foo, 1);"),
+            array('require_once $foo', "require_once $resolve(\$foo, 1);"),
+            array('require ($bar = "g.php")', "require $resolve(\$bar = \"g.php\", 1);"),
+            array('require_once ($bar = "h.php")', "require_once $resolve(\$bar = \"h.php\", 1);"),
+            array('$bar = require ($baz = "i.php")', "\$bar = (require $resolve(\$baz = \"i.php\", 1));"),
+            array('$bar = require_once ($baz = "j.php")', "\$bar = (require_once $resolve(\$baz = \"j.php\", 1));"),
         );
     }