diff vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.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/DeclareDeclare.php	Fri Feb 23 15:52:07 2018 +0000
+++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php	Mon Apr 23 09:33:26 2018 +0100
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,7 +6,7 @@
 
 class DeclareDeclare extends Node\Stmt
 {
-    /** @var string Key */
+    /** @var Node\Identifier Key */
     public $key;
     /** @var Node\Expr Value */
     public $value;
@@ -14,17 +14,21 @@
     /**
      * Constructs a declare key=>value pair node.
      *
-     * @param string    $key        Key
-     * @param Node\Expr $value      Value
-     * @param array     $attributes Additional attributes
+     * @param string|Node\Identifier $key        Key
+     * @param Node\Expr              $value      Value
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct($key, Node\Expr $value, array $attributes = array()) {
+    public function __construct($key, Node\Expr $value, array $attributes = []) {
         parent::__construct($attributes);
-        $this->key = $key;
+        $this->key = \is_string($key) ? new Node\Identifier($key) : $key;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('key', 'value');
+    public function getSubNodeNames() : array {
+        return ['key', 'value'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_DeclareDeclare';
     }
 }