Update code style based on new coding style conventions.

loophp · Jan 22, 2019 · be6778b · be6778b
1 parent 42bf77c
commit be6778b
Show file tree

Hide file tree

Showing 44 changed files with 437 additions and 437 deletions.
diff --git a/benchmarks/DrupolPhpTreeBench.php b/benchmarks/DrupolPhpTreeBench.php
@@ -18,13 +18,6 @@ class DrupolPhpTreeBench extends AbstractBench
      */
     private $tree;
 
-    /**
-     * Init the object.
-     */
-    public function initObject()
-    {
-    }
-
     /**
      * @Revs({1, 100, 1000})
      * @Iterations(5)
@@ -38,4 +31,11 @@ public function benchTreeAdd()
             $this->tree->add(new ValueNode($value, 2));
         }
     }
+
+    /**
+     * Init the object.
+     */
+    public function initObject()
+    {
+    }
 }
diff --git a/spec/drupol/phptree/Exporter/AsciiSpec.php b/spec/drupol/phptree/Exporter/AsciiSpec.php
@@ -11,11 +11,6 @@
 
 class AsciiSpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(Ascii::class);
-    }
-
     public function it_can_export_to_ascii()
     {
         $tree = new ValueNode('root', 2);
@@ -26,7 +21,7 @@ public function it_can_export_to_ascii()
 
         $tree->add(...\array_values($nodes));
 
-        $expected = <<<EOF
+        $expected = <<<'EOF'
 ├─ root
 └─┐
   ├─┐
@@ -115,4 +110,9 @@ public function it_can_throw_an_error_when_tree_is_not_a_valuenode()
             ->shouldThrow(\InvalidArgumentException::class)
             ->during('export', [$tree]);
     }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Ascii::class);
+    }
 }
diff --git a/spec/drupol/phptree/Exporter/GraphSpec.php b/spec/drupol/phptree/Exporter/GraphSpec.php
@@ -11,11 +11,6 @@
 
 class GraphSpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(Graph::class);
-    }
-
     public function it_can_generate_a_graph()
     {
         $root = new ValueNode('root');
@@ -43,7 +38,7 @@ public function it_can_generate_a_graph()
 
         $nodes = \iterator_to_array($traverser->traverse($root));
 
-        for ($i = 0; $i < \count($nodes) - 1; $i++) {
+        for ($i = 0; \count($nodes) - 1 > $i; ++$i) {
             $node0 = $nodes[0];
             $node1 = $nodes[$i + 1];
 
@@ -52,7 +47,7 @@ public function it_can_generate_a_graph()
                 ->getVertices()
                 ->getVertexId(\spl_object_hash($node0))
                 ->hasEdgeTo($this->getGraph()->getVertices()->getVertexId(\spl_object_hash($node1)))
-                ->shouldReturn(TRUE);
+                ->shouldReturn(true);
         }
     }
 
@@ -72,4 +67,9 @@ public function it_can_use_constructor_parameters()
             ->getTraverser()
             ->shouldReturn($traverser);
     }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Graph::class);
+    }
 }
diff --git a/spec/drupol/phptree/Exporter/SimpleArraySpec.php b/spec/drupol/phptree/Exporter/SimpleArraySpec.php
@@ -11,11 +11,6 @@
 
 class SimpleArraySpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(SimpleArray::class);
-    }
-
     public function it_can_export_to_an_array()
     {
         $tree = new ValueNode('root', 2);
@@ -94,4 +89,9 @@ public function it_can_throw_an_error_when_tree_is_not_a_valuenode()
             ->shouldThrow(\InvalidArgumentException::class)
             ->during('export', [$tree]);
     }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(SimpleArray::class);
+    }
 }
diff --git a/spec/drupol/phptree/Exporter/TextSpec.php b/spec/drupol/phptree/Exporter/TextSpec.php
@@ -11,11 +11,6 @@
 
 class TextSpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(Text::class);
-    }
-
     public function it_can_export_to_text()
     {
         $tree = new ValueNode('root', 2);
@@ -30,7 +25,7 @@ public function it_can_export_to_text()
         }
 
         $tree->add(...\array_values($nodes));
