[zendframework/zendframework#3348] Fix CS issues

- Trailing whitespace
zendframework · Jan 14, 2013 · 39f68ab · 39f68ab
1 parent 696eb80
commit 39f68ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -418,18 +418,18 @@ public function get($name, $usePeeringServiceManagers = true)
                 $cName = $this->aliases[$cName];
             } while ($this->hasAlias($cName));
         }
-        
+
         $instance                        = null;
         $retrieveFromPeeringManagerFirst = $this->retrieveFromPeeringManagerFirst();
 
         if ($usePeeringServiceManagers && $retrieveFromPeeringManagerFirst) {
             $instance = $this->retrieveFromPeeringManager($name);
-            
+
             if(null !== $instance) {
                 return $instance;
             }
         }
-        
+
         if (isset($this->instances[$cName])) {
             return $this->instances[$cName];
         }

diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
@@ -667,7 +667,7 @@ public function testDuplicateNewInstanceMultipleAbstractFactories()
         $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
         $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
     }
-    
+
     /**
      * @covers Zend\ServiceManager\ServiceManager::setService
      * @covers Zend\ServiceManager\ServiceManager::get
@@ -680,22 +680,22 @@ public function testRetrieveServiceFromPeeringServiceManagerIfretrieveFromPeerin
         $foo1 = "foo1";
         $boo1 = "boo1";
         $boo2 = "boo2";
-        
+
         $this->serviceManager->setService($foo1, $boo1);
         $this->assertEquals($this->serviceManager->get($foo1), $boo1);
-        
+
         $serviceManagerChild = new ServiceManager();
         $serviceManagerChild->setService($foo1, $boo2);
         $this->assertEquals($serviceManagerChild->get($foo1), $boo2);
-        
+
         $this->assertFalse($this->serviceManager->retrieveFromPeeringManagerFirst());
-        $this->serviceManager->setRetrieveFromPeeringManagerFirst(true); 
+        $this->serviceManager->setRetrieveFromPeeringManagerFirst(true);
         $this->assertTrue($this->serviceManager->retrieveFromPeeringManagerFirst());
-        
+
         $this->serviceManager->addPeeringServiceManager($serviceManagerChild);
-        
+
         $this->assertContains($serviceManagerChild, $this->readAttribute($this->serviceManager, 'peeringServiceManagers'));
-        
+
         $this->assertEquals($serviceManagerChild->get($foo1), $boo2);
         $this->assertEquals($this->serviceManager->get($foo1), $boo2);
     }