Merge branch 'master' into fixAnnotationsOnZendDb

Conflicts: library/Zend/Db/Adapter/AdapterInterface.php
dennisdegreef · Dec 2, 2014 · 433a40e · 433a40e
2 parents 543dd65 + 5b557b2
commit 433a40e
Show file tree

Hide file tree

Showing 971 changed files with 3,194 additions and 2,145 deletions.
diff --git a/.php_cs b/.php_cs
@@ -26,6 +26,7 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
         }
     });
 $config = Symfony\CS\Config\Config::create();
+$config->level(null);
 $config->fixers(
     array(
         'indentation',

diff --git a/.travis.yml b/.travis.yml
@@ -16,10 +16,10 @@ before_script:
   - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
 
 script:
-  # Run coding standard checks in parallel
-  - ls -d library/Zend/* tests/ZendTest/* bin | parallel --gnu --keep-order 'echo "Running {} CS checks"; ./vendor/bin/php-cs-fixer fix {} -v --dry-run --config-file=.php_cs;' || exit 1
   # Run tests for the various components in parallel
   - ls -d tests/ZendTest/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/phpunit.xml.dist --coverage-php build/coverage/coverage-{/.}.cov {};' || exit 1
+  # Run coding standard checks in parallel
+  - ls -d library/Zend/* tests/ZendTest/* bin | parallel --gnu --keep-order 'echo "Running {} CS checks"; ./vendor/bin/php-cs-fixer fix {} -v --dry-run --config-file=.php_cs;' || exit 1
 
 after_script:
   # Merges the individual clover reports of each component into a single clover.xml

diff --git a/bin/pluginmap_generator.php b/bin/pluginmap_generator.php
@@ -139,7 +139,6 @@
 }
 
 if ($appending) {
-
     $content = var_export((array) $map, true) . ';';
 
     // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op

diff --git a/bin/templatemap_generator.php b/bin/templatemap_generator.php
@@ -182,7 +182,6 @@
     $map->{$mapName} = $filename;
 }
 
-
 if ($appending) {
     $content = var_export((array) $map, true) . ';';
 
@@ -230,7 +229,9 @@
     $maxWidth = max($maxWidth, strlen($match[1]));
 }
 
-$content = preg_replace('(\n\s+([^=]+)=>)e', "'\n    \\1' . str_repeat(' ', " . $maxWidth . " - strlen('\\1')) . '=>'", $content);
+$content = preg_replace_callback('(\n\s+([^=]+)=>)', function ($matches) use ($maxWidth) {
+    return PHP_EOL . '    ' . $matches[1] . str_repeat(' ', $maxWidth - strlen($matches[1])) . '=>';
+}, $content);
 
 // Make the file end by EOL
 $content = rtrim($content, "\n") . "\n";

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "ircmaxell/random-lib": "dev-master",
         "ircmaxell/security-lib": "dev-master",
         "mikey179/vfsStream": "1.2.*",
-        "fabpot/php-cs-fixer": "dev-master#fcbb09b5204",
+        "fabpot/php-cs-fixer": "1.*",
         "phpunit/PHPUnit": "3.7.*",
         "satooshi/php-coveralls": "dev-master",
         "sebastianbergmann/phpcov": "1.1.0"

diff --git a/library/Zend/Authentication/Adapter/AbstractAdapter.php b/library/Zend/Authentication/Adapter/AbstractAdapter.php
@@ -11,7 +11,6 @@
 
 abstract class AbstractAdapter implements ValidatableAdapterInterface
 {
-
     /**
      * @var mixed
      */

diff --git a/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php b/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
@@ -195,25 +195,21 @@ public function getResultRowObject($returnColumns = null, $omitColumns = null)
         $returnObject = new stdClass();
 
         if (null !== $returnColumns) {
-
             $availableColumns = array_keys($this->resultRow);
             foreach ((array) $returnColumns as $returnColumn) {
                 if (in_array($returnColumn, $availableColumns)) {
                     $returnObject->{$returnColumn} = $this->resultRow[$returnColumn];
                 }
             }
             return $returnObject;
-
         } elseif (null !== $omitColumns) {
-
             $omitColumns = (array) $omitColumns;
             foreach ($this->resultRow as $resultColumn => $resultValue) {
                 if (!in_array($resultColumn, $omitColumns)) {
                     $returnObject->{$resultColumn} = $resultValue;
                 }
             }
             return $returnObject;
-
         }
 
         foreach ($this->resultRow as $resultColumn => $resultValue) {
@@ -352,7 +348,6 @@ protected function authenticateQuerySelect(Sql\Select $dbSelect)
      */
     protected function authenticateValidateResultSet(array $resultIdentities)
     {
-
         if (count($resultIdentities) < 1) {
             $this->authenticateResultInfo['code']       = AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND;
             $this->authenticateResultInfo['messages'][] = 'A record with the supplied identity could not be found.';

diff --git a/library/Zend/Authentication/Adapter/Digest.php b/library/Zend/Authentication/Adapter/Digest.php
@@ -180,17 +180,14 @@ public function authenticate()
             }
             if (substr($line, 0, $idLength) === $id) {
                 if (CryptUtils::compareStrings(substr($line, -32), md5("$this->identity:$this->realm:$this->credential"))) {
-                    $result['code'] = AuthenticationResult::SUCCESS;
-                } else {
-                    $result['code'] = AuthenticationResult::FAILURE_CREDENTIAL_INVALID;
-                    $result['messages'][] = 'Password incorrect';
+                    return new AuthenticationResult(AuthenticationResult::SUCCESS, $result['identity'], $result['messages']);
                 }
-                return new AuthenticationResult($result['code'], $result['identity'], $result['messages']);
+                $result['messages'][] = 'Password incorrect';
+                return new AuthenticationResult(AuthenticationResult::FAILURE_CREDENTIAL_INVALID, $result['identity'], $result['messages']);
             }
         }
 
-        $result['code'] = AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND;
         $result['messages'][] = "Username '$this->identity' and realm '$this->realm' combination not found";
-        return new AuthenticationResult($result['code'], $result['identity'], $result['messages']);
+        return new AuthenticationResult(AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND, $result['identity'], $result['messages']);
     }
 }
diff --git a/library/Zend/Authentication/Adapter/Http.php b/library/Zend/Authentication/Adapter/Http.php
@@ -762,7 +762,6 @@ protected function _parseDigestAuth($header)
         if ($this->useOpaque) {
             $ret = preg_match('/opaque="([^"]+)"/', $header, $temp);
             if (!$ret || empty($temp[1])) {
-
                 // Big surprise: IE isn't RFC 2617-compliant.
                 $headers = $this->request->getHeaders();
                 if (!$headers->has('User-Agent')) {

diff --git a/library/Zend/Authentication/Adapter/Ldap.php b/library/Zend/Authentication/Adapter/Ldap.php
@@ -16,7 +16,6 @@
 
 class Ldap extends AbstractAdapter
 {
-
     /**
      * The Zend\Ldap\Ldap context.
      *
@@ -214,7 +213,6 @@ public function authenticate()
          * credentials against it.
          */
         foreach ($this->options as $options) {
-
             if (!is_array($options)) {
                 throw new Exception\InvalidArgumentException('Adapter options array not an array');
             }
@@ -277,7 +275,6 @@ public function authenticate()
                     $failedAuthorities[$dname] = $groupResult;
                 }
             } catch (LdapException $zle) {
-
                 /* LDAP based authentication is notoriously difficult to diagnose. Therefore
                  * we bend over backwards to capture and record every possible bit of
                  * information when something goes wrong.

diff --git a/library/Zend/Barcode/Barcode.php b/library/Zend/Barcode/Barcode.php
@@ -74,7 +74,7 @@ public static function getRendererPluginManager()
      * Factory for Zend\Barcode classes.
      *
      * First argument may be a string containing the base of the adapter class
-     * name, e.g. 'int25' corresponds to class Object\Int25.  This
+     * name, e.g. 'code25' corresponds to class Object\Code25.  This
      * is case-insensitive.
      *
      * First argument may alternatively be an object of type Traversable.

diff --git a/library/Zend/Barcode/Object/Ean13.php b/library/Zend/Barcode/Object/Ean13.php
@@ -14,7 +14,6 @@
  */
 class Ean13 extends AbstractObject
 {
-
     /**
      * Coding map
      * - 0 = narrow bar

diff --git a/library/Zend/Barcode/Object/Ean2.php b/library/Zend/Barcode/Object/Ean2.php
@@ -14,7 +14,6 @@
  */
 class Ean2 extends Ean5
 {
-
     protected $parities = array(
         0 => array('A','A'),
         1 => array('A','B'),

diff --git a/library/Zend/Barcode/Object/Ean5.php b/library/Zend/Barcode/Object/Ean5.php
@@ -14,7 +14,6 @@
  */
 class Ean5 extends Ean13
 {
-
     protected $parities = array(
         0 => array('B','B','A','A','A'),
         1 => array('B','A','B','A','A'),

diff --git a/library/Zend/Barcode/Object/Ean8.php b/library/Zend/Barcode/Object/Ean8.php
@@ -16,7 +16,6 @@
  */
 class Ean8 extends Ean13
 {
-
     /**
      * Default options for Postnet barcode
      * @return void

diff --git a/library/Zend/Barcode/Object/Identcode.php b/library/Zend/Barcode/Object/Identcode.php
@@ -14,7 +14,6 @@
  */
 class Identcode extends Code25interleaved
 {
-
     /**
      * Default options for Identcode barcode
      * @return void

diff --git a/library/Zend/Barcode/Object/Itf14.php b/library/Zend/Barcode/Object/Itf14.php
@@ -14,7 +14,6 @@
  */
 class Itf14 extends Code25interleaved
 {
-
     /**
      * Default options for Identcode barcode
      * @return void

diff --git a/library/Zend/Barcode/Object/Leitcode.php b/library/Zend/Barcode/Object/Leitcode.php
@@ -14,7 +14,6 @@
  */
 class Leitcode extends Identcode
 {
-
     /**
      * Default options for Leitcode barcode
      * @return void

diff --git a/library/Zend/Barcode/Object/Planet.php b/library/Zend/Barcode/Object/Planet.php
@@ -14,7 +14,6 @@
  */
 class Planet extends Postnet
 {
-
     /**
      * Coding map
      * - 0 = half bar

diff --git a/library/Zend/Barcode/Object/Postnet.php b/library/Zend/Barcode/Object/Postnet.php
@@ -14,7 +14,6 @@
  */
 class Postnet extends AbstractObject
 {
-
     /**
      * Coding map
      * - 0 = half bar

diff --git a/library/Zend/Barcode/Object/Royalmail.php b/library/Zend/Barcode/Object/Royalmail.php
@@ -14,7 +14,6 @@
  */
 class Royalmail extends AbstractObject
 {
-
     /**
      * Coding map
      * - 0 = Tracker, Ascender and Descender

diff --git a/library/Zend/Barcode/Object/Upca.php b/library/Zend/Barcode/Object/Upca.php
@@ -14,7 +14,6 @@
  */
 class Upca extends Ean13
 {
-
     /**
      * Default options for Postnet barcode
      * @return void

diff --git a/library/Zend/Barcode/Object/Upce.php b/library/Zend/Barcode/Object/Upce.php
@@ -16,7 +16,6 @@
  */
 class Upce extends Ean13
 {
-
     protected $parities = array(
         0 => array(
             0 => array('B','B','B','A','A','A'),
@@ -60,8 +59,8 @@ protected function getDefaultOptions()
     public function getText()
     {
         $text = parent::getText();
-        if ($text{0} != 1) {
-            $text{0} = 0;
+        if ($text[0] != 1) {
+            $text[0] = 0;
         }
         return $text;
     }
@@ -192,8 +191,8 @@ protected function validateSpecificText($value, $options = array())
     public function getChecksum($text)
     {
         $text = $this->addLeadingZeros($text, true);
-        if ($text{0} != 1) {
-            $text{0} = 0;
+        if ($text[0] != 1) {
+            $text[0] = 0;
         }
         return parent::getChecksum($text);
     }

diff --git a/library/Zend/Barcode/Renderer/Image.php b/library/Zend/Barcode/Renderer/Image.php
@@ -404,7 +404,6 @@ protected function drawText($text, $size, $position, $font, $color, $alignment =
             }
             imagestring($this->resource, $font, $positionX, $positionY, $text, $color);
         } else {
-
             if (!function_exists('imagettfbbox')) {
                 throw new Exception\RuntimeException(
                     'A font was provided, but this instance of PHP does not have TTF (FreeType) support'

diff --git a/library/Zend/Barcode/Renderer/Svg.php b/library/Zend/Barcode/Renderer/Svg.php
@@ -18,7 +18,6 @@
  */
 class Svg extends AbstractRenderer
 {
-
     /**
      * Resource for the image
      * @var DOMDocument

diff --git a/library/Zend/Cache/Pattern/CaptureCache.php b/library/Zend/Cache/Pattern/CaptureCache.php
@@ -318,7 +318,6 @@ protected function createDirectoryStructure($pathname)
                 $err = ErrorHandler::stop();
                 throw new Exception\RuntimeException("chmod('{$pathname}', 0{$oct}) failed", 0, $err);
             }
-
         } else {
             // build-in mkdir function sets permission together with current umask
             // which doesn't work well on multo threaded webservers

diff --git a/library/Zend/Cache/Storage/Adapter/AdapterOptions.php b/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
@@ -22,7 +22,6 @@
  */
 class AdapterOptions extends AbstractOptions
 {
-
     /**
      * The adapter using these options
      *
@@ -259,7 +258,7 @@ protected function normalizeTtl(&$ttl)
         }
 
         if ($ttl < 0) {
-             throw new Exception\InvalidArgumentException("TTL can't be negative");
+            throw new Exception\InvalidArgumentException("TTL can't be negative");
         }
     }
 }
diff --git a/library/Zend/Cache/Storage/Adapter/ApcIterator.php b/library/Zend/Cache/Storage/Adapter/ApcIterator.php
@@ -14,7 +14,6 @@
 
 class ApcIterator implements IteratorInterface
 {
-
     /**
      * The apc storage instance
      *

diff --git a/library/Zend/Cache/Storage/Adapter/Dba.php b/library/Zend/Cache/Storage/Adapter/Dba.php
@@ -189,7 +189,6 @@ public function flush()
         }
 
         if (file_exists($pathname)) {
-
             // close the dba file before delete
             // and reopen (create) on next use
             $this->_close();