remove Interface-Suffix

Dominik Liebler · Dominik Liebler · commit 9cb766070440 · 2019-08-19T17:08:38.000+02:00
diff --git a/Behavioral/Visitor/Group.php b/Behavioral/Visitor/Group.php
@@ -20,7 +20,7 @@ public function getName(): string
         return sprintf('Group: %s', $this->name);
     }
 
-    public function accept(RoleVisitorInterface $visitor)
+    public function accept(RoleVisitor $visitor)
     {
         $visitor->visitGroup($this);
     }
diff --git a/Behavioral/Visitor/README.rst b/Behavioral/Visitor/README.rst
@@ -25,15 +25,15 @@ Code
 
 You can also find this code on `GitHub`_
 
-RoleVisitorInterface.php
+RoleVisitor.php
 
-.. literalinclude:: RoleVisitorInterface.php
+.. literalinclude:: RoleVisitor.php
    :language: php
    :linenos:
 
-RoleVisitor.php
+RecordingVisitor.php
 
-.. literalinclude:: RoleVisitor.php
+.. literalinclude:: RecordingVisitor.php
    :language: php
    :linenos:
 
@@ -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
diff --git a/Behavioral/Visitor/RecordingVisitor.php b/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;
+    }
+}
diff --git a/Behavioral/Visitor/Role.php b/Behavioral/Visitor/Role.php
@@ -5,5 +5,5 @@
 
 interface Role
 {
-    public function accept(RoleVisitorInterface $visitor);
+    public function accept(RoleVisitor $visitor);
 }
diff --git a/Behavioral/Visitor/RoleVisitor.php b/Behavioral/Visitor/RoleVisitor.php
@@ -3,28 +3,13 @@
 
 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
 {
-    /**
-     * @var Role[]
-     */
-    private $visited = [];
+    public function visitUser(User $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;
-    }
+    public function visitGroup(Group $role);
 }
diff --git a/Behavioral/Visitor/RoleVisitorInterface.php b/Behavioral/Visitor/RoleVisitorInterface.php
diff --git a/Behavioral/Visitor/Tests/VisitorTest.php b/Behavioral/Visitor/Tests/VisitorTest.php
@@ -9,13 +9,13 @@
 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()
diff --git a/Behavioral/Visitor/User.php b/Behavioral/Visitor/User.php
@@ -20,7 +20,7 @@ public function getName(): string
         return sprintf('User %s', $this->name);
     }
 
-    public function accept(RoleVisitorInterface $visitor)
+    public function accept(RoleVisitor $visitor)
     {
         $visitor->visitUser($this);
     }
diff --git a/Behavioral/Visitor/uml/uml.png b/Behavioral/Visitor/uml/uml.png

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function getName(): string`
`20`	`20`	`return sprintf('Group: %s', $this->name);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function accept(RoleVisitorInterface $visitor)`
	`23`	`+ public function accept(RoleVisitor $visitor)`
`24`	`24`	`{`
`25`	`25`	`$visitor->visitGroup($this);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`
`6`	`6`	`interface Role`
`7`	`7`	`{`
`8`		`- public function accept(RoleVisitorInterface $visitor);`
	`8`	`+ public function accept(RoleVisitor $visitor);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@`
`9`	`9`	`class VisitorTest extends TestCase`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`		`- * @var Visitor\RoleVisitor`
	`12`	`+ * @var Visitor\RecordingVisitor`
`13`	`13`	`*/`
`14`	`14`	`private $visitor;`
`15`	`15`
`16`	`16`	`protected function setUp(): void`
`17`	`17`	`{`
`18`		`- $this->visitor = new Visitor\RoleVisitor();`
	`18`	`+ $this->visitor = new Visitor\RecordingVisitor();`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public function provideRoles()`