Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / nikic / php-parser / lib / PhpParser / Builder / Trait_.php

diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php
index 7b004fa962e0325d8f778f3c6b81b7c76599f4b6..a836d40c60a5ab2ad8f85a750ffc531773f58e0e 100644 (file)
--- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php
@@ -1,23 +1,24 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
 use PhpParser\Node\Stmt;
 
 class Trait_ extends Declaration
 {
     protected $name;
-    protected $uses = array();
-    protected $properties = array();
-    protected $methods = array();
+    protected $uses = [];
+    protected $properties = [];
+    protected $methods = [];
 
     /**
      * Creates an interface builder.
      *
      * @param string $name Name of the interface
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -29,13 +30,13 @@ class Trait_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function addStmt($stmt) {
-        $stmt = $this->normalizeNode($stmt);
+        $stmt = BuilderHelpers::normalizeNode($stmt);
 
         if ($stmt instanceof Stmt\Property) {
             $this->properties[] = $stmt;
-        } else if ($stmt instanceof Stmt\ClassMethod) {
+        } elseif ($stmt instanceof Stmt\ClassMethod) {
             $this->methods[] = $stmt;
-        } else if ($stmt instanceof Stmt\TraitUse) {
+        } elseif ($stmt instanceof Stmt\TraitUse) {
             $this->uses[] = $stmt;
         } else {
             throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType()));
@@ -49,11 +50,11 @@ class Trait_ extends Declaration
      *
      * @return Stmt\Trait_ The built interface node
      */
-    public function getNode() {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Trait_(
-            $this->name, array(
+            $this->name, [
                 'stmts' => array_merge($this->uses, $this->properties, $this->methods)
-            ), $this->attributes
+            ], $this->attributes
         );
     }
 }