removed ...Interface suffix and added 2nd service to Bridge example

Dominik Liebler · Dominik Liebler · commit 617754573cbd · 2018-11-06T20:33:42.000+01:00
diff --git a/Structural/Bridge/Formatter.php b/Structural/Bridge/Formatter.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+interface Formatter
+{
+    public function format(string $text): string;
+}
diff --git a/Structural/Bridge/FormatterInterface.php b/Structural/Bridge/FormatterInterface.php
diff --git a/Structural/Bridge/HelloWorldService.php b/Structural/Bridge/HelloWorldService.php
@@ -4,7 +4,7 @@
 
 class HelloWorldService extends Service
 {
-    public function get()
+    public function get(): string
     {
         return $this->implementation->format('Hello World');
     }
diff --git a/Structural/Bridge/HtmlFormatter.php b/Structural/Bridge/HtmlFormatter.php
@@ -2,9 +2,9 @@
 
 namespace DesignPatterns\Structural\Bridge;
 
-class HtmlFormatter implements FormatterInterface
+class HtmlFormatter implements Formatter
 {
-    public function format(string $text)
+    public function format(string $text): string
     {
         return sprintf('<p>%s</p>', $text);
     }
diff --git a/Structural/Bridge/PingService.php b/Structural/Bridge/PingService.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace DesignPatterns\Structural\Bridge;
+
+class PingService extends Service
+{
+    public function get(): string
+    {
+        return $this->implementation->format('pong');
+    }
+}
diff --git a/Structural/Bridge/PlainTextFormatter.php b/Structural/Bridge/PlainTextFormatter.php
@@ -2,9 +2,9 @@
 
 namespace DesignPatterns\Structural\Bridge;
 
-class PlainTextFormatter implements FormatterInterface
+class PlainTextFormatter implements Formatter
 {
-    public function format(string $text)
+    public function format(string $text): string
     {
         return $text;
     }
diff --git a/Structural/Bridge/README.rst b/Structural/Bridge/README.rst
@@ -25,9 +25,9 @@ Code
 
 You can also find this code on `GitHub`_
 
-FormatterInterface.php
+Formatter.php
 
-.. literalinclude:: FormatterInterface.php
+.. literalinclude:: Formatter.php
    :language: php
    :linenos:
 
@@ -55,6 +55,12 @@ HelloWorldService.php
    :language: php
    :linenos:
 
+PingService.php
+
+.. literalinclude:: PingService.php
+   :language: php
+   :linenos:
+
 Test
 ----
 
diff --git a/Structural/Bridge/Service.php b/Structural/Bridge/Service.php
@@ -5,25 +5,25 @@
 abstract class Service
 {
     /**
-     * @var FormatterInterface
+     * @var Formatter
      */
     protected $implementation;
 
     /**
-     * @param FormatterInterface $printer
+     * @param Formatter $printer
      */
-    public function __construct(FormatterInterface $printer)
+    public function __construct(Formatter $printer)
     {
         $this->implementation = $printer;
     }
 
     /**
-     * @param FormatterInterface $printer
+     * @param Formatter $printer
      */
-    public function setImplementation(FormatterInterface $printer)
+    public function setImplementation(Formatter $printer)
     {
         $this->implementation = $printer;
     }
 
-    abstract public function get();
+    abstract public function get(): string;
 }
diff --git a/Structural/Bridge/Tests/BridgeTest.php b/Structural/Bridge/Tests/BridgeTest.php
@@ -9,13 +9,17 @@
 
 class BridgeTest extends TestCase
 {
-    public function testCanPrintUsingThePlainTextPrinter()
+    public function testCanPrintUsingThePlainTextFormatter()
     {
         $service = new HelloWorldService(new PlainTextFormatter());
+
         $this->assertSame('Hello World', $service->get());
+    }
+
+    public function testCanPrintUsingTheHtmlFormatter()
+    {
+        $service = new HelloWorldService(new HtmlFormatter());
 
-        // now change the implementation and use the HtmlFormatter instead
-        $service->setImplementation(new HtmlFormatter());
         $this->assertSame('<p>Hello World</p>', $service->get());
     }
 }
diff --git a/Structural/Bridge/uml/Bridge.uml b/Structural/Bridge/uml/Bridge.uml
@@ -1,38 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Diagram>
   <ID>PHP</ID>
-  <OriginalElement>\DesignPatterns\Structural\Bridge\HtmlFormatter</OriginalElement>
+  <OriginalElement>\DesignPatterns\Structural\Bridge\Service</OriginalElement>
   <nodes>
-    <node x="-111.0" y="-111.0">\DesignPatterns\Structural\Bridge\PlainTextFormatter</node>
-    <node x="-194.0" y="-212.0">\DesignPatterns\Structural\Bridge\FormatterInterface</node>
-    <node x="88.0" y="-239.0">\DesignPatterns\Structural\Bridge\Service</node>
-    <node x="121.0" y="-93.0">\DesignPatterns\Structural\Bridge\HelloWorldService</node>
-    <node x="-278.0" y="-111.0">\DesignPatterns\Structural\Bridge\HtmlFormatter</node>
+    <node x="151.0" y="366.0">\DesignPatterns\Structural\Bridge\PlainTextFormatter</node>
+    <node x="79.75" y="265.0">\DesignPatterns\Structural\Bridge\Formatter</node>
+    <node x="33.75" y="0.0">\DesignPatterns\Structural\Bridge\Service</node>
+    <node x="164.0" y="169.0">\DesignPatterns\Structural\Bridge\PingService</node>
+    <node x="0.0" y="169.0">\DesignPatterns\Structural\Bridge\HelloWorldService</node>
+    <node x="0.0" y="366.0">\DesignPatterns\Structural\Bridge\HtmlFormatter</node>
   </nodes>
   <notes />
   <edges>
     <edge source="\DesignPatterns\Structural\Bridge\HelloWorldService" target="\DesignPatterns\Structural\Bridge\Service">
       <point x="0.0" y="-25.5" />
-      <point x="0.0" y="48.0" />
+      <point x="72.0" y="144.0" />
+      <point x="88.75" y="144.0" />
+      <point x="-55.0" y="59.5" />
     </edge>
-    <edge source="\DesignPatterns\Structural\Bridge\PlainTextFormatter" target="\DesignPatterns\Structural\Bridge\FormatterInterface">
+    <edge source="\DesignPatterns\Structural\Bridge\PingService" target="\DesignPatterns\Structural\Bridge\Service">
       <point x="0.0" y="-25.5" />
-      <point x="-35.5" y="-136.0" />
-      <point x="-83.0" y="-136.0" />
-      <point x="37.0" y="25.5" />
+      <point x="215.5" y="144.0" />
+      <point x="198.75" y="144.0" />
+      <point x="55.0" y="59.5" />
     </edge>
-    <edge source="\DesignPatterns\Structural\Bridge\HtmlFormatter" target="\DesignPatterns\Structural\Bridge\FormatterInterface">
+    <edge source="\DesignPatterns\Structural\Bridge\HtmlFormatter" target="\DesignPatterns\Structural\Bridge\Formatter">
       <point x="0.0" y="-25.5" />
-      <point x="-204.5" y="-136.0" />
-      <point x="-157.0" y="-136.0" />
-      <point x="-37.0" y="25.5" />
+      <point x="65.5" y="341.0" />
+      <point x="112.5" y="341.0" />
+      <point x="-32.75" y="25.5" />
+    </edge>
+    <edge source="\DesignPatterns\Structural\Bridge\PlainTextFormatter" target="\DesignPatterns\Structural\Bridge\Formatter">
+      <point x="0.0" y="-25.5" />
+      <point x="225.0" y="341.0" />
+      <point x="178.0" y="341.0" />
+      <point x="32.75" y="25.5" />
     </edge>
   </edges>
-  <settings layout="Hierarchic Group" zoom="1.0" x="147.5" y="130.5" />
+  <settings layout="Hierarchic Group" zoom="1.0" x="144.5" y="130.5" />
   <SelectedNodes />
   <Categories>
     <Category>Fields</Category>
     <Category>Constants</Category>
+    <Category>Constructors</Category>
     <Category>Methods</Category>
   </Categories>
   <VISIBILITY>private</VISIBILITY>
diff --git a/Structural/Bridge/uml/uml.png b/Structural/Bridge/uml/uml.png
diff --git a/Structural/Bridge/uml/uml.svg b/Structural/Bridge/uml/uml.svg

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class HelloWorldService extends Service`
`6`	`6`	`{`
`7`		`- public function get()`
	`7`	`+ public function get(): string`
`8`	`8`	`{`
`9`	`9`	`return $this->implementation->format('Hello World');`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace DesignPatterns\Structural\Bridge;`
`4`	`4`
`5`		`-class HtmlFormatter implements FormatterInterface`
	`5`	`+class HtmlFormatter implements Formatter`
`6`	`6`	`{`
`7`		`- public function format(string $text)`
	`7`	`+ public function format(string $text): string`
`8`	`8`	`{`
`9`	`9`	`return sprintf('<p>%s</p>', $text);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace DesignPatterns\Structural\Bridge;`
`4`	`4`
`5`		`-class PlainTextFormatter implements FormatterInterface`
	`5`	`+class PlainTextFormatter implements Formatter`
`6`	`6`	`{`
`7`		`- public function format(string $text)`
	`7`	`+ public function format(string $text): string`
`8`	`8`	`{`
`9`	`9`	`return $text;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,25 +5,25 @@`
`5`	`5`	`abstract class Service`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`		`- * @var FormatterInterface`
	`8`	`+ * @var Formatter`
`9`	`9`	`*/`
`10`	`10`	`protected $implementation;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * @param FormatterInterface $printer`
	`13`	`+ * @param Formatter $printer`
`14`	`14`	`*/`
`15`		`- public function __construct(FormatterInterface $printer)`
	`15`	`+ public function __construct(Formatter $printer)`
`16`	`16`	`{`
`17`	`17`	`$this->implementation = $printer;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * @param FormatterInterface $printer`
	`21`	`+ * @param Formatter $printer`
`22`	`22`	`*/`
`23`		`- public function setImplementation(FormatterInterface $printer)`
	`23`	`+ public function setImplementation(Formatter $printer)`
`24`	`24`	`{`
`25`	`25`	`$this->implementation = $printer;`
`26`	`26`	`}`
`27`	`27`
`28`		`- abstract public function get();`
	`28`	`+ abstract public function get(): string;`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,17 @@`
`9`	`9`
`10`	`10`	`class BridgeTest extends TestCase`
`11`	`11`	`{`
`12`		`- public function testCanPrintUsingThePlainTextPrinter()`
	`12`	`+ public function testCanPrintUsingThePlainTextFormatter()`
`13`	`13`	`{`
`14`	`14`	`$service = new HelloWorldService(new PlainTextFormatter());`
	`15`	`+`
`15`	`16`	`$this->assertSame('Hello World', $service->get());`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ public function testCanPrintUsingTheHtmlFormatter()`
	`20`	`+ {`
	`21`	`+ $service = new HelloWorldService(new HtmlFormatter());`
`16`	`22`
`17`		`- // now change the implementation and use the HtmlFormatter instead`
`18`		`- $service->setImplementation(new HtmlFormatter());`
`19`	`23`	`$this->assertSame('<p>Hello World</p>', $service->get());`
`20`	`24`	`}`
`21`	`25`	`}`