remove Interface-Suffix

Behavioral/Visitor/Group.php

@@ -20,7 +20,7 @@ class Group implements Role
         return sprintf('Group: %s', $this->name);
     }
 
-    public function accept(RoleVisitorInterface $visitor)
+    public function accept(RoleVisitor $visitor)
     {
         $visitor->visitGroup($this);
     }

Behavioral/Visitor/README.rst

@@ -25,18 +25,18 @@ Code
 
 You can also find this code on `GitHub`_
 
-RoleVisitorInterface.php
-
-.. literalinclude:: RoleVisitorInterface.php
-   :language: php
-   :linenos:
-
 RoleVisitor.php
 
 .. literalinclude:: RoleVisitor.php
    :language: php
    :linenos:
 
+RecordingVisitor.php
+
+.. literalinclude:: RecordingVisitor.php
+   :language: php
+   :linenos:
+
 Role.php
 
 .. literalinclude:: Role.php
@@ -65,4 +65,4 @@ Tests/VisitorTest.php
    :linenos:
 
 .. _`GitHub`: https://github.com/domnikl/DesignPatternsPHP/tree/master/Behavioral/Visitor
-.. __: http://en.wikipedia.org/wiki/Visitor_pattern
+.. __: http://en.wikipedia.org/wiki/Visitor_pattern

Behavioral/Visitor/RecordingVisitor.php

@@ -0,0 +1,30 @@
+<?php
+declare(strict_types=1);
+
+namespace DesignPatterns\Behavioral\Visitor;
+
+class RecordingVisitor implements RoleVisitor
+{
+    /**
+     * @var Role[]
+     */
+    private $visited = [];
+
+    public function visitGroup(Group $role)
+    {
+        $this->visited[] = $role;
+    }
+
+    public function visitUser(User $role)
+    {
+        $this->visited[] = $role;
+    }
+
+    /**
+     * @return Role[]
+     */
+    public function getVisited(): array
+    {
+        return $this->visited;
+    }
+}

Behavioral/Visitor/Role.php

@@ -5,5 +5,5 @@ namespace DesignPatterns\Behavioral\Visitor;
 
 interface Role
 {
-    public function accept(RoleVisitorInterface $visitor);
+    public function accept(RoleVisitor $visitor);
 }

Behavioral/Visitor/RoleVisitor.php

@@ -3,28 +3,13 @@ declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Visitor;
 
-class RoleVisitor implements RoleVisitorInterface
+/**
+ * Note: the visitor must not choose itself which method to
+ * invoke, it is the Visitee that make this decision
+ */
+interface RoleVisitor
 {
-    /**
+    public function visitUser(User $role);
-     * @var Role[]
-     */
-    private $visited = [];
 
-    public function visitGroup(Group $role)
+    public function visitGroup(Group $role);
-    {
-        $this->visited[] = $role;
-    }
-
-    public function visitUser(User $role)
-    {
-        $this->visited[] = $role;
-    }
-
-    /**
-     * @return Role[]
-     */
-    public function getVisited(): array
-    {
-        return $this->visited;
-    }
 }

Behavioral/Visitor/RoleVisitorInterface.php

@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace DesignPatterns\Behavioral\Visitor;
-
-/**
- * Note: the visitor must not choose itself which method to
- * invoke, it is the Visitee that make this decision
- */
-interface RoleVisitorInterface
-{
-    public function visitUser(User $role);
-
-    public function visitGroup(Group $role);
-}

Behavioral/Visitor/Tests/VisitorTest.php

@@ -9,13 +9,13 @@ use PHPUnit\Framework\TestCase;
 class VisitorTest extends TestCase
 {
     /**
-     * @var Visitor\RoleVisitor
+     * @var Visitor\RecordingVisitor
      */
     private $visitor;
 
     protected function setUp(): void
     {
-        $this->visitor = new Visitor\RoleVisitor();
+        $this->visitor = new Visitor\RecordingVisitor();
     }
 
     public function provideRoles()

Behavioral/Visitor/User.php

@@ -20,7 +20,7 @@ class User implements Role
         return sprintf('User %s', $this->name);
     }
 
-    public function accept(RoleVisitorInterface $visitor)
+    public function accept(RoleVisitor $visitor)
     {
         $visitor->visitUser($this);
     }