X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FCodeCleaner%2FStrictTypesPass.php;fp=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FCodeCleaner%2FStrictTypesPass.php;h=5966f0c51a2f07d4eb56f9f442883697e0ff7570;hp=c75d007793a24f62eb7ca63ebda3e56c880e89cf;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae

diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php b/vendor/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php
index c75d00779..5966f0c51 100644
--- a/vendor/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php
+++ b/vendor/psy/psysh/src/Psy/CodeCleaner/StrictTypesPass.php
@@ -12,7 +12,7 @@
 namespace Psy\CodeCleaner;
 
 use PhpParser\Node\Scalar\LNumber;
-use PhpParser\Node\Stmt\Declare_ as DeclareStmt;
+use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\DeclareDeclare;
 use Psy\Exception\FatalErrorException;
 
@@ -28,6 +28,8 @@ use Psy\Exception\FatalErrorException;
  */
 class StrictTypesPass extends CodeCleanerPass
 {
+    const EXCEPTION_MESSAGE = 'strict_types declaration must have 0 or 1 as its value';
+
     private $strictTypes = false;
 
     /**
@@ -49,12 +51,12 @@ class StrictTypesPass extends CodeCleanerPass
         $prependStrictTypes = $this->strictTypes;
 
         foreach ($nodes as $key => $node) {
-            if ($node instanceof DeclareStmt) {
+            if ($node instanceof Declare_) {
                 foreach ($node->declares as $declare) {
                     if ($declare->key === 'strict_types') {
                         $value = $declare->value;
                         if (!$value instanceof LNumber || ($value->value !== 0 && $value->value !== 1)) {
-                            throw new FatalErrorException('strict_types declaration must have 0 or 1 as its value');
+                            throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine());
                         }
 
                         $this->strictTypes = $value->value === 1;
@@ -65,8 +67,8 @@ class StrictTypesPass extends CodeCleanerPass
 
         if ($prependStrictTypes) {
             $first = reset($nodes);
-            if (!$first instanceof DeclareStmt) {
-                $declare = new DeclareStmt(array(new DeclareDeclare('strict_types', new LNumber(1))));
+            if (!$first instanceof Declare_) {
+                $declare = new Declare_(array(new DeclareDeclare('strict_types', new LNumber(1))));
                 array_unshift($nodes, $declare);
             }
         }