diff --git a/library/Zend/Filter/BaseName.php b/library/Zend/Filter/BaseName.php
index d3a0d0e0a62..5d2ed0db891 100644
--- a/library/Zend/Filter/BaseName.php
+++ b/library/Zend/Filter/BaseName.php
@@ -28,7 +28,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Filter/Digits.php b/library/Zend/Filter/Digits.php
index 15cfc55e87e..71905854e1c 100644
--- a/library/Zend/Filter/Digits.php
+++ b/library/Zend/Filter/Digits.php
@@ -30,7 +30,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Filter/HtmlEntities.php b/library/Zend/Filter/HtmlEntities.php
index c518e0f7c99..962fb389736 100644
--- a/library/Zend/Filter/HtmlEntities.php
+++ b/library/Zend/Filter/HtmlEntities.php
@@ -186,7 +186,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Filter/Int.php b/library/Zend/Filter/Int.php
index e82e96d3d5c..515ad0d2f79 100644
--- a/library/Zend/Filter/Int.php
+++ b/library/Zend/Filter/Int.php
@@ -28,7 +28,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Filter/RealPath.php b/library/Zend/Filter/RealPath.php
index 2ac2564b3a8..61717e80158 100644
--- a/library/Zend/Filter/RealPath.php
+++ b/library/Zend/Filter/RealPath.php
@@ -78,7 +78,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Filter/StringToLower.php b/library/Zend/Filter/StringToLower.php
index 5087ead3600..c95f53346af 100644
--- a/library/Zend/Filter/StringToLower.php
+++ b/library/Zend/Filter/StringToLower.php
@@ -53,7 +53,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Filter/StringToUpper.php b/library/Zend/Filter/StringToUpper.php
index 078481651d2..22f0d29aff6 100644
--- a/library/Zend/Filter/StringToUpper.php
+++ b/library/Zend/Filter/StringToUpper.php
@@ -53,7 +53,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Filter/StripTags.php b/library/Zend/Filter/StripTags.php
index 21073853167..cb58dbf0701 100644
--- a/library/Zend/Filter/StripTags.php
+++ b/library/Zend/Filter/StripTags.php
@@ -179,7 +179,7 @@ public function filter($value)
             return null;
         }
 
-        if (!is_scalar($value)){
+        if (!is_scalar($value)) {
             trigger_error(
                 sprintf(
                     '%s expects parameter to be scalar, "%s" given; cannot filter',
diff --git a/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php
index cab0c17ba7b..d830a56e9d0 100644
--- a/library/Zend/Soap/Wsdl.php
+++ b/library/Zend/Soap/Wsdl.php
@@ -182,7 +182,7 @@ public function setClassMap($classMap)
      */
     public function setUri($uri)
     {
-        if ($uri instanceof Uri){
+        if ($uri instanceof Uri) {
             $uri = $uri->toString();
         }
 
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
index 84a5fc60510..defd133d54e 100644
--- a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
+++ b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -212,13 +212,13 @@ public function url($url, $method = HttpRequest::METHOD_GET, $params = array())
         }
 
         if ($method == HttpRequest::METHOD_POST) {
-            if (count($params) != 0){
+            if (count($params) != 0) {
                 $post = $params;
             }
         } elseif ($method == HttpRequest::METHOD_GET) {
             $query = array_merge($query, $params);
         } elseif ($method == HttpRequest::METHOD_PUT) {
-            if (count($params) != 0){
+            if (count($params) != 0) {
                 array_walk($params,
                     function(&$item, $key) { $item = $key . '=' . $item; }
                 );
diff --git a/tests/ZendTest/I18n/Translator/TranslatorTest.php b/tests/ZendTest/I18n/Translator/TranslatorTest.php
index 3f1cb6148ea..f3322bfaf68 100644
--- a/tests/ZendTest/I18n/Translator/TranslatorTest.php
+++ b/tests/ZendTest/I18n/Translator/TranslatorTest.php
@@ -351,7 +351,7 @@ public function testListenerOnNoMessagesLoadedEventCanReturnTextDomainObject()
         $events->attach(Translator::EVENT_NO_MESSAGES_LOADED, function(EventInterface $event) use ($textDomain) {
             return $textDomain;
         });
-        $events->attach(Translator::EVENT_NO_MESSAGES_LOADED, function(EventInterface $event) use (&$doNotTrigger){
+        $events->attach(Translator::EVENT_NO_MESSAGES_LOADED, function(EventInterface $event) use (&$doNotTrigger) {
             $doNotTrigger = true;
         });
 
diff --git a/tests/ZendTest/InputFilter/FactoryTest.php b/tests/ZendTest/InputFilter/FactoryTest.php
index b0e7534a9b2..e9f39889719 100644
--- a/tests/ZendTest/InputFilter/FactoryTest.php
+++ b/tests/ZendTest/InputFilter/FactoryTest.php
@@ -487,7 +487,7 @@ public function testFactoryWillNotGetPrioritySetting()
         // string_to_upper (1001), string_to_lower (1000), string_trim (999)
         $index = 0;
         foreach($input->getFilterChain()->getFilters() as $filter) {
-            switch($index) {
+            switch ($index) {
                 case 0:
                     $this->assertInstanceOf('Zend\Filter\StringToUpper', $filter);
                     break;
diff --git a/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php b/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php
index 5cfe586355d..96e76d721fb 100644
--- a/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php
+++ b/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php
@@ -134,7 +134,7 @@ public function replaceList($items)
     public function patchList($items)
     {
         //This isn't great code to have in a test class, but I seems the simplest without BC breaks.
-        if (isset($items['name']) && $items['name'] == 'testDispatchViaPatchWithoutIdentifierReturns405ResponseIfPatchListThrowsException'){
+        if (isset($items['name']) && $items['name'] == 'testDispatchViaPatchWithoutIdentifierReturns405ResponseIfPatchListThrowsException') {
             parent::patchList($items);
         }
         return $items;
diff --git a/tests/ZendTest/Navigation/ServiceFactoryTest.php b/tests/ZendTest/Navigation/ServiceFactoryTest.php
index 5fa4e2ef07a..86e8c11731f 100644
--- a/tests/ZendTest/Navigation/ServiceFactoryTest.php
+++ b/tests/ZendTest/Navigation/ServiceFactoryTest.php
@@ -149,7 +149,7 @@ public function testConstructedNavigationFactoryInjectRouterAndMatcher()
                        $this->isInstanceOf("Zend\Mvc\Router\RouteMatch"),
                        $this->isInstanceOf("Zend\Mvc\Router\RouteStackInterface"));
 
-        $this->serviceManager->setFactory('Navigation', function ($serviceLocator) use ($factory){
+        $this->serviceManager->setFactory('Navigation', function ($serviceLocator) use ($factory) {
               return $factory->createService($serviceLocator);
         });