diff --git a/src/AbstractOptions.php b/src/AbstractOptions.php
index ffe471a51..6bb4c12a7 100644
--- a/src/AbstractOptions.php
+++ b/src/AbstractOptions.php
@@ -73,7 +73,9 @@ public function toArray()
             return '_' . strtolower($letter);
         };
         foreach ($this as $key => $value) {
-            if ($key === '__strictMode__') continue;
+            if ($key === '__strictMode__') {
+                continue;
+            }
             $normalizedKey = preg_replace_callback('/([A-Z])/', $transform, $key);
             $array[$normalizedKey] = $value;
         }
diff --git a/src/Hydrator/ArraySerializable.php b/src/Hydrator/ArraySerializable.php
index 7a3581107..7b8a48bae 100644
--- a/src/Hydrator/ArraySerializable.php
+++ b/src/Hydrator/ArraySerializable.php
@@ -13,7 +13,6 @@
 
 class ArraySerializable extends AbstractHydrator
 {
-
     /**
      * Extract values from the provided object
      *
diff --git a/src/Hydrator/HydratorInterface.php b/src/Hydrator/HydratorInterface.php
index 8596143da..1c7355383 100644
--- a/src/Hydrator/HydratorInterface.php
+++ b/src/Hydrator/HydratorInterface.php
@@ -13,5 +13,4 @@
 
 interface HydratorInterface extends HydrationInterface, ExtractionInterface
 {
-
 }
diff --git a/src/MessageInterface.php b/src/MessageInterface.php
index 8d94e146b..990ed9c83 100644
--- a/src/MessageInterface.php
+++ b/src/MessageInterface.php
@@ -41,5 +41,4 @@ public function setContent($content);
      * @return mixed
      */
     public function getContent();
-
 }
diff --git a/src/Parameters.php b/src/Parameters.php
index 8347553f9..484dde25d 100644
--- a/src/Parameters.php
+++ b/src/Parameters.php
@@ -83,7 +83,7 @@ public function toString()
      */
     public function offsetGet($name)
     {
-          if ($this->offsetExists($name)) {
+        if ($this->offsetExists($name)) {
             return parent::offsetGet($name);
         }
         return null;
diff --git a/src/ResponseInterface.php b/src/ResponseInterface.php
index 2ddc9787a..894986aab 100644
--- a/src/ResponseInterface.php
+++ b/src/ResponseInterface.php
@@ -11,5 +11,4 @@
 
 interface ResponseInterface extends MessageInterface
 {
-
 }
diff --git a/src/StringUtils.php b/src/StringUtils.php
index e468a8f29..eed15d00c 100644
--- a/src/StringUtils.php
+++ b/src/StringUtils.php
@@ -19,7 +19,6 @@
  */
 abstract class StringUtils
 {
-
     /**
      * Ordered list of registered string wrapper instances
      *
diff --git a/test/ArrayObjectTest.php b/test/ArrayObjectTest.php
index 5685d1dda..13ee4d08d 100644
--- a/test/ArrayObjectTest.php
+++ b/test/ArrayObjectTest.php
@@ -14,7 +14,6 @@
 
 class ArrayObjectTest extends TestCase
 {
-
     public function testConstructorDefaults()
     {
         $ar = new ArrayObject();
diff --git a/test/FilterTest.php b/test/FilterTest.php
index 4682e94ca..bca8efea0 100644
--- a/test/FilterTest.php
+++ b/test/FilterTest.php
@@ -50,5 +50,4 @@ public function testIsValidation()
         $this->assertFalse($hasValidation->filter('Bar::ISFoo'));
         $this->assertFalse($hasValidation->filter(get_class($this).'::ISFoo'));
     }
-
 }
diff --git a/test/Hydrator/Strategy/ClosureStrategyTest.php b/test/Hydrator/Strategy/ClosureStrategyTest.php
index 944f2057d..7cb1953bc 100644
--- a/test/Hydrator/Strategy/ClosureStrategyTest.php
+++ b/test/Hydrator/Strategy/ClosureStrategyTest.php
@@ -80,7 +80,7 @@ public function testExtract($extractFunc, $data, $expected)
 
         $actual = array();
         foreach ($data as $k => $value) {
-           $actual[$k] = $strategy->extract($value, $data);
+            $actual[$k] = $strategy->extract($value, $data);
         }
 
         $this->assertSame($actual, $expected);
@@ -100,7 +100,7 @@ public function testHydrate($hydrateFunc, $data, $expected)
 
         $actual = array();
         foreach ($data as $k => $value) {
-           $actual[$k] = $strategy->hydrate($value, $data);
+            $actual[$k] = $strategy->hydrate($value, $data);
         }
 
         $this->assertSame($actual, $expected);
diff --git a/test/HydratorClosureStrategyTest.php b/test/HydratorClosureStrategyTest.php
index 3595060b9..9e0188da2 100644
--- a/test/HydratorClosureStrategyTest.php
+++ b/test/HydratorClosureStrategyTest.php
@@ -17,7 +17,6 @@
  */
 class HydratorClosureStrategyTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * The hydrator that is used during testing.
      *
@@ -118,5 +117,4 @@ function ($value) {
 
         $this->assertInstanceOf('ZendTest\Stdlib\TestAsset\HydratorClosureStrategyEntity', $entity->field3);
     }
-
 }
diff --git a/test/HydratorStrategyTest.php b/test/HydratorStrategyTest.php
index adc8bd5be..9272c07a3 100644
--- a/test/HydratorStrategyTest.php
+++ b/test/HydratorStrategyTest.php
@@ -163,5 +163,4 @@ public function testContextAwarenessHydrate()
 
         $this->assertEquals($data, $strategy->data);
     }
-
 }
