Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor code duplication removal #142

Merged
merged 3 commits into from
Feb 6, 2014
Merged

Minor code duplication removal #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f0d1fd
Moving lazy loading constructor to its own class to remove duplication
Ocramius Feb 6, 2014
af462af
Moving tests for the lazy loading constructor to their own namespace
Ocramius Feb 6, 2014
3d90db2
Removing code duplication
Ocramius Feb 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...dingGhost/MethodGenerator/Constructor.php → ...zyLoading/MethodGenerator/Constructor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/ProxyManager/ProxyGenerator/LazyLoadingGhostGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
61 changes: 0 additions & 61 deletions src/ProxyManager/ProxyGenerator/LazyLoadingValueHolder/MethodGenerator/Constructor.php
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/ProxyManager/ProxyGenerator/LazyLoadingValueHolderGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...Ghost/MethodGenerator/ConstructorTest.php → ...ading/MethodGenerator/ConstructorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand All @@ -50,7 +50,7 @@ public function testBodyStructure()
}

/**
* @covers \ProxyManager\ProxyGenerator\LazyLoadingGhost\MethodGenerator\Constructor::__construct
* @covers \ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\Constructor::__construct
*/
public function testBodyStructureWithoutPublicProperties()
{
Expand Down
67 changes: 0 additions & 67 deletions ...roxyManagerTest/ProxyGenerator/LazyLoadingValueHolder/MethodGenerator/ConstructorTest.php
View file
Open in desktop

This file was deleted.