Update codebase using rector/rector.

loophp · Mar 11, 2020 · 03d63ec · 03d63ec
1 parent d03f537
commit 03d63ec
Show file tree

Hide file tree

Showing 28 changed files with 99 additions and 95 deletions.
diff --git a/spec/loophp/phptree/Importer/MicrosoftTolerantPhpParserSpec.php b/spec/loophp/phptree/Importer/MicrosoftTolerantPhpParserSpec.php
@@ -25,7 +25,7 @@ public function it_can_import(): void
         $this
             ->import($ast)
             ->count()
-            ->shouldReturn(582);
+            ->shouldReturn(586);
 
         $file = __DIR__ . '/../../../../tests/sample.php';
 

diff --git a/spec/loophp/phptree/Importer/NikicPhpAstSpec.php b/spec/loophp/phptree/Importer/NikicPhpAstSpec.php
@@ -22,7 +22,7 @@ public function it_can_import(): void
         $this
             ->import($ast)
             ->count()
-            ->shouldReturn(542);
+            ->shouldReturn(545);
 
         $file = __DIR__ . '/../../../../tests/sample.php';
         $ast = \ast\parse_file($file, 50);

diff --git a/spec/loophp/phptree/Importer/NikicPhpParserSpec.php b/spec/loophp/phptree/Importer/NikicPhpParserSpec.php
@@ -33,7 +33,7 @@ public function it_can_import(): void
         $this
             ->import($ast)
             ->count()
-            ->shouldReturn(563);
+            ->shouldReturn(566);
 
         $file = __DIR__ . '/../../../../tests/sample.php';
 

diff --git a/src/Builder/BuilderInterface.php b/src/Builder/BuilderInterface.php
@@ -14,7 +14,7 @@ interface BuilderInterface
     /**
      * @param iterable<mixed> $nodes
      *
-     * @return \loophp\phptree\Node\NodeInterface|null
+     * @return NodeInterface|null
      */
     public static function create(iterable $nodes): ?NodeInterface;
 }
diff --git a/src/Builder/Random.php b/src/Builder/Random.php
@@ -27,7 +27,7 @@ public static function create(iterable $nodes): ?NodeInterface
                 continue;
             }
 
