Fix CS

config/bootstrap.php

@@ -82,24 +82,31 @@ function isEmpty($var = null) {
 function returns($value) {
 	if ($value === null) {
 		return 'NULL';
-	} elseif (is_array($value)) {
+	}
+	if (is_array($value)) {
 		return '(array)' . '<pre>' . print_r($value, true) . '</pre>';
-	} elseif ($value === true) {
+	}
+	if ($value === true) {
 		return '(bool)TRUE';
-	} elseif ($value === false) {
+	}
+	if ($value === false) {
 		return '(bool)FALSE';
-	} elseif (is_numeric($value) && is_float($value)) {
+	}
+	if (is_numeric($value) && is_float($value)) {
 		return '(float)' . $value;
-	} elseif (is_numeric($value) && is_int($value)) {
+	}
+	if (is_numeric($value) && is_int($value)) {
 		return '(int)' . $value;
-	} elseif (is_string($value)) {
+	}
+	if (is_string($value)) {
 		return '(string)' . $value;
-	} elseif (is_object($value)) {
+	}
+	if (is_object($value)) {
 		return '(object)' . get_class($value) . '<pre>' . print_r($value, true) .
 			'</pre>';
-	} else {
-		return '(unknown)' . $value;
 	}
+
+	return '(unknown)' . $value;
 }
 
 /**
@@ -113,7 +120,7 @@ function returns($value) {
  * @return string Converted text
  */
 function ent($text) {
-	return (!empty($text) ? htmlentities($text, ENT_QUOTES, 'UTF-8') : '');
+	return !empty($text) ? htmlentities($text, ENT_QUOTES, 'UTF-8') : '';
 }
 
 /**
@@ -139,7 +146,7 @@ function entDec($text, $quoteStyle = ENT_QUOTES) {
 	if (is_array($text)) {
 		return array_map('entDec', $text);
 	}
-	return (!empty($text) ? trim(html_entity_decode($text, $quoteStyle, 'UTF-8')) : '');
+	return !empty($text) ? trim(html_entity_decode($text, $quoteStyle, 'UTF-8')) : '';
 }
 
 /**
@@ -280,7 +287,7 @@ function pre($var, $collapsedAndExpandable = false, $options = []) {
  */
 function contains($haystack, $needle, $caseSensitive = false) {
 	$result = !$caseSensitive ? stripos($haystack, $needle) : strpos($haystack, $needle);
-	return ($result !== false);
+	return $result !== false;
 }
 
 /**
@@ -292,9 +299,9 @@ function contains($haystack, $needle, $caseSensitive = false) {
  */
 function startsWith($haystack, $needle, $caseSensitive = false) {
 	if ($caseSensitive) {
-		return (mb_strpos($haystack, $needle) === 0);
+		return mb_strpos($haystack, $needle) === 0;
 	}
-	return (mb_stripos($haystack, $needle) === 0);
+	return mb_stripos($haystack, $needle) === 0;
 }
 
 /**

tests/Fixture/AfterTreesFixture.php

@@ -5,7 +5,6 @@ use Cake\TestSuite\Fixture\TestFixture;
 
 /**
  * AfterTreeFixture class
- *
  */
 class AfterTreesFixture extends TestFixture {
 
@@ -37,4 +36,5 @@ class AfterTreesFixture extends TestFixture {
 		['parent_id' => null, 'lft' => 10, 'rght' => 11, 'name' => 'Six'],
 		['parent_id' => null, 'lft' => 13, 'rght' => 14, 'name' => 'Seven']
 	];
+
 }

tests/Fixture/BitmaskedCommentsFixture.php

@@ -5,7 +5,6 @@ use Cake\TestSuite\Fixture\TestFixture;
 
 /**
  * For BitmaskedBehaviorTest
- *
  */
 class BitmaskedCommentsFixture extends TestFixture {
 

tests/Fixture/JsonableCommentsFixture.php

@@ -16,4 +16,5 @@ class JsonableCommentsFixture extends TestFixture {
 
 	public $records = [
 	];
+
 }

tests/Fixture/RolesFixture.php

@@ -5,7 +5,6 @@ use Cake\TestSuite\Fixture\TestFixture;
 
 /**
  * RoleFixture
- *
  */
 class RolesFixture extends TestFixture {
 

tests/Fixture/StoriesFixture.php

@@ -5,7 +5,6 @@ use Cake\TestSuite\Fixture\TestFixture;
 
 /**
  * RoleFixture
- *
  */
 class StoriesFixture extends TestFixture {
 

tests/Fixture/StringCommentsFixture.php

@@ -15,4 +15,5 @@ class StringCommentsFixture extends TestFixture {
 
 	public $records = [
 	];
+
 }

tests/Fixture/TokensFixture.php

@@ -5,7 +5,6 @@ use Cake\TestSuite\Fixture\TestFixture;
 
 /**
  * TokenFixture
- *
  */
 class TokensFixture extends TestFixture {
 
@@ -133,4 +132,5 @@ class TokensFixture extends TestFixture {
 			'modified' => '2011-08-02 18:01:54'
 		],
 	];
+
 }

tests/TestApp/Controller/Component/AppleComponent.php

@@ -7,7 +7,6 @@ use Cake\Event\Event;
 
 /**
  * AppleComponent class
- *
  */
 class AppleComponent extends Component {
 

tests/TestApp/Controller/Component/BananaComponent.php

@@ -7,7 +7,6 @@ use Cake\Event\Event;
 
 /**
  * BananaComponent class
- *
  */
 class BananaComponent extends Component {
 

tests/TestApp/Model/Entity/BitmaskedComment.php

@@ -22,4 +22,5 @@ class BitmaskedComment extends Entity {
 	const STATUS_PUBLISHED = 2;
 	const STATUS_APPROVED = 4;
 	const STATUS_FLAGGED = 8;
+
 }

tests/TestApp/Model/Entity/SluggedArticle.php

@@ -5,6 +5,7 @@ namespace TestApp\Model\Entity;
 use Cake\ORM\Entity;
 
 class SluggedArticle extends Entity {
+
 	/**
 	 * Virtual field
 	 *
@@ -13,4 +14,5 @@ class SluggedArticle extends Entity {
 	protected function _getSpecial() {
 		return 'dereuromark';
 	}
+
 }

tests/TestCase/BootstrapTest.php

@@ -10,7 +10,6 @@ use Tools\View\RssView;
 
 /**
  * RssViewTest
- *
  */
 class BootstrapTest extends TestCase {
 

tests/TestCase/Controller/Component/AuthUserComponentTest.php

@@ -11,7 +11,6 @@ use Cake\Network\Request;
 
 /**
  * AuthUserComponent class
- *
  */
 class AuthUserComponentTest extends TestCase {
 

tests/TestCase/Controller/Component/FlashComponentTest.php

@@ -137,4 +137,5 @@ class FlashComponentTestController extends Controller {
 	public function header($status) {
 		$this->testHeaders[] = $status;
 	}
+
 }

tests/TestCase/Mailer/EmailTest.php

@@ -10,7 +10,6 @@ use Cake\Log\Log;
 
 /**
  * Help to test Email
- *
  */
 class TestEmail extends Email {
 

tests/TestCase/Model/Behavior/JsonableBehaviorTest.php

@@ -340,4 +340,5 @@ class JsonableBehaviorTest extends TestCase {
 		$expected = ['x' => ['y' => 'z']];
 		$this->assertEquals($expected, $res['details']);
 	}
+
 }

tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -373,8 +373,8 @@ class SluggedBehaviorTest extends TestCase {
 	 * TestTruncateMultibyte method
 	 *
 	 * Ensure that the first test doesn't cut a multibyte character The test string is:
-	 * 	17 chars
-	 * 	51 bytes UTF-8 encoded
+	 *     17 chars
+	 *     51 bytes UTF-8 encoded
 	 *
 	 * @return void
 	 */

tests/TestCase/Utility/L10nTest.php

@@ -6,7 +6,6 @@ use Tools\TestSuite\TestCase;
 
 /**
  * L10nTest class
- *
  */
 class L10nTest extends TestCase {
 

tests/TestCase/Utility/TextTest.php

@@ -32,7 +32,7 @@ TXT;
 
 	/**
 	 * @return void
-     */
+	 */
 	public function testReadWithPattern() {
 		$data = <<<TXT
 some random data

tests/TestCase/View/Helper/AuthUserHelperTest.php

@@ -8,7 +8,6 @@ use Cake\View\View;
 
 /**
  * AuthUserHelper class
- *
  */
 class AuthUserHelperTest extends TestCase {
 

tests/TestCase/View/Helper/GravatarHelperTest.php

@@ -8,7 +8,6 @@ use Cake\Core\Configure;
 
 /**
  * Gravatar Test Case
- *
  */
 class GravatarHelperTest extends TestCase {
 
@@ -87,7 +86,9 @@ class GravatarHelperTest extends TestCase {
 		$this->assertTrue(!empty($is));
 	}
 
-/** BASE TEST CASES **/
+/**
+ * BASE TEST CASES
+**/
 
 	/**
 	 * TestBaseUrlGeneration

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -12,7 +12,6 @@ use Cake\Routing\Router;
 
 /**
  * Datetime Test Case
- *
  */
 class HtmlHelperTest extends TestCase {
 

tests/TestCase/View/Helper/NumberHelperTest.php

@@ -118,4 +118,5 @@ class NumberHelperTest extends TestCase {
 
 		unset($this->Number);
 	}
+
 }

tests/TestCase/View/Helper/TimeHelperTest.php

@@ -9,7 +9,6 @@ use Tools\Utility\Time;
 
 /**
  * Datetime Test Case
- *
  */
 class TimeHelperTest extends TestCase {
 

tests/TestCase/View/Helper/TreeHelperTest.php

@@ -31,7 +31,6 @@ class TreeHelperTest extends TestCase {
 	 * - Three
 	 * - Four
 	 * -- Four-SubA
-	 *
 	 */
 	public function setUp() {
 		parent::setUp();
@@ -370,7 +369,6 @@ TEXT;
 	}
 
 	/**
-	 *
 	 * - One
 	 * -- One-SubA
 	 * - Two
@@ -431,7 +429,6 @@ TEXT;
 	}
 
 	/**
-	 *
 	 * - One
 	 * -- One-SubA
 	 * - Two

tests/TestCase/View/Helper/UrlHelperTest.php

@@ -11,7 +11,6 @@ use Cake\Routing\Router;
 
 /**
  * Datetime Test Case
- *
  */
 class UrlHelperTest extends TestCase {