Merge pull request #4739 from antograssiot/3.0-fix-cs

3.0  CS correction

src/Cache/CacheRegistry.php

@@ -14,10 +14,10 @@
  */
 namespace Cake\Cache;
 
+use BadMethodCallException;
 use Cake\Core\App;
 use Cake\Core\ObjectRegistry;
 use RuntimeException;
-use BadMethodCallException;
 
 /**
  * An object registry for cache engines.

src/Collection/Iterator/BufferedIterator.php

@@ -56,14 +56,14 @@ class BufferedIterator extends Collection implements Countable {
  * Whether or not the internal iterator's rewind method was already
  * called
  *
- * @var boolean
+ * @var bool
  */
 	protected $_started = false;
 
 /**
  * Whether or not the internal iterator has reached its end.
  *
- * @var boolean
+ * @var bool
  */
 	protected $_finished = false;
 
@@ -114,7 +114,7 @@ class BufferedIterator extends Collection implements Countable {
 /**
  * Returns whether or not the iterator has more elements
  *
- * @return boolean
+ * @return bool
  */
 	public function valid() {
 		if ($this->_buffer->offsetExists($this->_index)) {

src/Core/Configure/Engine/IniConfig.php

@@ -15,8 +15,8 @@
 namespace Cake\Core\Configure\Engine;
 
 use Cake\Core\Configure\ConfigEngineInterface;
-use Cake\Core\Plugin;
 use Cake\Core\Exception\Exception;
+use Cake\Core\Plugin;
 use Cake\Utility\Hash;
 
 /**

src/Datasource/ResultSetDecorator.php

@@ -14,8 +14,8 @@
  */
 namespace Cake\Datasource;
 
-use Cake\Datasource\ResultSetInterface;
 use Cake\Collection\Collection;
+use Cake\Datasource\ResultSetInterface;
 
 /**
  * Generic ResultSet decorator. This will make any traversable object appear to

src/Network/Email/SmtpTransport.php

@@ -14,8 +14,8 @@
  */
 namespace Cake\Network\Email;
 
-use Cake\Network\Socket;
 use Cake\Network\Exception\SocketException;
+use Cake\Network\Socket;
 
 /**
  * Send mail using SMTP protocol

src/Network/Response.php

@@ -15,8 +15,8 @@
 namespace Cake\Network;
 
 use Cake\Core\Configure;
-use Cake\Network\Exception\NotFoundException;
 use Cake\Filesystem\File;
+use Cake\Network\Exception\NotFoundException;
 use InvalidArgumentException;
 
 /**

src/ORM/Association/SelectableAssociationTrait.php

@@ -14,8 +14,8 @@
  */
 namespace Cake\ORM\Association;
 
-use Cake\Database\Expression\TupleComparison;
 use Cake\Database\Expression\IdentifierExpression;
+use Cake\Database\Expression\TupleComparison;
 
 /**
  * Represents a type of association that that can be fetched using another query

src/Shell/BakeShell.php

@@ -17,10 +17,10 @@ namespace Cake\Shell;
 use Cake\Cache\Cache;
 use Cake\Console\Shell;
 use Cake\Core\Configure;
+use Cake\Core\ConventionsTrait;
 use Cake\Core\Plugin;
 use Cake\Datasource\ConnectionManager;
 use Cake\Model\Model;
-use Cake\Core\ConventionsTrait;
 use Cake\Utility\Inflector;
 
 /**

src/Shell/Task/SimpleBakeTask.php

@@ -15,9 +15,9 @@
 namespace Cake\Shell\Task;
 
 use Cake\Console\Shell;
-use Cake\Shell\Task\BakeTask;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Shell\Task\BakeTask;
 use Cake\Utility\Inflector;
 
 /**

src/TestSuite/Fixture/FixtureManager.php

@@ -15,9 +15,9 @@
 namespace Cake\TestSuite\Fixture;
 
 use Cake\Core\Configure;
+use Cake\Core\Exception\Exception;
 use Cake\Database\Connection;
 use Cake\Datasource\ConnectionManager;
-use Cake\Core\Exception\Exception;
 use Cake\TestSuite\Fixture\TestFixture;
 use Cake\Utility\Inflector;
 

src/TestSuite/IntegrationTestCase.php

@@ -19,8 +19,8 @@ use Cake\Network\Request;
 use Cake\Network\Session;
 use Cake\Routing\DispatcherFactory;
 use Cake\Routing\Router;
-use Cake\TestSuite\TestCase;
 use Cake\TestSuite\Stub\Response;
+use Cake\TestSuite\TestCase;
 
 /**
  * A test case class intended to make integration tests of
@@ -239,6 +239,7 @@ abstract class IntegrationTestCase extends TestCase {
  * @param string $method The HTTP method
  * @param array|null $data The request data.
  * @return void
+ * @throws \Exception
  */
 	protected function _sendRequest($url, $method, $data = []) {
 		$request = $this->_buildRequest($url, $method, $data);

src/View/Helper/FormHelper.php

@@ -14,9 +14,9 @@
  */
 namespace Cake\View\Helper;
 
+use Cake\Collection\Collection;
 use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
-use Cake\Collection\Collection;
 use Cake\ORM\Entity;
 use Cake\Routing\Router;
 use Cake\Utility\Hash;

src/View/Widget/WidgetRegistry.php

@@ -15,10 +15,10 @@
 namespace Cake\View\Widget;
 
 use Cake\Core\App;
+use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\View\StringTemplate;
 use Cake\View\View;
 use Cake\View\Widget\WidgetInterface;
-use Cake\Core\Configure\Engine\PhpConfig;
 use \ReflectionClass;
 
 /**

tests/TestCase/Collection/Iterator/BufferedIteratorTest.php

@@ -61,7 +61,7 @@ class BufferedIteratorTest extends TestCase {
 		$buffered = $iterator->toArray();
 		$this->assertSame((array)$items, $buffered);
 
-		$iterator =  new BufferedIterator(new NoRewindIterator($items->getIterator()));
+		$iterator = new BufferedIterator(new NoRewindIterator($items->getIterator()));
 		$this->assertCount(3, $iterator);
 		$buffered = $iterator->toArray();
 		$this->assertSame((array)$items, $buffered);

tests/TestCase/Database/Expression/CaseExpressionTest.php

@@ -13,10 +13,10 @@
  */
 namespace Cake\Test\TestCase\Database\Expression;
 
+use Cake\Database\Expression\CaseExpression;
 use Cake\Database\Expression\QueryExpression;
 use Cake\Database\ValueBinder;
 use Cake\TestSuite\TestCase;
-use Cake\Database\Expression\CaseExpression;
 
 /**
  * Tests CaseExpression class

tests/TestCase/Log/Engine/ConsoleLogTest.php

@@ -64,7 +64,10 @@ class ConsoleLogTest extends TestCase {
  * test default value of stream 'outputAs'
  */
 	public function testDefaultOutputAs() {
-		if (DS === '\\' && !(bool)env('ANSICON')) {
+		if (
+			(DS === '\\' && !(bool)env('ANSICON')) ||
+			(function_exists('posix_isatty') && !posix_isatty(null))
+		) {
 			$expected = ConsoleOutput::PLAIN;
 		} else {
 			$expected = ConsoleOutput::COLOR;

tests/TestCase/Log/Engine/FileLogTest.php

@@ -34,6 +34,7 @@ class StringObject {
 	public function __toString() {
 		return 'Hey!';
 	}
+
 }
 
 /**
@@ -50,6 +51,7 @@ class JsonObject implements JsonSerializable {
 	public function jsonSerialize() {
 		return ['hello' => 'world'];
 	}
+
 }
 
 /**

tests/TestCase/Log/LogTraitTest.php

@@ -42,7 +42,7 @@ class LogTraitTest extends TestCase {
 
 		$mock->expects($this->at(1))
 			->method('log')
-			->with('debug',array(1, 2));
+			->with('debug', array(1, 2));
 
 		Log::config('trait_test', ['engine' => $mock]);
 		$subject = $this->getObjectForTrait('Cake\Log\LogTrait');

tests/TestCase/Model/Behavior/TranslateBehaviorTest.php

@@ -175,7 +175,6 @@ class TranslateBehaviorTest extends TestCase {
 			]
 		];
 		$this->assertSame($expected, $results);
-
 	}
 
 /**

tests/TestCase/Shell/BakeShellTest.php

@@ -14,11 +14,11 @@
  */
 namespace Cake\Test\TestCase\Shell;
 
-use Cake\Shell\BakeShellShell;
 use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Shell\BakeShellShell;
 use Cake\TestSuite\TestCase;
 
 class BakeShellTest extends TestCase {

tests/TestCase/Shell/CommandListShellTest.php

@@ -16,12 +16,12 @@
  */
 namespace Cake\Test\TestCase\Shell;
 
-use Cake\Shell\CommandListShell;
-use Cake\Shell\Task\CommandTask;
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOutput;
 use Cake\Core\App;
 use Cake\Core\Plugin;
+use Cake\Shell\CommandListShell;
+use Cake\Shell\Task\CommandTask;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Shell/CompletionShellTest.php

@@ -14,12 +14,12 @@
  */
 namespace Cake\Test\TestCase\Shell;
 
-use Cake\Shell\CompletionShell;
-use Cake\Shell\Task\CommandTask;
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOutput;
 use Cake\Console\Shell;
 use Cake\Core\Plugin;
+use Cake\Shell\CompletionShell;
+use Cake\Shell\Task\CommandTask;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Shell/OrmCacheShellTest.php

@@ -15,8 +15,8 @@
 namespace Cake\Test\TestCase\Shell;
 
 use Cake\Cache\Cache;
-use Cake\Shell\OrmCacheShell;
 use Cake\Datasource\ConnectionManager;
+use Cake\Shell\OrmCacheShell;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Shell/Task/CellTaskTest.php

@@ -14,9 +14,9 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\TemplateTask;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Shell\Task\TemplateTask;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Shell/Task/ControllerTaskTest.php

@@ -14,13 +14,13 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\ControllerTask;
-use Cake\Shell\Task\TemplateTask;
 use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Plugin;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
+use Cake\Shell\Task\ControllerTask;
+use Cake\Shell\Task\TemplateTask;
 use Cake\TestSuite\TestCase;
 use Cake\View\Helper;
 

tests/TestCase/Shell/Task/FixtureTaskTest.php

@@ -14,11 +14,11 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\FixtureTask;
-use Cake\Shell\Task\TemplateTask;
 use Cake\Core\Plugin;
 use Cake\Datasource\ConnectionManager;
 use Cake\ORM\TableRegistry;
+use Cake\Shell\Task\FixtureTask;
+use Cake\Shell\Task\TemplateTask;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Shell/Task/ModelTaskTest.php

@@ -14,12 +14,12 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\ModelTask;
-use Cake\Shell\Task\TemplateTask;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Model\Model;
 use Cake\ORM\TableRegistry;
+use Cake\Shell\Task\ModelTask;
+use Cake\Shell\Task\TemplateTask;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\ClassRegistry;
 use Cake\Utility\Inflector;

tests/TestCase/Shell/Task/SimpleBakeTaskTest.php

@@ -14,9 +14,9 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\TemplateTask;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Shell\Task\TemplateTask;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Shell/Task/TemplateTaskTest.php

@@ -14,8 +14,8 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\TemplateTask;
 use Cake\Core\App;
+use Cake\Shell\Task\TemplateTask;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/Shell/Task/TestTaskTest.php

@@ -14,8 +14,6 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\TemplateTask;
-use Cake\Shell\Task\TestTask;
 use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
@@ -24,6 +22,8 @@ use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
+use Cake\Shell\Task\TemplateTask;
+use Cake\Shell\Task\TestTask;
 use Cake\TestSuite\TestCase;
 use TestApp\Controller\PostsController;
 use TestApp\Model\Table\ArticlesTable;

tests/TestCase/Shell/Task/ViewTaskTest.php

@@ -14,13 +14,13 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\TemplateTask;
-use Cake\Shell\Task\ViewTask;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
+use Cake\Shell\Task\TemplateTask;
+use Cake\Shell\Task\ViewTask;
 use Cake\TestSuite\TestCase;
 
 /**

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -18,13 +18,13 @@ use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
 use Cake\Model\Model;
 use Cake\Network\Request;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\ClassRegistry;
-use Cake\Filesystem\File;
-use Cake\Filesystem\Folder;
 use Cake\View\Helper\FormHelper;
 use Cake\View\Helper\HtmlHelper;
 use Cake\View\View;

tests/TestCase/View/Widget/WidgetRegistryTest.php

@@ -14,11 +14,11 @@
  */
 namespace Cake\Test\TestCase\View\Widget;
 
+use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 use Cake\View\StringTemplate;
 use Cake\View\View;
 use Cake\View\Widget\WidgetRegistry;
-use Cake\Core\Plugin;
 
 /**
  * WidgetRegistry test case

tests/test_app/TestApp/Model/Table/AuthorsTable.php

@@ -11,8 +11,8 @@
  */
 namespace TestApp\Model\Table;
 
-use Cake\ORM\Table;
 use Cake\ORM\Query;
+use Cake\ORM\Table;
 
 /**
  * Author table class