X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FCodeCleaner%2FPassableByReferencePass.php;fp=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FCodeCleaner%2FPassableByReferencePass.php;h=5d9936c79751a33a7cd1b8230d13b28474a71515;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hp=d8393462329bf9d1b3d4f0757b6e32b60857203b;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php b/vendor/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php
index d83934623..5d9936c79 100644
--- a/vendor/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php
+++ b/vendor/psy/psysh/src/Psy/CodeCleaner/PassableByReferencePass.php
@@ -35,17 +35,21 @@ class PassableByReferencePass extends CodeCleanerPass
      */
     public function enterNode(Node $node)
     {
-        // TODO: support MethodCall and StaticCall as well.
+        // @todo support MethodCall and StaticCall as well.
         if ($node instanceof FuncCall) {
-            $name = $node->name;
-
             // if function name is an expression or a variable, give it a pass for now.
-            if ($name instanceof Expr || $name instanceof Variable) {
+            if ($node->name instanceof Expr || $node->name instanceof Variable) {
                 return;
             }
 
+            $name = (string) $node->name;
+
+            if ($name === 'array_multisort') {
+                return $this->validateArrayMultisort($node);
+            }
+
             try {
-                $refl = new \ReflectionFunction(implode('\\', $name->parts));
+                $refl = new \ReflectionFunction($name);
             } catch (\ReflectionException $e) {
                 // Well, we gave it a shot!
                 return;
@@ -55,7 +59,7 @@ class PassableByReferencePass extends CodeCleanerPass
                 if (array_key_exists($key, $node->args)) {
                     $arg = $node->args[$key];
                     if ($param->isPassedByReference() && !$this->isPassableByReference($arg)) {
-                        throw new FatalErrorException(self::EXCEPTION_MESSAGE);
+                        throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine());
                     }
                 }
             }
@@ -73,4 +77,33 @@ class PassableByReferencePass extends CodeCleanerPass
             $arg->value instanceof MethodCall ||
             $arg->value instanceof StaticCall;
     }
+
+    /**
+     * Because array_multisort has a problematic signature...
+     *
+     * The argument order is all sorts of wonky, and whether something is passed
+     * by reference or not depends on the values of the two arguments before it.
+     * We'll do a good faith attempt at validating this, but err on the side of
+     * permissive.
+     *
+     * This is why you don't design languages where core code and extensions can
+     * implement APIs that wouldn't be possible in userland code.
+     *
+     * @throws FatalErrorException for clearly invalid arguments
+     *
+     * @param Node $node
+     */
+    private function validateArrayMultisort(Node $node)
+    {
+        $nonPassable = 2; // start with 2 because the first one has to be passable by reference
+        foreach ($node->args as $arg) {
+            if ($this->isPassableByReference($arg)) {
+                $nonPassable = 0;
+            } elseif (++$nonPassable > 2) {
+                // There can be *at most* two non-passable-by-reference args in a row. This is about
+                // as close as we can get to validating the arguments for this function :-/
+                throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine());
+            }
+        }
+    }
 }