From dd22e2574fb68ce645d30cb56a78e33f00951e94 Mon Sep 17 00:00:00 2001
From: Menno Holtkamp <menno.holtkamp@gmail.com>
Date: Sun, 29 May 2016 10:08:19 +0200
Subject: [PATCH] Explicitly set FileWriterGeneratorStrategy (#412)

* Explicitly set FileWriterGeneratorStrategy

It defaults to the EvaluatingGeneratorStrategy

* Explicitly use EvaluatingGeneratorStrategy when not writing proxies

* Allow ProxyManager ~2.0 to be used
---
 doc/lazy-injection.md         | 2 +-
 src/DI/Proxy/ProxyFactory.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/lazy-injection.md b/doc/lazy-injection.md
index 9297061f3..b18e0c4ea 100644
--- a/doc/lazy-injection.md
+++ b/doc/lazy-injection.md
@@ -86,7 +86,7 @@ Lazy injection requires the [Ocramius/ProxyManager](https://github.com/Ocramius/
 {
     "require": {
         "php-di/php-di": "*",
-        "ocramius/proxy-manager": "~1.0"
+        "ocramius/proxy-manager": "~1.0 | ~2.0"
     }
 }
 ```
diff --git a/src/DI/Proxy/ProxyFactory.php b/src/DI/Proxy/ProxyFactory.php
index 5dc08760a..6bf435bda 100644
--- a/src/DI/Proxy/ProxyFactory.php
+++ b/src/DI/Proxy/ProxyFactory.php
@@ -4,7 +4,9 @@
 
 use ProxyManager\Configuration;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
+use ProxyManager\FileLocator\FileLocator;
 use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
+use ProxyManager\GeneratorStrategy\FileWriterGeneratorStrategy;
 
 /**
  * Creates proxy classes.
@@ -71,6 +73,7 @@ private function createProxyManager()
 
         if ($this->writeProxiesToFile) {
             $config->setProxiesTargetDir($this->proxyDirectory);
+            $config->setGeneratorStrategy(new FileWriterGeneratorStrategy(new FileLocator($this->proxyDirectory)));
             spl_autoload_register($config->getProxyAutoloader());
         } else {
             $config->setGeneratorStrategy(new EvaluatingGeneratorStrategy());