comparison vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php @ 16:c2387f117808

Routine composer update

 {
     const CLASS_TYPE     = 'class';
     const INTERFACE_TYPE = 'interface';
     const TRAIT_TYPE     = 'trait';
 
-    protected $checkTraits;
     private $conditionalScopes = 0;
     private $atLeastPhp55;
 
     public function __construct()
     {
-        $this->checkTraits = function_exists('trait_exists');
         $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>=');
     }
 
     /**
      * Validate class, interface and trait definitions.

      *
      * @param Class_ $stmt
      */
     protected function validateClassStatement(Class_ $stmt)
     {
-        $this->ensureCanDefine($stmt);
+        $this->ensureCanDefine($stmt, self::CLASS_TYPE);
         if (isset($stmt->extends)) {
             $this->ensureClassExists($this->getFullyQualifiedName($stmt->extends), $stmt);
         }
         $this->ensureInterfacesExist($stmt->implements, $stmt);
     }

      *
      * @param Interface_ $stmt
      */
     protected function validateInterfaceStatement(Interface_ $stmt)
     {
-        $this->ensureCanDefine($stmt);
+        $this->ensureCanDefine($stmt, self::INTERFACE_TYPE);
         $this->ensureInterfacesExist($stmt->extends, $stmt);
     }
 
     /**
      * Validate a trait definition statement.
      *
      * @param Trait_ $stmt
      */
     protected function validateTraitStatement(Trait_ $stmt)
     {
-        $this->ensureCanDefine($stmt);
+        $this->ensureCanDefine($stmt, self::TRAIT_TYPE);
     }
 
     /**
      * Validate a `new` expression.
      *

     /**
      * Ensure that no class, interface or trait name collides with a new definition.
      *
      * @throws FatalErrorException
      *
-     * @param Stmt $stmt
-     */
-    protected function ensureCanDefine(Stmt $stmt)
+     * @param Stmt   $stmt
+     * @param string $scopeType
+     */
+    protected function ensureCanDefine(Stmt $stmt, $scopeType = self::CLASS_TYPE)
     {
         $name = $this->getFullyQualifiedName($stmt->name);
 
         // check for name collisions
         $errorType = null;

             throw $this->createError(sprintf('%s named %s already exists', ucfirst($errorType), $name), $stmt);
         }
 
         // Store creation for the rest of this code snippet so we can find local
         // issue too
-        $this->currentScope[strtolower($name)] = $this->getScopeType($stmt);
+        $this->currentScope[strtolower($name)] = $scopeType;
     }
 
     /**
      * Ensure that a referenced class exists.
      *

     }
 
     /**
      * Get a symbol type key for storing in the scope name cache.
      *
+     * @deprecated No longer used. Scope type should be passed into ensureCanDefine directly.
+     * @codeCoverageIgnore
+     *
      * @param Stmt $stmt
      *
      * @return string
      */
     protected function getScopeType(Stmt $stmt)

      *
      * @return bool
      */
     protected function traitExists($name)
     {
-        return $this->checkTraits && (trait_exists($name) || $this->findInScope($name) === self::TRAIT_TYPE);
+        return trait_exists($name) || $this->findInScope($name) === self::TRAIT_TYPE;
     }
 
     /**
      * Find a symbol in the current code snippet scope.
      *