-            if (false === ($root instanceof NodeInterface)) {
+            if (!$root instanceof NodeInterface) {
                 continue;
             }
 

diff --git a/src/Exporter/Graph.php b/src/Exporter/Graph.php
@@ -43,18 +43,18 @@ public function export(NodeInterface $node): OriginalGraph
     /**
      * Create a vertex.
      *
-     * @param \loophp\phptree\Node\NodeInterface $node
+     * @param NodeInterface $node
      *   The node
      *
-     * @return \Fhaculty\Graph\Vertex
+     * @return Vertex
      *   A vertex
      */
     private function createVertex(NodeInterface $node): Vertex
     {
         /** @var int $vertexId */
         $vertexId = $this->createVertexId($node);
 
-        if (false === $this->getGraph()->hasVertex($vertexId)) {
+        if (!$this->getGraph()->hasVertex($vertexId)) {
             $vertex = $this->getGraph()->createVertex($vertexId);
 
             $vertex->setAttribute(
@@ -75,7 +75,7 @@ private function createVertex(NodeInterface $node): Vertex
     /**
      * Create a vertex ID.
      *
-     * @param \loophp\phptree\Node\NodeInterface $node
+     * @param NodeInterface $node
      *   The node
      *
      * @return string

diff --git a/src/Exporter/Gv.php b/src/Exporter/Gv.php
@@ -72,7 +72,7 @@ function ($key, $data) {
             $edges[] = sprintf(
                 '  "%s" %s "%s";',
                 $this->getHash($parent),
-                true === $this->getDirected() ? '->' : '--',
+                $this->getDirected() ? '->' : '--',
                 $this->getHash($child)
             );
         }
@@ -192,18 +192,16 @@ private function getGv(string $attributes = '', string $nodes = '', string $edge
             'digraph' :
             'graph';
 
-        return <<<EOF
-{$graphType} PHPTreeGraph {
+        return sprintf('%s PHPTreeGraph {
 // The graph attributes.
-{$attributes}
+%s
 
 // The graph nodes.
-{$nodes}
+%s
 
 // The graph edges.
-{$edges}
-}
-EOF;
+%s
+}', $graphType, $attributes, $nodes, $edges);
     }
 
     /**

diff --git a/src/Exporter/Image.php b/src/Exporter/Image.php
@@ -35,15 +35,15 @@ public function __construct()
     }
 
     /**
-     * @param \loophp\phptree\Node\NodeInterface $node
+     * @param NodeInterface $node
      *
      * @throws Exception
      *
      * @return string
      */
     public function export(NodeInterface $node): string
     {
-        if (false === $tmp = tempnam(sys_get_temp_dir(), 'phptree-export-')) {
+        if (!($tmp = tempnam(sys_get_temp_dir(), 'phptree-export-'))) {
             return '';
         }
 

diff --git a/src/Exporter/SimpleArray.php b/src/Exporter/SimpleArray.php
@@ -14,7 +14,7 @@ final class SimpleArray implements ExporterInterface
     /**
      * {@inheritdoc}
      */
-    public function export(NodeInterface $node)
+    public function export(NodeInterface $node): array
     {
         $children = [];
 

diff --git a/src/Importer/MicrosoftTolerantPhpParser.php b/src/Importer/MicrosoftTolerantPhpParser.php
@@ -21,7 +21,7 @@ final class MicrosoftTolerantPhpParser implements ImporterInterface
      *
      * @throws Exception
      *
-     * @return \loophp\phptree\Node\NodeInterface
+     * @return NodeInterface
      */
     public function import($data): NodeInterface
     {
@@ -31,18 +31,18 @@ public function import($data): NodeInterface
     /**
      * @param array $attributes
      *
-     * @return \loophp\phptree\Node\AttributeNodeInterface
+     * @return AttributeNodeInterface
      */
     private function createNode(array $attributes): AttributeNodeInterface
     {
         return new AttributeNode($attributes);
     }
 
     /**
-     * @param \loophp\phptree\Node\AttributeNodeInterface $parent
-     * @param \Microsoft\PhpParser\Node ...$astNodes
+     * @param AttributeNodeInterface $parent
+     * @param Node ...$astNodes
      *
-     * @return \loophp\phptree\Node\NodeInterface
+     * @return NodeInterface
      */
     private function parseNode(AttributeNodeInterface $parent, Node ...$astNodes): NodeInterface
     {

diff --git a/src/Importer/NikicPhpAst.php b/src/Importer/NikicPhpAst.php
@@ -20,14 +20,14 @@ final class NikicPhpAst implements ImporterInterface
     /**
      * @var array<int, \ast\Metadata>
      */
-    private $metadata;
+    private $metadata = [];
 
     /**
      * @param Node $data
      *
      * @throws Exception
      *
-     * @return \loophp\phptree\Node\NodeInterface
+     * @return NodeInterface
      */
     public function import($data): NodeInterface
     {
@@ -39,18 +39,18 @@ public function import($data): NodeInterface
     /**
      * @param array $attributes
      *
-     * @return \loophp\phptree\Node\AttributeNodeInterface
+     * @return AttributeNodeInterface
      */
     private function createNode(array $attributes): AttributeNodeInterface
     {
         return new AttributeNode($attributes);
     }
 
     /**
-     * @param \loophp\phptree\Node\AttributeNodeInterface $parent
+     * @param AttributeNodeInterface $parent
      * @param Node ...$astNodes
      *
-     * @return \loophp\phptree\Node\NodeInterface
+     * @return NodeInterface
      */
     private function parseNode(AttributeNodeInterface $parent, Node ...$astNodes): NodeInterface
     {

diff --git a/src/Importer/NikicPhpParser.php b/src/Importer/NikicPhpParser.php
@@ -22,7 +22,7 @@ final class NikicPhpParser implements ImporterInterface
      *
      * @throws Exception
      *
-     * @return \loophp\phptree\Node\NodeInterface
+     * @return NodeInterface
      */
     public function import($data): NodeInterface
     {
@@ -32,7 +32,7 @@ public function import($data): NodeInterface
     /**
      * @param array $attributes
      *
-     * @return \loophp\phptree\Node\AttributeNodeInterface
+     * @return AttributeNodeInterface
      */
     private function createNode(array $attributes): AttributeNodeInterface
     {
@@ -69,10 +69,10 @@ static function (string $subNodeName) use ($astNode): array {
     }
 
     /**
-     * @param \loophp\phptree\Node\AttributeNodeInterface $parent
+     * @param AttributeNodeInterface $parent
      * @param Node ...$astNodes
      *
-     * @return \loophp\phptree\Node\NodeInterface
+     * @return NodeInterface
      */
     private function parseNode(AttributeNodeInterface $parent, Node ...$astNodes): NodeInterface
     {

diff --git a/src/Importer/SimpleArray.php b/src/Importer/SimpleArray.php
@@ -27,7 +27,7 @@ public function import($data): NodeInterface
      * @param mixed $data
      *   The arguments
      *
-     * @return \loophp\phptree\Node\AttributeNodeInterface
+     * @return AttributeNodeInterface
      *   The node
      */
     private function createNode($data): AttributeNodeInterface
@@ -38,7 +38,7 @@ private function createNode($data): AttributeNodeInterface
     }
 
     /**
-     * @param \loophp\phptree\Node\AttributeNodeInterface $parent
+     * @param AttributeNodeInterface $parent
      * @param array ...$nodes
      *
      * @return \loophp\phptree\Node\NodeInterface

diff --git a/src/Importer/Text.php b/src/Importer/Text.php
@@ -27,7 +27,7 @@ public function import($data): NodeInterface
      * @param string $label
      *   The node label
      *
-     * @return \loophp\phptree\Node\AttributeNodeInterface
+     * @return AttributeNodeInterface
      *   The node
      */
     private function createNode(string $label): AttributeNodeInterface
@@ -58,7 +58,7 @@ private function parse(string $subject): array
         }
 
         // Todo: Improve the regex.
-        preg_match_all('~[^\[\]]+|\[(?<nested>(?R)*)]~', mb_substr($subject, $nextBracket, -1), $matches);
+        preg_match_all('#[^\[\]]+|\[(?<nested>(?R)*)]#', mb_substr($subject, $nextBracket, -1), $matches);
 
         $result['children'] = array_map(
             static function (string $match): string {
@@ -71,7 +71,7 @@ static function (string $match): string {
     }
 
     /**
-     * @param \loophp\phptree\Node\AttributeNodeInterface $parent
+     * @param AttributeNodeInterface $parent
      * @param string ...$nodes
      *
      * @return \loophp\phptree\Node\NodeInterface

diff --git a/src/Modifier/Apply.php b/src/Modifier/Apply.php
@@ -19,15 +19,15 @@ class Apply implements ModifierInterface
     private $apply;
 
     /**
-     * @var \loophp\phptree\Traverser\TraverserInterface|null
+     * @var TraverserInterface|null
      */
     private $traverser;
 
     /**
      * Apply constructor.
      *
      * @param callable $apply
-     * @param \loophp\phptree\Traverser\TraverserInterface|null $traverser
+     * @param TraverserInterface|null $traverser
      */
     public function __construct(callable $apply, ?TraverserInterface $traverser = null)
     {

diff --git a/src/Modifier/Filter.php b/src/Modifier/Filter.php
@@ -6,6 +6,7 @@
 
 use loophp\phptree\Node\NodeInterface;
 use loophp\phptree\Traverser\PostOrder;
+use loophp\phptree\Traverser\PreOrder;
 use loophp\phptree\Traverser\TraverserInterface;
 
 /**
@@ -19,15 +20,15 @@ class Filter implements ModifierInterface
     private $filter;
 
     /**
-     * @var \loophp\phptree\Traverser\PreOrder|\loophp\phptree\Traverser\TraverserInterface
+     * @var PreOrder|TraverserInterface
      */
     private $traverser;
 
     /**
      * Filter constructor.
      *
      * @param callable $filter
-     * @param \loophp\phptree\Traverser\TraverserInterface|null $traverser
+     * @param TraverserInterface|null $traverser
      */
     public function __construct(callable $filter, ?TraverserInterface $traverser = null)
     {
@@ -45,7 +46,7 @@ public function modify(NodeInterface $tree): NodeInterface
                 continue;
             }
 
-            if (false === (bool) ($this->filter)($item)) {
+            if (!(bool) ($this->filter)($item)) {
                 continue;
             }
 

diff --git a/src/Modifier/FulfillCapacity.php b/src/Modifier/FulfillCapacity.php
@@ -4,8 +4,10 @@
 
 namespace loophp\phptree\Modifier;
 
+use loophp\phptree\Node\NaryNodeInterface;
 use loophp\phptree\Node\NodeInterface;
 use loophp\phptree\Traverser\PostOrder;
+use loophp\phptree\Traverser\PreOrder;
 use loophp\phptree\Traverser\TraverserInterface;
 
 /**
@@ -14,14 +16,14 @@
 class FulfillCapacity implements ModifierInterface
 {
     /**
-     * @var \loophp\phptree\Traverser\PreOrder|\loophp\phptree\Traverser\TraverserInterface
+     * @var PreOrder|TraverserInterface
      */
     private $traverser;
 
     /**
      * FulfillCapacity constructor.
      *
-     * @param \loophp\phptree\Traverser\TraverserInterface|null $traverser
+     * @param TraverserInterface|null $traverser
      */
     public function __construct(?TraverserInterface $traverser = null)
     {
@@ -33,11 +35,11 @@ public function __construct(?TraverserInterface $traverser = null)
      */
     public function modify(NodeInterface $tree): NodeInterface
     {
-        /** @var \loophp\phptree\Node\NaryNodeInterface $item */
+        /** @var NaryNodeInterface $item */
         foreach ($this->traverser->traverse($tree) as $item) {
             $capacity = $item->capacity();
 
-            if (false === $item->isLeaf()) {
+            if (!$item->isLeaf()) {
                 $children = iterator_to_array($item->children());
 
                 while ($item->degree() !== $capacity) {

diff --git a/src/Modifier/ModifierInterface.php b/src/Modifier/ModifierInterface.php
@@ -4,7 +4,10 @@
 
 namespace loophp\phptree\Modifier;
 
+use loophp\phptree\Node\AttributeNodeInterface;
+use loophp\phptree\Node\MerkleNodeInterface;
 use loophp\phptree\Node\NodeInterface;
+use loophp\phptree\Node\ValueNodeInterface;
 
 /**
  * Interface ModifierInterface.
@@ -17,7 +20,7 @@ interface ModifierInterface
      * @param NodeInterface $tree
      *   The original tree.
      *
-     * @return \loophp\phptree\Node\AttributeNodeInterface|\loophp\phptree\Node\MerkleNodeInterface|\loophp\phptree\Node\ValueNodeInterface|NodeInterface
+     * @return AttributeNodeInterface|MerkleNodeInterface|NodeInterface|ValueNodeInterface
      *   A new tree.
      */
     public function modify(NodeInterface $tree): NodeInterface;