ソースを参照

Renamed folders "Cake" to "src" and "Test" to "tests".

ADmad 12 年 前
コミット
fb72c03b4c
100 ファイル変更16 行追加11 行削除
  1. 3 3
      composer.json
  2. 4 4
      phpunit.xml.dist
  3. 0 0
      src/Cache/Cache.php
  4. 0 0
      src/Cache/CacheEngine.php
  5. 0 0
      src/Cache/CacheRegistry.php
  6. 0 0
      src/Cache/Engine/ApcEngine.php
  7. 0 0
      src/Cache/Engine/FileEngine.php
  8. 0 0
      src/Cache/Engine/MemcachedEngine.php
  9. 0 0
      src/Cache/Engine/RedisEngine.php
  10. 0 0
      src/Cache/Engine/WincacheEngine.php
  11. 0 0
      src/Cache/Engine/XcacheEngine.php
  12. 0 0
      src/Collection/Collection.php
  13. 0 0
      src/Collection/CollectionTrait.php
  14. 0 0
      src/Collection/ExtractTrait.php
  15. 0 0
      src/Collection/Iterator/ExtractIterator.php
  16. 0 0
      src/Collection/Iterator/FilterIterator.php
  17. 0 0
      src/Collection/Iterator/MapReduce.php
  18. 0 0
      src/Collection/Iterator/ReplaceIterator.php
  19. 0 0
      src/Collection/Iterator/SortIterator.php
  20. 0 0
      src/Config/cacert.pem
  21. 0 0
      src/Config/config.php
  22. 0 0
      src/Config/routes.php
  23. 0 0
      src/Configure/ConfigEngineInterface.php
  24. 0 0
      src/Configure/Engine/IniConfig.php
  25. 0 0
      src/Configure/Engine/PhpConfig.php
  26. 0 0
      src/Console/Command/BakeShell.php
  27. 0 0
      src/Console/Command/CommandListShell.php
  28. 0 0
      src/Console/Command/CompletionShell.php
  29. 0 0
      src/Console/Command/I18nShell.php
  30. 0 0
      src/Console/Command/ServerShell.php
  31. 0 0
      src/Console/Command/Task/BakeTask.php
  32. 0 0
      src/Console/Command/Task/CommandTask.php
  33. 0 0
      src/Console/Command/Task/ControllerTask.php
  34. 0 0
      src/Console/Command/Task/DbConfigTask.php
  35. 0 0
      src/Console/Command/Task/ExtractTask.php
  36. 0 0
      src/Console/Command/Task/FixtureTask.php
  37. 0 0
      src/Console/Command/Task/ModelTask.php
  38. 0 0
      src/Console/Command/Task/PluginTask.php
  39. 0 0
      src/Console/Command/Task/ProjectTask.php
  40. 0 0
      src/Console/Command/Task/TemplateTask.php
  41. 0 0
      src/Console/Command/Task/TestTask.php
  42. 0 0
      src/Console/Command/Task/ViewTask.php
  43. 9 4
      Cake/Console/Command/TestShell.php
  44. 0 0
      src/Console/Command/UpgradeShell.php
  45. 0 0
      src/Console/ConsoleErrorHandler.php
  46. 0 0
      src/Console/ConsoleInput.php
  47. 0 0
      src/Console/ConsoleInputArgument.php
  48. 0 0
      src/Console/ConsoleInputOption.php
  49. 0 0
      src/Console/ConsoleInputSubcommand.php
  50. 0 0
      src/Console/ConsoleOptionParser.php
  51. 0 0
      src/Console/ConsoleOutput.php
  52. 0 0
      src/Console/HelpFormatter.php
  53. 0 0
      src/Console/Shell.php
  54. 0 0
      src/Console/ShellDispatcher.php
  55. 0 0
      src/Console/TaskRegistry.php
  56. 0 0
      src/Console/Templates/default/actions/controller_actions.ctp
  57. 0 0
      src/Console/Templates/default/classes/controller.ctp
  58. 0 0
      src/Console/Templates/default/classes/fixture.ctp
  59. 0 0
      src/Console/Templates/default/classes/model.ctp
  60. 0 0
      src/Console/Templates/default/classes/test.ctp
  61. 0 0
      src/Console/Templates/default/views/form.ctp
  62. 0 0
      src/Console/Templates/default/views/index.ctp
  63. 0 0
      src/Console/Templates/default/views/view.ctp
  64. 0 0
      src/Console/cake
  65. 0 0
      src/Console/cake.bat
  66. 0 0
      src/Console/cake.php
  67. 0 0
      src/Controller/Component.php
  68. 0 0
      src/Controller/Component/Acl/AclInterface.php
  69. 0 0
      src/Controller/Component/Acl/IniAcl.php
  70. 0 0
      src/Controller/Component/Acl/PhpAcl.php
  71. 0 0
      src/Controller/Component/AclComponent.php
  72. 0 0
      src/Controller/Component/Auth/AbstractPasswordHasher.php
  73. 0 0
      src/Controller/Component/Auth/ActionsAuthorize.php
  74. 0 0
      src/Controller/Component/Auth/BaseAuthenticate.php
  75. 0 0
      src/Controller/Component/Auth/BaseAuthorize.php
  76. 0 0
      src/Controller/Component/Auth/BasicAuthenticate.php
  77. 0 0
      src/Controller/Component/Auth/BlowfishPasswordHasher.php
  78. 0 0
      src/Controller/Component/Auth/ControllerAuthorize.php
  79. 0 0
      src/Controller/Component/Auth/CrudAuthorize.php
  80. 0 0
      src/Controller/Component/Auth/DigestAuthenticate.php
  81. 0 0
      src/Controller/Component/Auth/FormAuthenticate.php
  82. 0 0
      src/Controller/Component/Auth/SimplePasswordHasher.php
  83. 0 0
      src/Controller/Component/AuthComponent.php
  84. 0 0
      src/Controller/Component/CookieComponent.php
  85. 0 0
      src/Controller/Component/CsrfComponent.php
  86. 0 0
      src/Controller/Component/PaginatorComponent.php
  87. 0 0
      src/Controller/Component/RequestHandlerComponent.php
  88. 0 0
      src/Controller/Component/SecurityComponent.php
  89. 0 0
      src/Controller/Component/SessionComponent.php
  90. 0 0
      src/Controller/ComponentRegistry.php
  91. 0 0
      src/Controller/Controller.php
  92. 0 0
      src/Controller/ErrorController.php
  93. 0 0
      src/Core/App.php
  94. 0 0
      src/Core/ClassLoader.php
  95. 0 0
      src/Core/Configure.php
  96. 0 0
      src/Core/Object.php
  97. 0 0
      src/Core/Plugin.php
  98. 0 0
      src/Core/StaticConfigTrait.php
  99. 0 0
      src/Database/Connection.php
  100. 0 0
      Cake/Database/ConnectionManager.php

