diff vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php @ 13:5fb285c0d0e3

Update Drupal core to 8.4.7 via Composer. Security update; I *think* we've been lucky to get away with this so far, as we don't support self-registration which seems to be used by the so-called "drupalgeddon 2" attack that 8.4.5 was vulnerable to.
author Chris Cannam
date Mon, 23 Apr 2018 09:33:26 +0100
parents 4c8ae668cc8c
children
line wrap: on
line diff
--- a/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php	Fri Feb 23 15:52:07 2018 +0000
+++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php	Mon Apr 23 09:33:26 2018 +0100
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt\TraitUseAdaptation;
 
@@ -8,27 +8,31 @@
 {
     /** @var null|int New modifier */
     public $newModifier;
-    /** @var null|string New name */
+    /** @var null|Node\Identifier New name */
     public $newName;
 
     /**
      * Constructs a trait use precedence adaptation node.
      *
-     * @param null|Node\Name $trait       Trait name
-     * @param string         $method      Method name
-     * @param null|int       $newModifier New modifier
-     * @param null|string    $newName     New name
-     * @param array          $attributes  Additional attributes
+     * @param null|Node\Name              $trait       Trait name
+     * @param string|Node\Identifier      $method      Method name
+     * @param null|int                    $newModifier New modifier
+     * @param null|string|Node\Identifier $newName     New name
+     * @param array                       $attributes  Additional attributes
      */
-    public function __construct($trait, $method, $newModifier, $newName, array $attributes = array()) {
+    public function __construct($trait, $method, $newModifier, $newName, array $attributes = []) {
         parent::__construct($attributes);
         $this->trait = $trait;
-        $this->method = $method;
+        $this->method = \is_string($method) ? new Node\Identifier($method) : $method;
         $this->newModifier = $newModifier;
-        $this->newName = $newName;
+        $this->newName = \is_string($newName) ? new Node\Identifier($newName) : $newName;
     }
 
-    public function getSubNodeNames() {
-        return array('trait', 'method', 'newModifier', 'newName');
+    public function getSubNodeNames() : array {
+        return ['trait', 'method', 'newModifier', 'newName'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_TraitUseAdaptation_Alias';
     }
 }