Moving File and Folder to their own namespace

config/bootstrap.php

@@ -27,5 +27,7 @@ class_alias('Cake\Network\Exception\NotFoundException', 'Cake\Error\NotFoundExce
 class_alias('Cake\Network\Exception\NotImplementedException', 'Cake\Error\NotImplementedException');
 class_alias('Cake\Network\Exception\SocketException', 'Cake\Error\SocketException');
 class_alias('Cake\Network\Exception\UnauthorizedException', 'Cake\Error\UnauthorizedException');
+class_alias('Cake\Filesystem\File', 'Cake\Utility\File');
+class_alias('Cake\Filesystem\Folder', 'Cake\Utility\Folder');
 
 require CAKE . 'basics.php';

src/Console/Shell.php

@@ -18,9 +18,9 @@ use Cake\Console\ConsoleIo;
 use Cake\Console\Exception\ConsoleException;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Filesystem\File;
 use Cake\Log\LogTrait;
 use Cake\Model\ModelAwareTrait;
-use Cake\Utility\File;
 use Cake\Utility\Inflector;
 use Cake\Utility\MergeVariablesTrait;
 use Cake\Utility\String;

src/Utility/File.php

@@ -12,7 +12,7 @@
  * @since         0.2.9
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Utility;
+namespace Cake\Filesystem;
 
 /**
  * Convenience class for reading, writing and appending to files.

src/Utility/Folder.php

@@ -12,7 +12,7 @@
  * @since         0.2.9
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Utility;
+namespace Cake\Filesystem;
 
 /**
  * Folder structure browser, lists folders and files.

src/Network/Email/Email.php

@@ -18,9 +18,9 @@ use BadMethodCallException;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\StaticConfigTrait;
+use Cake\Filesystem\File;
 use Cake\Log\Log;
 use Cake\Network\Http\FormData\Part;
-use Cake\Utility\File;
 use Cake\Utility\Hash;
 use Cake\Utility\String;
 use Cake\View\View;

src/Network/Response.php

@@ -16,7 +16,7 @@ namespace Cake\Network;
 
 use Cake\Core\Configure;
 use Cake\Network\Exception\NotFoundException;
-use Cake\Utility\File;
+use Cake\Filesystem\File;
 use InvalidArgumentException;
 use RuntimeException;
 

src/Shell/Task/CommandTask.php

@@ -18,10 +18,10 @@ use Cake\Console\ConsoleOptionParser;
 use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Plugin;
+use Cake\Filesystem\Folder;
 use Cake\Utility\Inflector;
-use Cake\Utility\Folder;
-use \ReflectionClass;
-use \ReflectionMethod;
+use ReflectionClass;
+use ReflectionMethod;
 
 /**
  * Base class for Shell Command reflection.

src/Shell/Task/ExtractTask.php

@@ -17,8 +17,8 @@ namespace Cake\Shell\Task;
 use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Plugin;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
 use Cake\Utility\Inflector;
 
 /**

src/Shell/Task/PluginTask.php

@@ -14,11 +14,11 @@
  */
 namespace Cake\Shell\Task;
 
-use Cake\Shell\Task\BakeTask;
 use Cake\Console\Shell;
 use Cake\Core\App;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
+use Cake\Shell\Task\BakeTask;
 
 /**
  * The Plugin Task handles creating an empty plugin, ready to be used

src/Shell/Task/ProjectTask.php

@@ -14,8 +14,8 @@
  */
 namespace Cake\Shell\Task;
 
+use Cake\Filesystem\Folder;
 use Cake\Shell\Task\BakeTask;
-use Cake\Utility\Folder;
 
 /**
  * Task class for creating new project apps and plugins

src/Shell/Task/TemplateTask.php

@@ -16,9 +16,9 @@ namespace Cake\Shell\Task;
 
 use Cake\Console\Shell;
 use Cake\Core\App;
-use Cake\Core\Plugin;
 use Cake\Core\ConventionsTrait;
-use Cake\Utility\Folder;
+use Cake\Core\Plugin;
+use Cake\Filesystem\Folder;
 use Cake\View\ViewVarsTrait;
 
 /**

src/Shell/Task/TestTask.php

@@ -19,12 +19,12 @@ use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
 use Cake\Core\Plugin;
+use Cake\Filesystem\Folder;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\ORM\Association;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
-use Cake\Utility\Folder;
 use Cake\Utility\Inflector;
 
 /**

src/TestSuite/TestSuite.php

@@ -16,7 +16,7 @@
  */
 namespace Cake\TestSuite;
 
-use Cake\Utility\Folder;
+use Cake\Filesystem\Folder;
 
 /**
  * A class to contain test cases and run them with shared fixtures

src/Validation/Validation.php

@@ -16,7 +16,7 @@ namespace Cake\Validation;
 
 use Cake\Core\App;
 use Cake\Core\Exception\Exception;
-use Cake\Utility\File;
+use Cake\Filesystem\File;
 use Cake\Utility\Number;
 
 /**

tests/TestCase/Console/ShellTest.php

@@ -19,9 +19,9 @@ use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Filesystem\Folder;
 use Cake\Log\Log;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Folder;
 use Cake\Utility\Hash;
 
 /**

tests/TestCase/Utility/FileTest.php

@@ -14,11 +14,11 @@
  * @since         1.2.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Utility;
+namespace Cake\Test\TestCase\Filesystem;
 
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
 
 /**
  * FileTest class
@@ -120,7 +120,7 @@ class FileTest extends TestCase {
 		$this->assertEquals($expecting, $result);
 
 		$result = $this->File->Folder();
-		$this->assertInstanceOf('Cake\Utility\Folder', $result);
+		$this->assertInstanceOf('Cake\Filesystem\Folder', $result);
 	}
 
 /**

tests/TestCase/Utility/FolderTest.php

@@ -14,11 +14,11 @@
  * @since         1.2.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Utility;
+namespace Cake\Test\TestCase\Filesystem;
 
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
 
 /**
  * FolderTest class

tests/TestCase/Shell/Task/ExtractTaskTest.php

@@ -14,12 +14,12 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\ExtractTask;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Filesystem\Folder;
+use Cake\Shell\Task\ExtractTask;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Folder;
 
 /**
  * ExtractTaskTest class

tests/TestCase/Shell/Task/PluginTaskTest.php

@@ -14,13 +14,13 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\TemplateTask;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
+use Cake\Shell\Task\TemplateTask;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
 
 /**
  * PluginTaskPlugin class
@@ -115,7 +115,6 @@ class PluginTaskTest extends TestCase {
  */
 	public function testExecuteWithNoArgs() {
 		$path = $this->Task->path . 'TestPlugin';
-		$file = $path . DS . 'Controller' . DS . 'TestPluginAppController.php';
 
 		$this->Task->expects($this->at(0))
 			->method('err')

tests/TestCase/Shell/Task/ProjectTaskTest.php

@@ -14,11 +14,11 @@
  */
 namespace Cake\Test\TestCase\Shell\Task;
 
-use Cake\Shell\Task\ProjectTask;
 use Cake\Core\Configure;
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
+use Cake\Shell\Task\ProjectTask;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
 
 /**
  * ProjectTask Test class

tests/TestCase/TestSuite/TestSuiteTest.php

@@ -14,8 +14,8 @@
  */
 namespace Cake\Test\TestCase\TestSuite;
 
+use Cake\Filesystem\Folder;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Folder;
 
 /**
  * TestSuiteTest

tests/TestCase/Validation/ValidationTest.php

@@ -17,8 +17,8 @@
 namespace Cake\Test\TestCase\Validation;
 
 use Cake\Core\Configure;
+use Cake\Filesystem\File;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\File;
 use Cake\Validation\Validation;
 
 /**

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -23,8 +23,8 @@ use Cake\Network\Request;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\ClassRegistry;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
+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/Helper/RssHelperTest.php

@@ -16,9 +16,9 @@
  */
 namespace Cake\Test\TestCase\View\Helper;
 
+use Cake\Filesystem\File;
+use Cake\Filesystem\Folder;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\File;
-use Cake\Utility\Folder;
 use Cake\View\Helper\RssHelper;
 use Cake\View\Helper\TimeHelper;
 use Cake\View\View;