+ 3 - 3
composer.json

@@ -27,11 +27,11 @@
     },
     "autoload": {
         "psr-4": {
-            "Cake\\": "Cake",
-            "Cake\\Test\\": "Test"
+            "Cake\\": "src",
+            "Cake\\Test\\": "tests"
         }
     },
     "bin": [
-        "Cake/Console/cake"
+        "src/Cake/Console/cake"
     ]
 }

+ 4 - 4
phpunit.xml.dist

@@ -5,7 +5,7 @@
 	processIsolation="false"
 	stopOnFailure="false"
 	syntaxCheck="false"
-	bootstrap="./Test/init.php"
+	bootstrap="./tests/init.php"
 	>
 	<php>
 		<ini name="memory_limit" value="-1"/>
@@ -14,14 +14,14 @@
 
 	<testsuites>
 		<testsuite name="CakePHP Test Suite">
-			<directory>./Test/TestCase/</directory>
+			<directory>./tests/TestCase/</directory>
 		</testsuite>
 		<testsuite name="Database Test Suite">
-			<file>./Test/TestCase/DatabaseSuite.php</file>
+			<file>./tests/TestCase/DatabaseSuite.php</file>
 		</testsuite>
 	</testsuites>
 	<listeners>
-		<listener class="\Cake\TestSuite\Fixture\FixtureInjector" file="./Cake/TestSuite/Fixture/FixtureInjector.php">
+		<listener class="\Cake\TestSuite\Fixture\FixtureInjector" file="./src/TestSuite/Fixture/FixtureInjector.php">
 			<arguments>
 				<object class="\Cake\TestSuite\Fixture\FixtureManager" />
 			</arguments>

