diff vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.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/Precedence.php	Fri Feb 23 15:52:07 2018 +0000
+++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php	Mon Apr 23 09:33:26 2018 +0100
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt\TraitUseAdaptation;
 
@@ -12,19 +12,23 @@
     /**
      * Constructs a trait use precedence adaptation node.
      *
-     * @param Node\Name   $trait       Trait name
-     * @param string      $method      Method name
-     * @param Node\Name[] $insteadof   Overwritten traits
-     * @param array       $attributes  Additional attributes
+     * @param Node\Name              $trait       Trait name
+     * @param string|Node\Identifier $method      Method name
+     * @param Node\Name[]            $insteadof   Overwritten traits
+     * @param array                  $attributes  Additional attributes
      */
-    public function __construct(Node\Name $trait, $method, array $insteadof, array $attributes = array()) {
+    public function __construct(Node\Name $trait, $method, array $insteadof, array $attributes = []) {
         parent::__construct($attributes);
         $this->trait = $trait;
-        $this->method = $method;
+        $this->method = \is_string($method) ? new Node\Identifier($method) : $method;
         $this->insteadof = $insteadof;
     }
 
-    public function getSubNodeNames() {
-        return array('trait', 'method', 'insteadof');
+    public function getSubNodeNames() : array {
+        return ['trait', 'method', 'insteadof'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_TraitUseAdaptation_Precedence';
     }
 }