remove Interface-Suffix

Dominik Liebler · Dominik Liebler · commit 132de8e34e2e · 2019-08-19T16:50:40.000+02:00
diff --git a/Behavioral/Specification/AndSpecification.php b/Behavioral/Specification/AndSpecification.php
@@ -3,17 +3,17 @@
 
 namespace DesignPatterns\Behavioral\Specification;
 
-class AndSpecification implements SpecificationInterface
+class AndSpecification implements Specification
 {
     /**
-     * @var SpecificationInterface[]
+     * @var Specification[]
      */
     private $specifications;
 
     /**
-     * @param SpecificationInterface[] ...$specifications
+     * @param Specification[] ...$specifications
      */
-    public function __construct(SpecificationInterface ...$specifications)
+    public function __construct(Specification ...$specifications)
     {
         $this->specifications = $specifications;
     }
diff --git a/Behavioral/Specification/NotSpecification.php b/Behavioral/Specification/NotSpecification.php
@@ -3,14 +3,14 @@
 
 namespace DesignPatterns\Behavioral\Specification;
 
-class NotSpecification implements SpecificationInterface
+class NotSpecification implements Specification
 {
     /**
-     * @var SpecificationInterface
+     * @var Specification
      */
     private $specification;
 
-    public function __construct(SpecificationInterface $specification)
+    public function __construct(Specification $specification)
     {
         $this->specification = $specification;
     }
diff --git a/Behavioral/Specification/OrSpecification.php b/Behavioral/Specification/OrSpecification.php
@@ -3,17 +3,17 @@
 
 namespace DesignPatterns\Behavioral\Specification;
 
-class OrSpecification implements SpecificationInterface
+class OrSpecification implements Specification
 {
     /**
-     * @var SpecificationInterface[]
+     * @var Specification[]
      */
     private $specifications;
 
     /**
-     * @param SpecificationInterface[] ...$specifications
+     * @param Specification[] ...$specifications
      */
-    public function __construct(SpecificationInterface ...$specifications)
+    public function __construct(Specification ...$specifications)
     {
         $this->specifications = $specifications;
     }
diff --git a/Behavioral/Specification/PriceSpecification.php b/Behavioral/Specification/PriceSpecification.php
@@ -3,7 +3,7 @@
 
 namespace DesignPatterns\Behavioral\Specification;
 
-class PriceSpecification implements SpecificationInterface
+class PriceSpecification implements Specification
 {
     /**
      * @var float|null
diff --git a/Behavioral/Specification/README.rst b/Behavioral/Specification/README.rst
@@ -32,9 +32,9 @@ Item.php
    :language: php
    :linenos:
 
-SpecificationInterface.php
+Specification.php
 
-.. literalinclude:: SpecificationInterface.php
+.. literalinclude:: Specification.php
    :language: php
    :linenos:
 
diff --git a/Behavioral/Specification/Specification.php b/Behavioral/Specification/Specification.php
@@ -3,7 +3,7 @@
 
 namespace DesignPatterns\Behavioral\Specification;
 
-interface SpecificationInterface
+interface Specification
 {
     public function isSatisfiedBy(Item $item): bool;
 }
diff --git a/Behavioral/Specification/uml/Specification.uml b/Behavioral/Specification/uml/Specification.uml
@@ -2,51 +2,12 @@
 <Diagram>
   <ID>PHP</ID>
   <OriginalElement>\DesignPatterns\Behavioral\Specification\AndSpecification</OriginalElement>
-  <nodes>
-    <node x="0.0" y="112.0">\DesignPatterns\Behavioral\Specification\OrSpecification</node>
-    <node x="259.0" y="101.0">\DesignPatterns\Behavioral\Specification\PriceSpecification</node>
-    <node x="807.0" y="112.0">\DesignPatterns\Behavioral\Specification\NotSpecification</node>
-    <node x="0.0" y="265.0">\DesignPatterns\Behavioral\Specification\Item</node>
-    <node x="548.0" y="112.0">\DesignPatterns\Behavioral\Specification\AndSpecification</node>
-    <node x="436.99999999999994" y="0.0">\DesignPatterns\Behavioral\Specification\SpecificationInterface</node>
-  </nodes>
+  <nodes />
   <notes />
-  <edges>
-    <edge source="\DesignPatterns\Behavioral\Specification\AndSpecification" target="\DesignPatterns\Behavioral\Specification\SpecificationInterface">
-      <point x="0.0" y="-48.5" />
-      <point x="667.5" y="81.0" />
-      <point x="553.875" y="81.0" />
-      <point x="23.375000000000057" y="25.5" />
-    </edge>
-    <edge source="\DesignPatterns\Behavioral\Specification\NotSpecification" target="\DesignPatterns\Behavioral\Specification\SpecificationInterface">
-      <point x="0.0" y="-48.5" />
-      <point x="923.0" y="71.0" />
-      <point x="600.625" y="71.0" />
-      <point x="70.12500000000006" y="25.5" />
-    </edge>
-    <edge source="\DesignPatterns\Behavioral\Specification\PriceSpecification" target="\DesignPatterns\Behavioral\Specification\SpecificationInterface">
-      <point x="0.0" y="-59.5" />
-      <point x="393.5" y="81.0" />
-      <point x="507.12499999999994" y="81.0" />
-      <point x="-23.375" y="25.5" />
-    </edge>
-    <edge source="\DesignPatterns\Behavioral\Specification\OrSpecification" target="\DesignPatterns\Behavioral\Specification\SpecificationInterface">
-      <point x="0.0" y="-48.5" />
-      <point x="119.5" y="71.0" />
-      <point x="460.37499999999994" y="71.0" />
-      <point x="-70.125" y="25.5" />
-    </edge>
-  </edges>
-  <settings layout="Hierarchic Group" zoom="1.0" x="425.5" y="91.0" />
-  <SelectedNodes>
-    <node>\DesignPatterns\Behavioral\Specification\AndSpecification</node>
-  </SelectedNodes>
-  <Categories>
-    <Category>Fields</Category>
-    <Category>Constants</Category>
-    <Category>Constructors</Category>
-    <Category>Methods</Category>
-  </Categories>
+  <edges />
+  <settings layout="Hierarchic Group" zoom="1.0" x="524.5" y="191.0" />
+  <SelectedNodes />
+  <Categories />
   <VISIBILITY>private</VISIBILITY>
 </Diagram>
 
diff --git a/Behavioral/Specification/uml/uml.png b/Behavioral/Specification/uml/uml.png

Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,17 @@`
`3`	`3`
`4`	`4`	`namespace DesignPatterns\Behavioral\Specification;`
`5`	`5`
`6`		`-class AndSpecification implements SpecificationInterface`
	`6`	`+class AndSpecification implements Specification`
`7`	`7`	`{`
`8`	`8`	`/**`
`9`		`- * @var SpecificationInterface[]`
	`9`	`+ * @var Specification[]`
`10`	`10`	`*/`
`11`	`11`	`private $specifications;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * @param SpecificationInterface[] ...$specifications`
	`14`	`+ * @param Specification[] ...$specifications`
`15`	`15`	`*/`
`16`		`- public function __construct(SpecificationInterface ...$specifications)`
	`16`	`+ public function __construct(Specification ...$specifications)`
`17`	`17`	`{`
`18`	`18`	`$this->specifications = $specifications;`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@`
`3`	`3`
`4`	`4`	`namespace DesignPatterns\Behavioral\Specification;`
`5`	`5`
`6`		`-class NotSpecification implements SpecificationInterface`
	`6`	`+class NotSpecification implements Specification`
`7`	`7`	`{`
`8`	`8`	`/**`
`9`		`- * @var SpecificationInterface`
	`9`	`+ * @var Specification`
`10`	`10`	`*/`
`11`	`11`	`private $specification;`
`12`	`12`
`13`		`- public function __construct(SpecificationInterface $specification)`
	`13`	`+ public function __construct(Specification $specification)`
`14`	`14`	`{`
`15`	`15`	`$this->specification = $specification;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,17 @@`
`3`	`3`
`4`	`4`	`namespace DesignPatterns\Behavioral\Specification;`
`5`	`5`
`6`		`-class OrSpecification implements SpecificationInterface`
	`6`	`+class OrSpecification implements Specification`
`7`	`7`	`{`
`8`	`8`	`/**`
`9`		`- * @var SpecificationInterface[]`
	`9`	`+ * @var Specification[]`
`10`	`10`	`*/`
`11`	`11`	`private $specifications;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * @param SpecificationInterface[] ...$specifications`
	`14`	`+ * @param Specification[] ...$specifications`
`15`	`15`	`*/`
`16`		`- public function __construct(SpecificationInterface ...$specifications)`
	`16`	`+ public function __construct(Specification ...$specifications)`
`17`	`17`	`{`
`18`	`18`	`$this->specifications = $specifications;`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace DesignPatterns\Behavioral\Specification;`
`5`	`5`
`6`		`-class PriceSpecification implements SpecificationInterface`
	`6`	`+class PriceSpecification implements Specification`
`7`	`7`	`{`
`8`	`8`	`/**`
`9`	`9`	`* @var float\|null`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace DesignPatterns\Behavioral\Specification;`
`5`	`5`
`6`		`-interface SpecificationInterface`
	`6`	`+interface Specification`
`7`	`7`	`{`
`8`	`8`	`public function isSatisfiedBy(Item $item): bool;`
`9`	`9`	`}`