Merge f3217e3 into e64f658

.coveralls.yml

@@ -1,3 +1,2 @@
 service_name: travis-ci
-src_dir: src
 coverage_clover: build/logs/clover.xml

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - "5.6"
   - "7.0"
+  - "7.1"
 
 before_script:
   - composer self-update

composer.json

@@ -24,13 +24,13 @@
     }
   },
   "require": {
-    "php": ">=5.6",
+    "php": ">=7.0",
     "doctrine/annotations": "1.2.*",
-    "ocramius/proxy-manager": "1.0.*",
+    "ocramius/proxy-manager": "~2.0",
     "openclassrooms/doctrine-cache-extension": "1.0.*@dev",
     "symfony/expression-language": ">=2.7 <4",
     "symfony/filesystem": ">2.7 <4",
-    "zendframework/zend-code": "2.5.*"
+    "zendframework/zend-code": "~3.0"
   },
   "require-dev": {
     "fabpot/php-cs-fixer": "1.*",

src/Helpers/ServiceProxyHelper.php

@@ -20,7 +20,7 @@ trait ServiceProxyHelper
     /**
      * @return ServiceProxyFactory
      */
-    protected function getServiceProxyFactory($cacheDir = null)
+    protected function getServiceProxyFactory(string $cacheDir)
     {
         $serviceProxyFactory = new ServiceProxyFactory();
         $configuration = new Configuration();
@@ -68,7 +68,7 @@ private function buildCacheStrategy()
     /**
      * @return \OpenClassrooms\ServiceProxy\ServiceProxyBuilderInterface
      */
-    protected function getServiceProxyBuilder($cacheDir = null)
+    protected function getServiceProxyBuilder(string $cacheDir)
     {
         $serviceProxyBuilder = new ServiceProxyBuilder();
         $configuration = new Configuration();

src/Proxy/Factory/ProxyFactory.php

@@ -6,6 +6,7 @@
 use OpenClassrooms\ServiceProxy\ServiceProxyInterface;
 use ProxyManager\Configuration;
 use ProxyManager\Factory\AbstractBaseFactory;
+use ProxyManager\ProxyGenerator\ProxyGeneratorInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
@@ -46,7 +47,7 @@ public function createProxy($instance)
     /**
      * {@inheritdoc}
      */
-    protected function getGenerator()
+    protected function getGenerator() : ProxyGeneratorInterface
     {
         return $this->generator;
     }

tests/Doubles/WithoutAnnotationClass.php

@@ -25,6 +25,11 @@ public function aSetterMethod($value)
         $this->field = $value;
     }
 
+    public function aSetterMethodWithType(string $value): string
+    {
+        return $value;
+    }
+
     /**
      * @return bool
      */

tests/ServiceProxyCacheTest.php

@@ -96,7 +96,7 @@ public function WithLifeTime_ReturnData()
     public function TooLongId_WithId_ThrowException()
     {
         /** @var ExceptionCacheAnnotationClass $proxy */
-        $proxy = $this->getServiceProxyBuilder()
+        $proxy = $this->getServiceProxyBuilder(self::$cacheDir)
             ->create(new ExceptionCacheAnnotationClass())
             ->withCache($this->cacheProviderDecorator)
             ->build();

tests/ServiceProxyFactoryTest.php

@@ -87,6 +87,6 @@ public function WithCacheAnnotationWithConstructor_ReturnServiceProxyCacheInterf
      */
     protected function setUp()
     {
-        $this->factory = $this->getServiceProxyFactory();
+        $this->factory = $this->getServiceProxyFactory(self::$cacheDir);
     }
 }