Merge branch 'feature/optionnal-config' - fixes #86

Ocramius · Sep 13, 2013 · f4f8ed9 · f4f8ed9
2 parents 44da164 + 5ffb429
commit f4f8ed9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/src/ProxyManager/Factory/AbstractBaseFactory.php b/src/ProxyManager/Factory/AbstractBaseFactory.php
@@ -53,9 +53,9 @@ abstract class AbstractBaseFactory
     /**
      * @param \ProxyManager\Configuration $configuration
      */
-    public function __construct(Configuration $configuration)
+    public function __construct(Configuration $configuration = null)
     {
-        $this->configuration = $configuration;
+        $this->configuration = $configuration ?: new Configuration();
         // localizing some properties for performance
         $this->autoGenerate  = $this->configuration->doesAutoGenerateProxies();
         $this->inflector     = $this->configuration->getClassNameInflector();

diff --git a/tests/ProxyManagerTest/Factory/AccessInterceptorValueHolderFactoryTest.php b/tests/ProxyManagerTest/Factory/AccessInterceptorValueHolderFactoryTest.php
@@ -56,6 +56,18 @@ public function setUp()
             ->will($this->returnValue($this->inflector));
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @covers \ProxyManager\Factory\AccessInterceptorValueHolderFactory::__construct
+     */
+    public function testWithOptionalFactory()
+    {
+        $factory = new AccessInterceptorValueHolderFactory();
+        $this->assertAttributeNotEmpty('configuration', $factory);
+        $this->assertAttributeInstanceOf('ProxyManager\Configuration', 'configuration', $factory);
+    }
+
     /**
      * {@inheritDoc}
      *

diff --git a/tests/ProxyManagerTest/Factory/LazyLoadingGhostFactoryTest.php b/tests/ProxyManagerTest/Factory/LazyLoadingGhostFactoryTest.php
@@ -21,6 +21,7 @@
 use PHPUnit_Framework_TestCase;
 use ProxyManager\Factory\LazyLoadingGhostFactory;
 use ProxyManager\Generator\ClassGenerator;
+use \ProxyManager\Configuration;
 use ProxyManager\Generator\Util\UniqueIdentifierGenerator;
 
 /**
@@ -54,6 +55,18 @@ public function setUp()
             ->method('getClassNameInflector')
             ->will($this->returnValue($this->inflector));
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @covers \ProxyManager\Factory\LazyLoadingGhostFactory::__construct
+     */
+    public function testWithOptionalFactory()
+    {
+        $factory = new LazyLoadingGhostFactory();
+        $this->assertAttributeNotEmpty('configuration', $factory);
+        $this->assertAttributeInstanceOf('ProxyManager\Configuration', 'configuration', $factory);
+    }
 
     /**
      * {@inheritDoc}

diff --git a/tests/ProxyManagerTest/Factory/LazyLoadingValueHolderFactoryTest.php b/tests/ProxyManagerTest/Factory/LazyLoadingValueHolderFactoryTest.php
@@ -55,6 +55,18 @@ public function setUp()
             ->will($this->returnValue($this->inflector));
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @covers \ProxyManager\Factory\LazyLoadingValueHolderFactory::__construct
+     */
+    public function testWithOptionalFactory()
+    {
+        $factory = new LazyLoadingValueHolderFactory();
+        $this->assertAttributeNotEmpty('configuration', $factory);
+        $this->assertAttributeInstanceOf('ProxyManager\Configuration', 'configuration', $factory);
+    }
+
     /**
      * {@inheritDoc}
      *