-        
+
         $this
             ->export($tree)
             ->shouldReturn('[root [A [C [G] [H]] [D [I] [J]]] [B [E] [F]]]');
@@ -50,4 +45,9 @@ public function it_can_throw_an_error_when_tree_is_not_a_valuenode()
             ->shouldThrow(\InvalidArgumentException::class)
             ->during('export', [$tree]);
     }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Text::class);
+    }
 }
diff --git a/spec/drupol/phptree/Importer/SimpleArraySpec.php b/spec/drupol/phptree/Importer/SimpleArraySpec.php
@@ -10,11 +10,6 @@
 
 class SimpleArraySpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(SimpleArray::class);
-    }
-
     public function it_can_import()
     {
         $array = [
@@ -41,6 +36,11 @@ public function it_can_import()
         $this
             ->import($array)
             ->isRoot()
-            ->shouldReturn(TRUE);
+            ->shouldReturn(true);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(SimpleArray::class);
     }
 }
diff --git a/spec/drupol/phptree/Importer/TextSpec.php b/spec/drupol/phptree/Importer/TextSpec.php
@@ -11,11 +11,6 @@
 
 class TextSpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(Text::class);
-    }
-
     public function it_can_import()
     {
         $string = '[root [A [C [G] [H]] [D [I] [J]]] [B [E] [F]]]';
@@ -41,7 +36,7 @@ public function it_can_import()
         $this
             ->import($string)
             ->isRoot()
-            ->shouldReturn(TRUE);
+            ->shouldReturn(true);
 
         $this
             ->import($string)
@@ -57,4 +52,9 @@ public function it_can_throw_an_error_when_cannot_import()
             ->shouldThrow(\InvalidArgumentException::class)
             ->during('import', [$string]);
     }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Text::class);
+    }
 }
diff --git a/spec/drupol/phptree/Modifier/ReverseSpec.php b/spec/drupol/phptree/Modifier/ReverseSpec.php
@@ -10,11 +10,6 @@
 
 class ReverseSpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(Reverse::class);
-    }
-
     public function it_can_reverse_a_tree()
     {
         $tree1 = new ValueNode('root');
@@ -39,4 +34,9 @@ public function it_can_reverse_a_tree()
             ->children()->current()->getValue()
             ->shouldReturn('E');
     }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Reverse::class);
+    }
 }
diff --git a/spec/drupol/phptree/Node/KeyValueNodeSpec.php b/spec/drupol/phptree/Node/KeyValueNodeSpec.php
@@ -9,11 +9,6 @@
 
 class KeyValueNodeSpec extends ObjectBehavior
 {
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(KeyValueNode::class);
-    }
-
     public function it_can_be_set_with_a_key_and_value()
     {
         $this
@@ -36,4 +31,9 @@ public function it_can_throw_an_error_when_capacity_is_invalid()
             ->capacity()
             ->shouldReturn(0);
     }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(KeyValueNode::class);
+    }
 }
diff --git a/spec/drupol/phptree/Node/NaryNodeSpec.php b/spec/drupol/phptree/Node/NaryNodeSpec.php
@@ -9,9 +9,19 @@
 
 class NaryNodeSpec extends ObjectBehavior
 {
-    public function it_is_initializable()
+    public function it_can_be_counted()
     {
-        $this->shouldHaveType(NaryNode::class);
+        $this->beConstructedWith(2);
+
+        foreach (\range('A', 'Z') as $value) {
+            $node = new NaryNode(2);
+
+            $this->add($node);
+        }
+
+        $this
+            ->count()
+            ->shouldReturn(26);
     }
 
     public function it_can_get_the_capacity()
@@ -39,18 +49,8 @@ public function it_can_throw_an_error_when_capacity_is_invalid()
             ->shouldReturn(0);
     }
 
-    public function it_can_be_counted()
+    public function it_is_initializable()
     {
-        $this->beConstructedWith(2);
-
-        foreach (\range('A', 'Z') as $value) {
-            $node = new NaryNode(2);
-
-            $this->add($node);
-        }
-
-        $this
-            ->count()
-            ->shouldReturn(26);
+        $this->shouldHaveType(NaryNode::class);
     }
 }