X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FCodeCleaner%2FInstanceOfPass.php;h=78ce98e93082e78e9607d9475df8b46a2176162b;hp=7c2ae7bb3c78696ee3962222f015798d31c5ee8c;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php b/vendor/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php index 7c2ae7bb3..78ce98e93 100644 --- a/vendor/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php +++ b/vendor/psy/psysh/src/Psy/CodeCleaner/InstanceOfPass.php @@ -13,7 +13,7 @@ namespace Psy\CodeCleaner; use PhpParser\Node; use PhpParser\Node\Expr\ConstFetch; -use PhpParser\Node\Expr\Instanceof_ as InstanceofStmt; +use PhpParser\Node\Expr\Instanceof_; use PhpParser\Node\Scalar; use PhpParser\Node\Scalar\Encapsed; use Psy\Exception\FatalErrorException; @@ -25,6 +25,8 @@ use Psy\Exception\FatalErrorException; */ class InstanceOfPass extends CodeCleanerPass { + const EXCEPTION_MSG = 'instanceof expects an object instance, constant given'; + /** * Validate that the instanceof statement does not receive a scalar value or a non-class constant. * @@ -34,12 +36,12 @@ class InstanceOfPass extends CodeCleanerPass */ public function enterNode(Node $node) { - if (!$node instanceof InstanceofStmt) { + if (!$node instanceof Instanceof_) { return; } if (($node->expr instanceof Scalar && !$node->expr instanceof Encapsed) || $node->expr instanceof ConstFetch) { - throw new FatalErrorException('instanceof expects an object instance, constant given'); + throw new FatalErrorException(self::EXCEPTION_MSG, 0, E_ERROR, null, $node->getLine()); } } }