DesignPatternsPHP · eddiejaoude · Aug 15, 2015 · Aug 15, 2015 · Aug 15, 2015 · Aug 15, 2015
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,6 @@
 /vendor/
 _build/
 *.mo
+.vagrant/
+phpunit.xml
+composer.phar
diff --git a/.travis.yml b/.travis.yml
@@ -3,18 +3,7 @@ language: php
 sudo: false
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
   - 7.0
-  - hhvm
-
-matrix:
-  allow_failures:
-    - php: hhvm
-    - php: 7.0
-  fast_finish: true
 
 cache:
   directories:

diff --git a/Creational/FactoryMethod/Bicycle.php b/Creational/FactoryMethod/Bicycle.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
- * Bicycle is a bicycle
+ * Class Bicycle
+ * @package DesignPatterns\Creational\FactoryMethod
  */
 class Bicycle implements VehicleInterface
 {
@@ -17,7 +19,7 @@ class Bicycle implements VehicleInterface
      *
      * @param string $rgb
      */
-    public function setColor($rgb)
+    public function setColor(string $rgb)
     {
         $this->color = $rgb;
     }

diff --git a/Creational/FactoryMethod/FactoryMethod.php b/Creational/FactoryMethod/FactoryMethod.php
@@ -1,26 +1,25 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
- * class FactoryMethod
+ * Class FactoryMethod
+ * @package DesignPatterns\Creational\FactoryMethod
  */
 abstract class FactoryMethod
 {
-
+    /** @var int */
     const CHEAP = 1;
+
+    /** @var int */
     const FAST = 2;
 
-    /**
-     * The children of the class must implement this method
-     *
-     * Sometimes this method can be public to get "raw" object
-     *
-     * @param string $type a generic type
-     *
-     * @return VehicleInterface a new vehicle
-     */
-    abstract protected function createVehicle($type);
+    /** @var array */
+    public static $typeTexts = [
+        1 => 'Cheap',
+        2 => 'Fast',
+    ];
 
     /**
      * Creates a new vehicle
@@ -29,11 +28,22 @@ abstract protected function createVehicle($type);
      *
      * @return VehicleInterface a new vehicle
      */
-    public function create($type)
+    public function create(int $type) : VehicleInterface
     {
         $obj = $this->createVehicle($type);
         $obj->setColor("#f00");
 
         return $obj;
     }
+
+    /**
+     * The children of the class must implement this method
+     *
+     * Sometimes this method can be public to get "raw" object
+     *
+     * @param int $type a generic type
+     *
+     * @return VehicleInterface a new vehicle
+     */
+    abstract protected function createVehicle(int $type) : VehicleInterface;
 }
diff --git a/Creational/FactoryMethod/Ferrari.php b/Creational/FactoryMethod/Ferrari.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
- * Ferrari is a italian car
+ * Class Ferrari
+ * @package DesignPatterns\Creational\FactoryMethod
  */
 class Ferrari implements VehicleInterface
 {
@@ -15,7 +17,7 @@ class Ferrari implements VehicleInterface
     /**
      * @param string $rgb
      */
-    public function setColor($rgb)
+    public function setColor(string $rgb)
     {
         $this->color = $rgb;
     }

diff --git a/Creational/FactoryMethod/GermanFactory.php b/Creational/FactoryMethod/GermanFactory.php
@@ -1,16 +1,18 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
- * GermanFactory is a vehicle factory in Germany
+ * Class GermanFactory
+ * @package DesignPatterns\Creational\FactoryMethod
  */
 class GermanFactory extends FactoryMethod
 {
     /**
      * {@inheritdoc}
      */
-    protected function createVehicle($type)
+    protected function createVehicle(int $type) : VehicleInterface
     {
         switch ($type) {
             case parent::CHEAP:
@@ -25,7 +27,10 @@ protected function createVehicle($type)
                 return $obj;
                 break;
             default:
-                throw new \InvalidArgumentException("$type is not a valid vehicle");
+                throw new \InvalidArgumentException(
+                    'Not a valid vehicle, vehicles allowed: ' .
+                    implode(', ', FactoryMethod::$typeTexts)
+                );
         }
     }
 }
diff --git a/Creational/FactoryMethod/ItalianFactory.php b/Creational/FactoryMethod/ItalianFactory.php
@@ -1,16 +1,18 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
- * ItalianFactory is vehicle factory in Italy
+ * Class ItalianFactory
+ * @package DesignPatterns\Creational\FactoryMethod
  */
 class ItalianFactory extends FactoryMethod
 {
     /**
      * {@inheritdoc}
      */
-    protected function createVehicle($type)
+    protected function createVehicle(int $type) : VehicleInterface
     {
         switch ($type) {
             case parent::CHEAP:
@@ -20,7 +22,10 @@ protected function createVehicle($type)
                 return new Ferrari();
                 break;
             default:
-                throw new \InvalidArgumentException("$type is not a valid vehicle");
+                throw new \InvalidArgumentException(
+                    'Not a valid vehicle, vehicles allowed: ' .
+                    implode(', ', FactoryMethod::$typeTexts)
+                );
         }
     }
 }
diff --git a/Creational/FactoryMethod/Porsche.php b/Creational/FactoryMethod/Porsche.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
- * Porsche is a german car
+ * Class Porsche
+ * @package DesignPatterns\Creational\FactoryMethod
  */
 class Porsche implements VehicleInterface
 {
@@ -15,7 +17,7 @@ class Porsche implements VehicleInterface
     /**
      * @param string $rgb
      */
-    public function setColor($rgb)
+    public function setColor(string $rgb)
     {
         $this->color = $rgb;
     }

diff --git a/Creational/FactoryMethod/Tests/FactoryMethodTest.php b/Creational/FactoryMethod/Tests/FactoryMethodTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod\Tests;
 
@@ -7,22 +8,29 @@
 use DesignPatterns\Creational\FactoryMethod\ItalianFactory;
 
 /**
- * FactoryMethodTest tests the factory method pattern
+ * Class FactoryMethodTest
+ * @package DesignPatterns\Creational\FactoryMethod\Tests
  */
 class FactoryMethodTest extends \PHPUnit_Framework_TestCase
 {
-
-    protected $type = array(
+    /** @var array */
+    protected $type = [
         FactoryMethod::CHEAP,
-        FactoryMethod::FAST
-    );
+        FactoryMethod::FAST,
+    ];
+
+    /** @var int */
+    const UNKNOWN = 123;
 
+    /**
+     * @return array
+     */
     public function getShop()
     {
-        return array(
-            array(new GermanFactory()),
-            array(new ItalianFactory())
-        );
+        return [
+            [new GermanFactory()],
+            [new ItalianFactory()],
+        ];
     }
 
     /**
@@ -32,19 +40,21 @@ public function testCreation(FactoryMethod $shop)
     {
         // this test method acts as a client for the factory. We don't care
         // about the factory, all we know is it can produce vehicle
-        foreach ($this->type as $oneType) {
-            $vehicle = $shop->create($oneType);
-            $this->assertInstanceOf('DesignPatterns\Creational\FactoryMethod\VehicleInterface', $vehicle);
+        foreach ($this->type as $type) {
+            $this->assertInstanceOf(
+                'DesignPatterns\Creational\FactoryMethod\VehicleInterface',
+                $shop->create($type)
+            );
         }
     }
 
     /**
-     * @dataProvider getShop
+     * @dataProvider             getShop
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage spaceship is not a valid vehicle
+     * @expectedExceptionMessage Not a valid vehicle, vehicles allowed: Cheap, Fast
      */
     public function testUnknownType(FactoryMethod $shop)
     {
-        $shop->create('spaceship');
+        $shop->create(self::UNKNOWN);
     }
 }
diff --git a/Creational/FactoryMethod/VehicleInterface.php b/Creational/FactoryMethod/VehicleInterface.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
 /**
- * VehicleInterface is a contract for a vehicle
+ * Interface VehicleInterface
+ * @package DesignPatterns\Creational\FactoryMethod
  */
 interface VehicleInterface
 {
@@ -12,5 +14,5 @@ interface VehicleInterface
      *
      * @param string $rgb
      */
-    public function setColor($rgb);
+    public function setColor(string $rgb);
 }
diff --git a/Creational/Prototype/BarBookPrototype.php b/Creational/Prototype/BarBookPrototype.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\Prototype;
 
 /**
  * Class BarBookPrototype
+ * @package DesignPatterns\Creational\Prototype
  */
 class BarBookPrototype extends BookPrototype
 {
@@ -13,7 +15,7 @@ class BarBookPrototype extends BookPrototype
     protected $category = 'Bar';
 
     /**
-     * empty clone
+     * Do not allow clone
      */
     public function __clone()
     {

diff --git a/Creational/Prototype/BookPrototype.php b/Creational/Prototype/BookPrototype.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\Prototype;
 
 /**
- * class BookPrototype
+ * Class BookPrototype
+ * @package DesignPatterns\Creational\Prototype
  */
 abstract class BookPrototype
 {
@@ -19,14 +21,13 @@ abstract class BookPrototype
 
     /**
      * @abstract
-     * @return void
      */
     abstract public function __clone();
 
     /**
      * @return string
      */
-    public function getTitle()
+    public function getTitle() : string
     {
         return $this->title;
     }

diff --git a/Creational/Prototype/FooBookPrototype.php b/Creational/Prototype/FooBookPrototype.php
@@ -1,16 +1,20 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\Prototype;
 
 /**
  * Class FooBookPrototype
+ * @package DesignPatterns\Creational\Prototype
  */
 class FooBookPrototype extends BookPrototype
 {
+
+    /** @var string */
     protected $category = 'Foo';
 
     /**
-     * empty clone
+     * Do not allow clone
      */
     public function __clone()
     {