Type hint specialized plugin manager

zf-fr · May 2, 2014 · fa51553 · fa51553
1 parent 553dc70
commit fa51553
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 33 deletions.
diff --git a/src/ZfrRest/Mvc/Controller/Event/HydrationEvent.php b/src/ZfrRest/Mvc/Controller/Event/HydrationEvent.php
@@ -20,7 +20,7 @@
 
 use Zend\EventManager\Event;
 use Zend\Stdlib\Hydrator\HydratorInterface;
-use Zend\ServiceManager\AbstractPluginManager;
+use Zend\Stdlib\Hydrator\HydratorPluginManager;
 use ZfrRest\Resource\ResourceInterface;
 
 /**
@@ -46,7 +46,7 @@ class HydrationEvent extends Event
     protected $resource;
 
     /**
-     * @var AbstractPluginManager
+     * @var HydratorPluginManager
      */
     protected $hydratorManager;
 
@@ -57,9 +57,9 @@ class HydrationEvent extends Event
 
     /**
      * @param ResourceInterface     $resource
-     * @param AbstractPluginManager $hydratorManager
+     * @param HydratorPluginManager $hydratorManager
      */
-    public function __construct(ResourceInterface $resource, AbstractPluginManager $hydratorManager)
+    public function __construct(ResourceInterface $resource, HydratorPluginManager $hydratorManager)
     {
         $this->resource        = $resource;
         $this->hydratorManager = $hydratorManager;
@@ -90,7 +90,7 @@ public function getResource()
     }
 
     /**
-     * @return AbstractPluginManager
+     * @return HydratorPluginManager
      */
     public function getHydratorManager()
     {

diff --git a/src/ZfrRest/Mvc/Controller/Event/ValidationEvent.php b/src/ZfrRest/Mvc/Controller/Event/ValidationEvent.php
@@ -20,7 +20,7 @@
 
 use Zend\EventManager\Event;
 use Zend\InputFilter\InputFilterInterface;
-use Zend\ServiceManager\AbstractPluginManager;
+use Zend\InputFilter\InputFilterPluginManager;
 use ZfrRest\Resource\ResourceInterface;
 
 /**
@@ -47,7 +47,7 @@ class ValidationEvent extends Event
     protected $resource;
 
     /**
-     * @var AbstractPluginManager
+     * @var InputFilterPluginManager
      */
     protected $inputFilterManager;
 
@@ -57,10 +57,10 @@ class ValidationEvent extends Event
     protected $inputFilter;
 
     /**
-     * @param ResourceInterface     $resource
-     * @param AbstractPluginManager $inputFilterManager
+     * @param ResourceInterface        $resource
+     * @param InputFilterPluginManager $inputFilterManager
      */
-    public function __construct(ResourceInterface $resource, AbstractPluginManager $inputFilterManager)
+    public function __construct(ResourceInterface $resource, InputFilterPluginManager $inputFilterManager)
     {
         $this->resource           = $resource;
         $this->inputFilterManager = $inputFilterManager;
@@ -91,7 +91,7 @@ public function getResource()
     }
 
     /**
-     * @return AbstractPluginManager
+     * @return InputFilterPluginManager
      */
     public function getInputFilterManager()
     {

diff --git a/src/ZfrRest/Mvc/Controller/MethodHandler/DataHydrationTrait.php b/src/ZfrRest/Mvc/Controller/MethodHandler/DataHydrationTrait.php
@@ -19,8 +19,8 @@
 namespace ZfrRest\Mvc\Controller\MethodHandler;
 
 use Zend\EventManager\EventManagerAwareInterface;
-use Zend\ServiceManager\AbstractPluginManager;
 use Zend\Stdlib\Hydrator\HydratorInterface;
+use Zend\Stdlib\Hydrator\HydratorPluginManager;
 use ZfrRest\Mvc\Controller\Event\HydrationEvent;
 use ZfrRest\Mvc\Exception\RuntimeException;
 use ZfrRest\Resource\ResourceInterface;
@@ -34,7 +34,7 @@
 trait DataHydrationTrait
 {
     /**
-     * @var AbstractPluginManager
+     * @var HydratorPluginManager
      */
     protected $hydratorPluginManager;
 

diff --git a/src/ZfrRest/Mvc/Controller/MethodHandler/DataValidationTrait.php b/src/ZfrRest/Mvc/Controller/MethodHandler/DataValidationTrait.php
@@ -21,7 +21,7 @@
 use Zend\EventManager\EventManagerAwareInterface;
 use Zend\EventManager\EventManagerInterface;
 use Zend\InputFilter\InputFilterInterface;
-use Zend\ServiceManager\AbstractPluginManager;
+use Zend\InputFilter\InputFilterPluginManager;
 use ZfrRest\Http\Exception\Client\UnprocessableEntityException;
 use ZfrRest\Mvc\Controller\Event\ValidationEvent;
 use ZfrRest\Mvc\Exception\RuntimeException;
@@ -36,7 +36,7 @@
 trait DataValidationTrait
 {
     /**
-     * @var AbstractPluginManager
+     * @var InputFilterPluginManager
      */
     protected $inputFilterPluginManager;
 

diff --git a/tests/ZfrRestTest/Asset/Mvc/DataHydrationObject.php b/tests/ZfrRestTest/Asset/Mvc/DataHydrationObject.php
@@ -18,17 +18,17 @@
 
 namespace ZfrRestTest\Asset\Mvc;
 
-use Zend\ServiceManager\AbstractPluginManager;
+use Zend\Stdlib\Hydrator\HydratorPluginManager;
 use ZfrRest\Mvc\Controller\MethodHandler\DataHydrationTrait;
 
 class DataHydrationObject
 {
     use DataHydrationTrait;
 
     /**
-     * @param AbstractPluginManager $hydratorPluginManager
+     * @param HydratorPluginManager $hydratorPluginManager
      */
-    public function __construct(AbstractPluginManager $hydratorPluginManager)
+    public function __construct(HydratorPluginManager $hydratorPluginManager)
     {
         $this->hydratorPluginManager = $hydratorPluginManager;
     }

diff --git a/tests/ZfrRestTest/Asset/Mvc/DataValidationObject.php b/tests/ZfrRestTest/Asset/Mvc/DataValidationObject.php
@@ -18,17 +18,17 @@
 
 namespace ZfrRestTest\Asset\Mvc;
 
-use Zend\ServiceManager\AbstractPluginManager;
+use Zend\InputFilter\InputFilterPluginManager;
 use ZfrRest\Mvc\Controller\MethodHandler\DataValidationTrait;
 
 class DataValidationObject
 {
     use DataValidationTrait;
 
     /**
-     * @param AbstractPluginManager $inputFilterPluginManager
+     * @param InputFilterPluginManager $inputFilterPluginManager
      */
-    public function __construct(AbstractPluginManager $inputFilterPluginManager)
+    public function __construct(InputFilterPluginManager $inputFilterPluginManager)
     {
         $this->inputFilterPluginManager = $inputFilterPluginManager;
     }

diff --git a/tests/ZfrRestTest/Mvc/Controller/Event/HydrationEventTest.php b/tests/ZfrRestTest/Mvc/Controller/Event/HydrationEventTest.php
@@ -33,7 +33,7 @@ class HydrationEventTest extends TestCase
     public function testConstructorStoreParameters()
     {
         $resource        = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $hydratorManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $hydratorManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
         $event           = new HydrationEvent($resource, $hydratorManager);
 
         $this->assertAttributeEquals($resource, 'resource', $event);
@@ -43,7 +43,7 @@ public function testConstructorStoreParameters()
     public function testSetGetAutoHydrate()
     {
         $resource        = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $hydratorManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $hydratorManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
         $event           = new HydrationEvent($resource, $hydratorManager);
 
         $this->assertTrue($event->getAutoHydrate());
@@ -56,7 +56,7 @@ public function testSetGetAutoHydrate()
     public function testSetGetHydrator()
     {
         $resource        = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $hydratorManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $hydratorManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
         $hydrator        = $this->getMock('Zend\Stdlib\Hydrator\HydratorInterface');
         $event           = new HydrationEvent($resource, $hydratorManager);
 
@@ -70,7 +70,7 @@ public function testSetGetHydrator()
     public function testGetResource()
     {
         $resource        = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $hydratorManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $hydratorManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
         $event           = new HydrationEvent($resource, $hydratorManager);
 
         $this->assertSame($resource, $event->getResource());
@@ -79,7 +79,7 @@ public function testGetResource()
     public function testSetGetHydratorManager()
     {
         $resource        = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $hydratorManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $hydratorManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
         $event           = new HydrationEvent($resource, $hydratorManager);
 
         $this->assertSame($hydratorManager, $event->gethydratorManager());

diff --git a/tests/ZfrRestTest/Mvc/Controller/Event/ValidationEventTest.php b/tests/ZfrRestTest/Mvc/Controller/Event/ValidationEventTest.php
@@ -33,7 +33,7 @@ class ValidationEventTest extends TestCase
     public function testConstructorStoreParameters()
     {
         $resource           = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $inputFilterManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $inputFilterManager = $this->getMock('Zend\InputFilter\InputFilterPluginManager');
         $event              = new ValidationEvent($resource, $inputFilterManager);
 
         $this->assertAttributeEquals($resource, 'resource', $event);
@@ -43,7 +43,7 @@ public function testConstructorStoreParameters()
     public function testSetGetAutoValidate()
     {
         $resource           = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $inputFilterManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $inputFilterManager = $this->getMock('Zend\InputFilter\InputFilterPluginManager');
         $event              = new ValidationEvent($resource, $inputFilterManager);
 
         $this->assertTrue($event->getAutoValidate());
@@ -56,7 +56,7 @@ public function testSetGetAutoValidate()
     public function testSetGetInputFilter()
     {
         $resource           = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $inputFilterManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $inputFilterManager = $this->getMock('Zend\InputFilter\InputFilterPluginManager');
         $inputFilter        = $this->getMock('Zend\InputFilter\InputFilterInterface');
         $event              = new ValidationEvent($resource, $inputFilterManager);
 
@@ -70,7 +70,7 @@ public function testSetGetInputFilter()
     public function testGetResource()
     {
         $resource           = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $inputFilterManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $inputFilterManager = $this->getMock('Zend\InputFilter\InputFilterPluginManager');
         $event              = new ValidationEvent($resource, $inputFilterManager);
 
         $this->assertSame($resource, $event->getResource());
@@ -79,7 +79,7 @@ public function testGetResource()
     public function testGetInputFilterManager()
     {
         $resource           = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $inputFilterManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $inputFilterManager = $this->getMock('Zend\InputFilter\InputFilterPluginManager');
         $event              = new ValidationEvent($resource, $inputFilterManager);
 
         $this->assertSame($inputFilterManager, $event->getInputFilterManager());

diff --git a/tests/ZfrRestTest/Mvc/Controller/MethodHandler/DataHydrationTraitTest.php b/tests/ZfrRestTest/Mvc/Controller/MethodHandler/DataHydrationTraitTest.php
@@ -41,7 +41,7 @@ public function setUp()
         $this->resource              = $this->getMock('ZfrRest\Resource\ResourceInterface');
         $this->controller            = $this->getMock('Zend\EventManager\EventManagerAwareInterface');
         $this->eventManager          = $this->getMock('Zend\EventManager\EventManagerInterface');
-        $this->hydratorManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $this->hydratorManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
         $this->dataHydration         = new DataHydrationObject($this->hydratorManager);
 
         $this->controller->expects($this->once())->method('getEventManager')->will($this->returnValue($this->eventManager));

diff --git a/tests/ZfrRestTest/Mvc/Controller/MethodHandler/DataValidationTraitTest.php b/tests/ZfrRestTest/Mvc/Controller/MethodHandler/DataValidationTraitTest.php
@@ -43,7 +43,7 @@ public function setUp()
         $this->resource           = $this->getMock('ZfrRest\Resource\ResourceInterface');
         $this->controller         = $this->getMock('Zend\EventManager\EventManagerAwareInterface');
         $this->eventManager       = $this->getMock('Zend\EventManager\EventManagerInterface');
-        $this->inputFilterManager = $this->getMock('Zend\ServiceManager\AbstractPluginManager');
+        $this->inputFilterManager = $this->getMock('Zend\InputFilter\InputFilterPluginManager');
         $this->dataValidation     = new DataValidationObject($this->inputFilterManager);
 
         $this->controller->expects($this->once())->method('getEventManager')->will($this->returnValue($this->eventManager));