fix psr2 cs

cakephp · Jan 22, 2015 · dee3130 · dee3130
1 parent da10b6b
commit dee3130
Show file tree

Hide file tree

Showing 26 changed files with 49 additions and 69 deletions.
diff --git a/src/Controller/Component/SecurityComponent.php b/src/Controller/Component/SecurityComponent.php
@@ -250,8 +250,7 @@ protected function _authRequired(Controller $controller)
                 if ($this->session->check('_Token')) {
                     $tData = $this->session->read('_Token');
 
-                    if (
-                        !empty($tData['allowedControllers']) &&
+                    if (!empty($tData['allowedControllers']) &&
                         !in_array($this->request->params['controller'], $tData['allowedControllers']) ||
                         !empty($tData['allowedActions']) &&
                         !in_array($this->request->params['action'], $tData['allowedActions'])

diff --git a/src/Database/Expression/ValuesExpression.php b/src/Database/Expression/ValuesExpression.php
@@ -76,8 +76,7 @@ public function __construct(array $columns, $typeMap)
      */
     public function add($data)
     {
-        if (
-            (count($this->_values) && $data instanceof Query) ||
+        if ((count($this->_values) && $data instanceof Query) ||
             ($this->_query && is_array($data))
         ) {
             throw new Exception(

diff --git a/src/Database/Schema/MysqlSchema.php b/src/Database/Schema/MysqlSchema.php
@@ -316,16 +316,14 @@ public function columnSql(Table $table, $name)
         }
 
         $hasPrecision = ['float', 'decimal'];
-        if (
-            in_array($data['type'], $hasPrecision, true) &&
+        if (in_array($data['type'], $hasPrecision, true) &&
             (isset($data['length']) || isset($data['precision']))
         ) {
             $out .= '(' . (int)$data['length'] . ',' . (int)$data['precision'] . ')';
         }
 
         $hasUnsigned = ['float', 'decimal', 'integer', 'biginteger'];
-        if (
-            in_array($data['type'], $hasUnsigned, true) &&
+        if (in_array($data['type'], $hasUnsigned, true) &&
             isset($data['unsigned']) && $data['unsigned'] === true
         ) {
             $out .= ' UNSIGNED';
@@ -334,8 +332,7 @@ public function columnSql(Table $table, $name)
         if (isset($data['null']) && $data['null'] === false) {
             $out .= ' NOT NULL';
         }
-        if (
-            in_array($data['type'], ['integer', 'biginteger']) &&
+        if (in_array($data['type'], ['integer', 'biginteger']) &&
             ([$name] == (array)$table->primaryKey() || $data['autoIncrement'] === true)
         ) {
             $out .= ' AUTO_INCREMENT';
@@ -347,8 +344,7 @@ public function columnSql(Table $table, $name)
         if (isset($data['default']) && $data['type'] !== 'timestamp') {
             $out .= ' DEFAULT ' . $this->_driver->schemaValue($data['default']);
         }
-        if (
-            isset($data['default']) &&
+        if (isset($data['default']) &&
             $data['type'] === 'timestamp' &&
             strtolower($data['default']) === 'current_timestamp'
         ) {

diff --git a/src/Database/Schema/PostgresSchema.php b/src/Database/Schema/PostgresSchema.php
@@ -115,8 +115,7 @@ protected function _convertColumn($column)
         if ($col === 'real' || strpos($col, 'double') !== false) {
             return ['type' => 'float', 'length' => null];
         }
-        if (
-            strpos($col, 'numeric') !== false ||
+        if (strpos($col, 'numeric') !== false ||
             strpos($col, 'money') !== false ||
             strpos($col, 'decimal') !== false
         ) {
@@ -232,8 +231,7 @@ public function convertIndexDescription(Table $table, $row)
             // If there is only one column in the primary key and it is integery,
             // make it autoincrement.
             $columnDef = $table->column($columns[0]);
-            if (
-                count($columns) === 1 &&
+            if (count($columns) === 1 &&
                 in_array($columnDef['type'], ['integer', 'biginteger']) &&
                 $type === Table::CONSTRAINT_PRIMARY
             ) {

diff --git a/src/Database/Schema/SqliteSchema.php b/src/Database/Schema/SqliteSchema.php
@@ -239,8 +239,7 @@ public function columnSql(Table $table, $name)
         $out = $this->_driver->quoteIdentifier($name);
         $hasUnsigned = ['biginteger', 'integer', 'float', 'decimal'];
 
-        if (
-            in_array($data['type'], $hasUnsigned, true) &&
+        if (in_array($data['type'], $hasUnsigned, true) &&
             isset($data['unsigned']) && $data['unsigned'] === true
         ) {
             $out .= ' UNSIGNED';
@@ -252,8 +251,7 @@ public function columnSql(Table $table, $name)
             $out .= '(' . (int)$data['length'] . ')';
         }
         $hasPrecision = ['float', 'decimal'];
-        if (
-            in_array($data['type'], $hasPrecision, true) &&
+        if (in_array($data['type'], $hasPrecision, true) &&
             (isset($data['length']) || isset($data['precision']))
         ) {
             $out .= '(' . (int)$data['length'] . ',' . (int)$data['precision'] . ')';
@@ -287,8 +285,7 @@ public function columnSql(Table $table, $name)
     public function constraintSql(Table $table, $name)
     {
         $data = $table->constraint($name);
-        if (
-            $data['type'] === Table::CONSTRAINT_PRIMARY &&
+        if ($data['type'] === Table::CONSTRAINT_PRIMARY &&
             count($data['columns']) === 1 &&
             $table->column($data['columns'][0])['type'] === 'integer'
         ) {

diff --git a/src/Database/Schema/SqlserverSchema.php b/src/Database/Schema/SqlserverSchema.php
@@ -97,8 +97,7 @@ protected function _convertColumn($col, $length = null, $precision = null, $scal
         if ($col === 'bit') {
             return ['type' => 'boolean', 'length' => null];
         }
-        if (
-            strpos($col, 'numeric') !== false ||
+        if (strpos($col, 'numeric') !== false ||
             strpos($col, 'money') !== false ||
             strpos($col, 'decimal') !== false
         ) {

diff --git a/src/Database/Type/DateTimeType.php b/src/Database/Type/DateTimeType.php
@@ -138,8 +138,7 @@ public function marshal($value)
         $value += ['hour' => 0, 'minute' => 0, 'second' => 0];
 
         $format = '';
-        if (
-            isset($value['year'], $value['month'], $value['day']) &&
+        if (isset($value['year'], $value['month'], $value['day']) &&
             (is_numeric($value['year']) && is_numeric($value['month']) && is_numeric($value['day']))
         ) {
             $format .= sprintf('%d-%02d-%02d', $value['year'], $value['month'], $value['day']);
@@ -172,8 +171,7 @@ public function useLocaleParser($enable = true)
             $this->_useLocaleParser = $enable;
             return $this;
         }
-        if (
-            static::$dateTimeClass === 'Cake\I18n\Time' ||
+        if (static::$dateTimeClass === 'Cake\I18n\Time' ||
             is_subclass_of(static::$dateTimeClass, 'Cake\I18n\Time')
         ) {
             $this->_useLocaleParser = $enable;

diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -703,8 +703,7 @@ protected function _nestedErrors($field)
                 $val = isset($entity[$part]) ? $entity[$part] : false;
             }
 
-            if (
-                is_array($val) ||
+            if (is_array($val) ||
                 $val instanceof Traversable ||
                 $val instanceof EntityInterface
             ) {

diff --git a/src/Network/Email/Email.php b/src/Network/Email/Email.php
@@ -1948,8 +1948,7 @@ protected function _checkViewVars(&$item, $key)
             $item = (string)$item;
         }
 
-        if (
-            is_resource($item) ||
+        if (is_resource($item) ||
             $item instanceof Closure ||
             $item instanceof PDO
         ) {

diff --git a/src/ORM/Behavior/TimestampBehavior.php b/src/ORM/Behavior/TimestampBehavior.php
@@ -99,8 +99,7 @@ public function handleEvent(Event $event, Entity $entity)
                     sprintf('When should be one of "always", "new" or "existing". The passed value "%s" is invalid', $when)
                 );
             }
-            if (
-                $when === 'always' ||
+            if ($when === 'always' ||
                 ($when === 'new' && $new) ||
                 ($when === 'existing' && !$new)
             ) {

diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -371,8 +371,7 @@ public function merge(EntityInterface $entity, array $data, array $options = [])
                 $converter = Type::build($columnType);
                 $value = $converter->marshal($value);
                 $isObject = is_object($value);
-                if (
-                    (!$isObject && $original === $value) ||
+                if ((!$isObject && $original === $value) ||
                     ($isObject && $original == $value)
                 ) {
                     continue;

diff --git a/src/Routing/Route/Route.php b/src/Routing/Route/Route.php
@@ -400,8 +400,7 @@ public function match(array $url, array $context = [])
 
         // Check for properties that will cause an
         // absolute url. Copy the other properties over.
-        if (
-            isset($hostOptions['_scheme']) ||
+        if (isset($hostOptions['_scheme']) ||
             isset($hostOptions['_port']) ||
             isset($hostOptions['_host'])
         ) {
@@ -571,8 +570,7 @@ protected function _writeUrl($params, $pass = [], $query = [])
         }
 
         $out = str_replace('//', '/', $out);
-        if (
-            isset($params['_scheme']) ||
+        if (isset($params['_scheme']) ||
             isset($params['_host']) ||
             isset($params['_port'])
         ) {

diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -582,8 +582,7 @@ public static function url($url = null, $full = false)
 
             if (!isset($url['_name'])) {
                 // Copy the current action if the controller is the current one.
-                if (
-                    empty($url['action']) &&
+                if (empty($url['action']) &&
                     (empty($url['controller']) || $params['controller'] === $url['controller'])
                 ) {
                     $url['action'] = $params['action'];

diff --git a/src/Utility/MergeVariablesTrait.php b/src/Utility/MergeVariablesTrait.php
@@ -71,8 +71,7 @@ protected function _mergeProperty($property, $parentClasses, $options)
     {
         $thisValue = $this->{$property};
         $isAssoc = false;
-        if (
-            isset($options['associative']) &&
+        if (isset($options['associative']) &&
             in_array($property, (array)$options['associative'])
         ) {
             $isAssoc = true;

diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -982,8 +982,7 @@ public static function uploadedFile($file, $options = [])
     protected static function _getDateString($value)
     {
         $formatted = '';
-        if (
-            isset($value['year'], $value['month'], $value['day']) &&
+        if (isset($value['year'], $value['month'], $value['day']) &&
             (is_numeric($value['year']) && is_numeric($value['month']) && is_numeric($value['day']))
         ) {
             $formatted .= sprintf('%d-%02d-%02d ', $value['year'], $value['month'], $value['day']);

diff --git a/src/View/Form/ArrayContext.php b/src/View/Form/ArrayContext.php
@@ -99,8 +99,7 @@ public function __construct(Request $request, array $context)
      */
     public function primaryKey()
     {
-        if (
-            empty($this->_context['schema']['_constraints']) ||
+        if (empty($this->_context['schema']['_constraints']) ||
             !is_array($this->_context['schema']['_constraints'])
         ) {
             return [];

diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -498,8 +498,7 @@ protected function _csrfField()
     public function end($secureAttributes = [])
     {
         $out = '';
-        if (
-            $this->requestType !== 'get' &&
+        if ($this->requestType !== 'get' &&
             !empty($this->request['_Token'])
         ) {
             $out .= $this->secure($this->fields, $secureAttributes);
@@ -1799,8 +1798,7 @@ public function select($fieldName, $options = [], array $attributes = [])
 
         // Secure the field if there are options, or it's a multi select.
         // Single selects with no options don't submit, but multiselects do.
-        if (
-            $attributes['secure'] &&
+        if ($attributes['secure'] &&
             empty($options) &&
             empty($attributes['empty']) &&
             empty($attributes['multiple'])
@@ -2146,8 +2144,7 @@ protected function _datetimeOptions($options)
             }
 
             // Pass empty boolean to each type.
-            if (
-                !empty($options['empty']) &&
+            if (!empty($options['empty']) &&
                 is_bool($options['empty']) &&
                 is_array($options[$type])
             ) {
@@ -2469,8 +2466,7 @@ public function addWidget($name, $spec)
     public function widget($name, array $data = [])
     {
         $widget = $this->_registry->get($name);
-        if (
-            isset($data['secure'], $data['name']) &&
+        if (isset($data['secure'], $data['name']) &&
             $data['secure'] !== self::SECURE_SKIP
         ) {
             foreach ($widget->secureFields($data) as $field) {

diff --git a/src/View/Helper/PaginatorHelper.php b/src/View/Helper/PaginatorHelper.php
@@ -436,8 +436,7 @@ public function generateUrl(array $options = [], $model = null, $full = false)
         if (!empty($url['page']) && $url['page'] == 1) {
             $url['page'] = null;
         }
-        if (
-            isset($paging['sortDefault'], $paging['directionDefault'], $url['sort'], $url['direction']) &&
+        if (isset($paging['sortDefault'], $paging['directionDefault'], $url['sort'], $url['direction']) &&
             $url['sort'] === $paging['sortDefault'] &&
             $url['direction'] === $paging['directionDefault']
         ) {

diff --git a/src/View/Helper/UrlHelper.php b/src/View/Helper/UrlHelper.php
@@ -66,8 +66,7 @@ public function assetUrl($path, array $options = [])
         if (!empty($options['pathPrefix']) && $path[0] !== '/') {
             $path = $options['pathPrefix'] . $path;
         }
-        if (
-            !empty($options['ext']) &&
+        if (!empty($options['ext']) &&
             strpos($path, '?') === false &&
             substr($path, -strlen($options['ext'])) !== $options['ext']
         ) {

diff --git a/src/View/Widget/RadioWidget.php b/src/View/Widget/RadioWidget.php
@@ -192,8 +192,7 @@ protected function _renderInput($val, $text, $data, $context)
             $escape
         );
 
-        if (
-            $label === false &&
+        if ($label === false &&
             strpos($this->_templates->get('radioWrapper'), '{{input}}') === false
         ) {
             $label = $input;

diff --git a/src/View/Widget/SelectBoxWidget.php b/src/View/Widget/SelectBoxWidget.php
@@ -227,8 +227,7 @@ protected function _renderOptions($options, $disabled, $selected, $escape)
         foreach ($options as $key => $val) {
             // Option groups
             $arrayVal = (is_array($val) || $val instanceof Traversable);
-            if (
-                (!is_int($key) && $arrayVal) ||
+            if ((!is_int($key) && $arrayVal) ||
                 (is_int($key) && $arrayVal && isset($val['options']))
             ) {
                 $out[] = $this->_renderOptgroup($key, $val, $disabled, $selected, $escape);

diff --git a/tests/TestCase/Collection/Iterator/TreeIteratorTest.php b/tests/TestCase/Collection/Iterator/TreeIteratorTest.php
@@ -61,7 +61,7 @@ public function testPrinter()
      */
     public function testPrinterCustomKeyAndSpacer()
     {
-            $items = [
+        $items = [
             [
                 'id' => 1,
                 'name' => 'a',

diff --git a/tests/TestCase/Database/Schema/SqliteSchemaTest.php b/tests/TestCase/Database/Schema/SqliteSchemaTest.php
@@ -202,8 +202,7 @@ protected function _createTables($connection)
 
         $schema = new SchemaCollection($connection);
         $result = $schema->listTables();
-        if (
-            in_array('schema_articles', $result) &&
+        if (in_array('schema_articles', $result) &&
             in_array('schema_authors', $result)
         ) {
             return;

diff --git a/tests/TestCase/Log/Engine/ConsoleLogTest.php b/tests/TestCase/Log/Engine/ConsoleLogTest.php
@@ -68,8 +68,7 @@ public function testlogToFileStream()
      */
     public function testDefaultOutputAs()
     {
-        if (
-            (DS === '\\' && !(bool)env('ANSICON')) ||
+        if ((DS === '\\' && !(bool)env('ANSICON')) ||
             (function_exists('posix_isatty') && !posix_isatty(null))
         ) {
             $expected = ConsoleOutput::PLAIN;