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

diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php b/vendor/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php
index f0748a42b..d1c72c23c 100644
--- a/vendor/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php
+++ b/vendor/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php
@@ -12,9 +12,9 @@
 namespace Psy\CodeCleaner;
 
 use PhpParser\Node;
-use PhpParser\Node\Stmt\Class_ as ClassStmt;
+use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\Node\Stmt\Namespace_ as NamespaceStmt;
+use PhpParser\Node\Stmt\Namespace_;
 use Psy\Exception\FatalErrorException;
 
 /**
@@ -51,9 +51,9 @@ class StaticConstructorPass extends CodeCleanerPass
      */
     public function enterNode(Node $node)
     {
-        if ($node instanceof NamespaceStmt) {
+        if ($node instanceof Namespace_) {
             $this->namespace = isset($node->name) ? $node->name->parts : array();
-        } elseif ($node instanceof ClassStmt) {
+        } elseif ($node instanceof Class_) {
             // Bail early if this is PHP 5.3.3 and we have a namespaced class
             if (!empty($this->namespace) && $this->isPHP533) {
                 return;
@@ -76,11 +76,12 @@ class StaticConstructorPass extends CodeCleanerPass
             }
 
             if ($constructor && $constructor->isStatic()) {
-                throw new FatalErrorException(sprintf(
+                $msg = sprintf(
                     'Constructor %s::%s() cannot be static',
                     implode('\\', array_merge($this->namespace, (array) $node->name)),
                     $constructor->name
-                ));
+                );
+                throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
             }
         }
     }