Merge branch 'feature/#103-allow-proxymanager-v2-installation' into develop

Close #103

Author: Ocramius

.travis.yml

@@ -35,7 +35,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:
@@ -48,7 +47,7 @@ before_install:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls:^1.0 ; fi
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs
+  - travis_retry composer install --no-interaction
 
 script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi

composer.json

@@ -18,9 +18,9 @@
         "container-interop/container-interop": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.6",
-        "ocramius/proxy-manager": "~1.0",
-        "squizlabs/php_codesniffer": "^2.0@dev",
+        "phpunit/phpunit": "^4.6 || ^5.2.10",
+        "ocramius/proxy-manager": "^1.0 || ^2.0",
+        "squizlabs/php_codesniffer": "^2.5.1",
         "phpbench/phpbench": "^0.10.0"
     },
     "suggest": {

src/ServiceManager.php

@@ -14,7 +14,9 @@
 use Interop\Container\Exception\ContainerException;
 use ProxyManager\Configuration as ProxyConfiguration;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
+use ProxyManager\FileLocator\FileLocator;
 use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
+use ProxyManager\GeneratorStrategy\FileWriterGeneratorStrategy;
 use Zend\ServiceManager\Exception\ContainerModificationsNotAllowedException;
 use Zend\ServiceManager\Exception\CyclicAliasException;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
@@ -750,6 +752,10 @@ private function createLazyServiceDelegatorFactory()
 
         if (! isset($this->lazyServices['write_proxy_files']) || ! $this->lazyServices['write_proxy_files']) {
             $factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
+        } else {
+            $factoryConfig->setGeneratorStrategy(new FileWriterGeneratorStrategy(
+                new FileLocator($factoryConfig->getProxiesTargetDir())
+            ));
         }
 
         spl_autoload_register($factoryConfig->getProxyAutoloader());