Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2

zendframework · Jul 12, 2012 · 67c3033 · 67c3033
commit 67c3033
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -15,6 +15,6 @@
  * @package    Zend_ServiceManager
  * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
+class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {}
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -389,7 +389,7 @@ public function get($name, $usePeeringServiceManagers = true)
             if (!$instance) {
                 if ($this->canCreate(array($cName, $rName))) {
                     $instance = $this->create(array($cName, $rName));
-                } else if ($usePeeringServiceManagers && !$retrieveFromPeeringManagerFirst) {
+                } elseif ($usePeeringServiceManagers && !$retrieveFromPeeringManagerFirst) {
                     $instance = $this->retrieveFromPeeringManager($name);
                 }
             }
@@ -787,7 +787,7 @@ protected function createFromAbstractFactory($canonicalName, $requestedName)
             // support factories as strings
             if (is_string($abstractFactory) && class_exists($abstractFactory, true)) {
                 $this->abstractFactories[$index] = $abstractFactory = new $abstractFactory;
-            } else if (!$abstractFactory instanceof AbstractFactoryInterface) {
+            } elseif (!$abstractFactory instanceof AbstractFactoryInterface) {
                 throw new Exception\ServiceNotCreatedException(sprintf(
                     'While attempting to create %s%s an abstract factory could not produce a valid instance.',
                     $canonicalName,

diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
@@ -489,8 +489,7 @@ public function testDoNotFallbackToAbstractFactory()
     public function testAssignAliasWithExistingServiceName()
     {
         $this->serviceManager->setFactory('foo', 'ZendTest\ServiceManager\TestAsset\FooFactory');
-        $this->serviceManager->setFactory('bar', function ($sm)
-            {
+        $this->serviceManager->setFactory('bar', function ($sm) {
                 return new Bar(array('a'));
             });
         $this->serviceManager->setAllowOverride(false);

diff --git a/test/TestAsset/Bar.php b/test/TestAsset/Bar.php
@@ -12,7 +12,7 @@
 
 class Bar
 {
-    public function __construct(array $foo) {
-
+    public function __construct(array $foo)
+    {
     }
 }