From 4b7d31377bf8e4e5415da8dd9b5f172967a407a9 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 29 Nov 2016 12:33:28 +1300 Subject: [PATCH] PSR2: Automatic fixes --- src/Assets/GDBackend.php | 9 +++++---- src/Control/Email/Email.php | 6 +++--- src/Core/Config/Config.php | 4 ++-- src/Core/Core.php | 8 ++++---- src/Core/CustomMethods.php | 6 +++--- src/Core/Object.php | 31 +++++++++++++++++-------------- src/Dev/CliTestReporter.php | 25 +++++++++++++++---------- src/Dev/SapphireTestReporter.php | 20 ++++++++++++-------- src/ORM/Connect/Database.php | 1 - src/ORM/DataList.php | 10 ++++++---- src/ORM/Versioning/Versioned.php | 8 ++++---- src/View/ThemeResourceLoader.php | 4 ++-- 12 files changed, 73 insertions(+), 59 deletions(-) diff --git a/src/Assets/GDBackend.php b/src/Assets/GDBackend.php index 4a7d73e14..14455402f 100644 --- a/src/Assets/GDBackend.php +++ b/src/Assets/GDBackend.php @@ -402,14 +402,15 @@ class GDBackend extends Object implements Image_Backend, Flushable switch ($angle) { case 90: imagesetpixel($rotate, $y, $destHeight - $x - 1, $color); - break; + break; case 180: imagesetpixel($rotate, $destWidth - $x - 1, $destHeight - $y - 1, $color); - break; + break; case 270: imagesetpixel($rotate, $destWidth - $y - 1, $x, $color); - break; - default: $rotate = $this->gd; + break; + default: + $rotate = $this->gd; }; } } diff --git a/src/Control/Email/Email.php b/src/Control/Email/Email.php index 3f2ee0f3e..a1cb71465 100644 --- a/src/Control/Email/Email.php +++ b/src/Control/Email/Email.php @@ -744,16 +744,16 @@ class Email extends ViewableData public static function obfuscate($email, $method = 'visible') { switch ($method) { - case 'direction' : + case 'direction': Requirements::customCSS( 'span.codedirection { unicode-bidi: bidi-override; direction: rtl; }', 'codedirectionCSS' ); return '' . strrev($email) . ''; - case 'visible' : + case 'visible': $obfuscated = array('@' => ' [at] ', '.' => ' [dot] ', '-' => ' [dash] '); return strtr($email, $obfuscated); - case 'hex' : + case 'hex': $encoded = ''; for ($x=0; $x < strlen($email); $x++) { diff --git a/src/Core/Config/Config.php b/src/Core/Config/Config.php index 1a2551c67..9cc3d5b3f 100644 --- a/src/Core/Config/Config.php +++ b/src/Core/Config/Config.php @@ -489,7 +489,7 @@ class Config return false; } - static protected function check_key_or_value_contained_in_suppress_array($k, $v, $suppresses) + protected static function check_key_or_value_contained_in_suppress_array($k, $v, $suppresses) { foreach ($suppresses as $suppress) { list($sk, $sv) = $suppress; @@ -500,7 +500,7 @@ class Config return false; } - static protected function filter_array_by_suppress_array($array, $suppress) + protected static function filter_array_by_suppress_array($array, $suppress) { $res = array(); diff --git a/src/Core/Core.php b/src/Core/Core.php index c9ebe1ef6..853e64c69 100644 --- a/src/Core/Core.php +++ b/src/Core/Core.php @@ -237,13 +237,13 @@ function translate_memstring($memString) { switch (strtolower(substr($memString, -1))) { case "k": -return round(substr($memString, 0, -1)*1024); + return round(substr($memString, 0, -1)*1024); case "m": -return round(substr($memString, 0, -1)*1024*1024); + return round(substr($memString, 0, -1)*1024*1024); case "g": -return round(substr($memString, 0, -1)*1024*1024*1024); + return round(substr($memString, 0, -1)*1024*1024*1024); default: -return round($memString); + return round($memString); } } diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php index 325762749..1810e0e1b 100644 --- a/src/Core/CustomMethods.php +++ b/src/Core/CustomMethods.php @@ -89,14 +89,14 @@ trait CustomMethods ); } } - case isset($config['wrap']) : + case isset($config['wrap']): array_unshift($arguments, $config['method']); return call_user_func_array(array($this, $config['wrap']), $arguments); - case isset($config['function']) : + case isset($config['function']): return $config['function']($this, $arguments); - default : + default: throw new BadMethodCallException( "Object->__call(): extra method $method is invalid on $class:" . var_export($config, true) diff --git a/src/Core/Object.php b/src/Core/Object.php index 5cfca54b9..dc64e57b9 100755 --- a/src/Core/Object.php +++ b/src/Core/Object.php @@ -126,19 +126,19 @@ abstract class Object switch ($argString[0]) { case '"': $result = stripcslashes(substr($argString, 1, -1)); - break; + break; case "'": $result = str_replace(array("\\\\", "\\'"), array("\\", "'"), substr($argString, 1, -1)); - break; + break; default: - throw new Exception("Bad T_CONSTANT_ENCAPSED_STRING arg $argString"); + throw new Exception("Bad T_CONSTANT_ENCAPSED_STRING arg $argString"); } - break; + break; case T_DNUMBER: $result = (double)$token[1]; - break; + break; case T_LNUMBER: $result = (int)$token[1]; @@ -150,25 +150,28 @@ abstract class Object end($bucket); $currentKey = current($bucket); array_pop($bucket); - break; + break; case T_STRING: switch ($token[1]) { - case 'true': $result = true; + case 'true': + $result = true; -break; - case 'false': $result = false; + break; + case 'false': + $result = false; -break; - case 'null': $result = null; + break; + case 'null': + $result = null; $forceResult = true; -break; + break; default: -throw new Exception("Bad T_STRING arg '{$token[1]}'"); + throw new Exception("Bad T_STRING arg '{$token[1]}'"); } - break; + break; case T_ARRAY: $result = array(); diff --git a/src/Dev/CliTestReporter.php b/src/Dev/CliTestReporter.php index 6d94bbac5..19a4c2362 100644 --- a/src/Dev/CliTestReporter.php +++ b/src/Dev/CliTestReporter.php @@ -92,21 +92,26 @@ class CliTestReporter extends SapphireTestReporter { // Status indicator, a la PHPUnit switch ($this->currentTest['status']) { - case TEST_FAILURE: echo CLI::text("F", "red", null, true); + case TEST_FAILURE: + echo CLI::text("F", "red", null, true); -break; - case TEST_ERROR: echo CLI::text("E", "red", null, true); + break; + case TEST_ERROR: + echo CLI::text("E", "red", null, true); -break; - case TEST_INCOMPLETE: echo CLI::text("I", "yellow"); + break; + case TEST_INCOMPLETE: + echo CLI::text("I", "yellow"); -break; - case TEST_SUCCESS: echo CLI::text(".", "green"); + break; + case TEST_SUCCESS: + echo CLI::text(".", "green"); -break; - default: echo CLI::text("?", "yellow"); + break; + default: + echo CLI::text("?", "yellow"); -break; + break; } static $colCount = 0; diff --git a/src/Dev/SapphireTestReporter.php b/src/Dev/SapphireTestReporter.php index ae0d5d501..93811b6cd 100644 --- a/src/Dev/SapphireTestReporter.php +++ b/src/Dev/SapphireTestReporter.php @@ -452,18 +452,22 @@ class SapphireTestReporter implements PHPUnit_Framework_TestListener foreach ($suite['tests'] as $test) { $testCount++; switch ($test['status']) { - case TEST_ERROR: $errorCount++; + case TEST_ERROR: + $errorCount++; -break; - case TEST_INCOMPLETE: $incompleteCount++; + break; + case TEST_INCOMPLETE: + $incompleteCount++; -break; - case TEST_SUCCESS: $passCount++; + break; + case TEST_SUCCESS: + $passCount++; -break; - case TEST_FAILURE: $failCount++; + break; + case TEST_FAILURE: + $failCount++; -break; + break; } // Report test error diff --git a/src/ORM/Connect/Database.php b/src/ORM/Connect/Database.php index 11829ab7e..a82d87e5c 100644 --- a/src/ORM/Connect/Database.php +++ b/src/ORM/Connect/Database.php @@ -331,7 +331,6 @@ abstract class Database // Switch command type switch ($writeInfo['command']) { case "update": - // Build update $query = new SQLUpdate("\"$table\"", $this->escapeColumnKeys($fieldValues)); diff --git a/src/ORM/DataList.php b/src/ORM/DataList.php index 698688605..fd5632696 100644 --- a/src/ORM/DataList.php +++ b/src/ORM/DataList.php @@ -405,12 +405,14 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li // Validate and process arguments $arguments = func_get_args(); switch (sizeof($arguments)) { - case 1: $filters = $arguments[0]; + case 1: + $filters = $arguments[0]; -break; - case 2: $filters = array($arguments[0] => $arguments[1]); + break; + case 2: + $filters = array($arguments[0] => $arguments[1]); -break; + break; default: throw new InvalidArgumentException('Incorrect number of arguments passed to filter()'); } diff --git a/src/ORM/Versioning/Versioned.php b/src/ORM/Versioning/Versioned.php index 0651b7b19..cb7366172 100644 --- a/src/ORM/Versioning/Versioned.php +++ b/src/ORM/Versioning/Versioned.php @@ -392,7 +392,7 @@ class Versioned extends DataExtension implements TemplateGlobalProvider $stageTable = $this->stageTable($table, $stage); $query->renameTable($table, $stageTable); } - break; + break; // Reading a specific stage, but only return items that aren't in any other stage case 'stage_unique': @@ -420,7 +420,7 @@ class Versioned extends DataExtension implements TemplateGlobalProvider $query->addWhere('"'.$baseTable.'"."ID" NOT IN (SELECT "ID" FROM "'.$tempName.'")'); $query->renameTable($tempName, $excludingTable); } - break; + break; // Return all version instances case 'archive': @@ -516,9 +516,9 @@ class Versioned extends DataExtension implements TemplateGlobalProvider break; } } - break; + break; default: - throw new InvalidArgumentException("Bad value for query parameter Versioned.mode: " + throw new InvalidArgumentException("Bad value for query parameter Versioned.mode: " . $dataQuery->getQueryParam('Versioned.mode')); } } diff --git a/src/View/ThemeResourceLoader.php b/src/View/ThemeResourceLoader.php index df24f28cd..525c14580 100644 --- a/src/View/ThemeResourceLoader.php +++ b/src/View/ThemeResourceLoader.php @@ -124,11 +124,11 @@ class ThemeResourceLoader switch ($package) { case 'silverstripe/framework': $modulePath = FRAMEWORK_DIR; - break; + break; case 'silverstripe/cms': $modulePath = CMS_DIR; - break; + break; default: list($vendor, $modulePath) = explode('/', $parts[0], 2);