diff --git a/test/HydratorTest.php b/test/HydratorTest.php
index 8982d1aa3..b6a6cefbc 100644
--- a/test/HydratorTest.php
+++ b/test/HydratorTest.php
@@ -35,7 +35,6 @@
  */
 class HydratorTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @var ClassMethodsCamelCase
      */
diff --git a/test/ParametersTest.php b/test/ParametersTest.php
index f4ccb19fe..d83cc3e7e 100644
--- a/test/ParametersTest.php
+++ b/test/ParametersTest.php
@@ -13,7 +13,6 @@
 
 class ParametersTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testParametersConstructionAndClassStructure()
     {
         $parameters = new Parameters();
@@ -46,7 +45,6 @@ public function testParametersPersistNameAndValues()
         $parameters->set('foof', 'barf');
         $this->assertEquals('barf', $parameters->get('foof'));
         $this->assertEquals('barf', $parameters->foof);
-
     }
 
     public function testParametersOffsetgetReturnsNullIfNonexistentKeyIsProvided()
@@ -61,5 +59,4 @@ public function testParametersGetReturnsDefaultValueIfNonExistent()
 
         $this->assertEquals(5, $parameters->get('nonExistentProp', 5));
     }
-
 }
diff --git a/test/StringWrapper/IconvTest.php b/test/StringWrapper/IconvTest.php
index c7794ecb4..e763c6d23 100644
--- a/test/StringWrapper/IconvTest.php
+++ b/test/StringWrapper/IconvTest.php
@@ -14,7 +14,6 @@
 
 class IconvTest extends CommonStringWrapperTest
 {
-
     public function setUp()
     {
         if (!extension_loaded('iconv')) {
diff --git a/test/StringWrapper/IntlTest.php b/test/StringWrapper/IntlTest.php
index a23d4771e..db2eafe62 100644
--- a/test/StringWrapper/IntlTest.php
+++ b/test/StringWrapper/IntlTest.php
@@ -14,7 +14,6 @@
 
 class IntlTest extends CommonStringWrapperTest
 {
-
     public function setUp()
     {
         if (!extension_loaded('intl')) {
diff --git a/test/StringWrapper/MbStringTest.php b/test/StringWrapper/MbStringTest.php
index 279e57eee..0431a0c4b 100644
--- a/test/StringWrapper/MbStringTest.php
+++ b/test/StringWrapper/MbStringTest.php
@@ -14,7 +14,6 @@
 
 class MbStringTest extends CommonStringWrapperTest
 {
-
     public function setUp()
     {
         if (!extension_loaded('mbstring')) {
diff --git a/test/StringWrapper/NativeTest.php b/test/StringWrapper/NativeTest.php
index 45a62a4cf..cbe38fa89 100644
--- a/test/StringWrapper/NativeTest.php
+++ b/test/StringWrapper/NativeTest.php
@@ -13,7 +13,6 @@
 
 class NativeTest extends CommonStringWrapperTest
 {
-
     protected function getWrapper($encoding = null, $convertEncoding = null)
     {
         if ($encoding === null) {