Cake/Cache/Cache.php → src/Cache/Cache.php


Cake/Cache/CacheEngine.php → src/Cache/CacheEngine.php


Cake/Cache/CacheRegistry.php → src/Cache/CacheRegistry.php


Cake/Cache/Engine/ApcEngine.php → src/Cache/Engine/ApcEngine.php


Cake/Cache/Engine/FileEngine.php → src/Cache/Engine/FileEngine.php


Cake/Cache/Engine/MemcachedEngine.php → src/Cache/Engine/MemcachedEngine.php


Cake/Cache/Engine/RedisEngine.php → src/Cache/Engine/RedisEngine.php


Cake/Cache/Engine/WincacheEngine.php → src/Cache/Engine/WincacheEngine.php


Cake/Cache/Engine/XcacheEngine.php → src/Cache/Engine/XcacheEngine.php


Cake/Collection/Collection.php → src/Collection/Collection.php


Cake/Collection/CollectionTrait.php → src/Collection/CollectionTrait.php


Cake/Collection/ExtractTrait.php → src/Collection/ExtractTrait.php


Cake/Collection/Iterator/ExtractIterator.php → src/Collection/Iterator/ExtractIterator.php


Cake/Collection/Iterator/FilterIterator.php → src/Collection/Iterator/FilterIterator.php


Cake/Collection/Iterator/MapReduce.php → src/Collection/Iterator/MapReduce.php


Cake/Collection/Iterator/ReplaceIterator.php → src/Collection/Iterator/ReplaceIterator.php


Cake/Collection/Iterator/SortIterator.php → src/Collection/Iterator/SortIterator.php


Cake/Config/cacert.pem → src/Config/cacert.pem


Cake/Config/config.php → src/Config/config.php


Cake/Config/routes.php → src/Config/routes.php


Cake/Configure/ConfigEngineInterface.php → src/Configure/ConfigEngineInterface.php


Cake/Configure/Engine/IniConfig.php → src/Configure/Engine/IniConfig.php


Cake/Configure/Engine/PhpConfig.php → src/Configure/Engine/PhpConfig.php


Cake/Console/Command/BakeShell.php → src/Console/Command/BakeShell.php


Cake/Console/Command/CommandListShell.php → src/Console/Command/CommandListShell.php


Cake/Console/Command/CompletionShell.php → src/Console/Command/CompletionShell.php


Cake/Console/Command/I18nShell.php → src/Console/Command/I18nShell.php


Cake/Console/Command/ServerShell.php → src/Console/Command/ServerShell.php


Cake/Console/Command/Task/BakeTask.php → src/Console/Command/Task/BakeTask.php


Cake/Console/Command/Task/CommandTask.php → src/Console/Command/Task/CommandTask.php


Cake/Console/Command/Task/ControllerTask.php → src/Console/Command/Task/ControllerTask.php


Cake/Console/Command/Task/DbConfigTask.php → src/Console/Command/Task/DbConfigTask.php


Cake/Console/Command/Task/ExtractTask.php → src/Console/Command/Task/ExtractTask.php


Cake/Console/Command/Task/FixtureTask.php → src/Console/Command/Task/FixtureTask.php


Cake/Console/Command/Task/ModelTask.php → src/Console/Command/Task/ModelTask.php


Cake/Console/Command/Task/PluginTask.php → src/Console/Command/Task/PluginTask.php


