diff --git a/.gitignore b/.gitignore
index 57f6f89c9..c6fa3e1f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 /vendor/
 _build/
 *.mo
+.vagrant/
+phpunit.xml
+composer.phar
diff --git a/.travis.yml b/.travis.yml
index 9f379f8b0..e2111642b 100644
--- 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
index 01fa8a0a3..6bb4ace8d 100644
--- 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
index dd24b1565..cf161b886 100644
--- 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
index c905f918e..5786224c2 100644
--- 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
index 67306e9aa..006cb1093 100644
--- 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
index c7010e0ca..3f214483f 100644
--- 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
index cba25ce86..96655a666 100644
--- 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
index acbe0c648..5313239fd 100644
--- 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
index a734b612f..59e2382d5 100644
--- 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
index 4354a6045..d48ecd824 100644
--- 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
index 18d48713a..f4372c3bd 100644
--- 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
index 9707bfd42..358c0d282 100644
--- 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()
     {
diff --git a/Creational/Prototype/Tests/PrototypeTest.php b/Creational/Prototype/Tests/PrototypeTest.php
new file mode 100644
index 000000000..5177c35e4
--- /dev/null
+++ b/Creational/Prototype/Tests/PrototypeTest.php
@@ -0,0 +1,47 @@
+<?php
+declare(strict_types = 1);
+
+namespace DesignPatterns\Creational\Prototype\Tests;
+
+use DesignPatterns\Creational\Prototype\BarBookPrototype;
+use DesignPatterns\Creational\Prototype\FooBookPrototype;
+
+/**
+ * Class PrototypeTest
+ * @package DesignPatterns\Creational\Prototype\Tests
+ */
+class PrototypeTest extends \PHPUnit_Framework_TestCase
+{
+
+    /** @var FooBookPrototype */
+    protected $fooBookPrototype;
+
+    /** @var BarBookPrototype */
+    protected $barBookPrototype;
+
+    protected function setUp()
+    {
+        $this->fooBookPrototype = new FooBookPrototype();
+        $this->barBookPrototype = new BarBookPrototype();
+    }
+
+    public function testCloneOfFooBookPrototype()
+    {
+        for ($i = 0; $i < 100; $i++) {
+            $book = clone $this->fooBookPrototype;
+
+            $this->assertInstanceOf('DesignPatterns\Creational\Prototype\FooBookPrototype', $book);
+            $this->assertNotSame($this->fooBookPrototype, $book);
+        }
+    }
+
+    public function testCloneOfBarBookPrototype()
+    {
+        for ($i = 0; $i < 100; $i++) {
+            $book = clone $this->barBookPrototype;
+
+            $this->assertInstanceOf('DesignPatterns\Creational\Prototype\BarBookPrototype', $book);
+            $this->assertNotSame($this->barBookPrototype, $book);
+        }
+    }
+}
diff --git a/Creational/Prototype/index.php b/Creational/Prototype/index.php
deleted file mode 100644
index f268e5c60..000000000
--- a/Creational/Prototype/index.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace DesignPatterns\Creational\Prototype;
-
-$fooPrototype = new FooBookPrototype();
-$barPrototype = new BarBookPrototype();
-
-// now lets say we need 10,000 books of foo and 5,000 of bar ...
-for ($i = 0; $i < 10000; $i++) {
-    $book = clone $fooPrototype;
-    $book->setTitle('Foo Book No ' . $i);
-}
-
-for ($i = 0; $i < 5000; $i++) {
-    $book = clone $barPrototype;
-    $book->setTitle('Bar Book No ' . $i);
-}
diff --git a/Creational/SimpleFactory/Bicycle.php b/Creational/SimpleFactory/Bicycle.php
index 67215f185..f4e20512f 100644
--- a/Creational/SimpleFactory/Bicycle.php
+++ b/Creational/SimpleFactory/Bicycle.php
@@ -1,18 +1,20 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
- * Bicycle is a bicycle
+ * Class Bicycle
+ * @package DesignPatterns\Creational\SimpleFactory
  */
 class Bicycle implements VehicleInterface
 {
     /**
-     * @param mixed $destination
+     * @param string $destination
      *
-     * @return mixed|void
+     * @return DestinationInterface
      */
-    public function driveTo($destination)
+    public function driveTo(string $destination) : DestinationInterface
     {
     }
 }
diff --git a/Creational/SimpleFactory/ConcreteFactory.php b/Creational/SimpleFactory/ConcreteFactory.php
index dd8acf8b4..6dd64efc3 100644
--- a/Creational/SimpleFactory/ConcreteFactory.php
+++ b/Creational/SimpleFactory/ConcreteFactory.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
- * class ConcreteFactory
+ * Class ConcreteFactory
+ * @package DesignPatterns\Creational\SimpleFactory
  */
 class ConcreteFactory
 {
@@ -18,10 +20,10 @@ class ConcreteFactory
      */
     public function __construct()
     {
-        $this->typeList = array(
+        $this->typeList = [
             'bicycle' => __NAMESPACE__ . '\Bicycle',
-            'other' => __NAMESPACE__ . '\Scooter'
-        );
+            'other'   => __NAMESPACE__ . '\Scooter',
+        ];
     }
 
     /**
@@ -32,13 +34,12 @@ public function __construct()
      * @return VehicleInterface a new instance of VehicleInterface
      * @throws \InvalidArgumentException
      */
-    public function createVehicle($type)
+    public function createVehicle(string $type) : VehicleInterface
     {
         if (!array_key_exists($type, $this->typeList)) {
-            throw new \InvalidArgumentException("$type is not valid vehicle");
+            throw new \InvalidArgumentException($type . ' is not valid vehicle');
         }
-        $className = $this->typeList[$type];
 
-        return new $className();
+        return new $this->typeList[ $type ]();
     }
 }
diff --git a/Creational/SimpleFactory/DestinationInterface.php b/Creational/SimpleFactory/DestinationInterface.php
new file mode 100644
index 000000000..90d7a00b0
--- /dev/null
+++ b/Creational/SimpleFactory/DestinationInterface.php
@@ -0,0 +1,12 @@
+<?php
+declare(strict_types = 1);
+
+namespace DesignPatterns\Creational\SimpleFactory;
+
+/**
+ * Interface DestinationInterface
+ * @package DesignPatterns\Creational\SimpleFactory
+ */
+interface DestinationInterface
+{
+}
diff --git a/Creational/SimpleFactory/Scooter.php b/Creational/SimpleFactory/Scooter.php
index 81fa50566..8fab53829 100644
--- a/Creational/SimpleFactory/Scooter.php
+++ b/Creational/SimpleFactory/Scooter.php
@@ -1,16 +1,20 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
- * Scooter is a Scooter
+ * Class Scooter
+ * @package DesignPatterns\Creational\SimpleFactory
  */
 class Scooter implements VehicleInterface
 {
     /**
-     * @param mixed $destination
+     * @param string $destination
+     *
+     * @return DestinationInterface
      */
-    public function driveTo($destination)
+    public function driveTo(string $destination) : DestinationInterface
     {
     }
 }
diff --git a/Creational/SimpleFactory/Tests/SimpleFactoryTest.php b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
index 1fffda3e7..23d6a8d2b 100644
--- a/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
+++ b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
@@ -1,28 +1,31 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\SimpleFactory\Tests;
 
 use DesignPatterns\Creational\SimpleFactory\ConcreteFactory;
 
 /**
- * SimpleFactoryTest tests the Simple Factory pattern
+ * Class SimpleFactoryTest
+ * @package DesignPatterns\Creational\SimpleFactory\Tests
  */
 class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
 {
 
+    /** @var  ConcreteFactory */
     protected $factory;
 
-    protected function setUp()
+    public function getType()
     {
-        $this->factory = new ConcreteFactory();
+        return [
+            ['bicycle'],
+            ['other'],
+        ];
     }
 
-    public function getType()
+    protected function setUp()
     {
-        return array(
-            array('bicycle'),
-            array('other')
-        );
+        $this->factory = new ConcreteFactory();
     }
 
     /**
diff --git a/Creational/SimpleFactory/VehicleInterface.php b/Creational/SimpleFactory/VehicleInterface.php
index eb13a6689..42df9b1a9 100644
--- a/Creational/SimpleFactory/VehicleInterface.php
+++ b/Creational/SimpleFactory/VehicleInterface.php
@@ -1,16 +1,18 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\SimpleFactory;
 
 /**
- * VehicleInterface is a contract for a vehicle
+ * Interface VehicleInterface
+ * @package DesignPatterns\Creational\SimpleFactory
  */
 interface VehicleInterface
 {
     /**
-     * @param mixed $destination
+     * @param string $destination
      *
-     * @return mixed
+     * @return DestinationInterface
      */
-    public function driveTo($destination);
+    public function driveTo(string $destination) : DestinationInterface;
 }
diff --git a/Creational/Singleton/Singleton.php b/Creational/Singleton/Singleton.php
index 41a45695a..e78879425 100644
--- a/Creational/Singleton/Singleton.php
+++ b/Creational/Singleton/Singleton.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\Singleton;
 
 /**
- * class Singleton
+ * Class Singleton
+ * @package DesignPatterns\Creational\Singleton
  */
 class Singleton
 {
@@ -11,13 +13,20 @@ class Singleton
      * @var Singleton reference to singleton instance
      */
     private static $instance;
-    
+
+    /**
+     * is not allowed to call from outside: private!
+     */
+    private function __construct()
+    {
+    }
+
     /**
      * gets the instance via lazy initialization (created on first usage)
      *
      * @return self
      */
-    public static function getInstance()
+    public static function getInstance() : Singleton
     {
         if (null === static::$instance) {
             static::$instance = new static;
@@ -26,18 +35,8 @@ public static function getInstance()
         return static::$instance;
     }
 
-    /**
-     * is not allowed to call from outside: private!
-     *
-     */
-    private function __construct()
-    {
-    }
-
     /**
      * prevent the instance from being cloned
-     *
-     * @return void
      */
     private function __clone()
     {
@@ -45,8 +44,6 @@ private function __clone()
 
     /**
      * prevent from being unserialized
-     *
-     * @return void
      */
     private function __wakeup()
     {
diff --git a/Creational/Singleton/Tests/SingletonTest.php b/Creational/Singleton/Tests/SingletonTest.php
index 07abf7cd4..171735c3c 100644
--- a/Creational/Singleton/Tests/SingletonTest.php
+++ b/Creational/Singleton/Tests/SingletonTest.php
@@ -1,11 +1,13 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\Singleton\Tests;
 
 use DesignPatterns\Creational\Singleton\Singleton;
 
 /**
- * SingletonTest tests the singleton pattern
+ * Class SingletonTest
+ * @package DesignPatterns\Creational\Singleton\Tests
  */
 class SingletonTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Creational/StaticFactory/FormatNumber.php b/Creational/StaticFactory/FormatNumber.php
index 8f382f703..4fe1fe26f 100644
--- a/Creational/StaticFactory/FormatNumber.php
+++ b/Creational/StaticFactory/FormatNumber.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
 /**
  * Class FormatNumber
+ * @package DesignPatterns\Creational\StaticFactory
  */
 class FormatNumber implements FormatterInterface
 {
diff --git a/Creational/StaticFactory/FormatString.php b/Creational/StaticFactory/FormatString.php
index a0d174d94..f357869b6 100644
--- a/Creational/StaticFactory/FormatString.php
+++ b/Creational/StaticFactory/FormatString.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
 /**
  * Class FormatString
+ * @package DesignPatterns\Creational\StaticFactory
  */
 class FormatString implements FormatterInterface
 {
diff --git a/Creational/StaticFactory/FormatterInterface.php b/Creational/StaticFactory/FormatterInterface.php
index 81b914972..f1ef9283f 100644
--- a/Creational/StaticFactory/FormatterInterface.php
+++ b/Creational/StaticFactory/FormatterInterface.php
@@ -1,9 +1,11 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
 /**
- * Class FormatterInterface
+ * Interface FormatterInterface
+ * @package DesignPatterns\Creational\StaticFactory
  */
 interface FormatterInterface
 {
diff --git a/Creational/StaticFactory/StaticFactory.php b/Creational/StaticFactory/StaticFactory.php
index e4f2f962a..e64d0b322 100644
--- a/Creational/StaticFactory/StaticFactory.php
+++ b/Creational/StaticFactory/StaticFactory.php
@@ -1,10 +1,15 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
 /**
+ * Class StaticFactory
+ *
  * Note1: Remember, static => global => evil
  * Note2: Cannot be subclassed or mock-upped or have multiple different instances
+ *
+ * @package DesignPatterns\Creational\StaticFactory
  */
 class StaticFactory
 {
@@ -18,7 +23,7 @@ class StaticFactory
      * @throws \InvalidArgumentException
      * @return FormatterInterface
      */
-    public static function factory($type)
+    public static function factory(string $type) : FormatterInterface
     {
         $className = __NAMESPACE__ . '\Format' . ucfirst($type);
 
diff --git a/Creational/StaticFactory/Tests/StaticFactoryTest.php b/Creational/StaticFactory/Tests/StaticFactoryTest.php
index f0304ca93..4032368a6 100644
--- a/Creational/StaticFactory/Tests/StaticFactoryTest.php
+++ b/Creational/StaticFactory/Tests/StaticFactoryTest.php
@@ -1,22 +1,26 @@
 <?php
+declare(strict_types = 1);
 
 namespace DesignPatterns\Creational\StaticFactory\Tests;
 
 use DesignPatterns\Creational\StaticFactory\StaticFactory;
 
 /**
- * Tests for Static Factory pattern
- *
+ * Class StaticFactoryTest
+ * @package DesignPatterns\Creational\StaticFactory\Tests
  */
 class StaticFactoryTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function getTypeList()
+    /**
+     * @return array
+     */
+    public function getTypeList() : array
     {
-        return array(
-            array('string'),
-            array('number')
-        );
+        return [
+            ['string'],
+            ['number'],
+        ];
     }
 
     /**
@@ -29,7 +33,7 @@ public function testCreation($type)
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testException()
     {
diff --git a/README.md b/README.md
index 0d9e0540b..65d71d783 100755
--- a/README.md
+++ b/README.md
@@ -13,12 +13,32 @@ I think the problem with patterns is that often people do know them but don't kn
 You should look at and run the tests to see what happens in the example.
 To do this, you should install dependencies with `Composer` first:
 
+### [optional] Using a Virtual Machine (VM)
+
+If you wish to use a ready made VM environment, you can easily create one with Vagrant and Ansible.
+
+```bash
+$ vagrant up
+```
+
+Then `vagrant ssh` and `cd /vagrant`
+
+More information on [vagrant](https://www.vagrantup.com)
+
+### Install dependencies
+
 ```bash
 $ composer install
 ```
 
 Read more about how to install and use `Composer` on your local machine [here](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-osx).
 
+### Running test suite
+
+```bash
+$ ./vendor/bin/phpunit
+```
+
 ## Patterns
 
 The patterns can be structured in roughly three different categories. Please click on the [:notebook:](http://en.wikipedia.org/wiki/Software_design_pattern) for a full explanation of the pattern on Wikipedia.
diff --git a/Structural/Decorator/Tests/DecoratorTest.php b/Structural/Decorator/Tests/DecoratorTest.php
index 1789870f6..a88e382df 100644
--- a/Structural/Decorator/Tests/DecoratorTest.php
+++ b/Structural/Decorator/Tests/DecoratorTest.php
@@ -44,16 +44,6 @@ public function testDecoratorMustImplementsRenderer()
         $this->assertTrue(is_subclass_of($className, $interfaceName));
     }
 
-    /**
-     * Second key-point of this pattern : the decorator is type-hinted
-     *
-     * @expectedException \PHPUnit_Framework_Error
-     */
-    public function testDecoratorTypeHinted()
-    {
-        $this->getMockForAbstractClass('DesignPatterns\Structural\Decorator\Decorator', array(new \stdClass()));
-    }
-
     /**
      * The decorator implements and wraps the same interface
      */
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100755
index 000000000..30f924c46
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,59 @@
+##################################################
+# Generated by phansible.com
+##################################################
+
+#If your Vagrant version is lower than 1.5, you can still use this provisioning
+#by commenting or removing the line below and providing the config.vm.box_url parameter,
+#if it's not already defined in this Vagrantfile. Keep in mind that you won't be able
+#to use the Vagrant Cloud and other newer Vagrant features.
+Vagrant.require_version ">= 1.5"
+
+# Check to determine whether we're on a windows or linux/os-x host,
+# later on we use this to launch ansible in the supported way
+# source: https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+def which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable? exe
+        }
+    end
+    return nil
+end
+Vagrant.configure("2") do |config|
+
+    config.vm.provider :virtualbox do |v|
+        v.name = "design-patterns"
+        v.customize [
+            "modifyvm", :id,
+            "--name", "design-patterns",
+            "--memory", 512,
+            "--natdnshostresolver1", "on",
+            "--cpus", 1,
+        ]
+    end
+
+    config.vm.box = "ubuntu/trusty64"
+
+    config.vm.network :private_network, ip: "192.168.11.2"
+    config.ssh.forward_agent = true
+
+    #############################################################
+    # Ansible provisioning (you need to have ansible installed)
+    #############################################################
+
+
+    if which('ansible-playbook')
+        config.vm.provision "ansible" do |ansible|
+            ansible.playbook = "ansible/playbook.yml"
+            ansible.inventory_path = "ansible/inventories/dev"
+            ansible.limit = 'all'
+        end
+    else
+        config.vm.provision :shell, path: "ansible/windows.sh", args: ["default"]
+    end
+
+
+    config.vm.synced_folder "./", "/vagrant", type: "nfs"
+end
diff --git a/ansible/inventories/dev b/ansible/inventories/dev
new file mode 100755
index 000000000..86d8f3b76
--- /dev/null
+++ b/ansible/inventories/dev
@@ -0,0 +1,2 @@
+[phansible-web]
+192.168.11.2
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
new file mode 100755
index 000000000..33e3fda98
--- /dev/null
+++ b/ansible/playbook.yml
@@ -0,0 +1,11 @@
+---
+- hosts: all
+  sudo: true
+  vars_files:
+    - vars/all.yml
+  roles:
+    - server
+    - vagrant_local
+    - php
+    - xdebug
+    - app
diff --git a/ansible/roles/app/tasks/main.yml b/ansible/roles/app/tasks/main.yml
new file mode 100755
index 000000000..c330e4818
--- /dev/null
+++ b/ansible/roles/app/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+# application tasks to be customized and to run after the main provision
+- name: update file db
+  sudo: yes
+  shell: updatedb
diff --git a/ansible/roles/php/tasks/configure.yml b/ansible/roles/php/tasks/configure.yml
new file mode 100755
index 000000000..1b093e734
--- /dev/null
+++ b/ansible/roles/php/tasks/configure.yml
@@ -0,0 +1,6 @@
+---
+- stat: path=/etc/php5/cli/php.ini
+  register: phpcli
+
+- include: php-cli.yml
+  when: phpcli.stat.exists
diff --git a/ansible/roles/php/tasks/main.yml b/ansible/roles/php/tasks/main.yml
new file mode 100755
index 000000000..7603d868f
--- /dev/null
+++ b/ansible/roles/php/tasks/main.yml
@@ -0,0 +1,20 @@
+---
+- name: Add ppa Repository
+  sudo: yes
+  apt_repository: repo=ppa:ondrej/{{ php.ppa }}
+
+- name: Update apt
+  sudo: yes
+  apt: update_cache=yes
+
+- name: Install php
+  sudo: yes
+  apt: pkg=php state=latest
+
+- name: Install PHP Packages
+  sudo: yes
+  apt: pkg={{ item }} state=latest
+  with_items: php.packages
+  when: php.packages is defined
+
+- include: configure.yml
diff --git a/ansible/roles/php/tasks/php-cli.yml b/ansible/roles/php/tasks/php-cli.yml
new file mode 100755
index 000000000..e1cfffa13
--- /dev/null
+++ b/ansible/roles/php/tasks/php-cli.yml
@@ -0,0 +1,10 @@
+---
+- name: ensure timezone is set in cli php.ini
+  lineinfile: dest=/etc/php5/cli/php.ini
+              regexp='date.timezone ='
+              line='date.timezone = {{ server.timezone }}'
+
+- name: enabling opcache cli
+  lineinfile: dest=/etc/php5/cli/php.ini
+              regexp=';opcache.enable_cli=0'
+              line='opcache.enable_cli=1'
diff --git a/ansible/roles/server/tasks/main.yml b/ansible/roles/server/tasks/main.yml
new file mode 100755
index 000000000..f1ffc0866
--- /dev/null
+++ b/ansible/roles/server/tasks/main.yml
@@ -0,0 +1,31 @@
+---
+- name: Update apt
+  sudo: yes
+  apt: update_cache=yes
+
+- name: Install System Packages
+  sudo: yes
+  apt: pkg={{ item }} state=latest
+  with_items:
+    - curl
+    - wget
+    - python-software-properties
+
+- name: Install Extra Packages
+  sudo: yes
+  apt: pkg={{ item }} state=latest
+  with_items: server.packages
+  when: server.packages is defined
+
+- name: Configure the timezone
+  sudo: yes
+  template: src=timezone.tpl dest=/etc/timezone
+
+- name: More Configure the timezone
+  sudo: yes
+  file: src=/usr/share/zoneinfo/{{server.timezone}} dest=/etc/localtime state=link force=yes backup=yes
+
+- name: Set default system language pack
+  shell: locale-gen {{server.locale}}
+  sudo: yes
+
diff --git a/ansible/roles/server/templates/timezone.tpl b/ansible/roles/server/templates/timezone.tpl
new file mode 100755
index 000000000..cca236521
--- /dev/null
+++ b/ansible/roles/server/templates/timezone.tpl
@@ -0,0 +1 @@
+{{server.timezone}}
diff --git a/ansible/roles/vagrant_local/tasks/main.yml b/ansible/roles/vagrant_local/tasks/main.yml
new file mode 100755
index 000000000..cd53609cf
--- /dev/null
+++ b/ansible/roles/vagrant_local/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+- name: Set the hostname in /etc/hostname
+  shell: echo {{ vagrant_local.vm.hostname }} > /etc/hostname
+  when: vagrant_local.vm.hostname is defined
+
+- name: Set the hostname
+  shell: hostname {{ vagrant_local.vm.hostname }}
+  when: vagrant_local.vm.hostname is defined
+
+- name: Update /etc/hosts
+  lineinfile: dest=/etc/hosts regexp='^127\.0\.0\.1' line='127.0.0.1 localhost {{ vagrant_local.vm.hostname }}' owner=root group=root mode=0644
diff --git a/ansible/roles/xdebug/defaults/main.yml b/ansible/roles/xdebug/defaults/main.yml
new file mode 100755
index 000000000..f2d917eb8
--- /dev/null
+++ b/ansible/roles/xdebug/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+xdebug:
+    settings:
+        - xdebug.remote_enable=1
+        - xdebug.idekey=PHPSTORM
+        - xdebug.remote_connect_back=1
+        - xdebug.remote_port=9000
diff --git a/ansible/roles/xdebug/tasks/main.yml b/ansible/roles/xdebug/tasks/main.yml
new file mode 100755
index 000000000..e38815d00
--- /dev/null
+++ b/ansible/roles/xdebug/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+- name: Install xDebug
+  sudo: yes
+  apt: pkg=php5-xdebug state=latest
diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml
new file mode 100755
index 000000000..81b1eea43
--- /dev/null
+++ b/ansible/vars/all.yml
@@ -0,0 +1,15 @@
+---
+server:
+    install: '1'
+    packages: [vim, htop, iotop, bwm-ng]
+    timezone: UTC
+    locale: en_US.UTF-8
+vagrant_local:
+    install: '1'
+    vm: { base_box: trusty64, hostname: design-patterns, ip: 192.168.11.2, sharedfolder: ./, enableWindows: '1', useVagrantCloud: '1', syncType: nfs }
+php:
+    install: '1'
+    ppa: php-7.0
+    packages: []
+xdebug:
+    install: '1'
diff --git a/ansible/windows.sh b/ansible/windows.sh
new file mode 100755
index 000000000..eab5d9a5b
--- /dev/null
+++ b/ansible/windows.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# Update Repositories
+sudo apt-get update
+
+# Determine Ubuntu Version
+. /etc/lsb-release
+
+# Decide on package to install for `add-apt-repository` command
+#
+# USE_COMMON=1 when using a distribution over 12.04
+# USE_COMMON=0 when using a distribution at 12.04 or older
+USE_COMMON=$(echo "$DISTRIB_RELEASE > 12.04" | bc)
+
+if [ "$USE_COMMON" -eq "1" ];
+then
+    sudo apt-get install -y software-properties-common
+else
+    sudo apt-get install -y python-software-properties
+fi
+
+# Add Ansible Repository & Install Ansible
+sudo add-apt-repository -y ppa:ansible/ansible
+sudo apt-get update
+sudo apt-get install -y ansible
+
+# Setup Ansible for Local Use and Run
+cp /vagrant/ansible/inventories/dev /etc/ansible/hosts -f
+chmod 666 /etc/ansible/hosts
+cat /vagrant/ansible/files/authorized_keys >> /home/vagrant/.ssh/authorized_keys
+sudo ansible-playbook /vagrant/ansible/playbook.yml -e hostname=$1 --connection=local
\ No newline at end of file