[zendframework/zendframework#4408] CS fixes

- re-flow conditionals, one condition per line; brace onto next line for multi-line conditionals. - add comments where needed - add imports where needed
zendframework · May 6, 2013 · ba9be9e · ba9be9e
1 parent c7910dd
commit ba9be9e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
@@ -230,11 +230,15 @@ protected function createServiceViaCallback($callable, $cName, $rName)
         if (is_object($callable)) {
             $factory = $callable;
         } elseif (is_array($callable)) {
+            // reset both rewinds and returns the value of the first array element
             $factory = reset($callable);
         }
 
-        if (isset($factory) && ($factory instanceof MutableCreationOptionsInterface)
-            && is_array($this->creationOptions) && !empty($this->creationOptions)){
+        if (isset($factory)
+            && ($factory instanceof MutableCreationOptionsInterface)
+            && is_array($this->creationOptions)
+            && !empty($this->creationOptions)
+        ) {
             $factory->setCreationOptions($this->creationOptions);
         }
 

diff --git a/test/AbstractPluginManagerTest.php b/test/AbstractPluginManagerTest.php
@@ -11,6 +11,7 @@
 namespace ZendTest\ServiceManager;
 
 use ReflectionClass;
+use ReflectionObject;
 use Zend\ServiceManager\Exception;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\Config;
@@ -31,11 +32,11 @@ public function setup()
         $this->serviceManager = new ServiceManager;
         $this->pluginManager = new FooPluginManager(new Config(array(
             'factories' => array(
-                'Foo' => 'ZendTest\ServiceManager\TestAsset\FooFactory'
+                'Foo' => 'ZendTest\ServiceManager\TestAsset\FooFactory',
             ),
             'shared' => array(
-                'Foo' => false
-            )
+                'Foo' => false,
+            ),
         )));
     }
 
@@ -76,8 +77,8 @@ public function testAbstractFactoryWithMutableCreationOptions()
         $mock = 'ZendTest\ServiceManager\TestAsset\AbstractFactoryWithMutableCreationOptions';
         $abstractFactory = $this->getMock($mock, array('setCreationOptions'));
         $abstractFactory->expects($this->once())
-                ->method('setCreationOptions')
-                ->with($creationOptions);
+            ->method('setCreationOptions')
+            ->with($creationOptions);
 
         $this->pluginManager->addAbstractFactory($abstractFactory);
         $instance = $this->pluginManager->get('classnoexists', $creationOptions);
@@ -89,9 +90,10 @@ public function testMutableMethodNeverCalledWithoutCreationOptions()
         $mock = 'ZendTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
         $callable = $this->getMock($mock, array('setCreationOptions'));
         $callable->expects($this->never())
-                 ->method('setCreationOptions');
+            ->method('setCreationOptions');
+
+        $ref = new ReflectionObject($this->pluginManager);
 
-        $ref = new \ReflectionObject($this->pluginManager);
         $method = $ref->getMethod('createServiceViaCallback');
         $method->setAccessible(true);
         $method->invoke($this->pluginManager, $callable, 'foo', 'bar');
@@ -103,13 +105,15 @@ public function testCallableObjectWithMutableCreationOptions()
         $mock = 'ZendTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
         $callable = $this->getMock($mock, array('setCreationOptions'));
         $callable->expects($this->once())
-                 ->method('setCreationOptions')
-                 ->with($creationOptions);
+            ->method('setCreationOptions')
+            ->with($creationOptions);
+
+        $ref = new ReflectionObject($this->pluginManager);
 
-        $ref = new \ReflectionObject($this->pluginManager);
         $property = $ref->getProperty('creationOptions');
         $property->setAccessible(true);
         $property->setValue($this->pluginManager, $creationOptions);
+
         $method = $ref->getMethod('createServiceViaCallback');
         $method->setAccessible(true);
         $method->invoke($this->pluginManager, $callable, 'foo', 'bar');

diff --git a/test/TestAsset/AbstractFactoryWithMutableCreationOptions.php b/test/TestAsset/AbstractFactoryWithMutableCreationOptions.php
@@ -9,12 +9,13 @@
 
 namespace ZendTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
+use stdClass;
 use Zend\ServiceManager\AbstractFactoryInterface;
 use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
 /**
  * implements multiple interface mock
- *
  */
 class AbstractFactoryWithMutableCreationOptions implements
     AbstractFactoryInterface,
@@ -27,7 +28,7 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
 
     public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        return new \StdClass;
+        return new stdClass;
     }
 
     public function setCreationOptions(array $options)

diff --git a/test/TestAsset/CallableWithMutableCreationOptions.php b/test/TestAsset/CallableWithMutableCreationOptions.php
@@ -9,11 +9,12 @@
 
 namespace ZendTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
+use stdClass;
 use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
 /**
  * implements multiple interface invokable object mock
- *
  */
 class CallableWithMutableCreationOptions implements MutableCreationOptionsInterface
 {
@@ -24,6 +25,6 @@ public function setCreationOptions(array $options)
 
     public function __invoke(ServiceLocatorInterface $serviceLocator, $cName, $rName)
     {
-        return new \StdClass;
+        return new stdClass;
     }
 }