Yaffs site version 1.1

[yaffs-website] / vendor / psy / psysh / src / Psy / CodeCleaner / StaticConstructorPass.php

diff --git a/vendor/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php b/vendor/psy/psysh/src/Psy/CodeCleaner/StaticConstructorPass.php
index f0748a42bd16b789732bac24d6d80d34b68d1aa5..d1c72c23ccceabb26dec59cc54245675afa9128c 100644 (file)
--- 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;
 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\ClassMethod;

-use PhpParser\Node\Stmt\Namespace_ as NamespaceStmt;
+use PhpParser\Node\Stmt\Namespace_;

 use Psy\Exception\FatalErrorException;
 
 /**
 use Psy\Exception\FatalErrorException;
 
 /**


@@ -51,9 +51,9 @@ class StaticConstructorPass extends CodeCleanerPass
      */
     public function enterNode(Node $node)
     {
      */
     public function enterNode(Node $node)
     {

-        if ($node instanceof NamespaceStmt) {
+        if ($node instanceof Namespace_) {

             $this->namespace = isset($node->name) ? $node->name->parts : array();
             $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;
             // 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()) {
             }
 
             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
                     '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());

             }
         }
     }
             }
         }
     }