CS: imported symbols cleanups

src/ProxyManager/Factory/LazyLoadingGhostFactory.php

@@ -18,6 +18,7 @@
 
 namespace ProxyManager\Factory;
 
+use ProxyManager\Proxy\GhostObjectInterface;
 use ProxyManager\ProxyGenerator\LazyLoadingGhostGenerator;
 
 /**
@@ -26,7 +27,7 @@
  * @author Marco Pivetta <ocramius@gmail.com>
  * @license MIT
  *
- * @method \ProxyManager\Proxy\GhostObjectInterface createProxy($className, \Closure $initializer)
+ * @method GhostObjectInterface createProxy($className, \Closure $initializer)
  */
 class LazyLoadingGhostFactory extends AbstractLazyFactory
 {

src/ProxyManager/Factory/LazyLoadingValueHolderFactory.php

@@ -18,6 +18,7 @@
 
 namespace ProxyManager\Factory;
 
+use ProxyManager\Proxy\VirtualProxyInterface;
 use ProxyManager\ProxyGenerator\LazyLoadingValueHolderGenerator;
 
 /**
@@ -26,7 +27,7 @@
  * @author Marco Pivetta <ocramius@gmail.com>
  * @license MIT
  *
- * @method \ProxyManager\Proxy\VirtualProxyInterface createProxy($className, \Closure $initializer)
+ * @method VirtualProxyInterface createProxy($className, \Closure $initializer)
  */
 class LazyLoadingValueHolderFactory extends AbstractLazyFactory
 {

tests/ProxyManagerTest/Factory/RemoteObject/Adapter/JsonRpcTest.php

@@ -20,6 +20,7 @@
 
 use PHPUnit_Framework_TestCase;
 use ProxyManager\Factory\RemoteObject\Adapter\JsonRpc;
+use Zend\Server\Client;
 
 /**
  * Tests for {@see \ProxyManager\Factory\RemoteObject\Adapter\JsonRpc}
@@ -39,10 +40,8 @@ class JsonRpcTest extends PHPUnit_Framework_TestCase
      */
     public function testCanBuildAdapterWithJsonRpcClient()
     {
-        $client = $this
-            ->getMockBuilder('Zend\Server\Client')
-            ->setMethods(['call'])
-            ->getMock();
+        /* @var $client Client|\PHPUnit_Framework_MockObject_MockObject */
+        $client = $this->getMock(Client::class, ['call']);
 
         $adapter = new JsonRpc($client);
 

tests/ProxyManagerTest/Factory/RemoteObject/Adapter/SoapTest.php

@@ -20,6 +20,7 @@
 
 use PHPUnit_Framework_TestCase;
 use ProxyManager\Factory\RemoteObject\Adapter\Soap;
+use Zend\Server\Client;
 
 /**
  * Tests for {@see \ProxyManager\Factory\RemoteObject\Adapter\Soap}
@@ -39,10 +40,8 @@ class SoapTest extends PHPUnit_Framework_TestCase
      */
     public function testCanBuildAdapterWithSoapRpcClient()
     {
-        $client = $this
-            ->getMockBuilder('Zend\Server\Client')
-            ->setMethods(['call'])
-            ->getMock();
+        /* @var $client Client|\PHPUnit_Framework_MockObject_MockObject */
+        $client = $this->getMock(Client::class, ['call']);
 
         $adapter = new Soap($client);
 

tests/ProxyManagerTest/Factory/RemoteObject/Adapter/XmlRpcTest.php

@@ -20,6 +20,7 @@
 
 use PHPUnit_Framework_TestCase;
 use ProxyManager\Factory\RemoteObject\Adapter\XmlRpc;
+use Zend\Server\Client;
 
 /**
  * Tests for {@see \ProxyManager\Factory\RemoteObject\Adapter\XmlRpc}
@@ -39,10 +40,8 @@ class XmlRpcTest extends PHPUnit_Framework_TestCase
      */
     public function testCanBuildAdapterWithXmlRpcClient()
     {
-        $client = $this
-            ->getMockBuilder('Zend\Server\Client')
-            ->setMethods(['call'])
-            ->getMock();
+        /* @var $client Client|\PHPUnit_Framework_MockObject_MockObject */
+        $client = $this->getMock(Client::class, ['call']);
 
         $adapter = new XmlRpc($client);
 

tests/ProxyManagerTest/Factory/RemoteObjectFactoryTest.php

@@ -21,9 +21,11 @@
 use PHPUnit_Framework_TestCase;
 use ProxyManager\Autoloader\AutoloaderInterface;
 use ProxyManager\Configuration;
+use ProxyManager\Factory\RemoteObject\AdapterInterface;
 use ProxyManager\Factory\RemoteObjectFactory;
 use ProxyManager\Generator\ClassGenerator;
 use ProxyManager\Generator\Util\UniqueIdentifierGenerator;
+use ProxyManager\GeneratorStrategy\GeneratorStrategyInterface;
 use ProxyManager\Inflector\ClassNameInflectorInterface;
 use ProxyManager\Signature\ClassSignatureGeneratorInterface;
 use ProxyManager\Signature\SignatureCheckerInterface;
@@ -105,7 +107,8 @@ public function testWillSkipAutoGeneration()
             ->with(BaseInterface::class)
             ->will($this->returnValue(RemoteObjectMock::class));
 
-        $adapter = $this->getMock('ProxyManager\Factory\RemoteObject\AdapterInterface');
+        /* @var $adapter AdapterInterface|\PHPUnit_Framework_MockObject_MockObject */
+        $adapter = $this->getMock(AdapterInterface::class);
         $factory = new RemoteObjectFactory($adapter, $this->config);
         /* @var $proxy \stdClass */
         $proxy   = $factory->createProxy(BaseInterface::class, $adapter);
@@ -125,7 +128,7 @@ public function testWillSkipAutoGeneration()
     public function testWillTryAutoGeneration()
     {
         $proxyClassName = UniqueIdentifierGenerator::getIdentifier('bar');
-        $generator      = $this->getMock('ProxyManager\GeneratorStrategy\\GeneratorStrategyInterface');
+        $generator      = $this->getMock(GeneratorStrategyInterface::class);
         $autoloader     = $this->getMock(AutoloaderInterface::class);
 
         $this->config->expects($this->any())->method('getGeneratorStrategy')->will($this->returnValue($generator));
@@ -176,7 +179,8 @@ function () use ($proxyClassName) {
         $this->signatureChecker->expects($this->atLeastOnce())->method('checkSignature');
         $this->classSignatureGenerator->expects($this->once())->method('addSignature')->will($this->returnArgument(0));
 
-        $adapter = $this->getMock('ProxyManager\Factory\RemoteObject\AdapterInterface');
+        /* @var $adapter AdapterInterface */
+        $adapter = $this->getMock(AdapterInterface::class);
         $factory = new RemoteObjectFactory($adapter, $this->config);
         $proxy   = $factory->createProxy(BaseInterface::class, $adapter);
 

tests/ProxyManagerTest/Functional/AccessInterceptorScopeLocalizerFunctionalTest.php

@@ -47,12 +47,18 @@ class AccessInterceptorScopeLocalizerFunctionalTest extends PHPUnit_Framework_Te
 {
     /**
      * @dataProvider getProxyMethods
+     *
+     * @param string  $className
+     * @param object  $instance
+     * @param string  $method
+     * @param mixed[] $params
+     * @param mixed   $expectedValue
      */
-    public function testMethodCalls($className, $instance, $method, $params, $expectedValue)
+    public function testMethodCalls($className, $instance, $method, array $params, $expectedValue)
     {
         $proxyName = $this->generateProxy($className);
 
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
+        /* @var $proxy AccessInterceptorInterface */
         $proxy     = $proxyName::staticProxyConstructor($instance);
 
         $this->assertProxySynchronized($instance, $proxy);
@@ -91,12 +97,18 @@ function ($proxy, $instance, $method, $params, & $returnEarly) use ($random) {
 
     /**
      * @dataProvider getProxyMethods
+     *
+     * @param string  $className
+     * @param object  $instance
+     * @param string  $method
+     * @param mixed[] $params
+     * @param mixed   $expectedValue
      */
-    public function testMethodCallsWithSuffixListener($className, $instance, $method, $params, $expectedValue)
+    public function testMethodCallsWithSuffixListener($className, $instance, $method, array $params, $expectedValue)
     {
         $proxyName = $this->generateProxy($className);
 
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
+        /* @var $proxy AccessInterceptorInterface */
         $proxy     = $proxyName::staticProxyConstructor($instance);
         /* @var $listener callable|\PHPUnit_Framework_MockObject_MockObject */
         $listener  = $this->getMock(stdClass::class, ['__invoke']);
@@ -131,11 +143,17 @@ function ($proxy, $instance, $method, $params, $returnValue, & $returnEarly) use
 
     /**
      * @dataProvider getProxyMethods
+     *
+     * @param string  $className
+     * @param object  $instance
+     * @param string  $method
+     * @param mixed[] $params
+     * @param mixed   $expectedValue
      */
-    public function testMethodCallsAfterUnSerialization($className, $instance, $method, $params, $expectedValue)
+    public function testMethodCallsAfterUnSerialization($className, $instance, $method, array $params, $expectedValue)
     {
         $proxyName = $this->generateProxy($className);
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
+        /* @var $proxy AccessInterceptorInterface */
         $proxy     = unserialize(serialize($proxyName::staticProxyConstructor($instance)));
 
         $this->assertSame($expectedValue, call_user_func_array([$proxy, $method], $params));
@@ -144,12 +162,18 @@ public function testMethodCallsAfterUnSerialization($className, $instance, $meth
 
     /**
      * @dataProvider getProxyMethods
+     *
+     * @param string  $className
+     * @param object  $instance
+     * @param string  $method
+     * @param mixed[] $params
+     * @param mixed   $expectedValue
      */
-    public function testMethodCallsAfterCloning($className, $instance, $method, $params, $expectedValue)
+    public function testMethodCallsAfterCloning($className, $instance, $method, array $params, $expectedValue)
     {
         $proxyName = $this->generateProxy($className);
 
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
+        /* @var $proxy AccessInterceptorInterface */
         $proxy     = $proxyName::staticProxyConstructor($instance);
         $cloned    = clone $proxy;
 
@@ -160,20 +184,31 @@ public function testMethodCallsAfterCloning($className, $instance, $method, $par
 
     /**
      * @dataProvider getPropertyAccessProxies
+     *
+     * @param object                     $instance
+     * @param AccessInterceptorInterface $proxy
+     * @param string                     $publicProperty
+     * @param mixed                      $propertyValue
      */
-    public function testPropertyReadAccess($instance, $proxy, $publicProperty, $propertyValue)
-    {
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
+    public function testPropertyReadAccess(
+        $instance,
+        AccessInterceptorInterface $proxy,
+        $publicProperty,
+        $propertyValue
+    ) {
         $this->assertSame($propertyValue, $proxy->$publicProperty);
         $this->assertProxySynchronized($instance, $proxy);
     }
 
     /**
      * @dataProvider getPropertyAccessProxies
+     *
+     * @param object                     $instance
+     * @param AccessInterceptorInterface $proxy
+     * @param string                     $publicProperty
      */
-    public function testPropertyWriteAccess($instance, $proxy, $publicProperty)
+    public function testPropertyWriteAccess($instance, AccessInterceptorInterface $proxy, $publicProperty)
     {
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
         $newValue               = uniqid();
         $proxy->$publicProperty = $newValue;
 
@@ -183,10 +218,13 @@ public function testPropertyWriteAccess($instance, $proxy, $publicProperty)
 
     /**
      * @dataProvider getPropertyAccessProxies
+     *
+     * @param object                     $instance
+     * @param AccessInterceptorInterface $proxy
+     * @param string                     $publicProperty
      */
-    public function testPropertyExistence($instance, $proxy, $publicProperty)
+    public function testPropertyExistence($instance, AccessInterceptorInterface $proxy, $publicProperty)
     {
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
         $this->assertSame(isset($instance->$publicProperty), isset($proxy->$publicProperty));
         $this->assertProxySynchronized($instance, $proxy);
 
@@ -197,11 +235,14 @@ public function testPropertyExistence($instance, $proxy, $publicProperty)
 
     /**
      * @dataProvider getPropertyAccessProxies
+     *
+     * @param object                     $instance
+     * @param AccessInterceptorInterface $proxy
+     * @param string                     $publicProperty
      */
-    public function testPropertyUnset($instance, $proxy, $publicProperty)
+    public function testPropertyUnset($instance, AccessInterceptorInterface $proxy, $publicProperty)
     {
         $this->markTestSkipped('It is currently not possible to synchronize properties un-setting');
-        /* @var $proxy \ProxyManager\Proxy\AccessInterceptorInterface */
         unset($proxy->$publicProperty);
 
         $this->assertFalse(isset($instance->$publicProperty));
@@ -217,7 +258,7 @@ public function testCanWriteToArrayKeysInPublicProperty()
         $instance    = new ClassWithPublicArrayProperty();
         $className   = get_class($instance);
         $proxyName   = $this->generateProxy($className);
-        /* @var $proxy ClassWithPublicArrayProperty */
+        /* @var $proxy ClassWithPublicArrayProperty|AccessInterceptorInterface */
         $proxy       = $proxyName::staticProxyConstructor($instance);
 
         $proxy->arrayProperty['foo'] = 'bar';
@@ -238,7 +279,7 @@ public function testWillNotModifyRetrievedPublicProperties()
         $instance    = new ClassWithPublicProperties();
         $className   = get_class($instance);
         $proxyName   = $this->generateProxy($className);
-        /* @var $proxy ClassWithPublicProperties||AccessInterceptorInterface */
+        /* @var $proxy ClassWithPublicProperties|AccessInterceptorInterface */
         $proxy       = $proxyName::staticProxyConstructor($instance);
         $variable    = $proxy->property0;