Merge pull request #142 from Ocramius/hotfix/duplication-removal

Minor code duplication removal
Ocramius · Feb 6, 2014 · c870510 · c870510
2 parents 96d5e24 + 3d90db2
commit c870510
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 136 deletions.
diff --git a/...dingGhost/MethodGenerator/Constructor.php → ...zyLoading/MethodGenerator/Constructor.php b/...dingGhost/MethodGenerator/Constructor.php → ...zyLoading/MethodGenerator/Constructor.php
@@ -16,7 +16,7 @@
  * and is licensed under the MIT license.
  */
 
-namespace ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator;
+namespace ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator;
 
 use ReflectionClass;
 use ReflectionProperty;

diff --git a/src/ProxyManager/ProxyGenerator/LazyLoadingGhostGenerator.php b/src/ProxyManager/ProxyGenerator/LazyLoadingGhostGenerator.php
@@ -18,8 +18,9 @@
 
 namespace ProxyManager\ProxyGenerator;
 
+use ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\Constructor;
+
 use ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\CallInitializer;
-use ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\Constructor;
 use ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\GetProxyInitializer;
 use ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\InitializeProxy;
 use ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\IsProxyInitialized;

diff --git a/src/ProxyManager/ProxyGenerator/LazyLoadingValueHolder/MethodGenerator/Constructor.php b/src/ProxyManager/ProxyGenerator/LazyLoadingValueHolder/MethodGenerator/Constructor.php
diff --git a/src/ProxyManager/ProxyGenerator/LazyLoadingValueHolderGenerator.php b/src/ProxyManager/ProxyGenerator/LazyLoadingValueHolderGenerator.php
@@ -24,7 +24,8 @@
 
 use ProxyManager\ProxyGenerator\AccessInterceptor\MethodGenerator\MagicWakeup;
 
-use ProxyManager\ProxyGenerator\LazyLoadingValueHolder\MethodGenerator\Constructor;
+use ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\Constructor;
+
 use ProxyManager\ProxyGenerator\LazyLoadingValueHolder\MethodGenerator\GetProxyInitializer;
 use ProxyManager\ProxyGenerator\LazyLoadingValueHolder\MethodGenerator\InitializeProxy;
 use ProxyManager\ProxyGenerator\LazyLoadingValueHolder\MethodGenerator\IsProxyInitialized;

diff --git a/...Ghost/MethodGenerator/ConstructorTest.php → ...ading/MethodGenerator/ConstructorTest.php b/...Ghost/MethodGenerator/ConstructorTest.php → ...ading/MethodGenerator/ConstructorTest.php
@@ -16,22 +16,22 @@
  * and is licensed under the MIT license.
  */
 
-namespace ProxyManagerTest\ProxyGenerator\LazyLoadingGhost\MethodGenerator;
+namespace ProxyManagerTest\ProxyGenerator\LazyLoading\MethodGenerator;
 
 use PHPUnit_Framework_TestCase;
-use ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\Constructor;
+use ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\Constructor;
 use ReflectionClass;
 
 /**
- * Tests for {@see \ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\Constructor}
+ * Tests for {@see \ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\Constructor}
  *
  * @author Marco Pivetta <ocramius@gmail.com>
  * @license MIT
  */
 class ConstructorTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * @covers \ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\Constructor::__construct
+     * @covers \ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\Constructor::__construct
      */
     public function testBodyStructure()
     {
@@ -50,7 +50,7 @@ public function testBodyStructure()
     }
 
     /**
-     * @covers \ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\Constructor::__construct
+     * @covers \ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\Constructor::__construct
      */
     public function testBodyStructureWithoutPublicProperties()
     {

diff --git a/...roxyManagerTest/ProxyGenerator/LazyLoadingValueHolder/MethodGenerator/ConstructorTest.php b/...roxyManagerTest/ProxyGenerator/LazyLoadingValueHolder/MethodGenerator/ConstructorTest.php