Merge pull request #4 from tweakers/use-different-proxy-method

Use different proxy method

Author: arjenm

src/MockableService/MockableServiceProxyFactory.php

@@ -2,16 +2,15 @@
 
 namespace Tweakers\Test\MockableService;
 
-use ProxyManager\Factory\LazyLoadingValueHolderFactory;
+use ProxyManager\Factory\AccessInterceptorValueHolderFactory;
 use ProxyManager\ProxyGenerator\ProxyGeneratorInterface;
 
-
 /**
  * Factory for a MockableService proxy derived from a 'original' service.
  *
  * @author Arjen van der Meijden <acm@tweakers.net>
  */
-class MockableServiceProxyFactory extends LazyLoadingValueHolderFactory
+class MockableServiceProxyFactory extends AccessInterceptorValueHolderFactory
 {
     /**
      * Create a service-proxy based on the given original.
@@ -23,7 +22,7 @@ class MockableServiceProxyFactory extends LazyLoadingValueHolderFactory
     public function createServiceProxy(object $original): MockableService
     {
         /** @var MockableService $proxy */
-        $proxy = $this->createProxy(get_class($original), function () use ($original) {return $original; });
+        $proxy = $this->createProxy($original);
 
         $proxy->setOriginalService($original);
 

src/MockableService/MockableServiceProxyGenerator.php

@@ -3,11 +3,11 @@
 namespace Tweakers\Test\MockableService;
 
 use InvalidArgumentException;
+use Laminas\Code\Generator\ClassGenerator;
+use Laminas\Code\Generator\PropertyGenerator;
 use ProxyManager\Generator\Util\ClassGeneratorUtils;
-use ProxyManager\ProxyGenerator\LazyLoadingValueHolderGenerator;
+use ProxyManager\ProxyGenerator\AccessInterceptorValueHolderGenerator;
 use ReflectionClass;
-use Zend\Code\Generator\ClassGenerator;
-use Zend\Code\Generator\PropertyGenerator;
 
 /**
  * Generator for Proxy-classes that allows switching the underlying implementation.
@@ -30,12 +30,13 @@
  *
  * @author Arjen
  */
-class MockableServiceProxyGenerator extends LazyLoadingValueHolderGenerator
+class MockableServiceProxyGenerator extends AccessInterceptorValueHolderGenerator
 {
     public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator)
     {
         parent::generate($originalClass, $classGenerator);
 
+        /** @var string[] $implementedInterfaces */
         $implementedInterfaces   = $classGenerator->getImplementedInterfaces();
         $implementedInterfaces[] = MockableService::class;
 

src/MockableService/OriginalPropertyGenerator.php

@@ -2,8 +2,8 @@
 
 namespace Tweakers\Test\MockableService;
 
+use Laminas\Code\Generator\PropertyGenerator;
 use ProxyManager\Generator\Util\UniqueIdentifierGenerator;
-use Zend\Code\Generator\PropertyGenerator;
 
 /**
  * Generator for the originalService-property.

src/MockableService/RestoreOriginalsGenerator.php

@@ -2,8 +2,8 @@
 
 namespace Tweakers\Test\MockableService;
 
+use Laminas\Code\Generator\PropertyGenerator;
 use ProxyManager\Generator\MethodGenerator;
-use Zend\Code\Generator\PropertyGenerator;
 
 /**
  * Generator for a restore-method that restores the original service as 'the service to use' within the proxy.

src/MockableService/SetAlternativeGenerator.php

@@ -2,9 +2,9 @@
 
 namespace Tweakers\Test\MockableService;
 
+use Laminas\Code\Generator\ParameterGenerator;
+use Laminas\Code\Generator\PropertyGenerator;
 use ProxyManager\Generator\MethodGenerator;
-use Zend\Code\Generator\ParameterGenerator;
-use Zend\Code\Generator\PropertyGenerator;
 
 /**
  * Generator for a setAlternative-method that allows to use a different service (normally a test double) within the proxy.

src/MockableService/SetOriginalGenerator.php

@@ -2,9 +2,9 @@
 
 namespace Tweakers\Test\MockableService;
 
+use Laminas\Code\Generator\ParameterGenerator;
+use Laminas\Code\Generator\PropertyGenerator;
 use ProxyManager\Generator\MethodGenerator;
-use Zend\Code\Generator\ParameterGenerator;
-use Zend\Code\Generator\PropertyGenerator;
 
 /**
  * Generator for a setOriginal-method that sets the 'base' service which is used by default within the proxy.

test/MockableService/OriginalPropertyPropertyGeneratorTest.php

@@ -2,10 +2,10 @@
 
 namespace Tweakers\Test\MockableService;
 
+use Laminas\Code\Generator\PropertyGenerator;
 use PHPUnit\Framework\TestCase;
-use Zend\Code\Generator\PropertyGenerator;
 
-class OriginalPropertyGeneratorTest extends TestCase
+class OriginalPropertyPropertyGeneratorTest extends TestCase
 {
     /** @test */
     public function it_should_generate_a_set_method(): void

test/MockableService/RestoreOriginalsGeneratorTest.php

@@ -2,8 +2,8 @@
 
 namespace Tweakers\Test\MockableService;
 
+use Laminas\Code\Generator\PropertyGenerator;
 use PHPUnit\Framework\TestCase;
-use Zend\Code\Generator\PropertyGenerator;
 
 class RestoreOriginalsGeneratorTest extends TestCase
 {

test/MockableService/SetAlternativeGeneratorTest.php

@@ -2,8 +2,8 @@
 
 namespace Tweakers\Test\MockableService;
 
+use Laminas\Code\Generator\PropertyGenerator;
 use PHPUnit\Framework\TestCase;
-use Zend\Code\Generator\PropertyGenerator;
 
 class SetAlternativeGeneratorTest extends TestCase
 {