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

src/Csrf.php

@@ -204,7 +204,7 @@ public function getSalt()
     /**
      * Retrieve CSRF token
      *
-     * If no CSRF token currently exists, or should be regenrated, 
+     * If no CSRF token currently exists, or should be regenrated,
      * generates one.
      *
      * @param  bool $regenerate    default false

src/DateStep.php

@@ -213,7 +213,7 @@ protected function convertToDateTime($param)
         if (is_int($param)) {
             // Convert from timestamp
             $dateObj = date_create("@$param");
-        } else if (is_string($param)) {
+        } elseif (is_string($param)) {
             // Custom week format support
             if (strpos($this->getFormat(), 'Y-\WW') === 0
                 && preg_match('/^([0-9]{4})\-W([0-9]{2})/', $param, $matches)
@@ -339,9 +339,9 @@ public function isValid($value)
                         && 0 == $diffParts['minutes'] && 0 == $diffParts['seconds']
                     ) {
                         return true;
-                    } else if ('minutes' === $intervalUnit && 0 == $diffParts['seconds']) {
+                    } elseif ('minutes' === $intervalUnit && 0 == $diffParts['seconds']) {
                         return true;
-                    } else if ('seconds' === $intervalUnit) {
+                    } elseif ('seconds' === $intervalUnit) {
                         return true;
                     }
                 }

src/StaticValidator.php

@@ -23,7 +23,7 @@ class StaticValidator
 
     /**
      * Set plugin manager to use for locating validators
-     * 
+     *
      * @param  ValidatorPluginManager|null $plugins
      * @return void
      */
@@ -38,7 +38,7 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null)
 
     /**
      * Get plugin manager for locating validators
-     * 
+     *
      * @return ValidatorPluginManager
      */
     public static function getPluginManager()

test/DateTest.php

@@ -118,8 +118,8 @@ public function testUseManualFormat()
         $this->assertFalse($this->validator->setFormat('d/m/Y')->isValid('2008/10/22'));
         $this->assertTrue($this->validator->setFormat('d/m/Y')->isValid('22/10/08'));
         $this->assertFalse($this->validator->setFormat('d/m/Y')->isValid('22/10'));
-        // Omitting the following assertion, as it varies from 5.3.3 to 5.3.11, 
-        // and there is no indication in the PHP changelog as to when or why it 
+        // Omitting the following assertion, as it varies from 5.3.3 to 5.3.11,
+        // and there is no indication in the PHP changelog as to when or why it
         // may have changed. Leaving for posterity, to indicate original expectation.
         // $this->assertFalse($this->validator->setFormat('s')->isValid(0));
     }

test/StaticValidatorTest.php

@@ -97,7 +97,7 @@ public function testMaximumErrorMessageLength()
 
         $loader = new TestAsset\ArrayTranslator();
         $loader->translations = array(
-            Alpha::INVALID => 'This is the translated message for %value%', 
+            Alpha::INVALID => 'This is the translated message for %value%',
         );
         $translator = new Translator\Translator();
         $translator->getPluginManager()->setService('default', $loader);