Cake/Console/Command/Task/ProjectTask.php → src/Console/Command/Task/ProjectTask.php


Cake/Console/Command/Task/TemplateTask.php → src/Console/Command/Task/TemplateTask.php


Cake/Console/Command/Task/TestTask.php → src/Console/Command/Task/TestTask.php


Cake/Console/Command/Task/ViewTask.php → src/Console/Command/Task/ViewTask.php


+ 9 - 4
Cake/Console/Command/TestShell.php

@@ -379,7 +379,7 @@ class TestShell extends Shell {
 			$testCase = str_replace(DS, '/', $file);
 			$testCase = preg_replace('@.*lib/Cake/@', '', $file);
 			$testCase[0] = strtoupper($testCase[0]);
-			$testFile = ROOT . '/Test/TestCase/' . $testCase . 'Test.php';
+			$testFile = ROOT . '/tests/TestCase/' . $testCase . 'Test.php';
 
 			if (!file_exists($testFile) && $throwOnMissingFile) {
 				throw new \Exception(sprintf('Test case %s not found', $testFile));
@@ -389,11 +389,11 @@ class TestShell extends Shell {
 		}
 
 		if ($category === 'app') {
-			$testFile = str_replace(APP, APP . 'Test/TestCase/', $file) . 'Test.php';
+			$testFile = str_replace(APP, APP . 'tests/TestCase/', $file) . 'Test.php';
 		} else {
 			$testFile = preg_replace(
 				"@((?:plugins|Plugin)[\\/]{$category}[\\/])(.*)$@",
-				'\1Test/TestCase/\2Test.php',
+				'\1tests/TestCase/\2Test.php',
 				$file
 			);
 		}
@@ -404,7 +404,7 @@ class TestShell extends Shell {
 
 		$testCase = substr($testFile, 0, -8);
 		$testCase = str_replace(DS, '/', $testCase);
-		$testCase = preg_replace('@.*Test/TestCase/@', '', $testCase);
+		$testCase = preg_replace('@.*tests/TestCase/@', '', $testCase);
 
 		return $testCase;
 	}
@@ -428,6 +428,11 @@ class TestShell extends Shell {
 		if (strpos($file, APP) !== false) {
 			return 'app';
 		}
+		$file = preg_replace(
+			['#^Cake/#', '#^Test/#'],
+			['src/', 'tests/'],
+			$file
+		);
 		if (file_exists(ROOT . DS . $file) || strpos($file, ROOT . DS) !== false) {
 			return 'core';
 		}

Cake/Console/Command/UpgradeShell.php → src/Console/Command/UpgradeShell.php


Cake/Console/ConsoleErrorHandler.php → src/Console/ConsoleErrorHandler.php


Cake/Console/ConsoleInput.php → src/Console/ConsoleInput.php


Cake/Console/ConsoleInputArgument.php → src/Console/ConsoleInputArgument.php


Cake/Console/ConsoleInputOption.php → src/Console/ConsoleInputOption.php


Cake/Console/ConsoleInputSubcommand.php → src/Console/ConsoleInputSubcommand.php


Cake/Console/ConsoleOptionParser.php → src/Console/ConsoleOptionParser.php


Cake/Console/ConsoleOutput.php → src/Console/ConsoleOutput.php


Cake/Console/HelpFormatter.php → src/Console/HelpFormatter.php


Cake/Console/Shell.php → src/Console/Shell.php


Cake/Console/ShellDispatcher.php → src/Console/ShellDispatcher.php


Cake/Console/TaskRegistry.php → src/Console/TaskRegistry.php


Cake/Console/Templates/default/actions/controller_actions.ctp → src/Console/Templates/default/actions/controller_actions.ctp


Cake/Console/Templates/default/classes/controller.ctp → src/Console/Templates/default/classes/controller.ctp


Cake/Console/Templates/default/classes/fixture.ctp → src/Console/Templates/default/classes/fixture.ctp


Cake/Console/Templates/default/classes/model.ctp → src/Console/Templates/default/classes/model.ctp


Cake/Console/Templates/default/classes/test.ctp → src/Console/Templates/default/classes/test.ctp


Cake/Console/Templates/default/views/form.ctp → src/Console/Templates/default/views/form.ctp


Cake/Console/Templates/default/views/index.ctp → src/Console/Templates/default/views/index.ctp


Cake/Console/Templates/default/views/view.ctp → src/Console/Templates/default/views/view.ctp


Cake/Console/cake → src/Console/cake


Cake/Console/cake.bat → src/Console/cake.bat


Cake/Console/cake.php → src/Console/cake.php


Cake/Controller/Component.php → src/Controller/Component.php


Cake/Controller/Component/Acl/AclInterface.php → src/Controller/Component/Acl/AclInterface.php


Cake/Controller/Component/Acl/IniAcl.php → src/Controller/Component/Acl/IniAcl.php


Cake/Controller/Component/Acl/PhpAcl.php → src/Controller/Component/Acl/PhpAcl.php


Cake/Controller/Component/AclComponent.php → src/Controller/Component/AclComponent.php


Cake/Controller/Component/Auth/AbstractPasswordHasher.php → src/Controller/Component/Auth/AbstractPasswordHasher.php


Cake/Controller/Component/Auth/ActionsAuthorize.php → src/Controller/Component/Auth/ActionsAuthorize.php


Cake/Controller/Component/Auth/BaseAuthenticate.php → src/Controller/Component/Auth/BaseAuthenticate.php


Cake/Controller/Component/Auth/BaseAuthorize.php → src/Controller/Component/Auth/BaseAuthorize.php


Cake/Controller/Component/Auth/BasicAuthenticate.php → src/Controller/Component/Auth/BasicAuthenticate.php


Cake/Controller/Component/Auth/BlowfishPasswordHasher.php → src/Controller/Component/Auth/BlowfishPasswordHasher.php


Cake/Controller/Component/Auth/ControllerAuthorize.php → src/Controller/Component/Auth/ControllerAuthorize.php


Cake/Controller/Component/Auth/CrudAuthorize.php → src/Controller/Component/Auth/CrudAuthorize.php


Cake/Controller/Component/Auth/DigestAuthenticate.php → src/Controller/Component/Auth/DigestAuthenticate.php


Cake/Controller/Component/Auth/FormAuthenticate.php → src/Controller/Component/Auth/FormAuthenticate.php


Cake/Controller/Component/Auth/SimplePasswordHasher.php → src/Controller/Component/Auth/SimplePasswordHasher.php


Cake/Controller/Component/AuthComponent.php → src/Controller/Component/AuthComponent.php


Cake/Controller/Component/CookieComponent.php → src/Controller/Component/CookieComponent.php


Cake/Controller/Component/CsrfComponent.php → src/Controller/Component/CsrfComponent.php


Cake/Controller/Component/PaginatorComponent.php → src/Controller/Component/PaginatorComponent.php


Cake/Controller/Component/RequestHandlerComponent.php → src/Controller/Component/RequestHandlerComponent.php


Cake/Controller/Component/SecurityComponent.php → src/Controller/Component/SecurityComponent.php


Cake/Controller/Component/SessionComponent.php → src/Controller/Component/SessionComponent.php


Cake/Controller/ComponentRegistry.php → src/Controller/ComponentRegistry.php


Cake/Controller/Controller.php → src/Controller/Controller.php


Cake/Controller/ErrorController.php → src/Controller/ErrorController.php


Cake/Core/App.php → src/Core/App.php


Cake/Core/ClassLoader.php → src/Core/ClassLoader.php


Cake/Core/Configure.php → src/Core/Configure.php


Cake/Core/Object.php → src/Core/Object.php


Cake/Core/Plugin.php → src/Core/Plugin.php


Cake/Core/StaticConfigTrait.php → src/Core/StaticConfigTrait.php


Cake/Database/Connection.php → src/Database/Connection.php


+ 0 - 0
Cake/Database/ConnectionManager.php


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません