Fix CS for easier 3.x/4.x comparison/merge.

cakephp · Nov 19, 2019 · 44a7812 · 44a7812
1 parent 68328c1
commit 44a7812
Show file tree

Hide file tree

Showing 422 changed files with 6,405 additions and 6,405 deletions.
diff --git a/config/config.php b/config/config.php
@@ -16,5 +16,5 @@
  */
 $versionFile = file(CORE_PATH . 'VERSION.txt');
 return [
-    'Cake.version' => trim(array_pop($versionFile))
+    'Cake.version' => trim(array_pop($versionFile)),
 ];
diff --git a/src/Auth/BaseAuthenticate.php b/src/Auth/BaseAuthenticate.php
@@ -48,13 +48,13 @@ abstract class BaseAuthenticate implements EventListenerInterface
     protected $_defaultConfig = [
         'fields' => [
             'username' => 'username',
-            'password' => 'password'
+            'password' => 'password',
         ],
         'userModel' => 'Users',
         'scope' => [],
         'finder' => 'all',
         'contain' => null,
-        'passwordHasher' => 'Default'
+        'passwordHasher' => 'Default',
     ];
 
     /**
@@ -160,7 +160,7 @@ protected function _query($username)
         $table = $this->getTableLocator()->get($config['userModel']);
 
         $options = [
-            'conditions' => [$table->aliasField($config['fields']['username']) => $username]
+            'conditions' => [$table->aliasField($config['fields']['username']) => $username],
         ];
 
         if (!empty($config['scope'])) {

diff --git a/src/Auth/BasicAuthenticate.php b/src/Auth/BasicAuthenticate.php
@@ -108,7 +108,7 @@ public function loginHeaders(ServerRequest $request)
         $realm = $this->getConfig('realm') ?: $request->getEnv('SERVER_NAME');
 
         return [
-            'WWW-Authenticate' => sprintf('Basic realm="%s"', $realm)
+            'WWW-Authenticate' => sprintf('Basic realm="%s"', $realm),
         ];
     }
 }
diff --git a/src/Auth/DefaultPasswordHasher.php b/src/Auth/DefaultPasswordHasher.php
@@ -33,7 +33,7 @@ class DefaultPasswordHasher extends AbstractPasswordHasher
      */
     protected $_defaultConfig = [
         'hashType' => PASSWORD_DEFAULT,
-        'hashOptions' => []
+        'hashOptions' => [],
     ];
 
     /**

diff --git a/src/Auth/DigestAuthenticate.php b/src/Auth/DigestAuthenticate.php
@@ -222,7 +222,7 @@ public function loginHeaders(ServerRequest $request)
             'realm' => $realm,
             'qop' => $this->_config['qop'],
             'nonce' => $this->generateNonce(),
-            'opaque' => $this->_config['opaque'] ?: md5($realm)
+            'opaque' => $this->_config['opaque'] ?: md5($realm),
         ];
 
         $digest = $this->_getDigest($request);
@@ -241,7 +241,7 @@ public function loginHeaders(ServerRequest $request)
         }
 
         return [
-            'WWW-Authenticate' => 'Digest ' . implode(',', $opts)
+            'WWW-Authenticate' => 'Digest ' . implode(',', $opts),
         ];
     }
 

diff --git a/src/Auth/FallbackPasswordHasher.php b/src/Auth/FallbackPasswordHasher.php
@@ -27,7 +27,7 @@ class FallbackPasswordHasher extends AbstractPasswordHasher
      * @var array
      */
     protected $_defaultConfig = [
-        'hashers' => []
+        'hashers' => [],
     ];
 
     /**

diff --git a/src/Auth/Storage/SessionStorage.php b/src/Auth/Storage/SessionStorage.php
@@ -54,7 +54,7 @@ class SessionStorage implements StorageInterface
      */
     protected $_defaultConfig = [
         'key' => 'Auth.User',
-        'redirect' => 'Auth.redirect'
+        'redirect' => 'Auth.redirect',
     ];
 
     /**

diff --git a/src/Auth/WeakPasswordHasher.php b/src/Auth/WeakPasswordHasher.php
@@ -31,7 +31,7 @@ class WeakPasswordHasher extends AbstractPasswordHasher
      * @var array
      */
     protected $_defaultConfig = [
-        'hashType' => null
+        'hashType' => null,
     ];
 
     /**

diff --git a/src/Cache/Engine/FileEngine.php b/src/Cache/Engine/FileEngine.php
@@ -67,7 +67,7 @@ class FileEngine extends CacheEngine
         'path' => null,
         'prefix' => 'cake_',
         'probability' => 100,
-        'serialize' => true
+        'serialize' => true,
     ];
 
     /**

diff --git a/src/Cache/Engine/MemcachedEngine.php b/src/Cache/Engine/MemcachedEngine.php
@@ -110,7 +110,7 @@ public function init(array $config = [])
         $this->_serializers = [
             'igbinary' => Memcached::SERIALIZER_IGBINARY,
             'json' => Memcached::SERIALIZER_JSON,
-            'php' => Memcached::SERIALIZER_PHP
+            'php' => Memcached::SERIALIZER_PHP,
         ];
         if (defined('Memcached::HAVE_MSGPACK') && Memcached::HAVE_MSGPACK) {
             $this->_serializers['msgpack'] = Memcached::SERIALIZER_MSGPACK;

diff --git a/src/Cache/Engine/XcacheEngine.php b/src/Cache/Engine/XcacheEngine.php
@@ -45,7 +45,7 @@ class XcacheEngine extends CacheEngine
         'prefix' => null,
         'probability' => 100,
         'PHP_AUTH_USER' => 'user',
-        'PHP_AUTH_PW' => 'password'
+        'PHP_AUTH_PW' => 'password',
     ];
 
     /**

diff --git a/src/Collection/CollectionTrait.php b/src/Collection/CollectionTrait.php
@@ -569,7 +569,7 @@ public function combine($keyPath, $valuePath, $groupPath = null)
         $options = [
             'keyPath' => $this->_propertyExtractor($keyPath),
             'valuePath' => $this->_propertyExtractor($valuePath),
-            'groupPath' => $groupPath ? $this->_propertyExtractor($groupPath) : null
+            'groupPath' => $groupPath ? $this->_propertyExtractor($groupPath) : null,
         ];
 
         $mapper = function ($value, $key, $mapReduce) use ($options) {
@@ -740,7 +740,7 @@ public function listNested($dir = 'desc', $nestingKey = 'children')
         $modes = [
             'desc' => TreeIterator::SELF_FIRST,
             'asc' => TreeIterator::CHILD_FIRST,
-            'leaves' => TreeIterator::LEAVES_ONLY
+            'leaves' => TreeIterator::LEAVES_ONLY,
         ];
 
         return new TreeIterator(

diff --git a/src/Collection/Iterator/BufferedIterator.php b/src/Collection/Iterator/BufferedIterator.php
@@ -139,7 +139,7 @@ public function valid()
             $this->_key = parent::key();
             $this->_buffer->push([
                 'key' => $this->_key,
-                'value' => $this->_current
+                'value' => $this->_current,
             ]);
         }
 

diff --git a/src/Command/HelpCommand.php b/src/Command/HelpCommand.php
@@ -201,7 +201,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
             'Get the list of available commands for this application.'
         )->addOption('xml', [
             'help' => 'Get the listing as XML.',
-            'boolean' => true
+            'boolean' => true,
         ]);
 
         return $parser;

diff --git a/src/Console/CommandScanner.php b/src/Console/CommandScanner.php
@@ -139,7 +139,7 @@ protected function scanDir($path, $namespace, $prefix, array $hide)
                 'file' => $path . $file,
                 'fullName' => $prefix . $name,
                 'name' => $name,
-                'class' => $class
+                'class' => $class,
             ];
         }
 

diff --git a/src/Console/ConsoleIo.php b/src/Console/ConsoleIo.php
@@ -491,7 +491,7 @@ public function setLoggers($enable)
         if ($enable !== static::QUIET) {
             $stdout = new ConsoleLog([
                 'types' => $outLevels,
-                'stream' => $this->_out
+                'stream' => $this->_out,
             ]);
             Log::setConfig('stdout', ['engine' => $stdout]);
         }

diff --git a/src/Console/ConsoleOptionParser.php b/src/Console/ConsoleOptionParser.php
@@ -162,18 +162,18 @@ public function __construct($command = null, $defaultOptions = true)
         $this->addOption('help', [
             'short' => 'h',
             'help' => 'Display this help.',
-            'boolean' => true
+            'boolean' => true,
         ]);
 
         if ($defaultOptions) {
             $this->addOption('verbose', [
                 'short' => 'v',
                 'help' => 'Enable verbose output.',
-                'boolean' => true
+                'boolean' => true,
             ])->addOption('quiet', [
                 'short' => 'q',
                 'help' => 'Enable quiet output.',
-                'boolean' => true
+                'boolean' => true,
             ]);
         }
     }
@@ -248,7 +248,7 @@ public function toArray()
             'options' => $this->_options,
             'subcommands' => $this->_subcommands,
             'description' => $this->_description,
-            'epilog' => $this->_epilog
+            'epilog' => $this->_epilog,
         ];
 
         return $result;
@@ -484,7 +484,7 @@ public function addOption($name, array $options = [])
                 'help' => '',
                 'default' => null,
                 'boolean' => false,
-                'choices' => []
+                'choices' => [],
             ];
             $options += $defaults;
             $option = new ConsoleInputOption($options);
@@ -541,7 +541,7 @@ public function addArgument($name, array $params = [])
                 'help' => '',
                 'index' => count($this->_args),
                 'required' => false,
-                'choices' => []
+                'choices' => [],
             ];
             $options = $params + $defaults;
             $index = $options['index'];
@@ -629,7 +629,7 @@ public function addSubcommand($name, array $options = [])
             $defaults = [
                 'name' => $name,
                 'help' => '',
-                'parser' => null
+                'parser' => null,
             ];
             $options += $defaults;
 
@@ -876,7 +876,7 @@ protected function getCommandError($command)
                 $this->rootName,
                 $rootCommand
             ),
-            ''
+            '',
         ];
 
         if ($bestGuess !== null) {
@@ -905,7 +905,7 @@ protected function getOptionError($option)
         $bestGuess = $this->findClosestItem($option, $availableOptions);
         $out = [
             sprintf('Unknown option `%s`.', $option),
-            ''
+            '',
         ];
 
         if ($bestGuess !== null) {

diff --git a/src/Console/ConsoleOutput.php b/src/Console/ConsoleOutput.php
@@ -101,7 +101,7 @@ class ConsoleOutput
         'blue' => 34,
         'magenta' => 35,
         'cyan' => 36,
-        'white' => 37
+        'white' => 37,
     ];
 
     /**
@@ -117,7 +117,7 @@ class ConsoleOutput
         'blue' => 44,
         'magenta' => 45,
         'cyan' => 46,
-        'white' => 47
+        'white' => 47,
     ];
 
     /**
@@ -149,7 +149,7 @@ class ConsoleOutput
         'success' => ['text' => 'green'],
         'comment' => ['text' => 'blue'],
         'question' => ['text' => 'magenta'],
-        'notice' => ['text' => 'cyan']
+        'notice' => ['text' => 'cyan'],
     ];
 
     /**

diff --git a/src/Console/HelpFormatter.php b/src/Console/HelpFormatter.php
@@ -110,7 +110,7 @@ public function text($width = 72)
                 $out[] = Text::wrapBlock($command->help($max), [
                     'width' => $width,
                     'indent' => str_repeat(' ', $max),
-                    'indentAt' => 1
+                    'indentAt' => 1,
                 ]);
             }
             $out[] = '';
@@ -127,7 +127,7 @@ public function text($width = 72)
                 $out[] = Text::wrapBlock($option->help($max), [
                     'width' => $width,
                     'indent' => str_repeat(' ', $max),
-                    'indentAt' => 1
+                    'indentAt' => 1,
                 ]);
             }
             $out[] = '';
@@ -142,7 +142,7 @@ public function text($width = 72)
                 $out[] = Text::wrapBlock($argument->help($max), [
                     'width' => $width,
                     'indent' => str_repeat(' ', $max),
-                    'indentAt' => 1
+                    'indentAt' => 1,
                 ]);
             }
             $out[] = '';

diff --git a/src/Console/HelperRegistry.php b/src/Console/HelperRegistry.php
@@ -80,7 +80,7 @@ protected function _throwMissingClassError($class, $plugin)
     {
         throw new MissingHelperException([
             'class' => $class,
-            'plugin' => $plugin
+            'plugin' => $plugin,
         ]);
     }
 

diff --git a/src/Console/TaskRegistry.php b/src/Console/TaskRegistry.php
@@ -71,7 +71,7 @@ protected function _throwMissingClassError($class, $plugin)
     {
         throw new MissingTaskException([
             'class' => $class,
-            'plugin' => $plugin
+            'plugin' => $plugin,
         ]);
     }
 

diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php
@@ -164,7 +164,7 @@ class AuthComponent extends Component
         'authError' => null,
         'unauthorizedRedirect' => true,
         'storage' => 'Session',
-        'checkAuthIn' => 'Controller.startup'
+        'checkAuthIn' => 'Controller.startup',
     ];
 
     /**
@@ -488,15 +488,15 @@ protected function _setDefaults()
             'flash' => [
                 'element' => 'error',
                 'key' => 'flash',
-                'params' => ['class' => 'error']
+                'params' => ['class' => 'error'],
             ],
             'loginAction' => [
                 'controller' => 'Users',
                 'action' => 'login',
-                'plugin' => null
+                'plugin' => null,
             ],
             'logoutRedirect' => $this->_config['loginAction'],
-            'authError' => __d('cake', 'You are not authorized to access that location.')
+            'authError' => __d('cake', 'You are not authorized to access that location.'),
         ];
 
         $config = $this->getConfig();

diff --git a/src/Controller/Component/FlashComponent.php b/src/Controller/Component/FlashComponent.php
@@ -48,7 +48,7 @@ class FlashComponent extends Component
         'element' => 'default',
         'params' => [],
         'clear' => false,
-        'duplicate' => true
+        'duplicate' => true,
     ];
 
     /**
@@ -124,7 +124,7 @@ public function set($message, array $options = [])
             'message' => $message,
             'key' => $options['key'],
             'element' => $options['element'],
-            'params' => $options['params']
+            'params' => $options['params'],
         ];
 
         $this->getSession()->write('Flash.' . $options['key'], $messages);

diff --git a/src/Controller/Component/PaginatorComponent.php b/src/Controller/Component/PaginatorComponent.php
@@ -53,7 +53,7 @@ class PaginatorComponent extends Component
         'page' => 1,
         'limit' => 20,
         'maxLimit' => 100,
-        'whitelist' => ['limit', 'sort', 'page', 'direction']
+        'whitelist' => ['limit', 'sort', 'page', 'direction'],
     ];
 
     /**