From f2638b3e38345d4c2143c73c7e46ccd201d394cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Wed, 10 Aug 2016 12:22:09 +0200 Subject: [PATCH 01/15] Remove superfluous "Class" from doc blocks --- lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php | 2 +- lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php | 2 +- lib/Cake/Test/Case/Configure/IniReaderTest.php | 2 +- lib/Cake/Test/Case/Configure/PhpReaderTest.php | 2 +- .../Test/Case/Console/Command/CommandListShellTest.php | 4 ++-- .../Test/Case/Console/Command/CompletionShellTest.php | 4 ++-- .../Test/Case/Console/Command/Task/ControllerTaskTest.php | 2 +- lib/Cake/Test/Case/Console/Command/TestShellTest.php | 4 ++-- lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php | 2 +- lib/Cake/Test/Case/Console/ConsoleOutputTest.php | 2 +- lib/Cake/Test/Case/Console/HelpFormatterTest.php | 2 +- lib/Cake/Test/Case/Console/TaskCollectionTest.php | 2 +- .../Controller/Component/Auth/ActionsAuthorizeTest.php | 2 +- .../Controller/Component/Auth/ControllerAuthorizeTest.php | 2 +- .../Case/Controller/Component/Auth/CrudAuthorizeTest.php | 2 +- lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php | 4 ++-- lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php | 6 +++--- lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php | 8 ++++---- .../Case/Model/Datasource/Session/CacheSessionTest.php | 2 +- .../Case/Model/Datasource/Session/DatabaseSessionTest.php | 2 +- lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php | 2 +- lib/Cake/Test/Case/Network/CakeRequestTest.php | 4 ++-- lib/Cake/Test/Case/Network/CakeResponseTest.php | 2 +- .../Test/Case/Network/Http/BasicAuthenticationTest.php | 2 +- .../Test/Case/Network/Http/DigestAuthenticationTest.php | 2 +- lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php | 2 +- lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php | 2 +- lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php | 2 +- lib/Cake/Test/Case/Utility/HashTest.php | 2 +- lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php | 2 +- lib/Cake/Test/Case/View/Helper/JsHelperTest.php | 4 ++-- .../Test/Case/View/Helper/MootoolsEngineHelperTest.php | 2 +- .../Test/Case/View/Helper/PrototypeEngineHelperTest.php | 2 +- lib/Cake/Test/Case/View/Helper/TextHelperTest.php | 2 +- lib/Cake/Test/Case/View/HelperCollectionTest.php | 2 +- lib/Cake/Test/Case/View/ViewTest.php | 6 +++--- lib/Cake/Test/Fixture/FilmFileFixture.php | 2 +- lib/Cake/Test/Fixture/FruitsUuidTagFixture.php | 2 +- lib/Cake/Test/Fixture/GroupUpdateAllFixture.php | 2 +- lib/Cake/Test/Fixture/GuildFixture.php | 2 +- lib/Cake/Test/Fixture/GuildsPlayerFixture.php | 2 +- lib/Cake/Test/Fixture/HomeFixture.php | 2 +- lib/Cake/Test/Fixture/ImageFixture.php | 2 +- lib/Cake/Test/Fixture/InnoFixture.php | 2 +- lib/Cake/Test/Fixture/ItemFixture.php | 2 +- lib/Cake/Test/Fixture/ItemsPortfolioFixture.php | 2 +- lib/Cake/Test/Fixture/JoinABFixture.php | 2 +- lib/Cake/Test/Fixture/JoinACFixture.php | 2 +- lib/Cake/Test/Fixture/JoinAFixture.php | 2 +- lib/Cake/Test/Fixture/JoinBFixture.php | 2 +- lib/Cake/Test/Fixture/JoinCFixture.php | 2 +- lib/Cake/Test/Fixture/JoinThingFixture.php | 2 +- lib/Cake/Test/Fixture/MessageFixture.php | 2 +- lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php | 2 +- lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php | 2 +- lib/Cake/Test/Fixture/MyCategoryFixture.php | 2 +- lib/Cake/Test/Fixture/MyProductFixture.php | 2 +- lib/Cake/Test/Fixture/MyUserFixture.php | 2 +- lib/Cake/Test/Fixture/NodeFixture.php | 2 +- lib/Cake/Test/Fixture/NumberTreeFixture.php | 2 +- lib/Cake/Test/Fixture/NumberTreeTwoFixture.php | 2 +- lib/Cake/Test/Fixture/NumericArticleFixture.php | 2 +- lib/Cake/Test/Fixture/OverallFavoriteFixture.php | 2 +- lib/Cake/Test/Fixture/PersonFixture.php | 2 +- lib/Cake/Test/Fixture/PlayerFixture.php | 2 +- lib/Cake/Test/Fixture/PortfolioFixture.php | 2 +- lib/Cake/Test/Fixture/PostsTagFixture.php | 2 +- lib/Cake/Test/Fixture/PrimaryModelFixture.php | 2 +- lib/Cake/Test/Fixture/ProductFixture.php | 2 +- lib/Cake/Test/Fixture/ProductUpdateAllFixture.php | 2 +- lib/Cake/Test/Fixture/ProjectFixture.php | 2 +- lib/Cake/Test/Fixture/SampleFixture.php | 2 +- lib/Cake/Test/Fixture/SecondaryModelFixture.php | 2 +- lib/Cake/Test/Fixture/SessionFixture.php | 2 +- lib/Cake/Test/Fixture/SiteFixture.php | 2 +- lib/Cake/Test/Fixture/SomethingElseFixture.php | 2 +- lib/Cake/Test/Fixture/SomethingFixture.php | 2 +- lib/Cake/Test/Fixture/StoriesTagFixture.php | 2 +- lib/Cake/Test/Fixture/StoryFixture.php | 2 +- lib/Cake/Test/Fixture/SyfileFixture.php | 2 +- lib/Cake/Test/Fixture/TagFixture.php | 2 +- lib/Cake/Test/Fixture/TestPluginArticleFixture.php | 2 +- lib/Cake/Test/Fixture/TestPluginCommentFixture.php | 2 +- lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php | 2 +- lib/Cake/Test/Fixture/ThreadFixture.php | 2 +- lib/Cake/Test/Fixture/TranslateArticleFixture.php | 2 +- lib/Cake/Test/Fixture/TranslateFixture.php | 2 +- lib/Cake/Test/Fixture/TranslateTableFixture.php | 2 +- lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php | 2 +- lib/Cake/Test/Fixture/TranslatedArticleFixture.php | 2 +- lib/Cake/Test/Fixture/TranslatedItemFixture.php | 2 +- lib/Cake/Test/Fixture/UserFixture.php | 2 +- lib/Cake/Test/Fixture/UuidFixture.php | 2 +- lib/Cake/Test/Fixture/UuidNativeFixture.php | 2 +- lib/Cake/Test/Fixture/UuidNativeTagFixture.php | 2 +- lib/Cake/Test/Fixture/UuidTagFixture.php | 2 +- lib/Cake/Test/Fixture/UuiditemFixture.php | 2 +- lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php | 2 +- .../Fixture/UuiditemsUuidportfolioNumericidFixture.php | 2 +- lib/Cake/Test/Fixture/UuidnativeitemFixture.php | 2 +- .../Fixture/UuidnativeitemsUuidnativeportfolioFixture.php | 2 +- ...UuidnativeitemsUuidnativeportfolioNumericidFixture.php | 2 +- lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php | 2 +- lib/Cake/Test/Fixture/UuidportfolioFixture.php | 2 +- lib/Cake/Test/test_app/Console/Command/SampleShell.php | 2 +- lib/Cake/Test/test_app/Controller/TestsAppsController.php | 2 +- .../Test/test_app/Controller/TestsAppsPostsController.php | 2 +- .../Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php | 2 +- lib/Cake/Test/test_app/Lib/Library.php | 2 +- lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php | 2 +- lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php | 2 +- lib/Cake/Test/test_app/Model/Extract.php | 2 +- lib/Cake/Test/test_app/Model/PersisterOne.php | 2 +- lib/Cake/Test/test_app/Model/PersisterTwo.php | 2 +- lib/Cake/Test/test_app/Model/Post.php | 2 +- .../test_app/Plugin/TestPlugin/Config/Schema/schema.php | 2 +- .../Plugin/TestPlugin/Console/Command/ExampleShell.php | 2 +- .../TestPlugin/Console/Command/Task/OtherTaskTask.php | 2 +- .../Plugin/TestPlugin/Console/Command/TestPluginShell.php | 2 +- .../TestPlugin/Controller/Component/OtherComponent.php | 2 +- .../TestPlugin/Controller/Component/PluginsComponent.php | 2 +- .../Controller/Component/TestPluginComponent.php | 2 +- .../Controller/Component/TestPluginOtherComponent.php | 2 +- .../TestPlugin/Controller/TestPluginAppController.php | 2 +- .../Plugin/TestPlugin/Controller/TestPluginController.php | 2 +- .../Plugin/TestPlugin/Controller/TestsController.php | 2 +- .../TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php | 2 +- .../TestPlugin/Lib/Custom/Package/CustomLibClass.php | 2 +- .../TestPlugin/Lib/Error/TestPluginExceptionRenderer.php | 2 +- .../Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php | 2 +- .../Lib/Routing/Filter/Test2DispatcherFilter.php | 2 +- .../Lib/Routing/Filter/TestDispatcherFilter.php | 2 +- .../test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php | 2 +- .../Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php | 2 +- .../Plugin/TestPlugin/Model/TestPluginAppModel.php | 2 +- .../Plugin/TestPlugin/Model/TestPluginAuthUser.php | 2 +- .../Plugin/TestPlugin/Model/TestPluginAuthors.php | 2 +- .../Plugin/TestPlugin/Model/TestPluginComment.php | 2 +- .../test_app/Plugin/TestPlugin/Model/TestPluginPost.php | 2 +- .../Plugin/TestPlugin/Vendor/sample/sample_plugin.php | 2 +- .../Plugin/TestPlugin/View/Helper/OtherHelperHelper.php | 2 +- .../Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php | 2 +- .../Plugin/TestPluginTwo/Console/Command/ExampleShell.php | 2 +- .../Plugin/TestPluginTwo/Console/Command/WelcomeShell.php | 2 +- .../Vendor/sample/configure_test_vendor_sample.php | 2 +- 145 files changed, 158 insertions(+), 158 deletions(-) diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php index 2060d1527..1ae64fde6 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php @@ -20,7 +20,7 @@ App::uses('Cache', 'Cache'); App::uses('MemcacheEngine', 'Cache/Engine'); /** - * Class TestMemcacheEngine + * TestMemcacheEngine * * @package Cake.Test.Case.Cache.Engine */ diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php index babdf9779..9bce33ea4 100644 --- a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php @@ -22,7 +22,7 @@ App::uses('Cache', 'Cache'); App::uses('MemcachedEngine', 'Cache/Engine'); /** - * Class TestMemcachedEngine + * TestMemcachedEngine * * @package Cake.Test.Case.Cache.Engine */ diff --git a/lib/Cake/Test/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php index ed7129eba..b53d56cf2 100644 --- a/lib/Cake/Test/Case/Configure/IniReaderTest.php +++ b/lib/Cake/Test/Case/Configure/IniReaderTest.php @@ -19,7 +19,7 @@ App::uses('IniReader', 'Configure'); /** - * Class IniReaderTest + * IniReaderTest * * @package Cake.Test.Case.Configure */ diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php index 6d108c5ed..1dea44b73 100644 --- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php +++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php @@ -19,7 +19,7 @@ App::uses('PhpReader', 'Configure'); /** - * Class PhpReaderTest + * PhpReaderTest * * @package Cake.Test.Case.Configure */ diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php index db0389617..7f2fda731 100644 --- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php @@ -23,7 +23,7 @@ App::uses('Shell', 'Console'); App::uses('CommandTask', 'Console/Command/Task'); /** - * Class TestStringOutput + * TestStringOutput * * @package Cake.Test.Case.Console.Command */ @@ -38,7 +38,7 @@ class TestStringOutput extends ConsoleOutput { } /** - * Class CommandListShellTest + * CommandListShellTest * * @package Cake.Test.Case.Console.Command */ diff --git a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php index b28db0c65..aeb85606e 100644 --- a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php @@ -25,7 +25,7 @@ App::uses('Shell', 'Console'); App::uses('CommandTask', 'Console/Command/Task'); /** - * Class TestCompletionStringOutput + * TestCompletionStringOutput * * @package Cake.Test.Case.Console.Command */ @@ -40,7 +40,7 @@ class TestCompletionStringOutput extends ConsoleOutput { } /** - * Class CompletionShellTest + * CompletionShellTest * * @package Cake.Test.Case.Console.Command */ diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php index ded7e9596..40a843dc1 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php @@ -39,7 +39,7 @@ if (!$imported) { define('ARTICLE_MODEL_CREATED', true); /** - * Class BakeArticle + * BakeArticle */ class BakeArticle extends Model { diff --git a/lib/Cake/Test/Case/Console/Command/TestShellTest.php b/lib/Cake/Test/Case/Console/Command/TestShellTest.php index bcc100628..bde6c0d8c 100644 --- a/lib/Cake/Test/Case/Console/Command/TestShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/TestShellTest.php @@ -20,7 +20,7 @@ App::uses('ShellDispatcher', 'Console'); App::uses('TestShell', 'Console/Command'); /** - * Class TestTestShell + * TestTestShell * * @package Cake.Test.Case.Console.Command */ @@ -37,7 +37,7 @@ class TestTestShell extends TestShell { } /** - * Class TestShellTest + * TestShellTest * * @package Cake.Test.Case.Console.Command */ diff --git a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php index 5a194db08..ecf5c0abb 100644 --- a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php +++ b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php @@ -19,7 +19,7 @@ App::uses('ConsoleOptionParser', 'Console'); /** - * Class ConsoleOptionParserTest + * ConsoleOptionParserTest * * @package Cake.Test.Case.Console */ diff --git a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php index 8925428b4..76bdee0e7 100644 --- a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php +++ b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php @@ -19,7 +19,7 @@ App::uses('ConsoleOutput', 'Console'); /** - * Class ConsoleOutputTest + * ConsoleOutputTest * * @package Cake.Test.Case.Console */ diff --git a/lib/Cake/Test/Case/Console/HelpFormatterTest.php b/lib/Cake/Test/Case/Console/HelpFormatterTest.php index b364eedc0..77375f63b 100644 --- a/lib/Cake/Test/Case/Console/HelpFormatterTest.php +++ b/lib/Cake/Test/Case/Console/HelpFormatterTest.php @@ -20,7 +20,7 @@ App::uses('ConsoleOptionParser', 'Console'); App::uses('HelpFormatter', 'Console'); /** - * Class HelpFormatterTest + * HelpFormatterTest * * @package Cake.Test.Case.Console */ diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php index 4d5c0a116..55418d26b 100644 --- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php +++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php @@ -26,7 +26,7 @@ class DbConfigAliasedTask extends Shell { } /** - * Class TaskCollectionTest + * TaskCollectionTest * * @package Cake.Test.Case.Console */ diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php index 25bf7b99b..6a9aa546b 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php @@ -23,7 +23,7 @@ App::uses('CakeRequest', 'Network'); App::uses('CakeResponse', 'Network'); /** - * Class ActionsAuthorizeTest + * ActionsAuthorizeTest * * @package Cake.Test.Case.Controller.Component.Auth */ diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php index 3216cdc3a..b0f554bf4 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php @@ -22,7 +22,7 @@ App::uses('CakeRequest', 'Network'); App::uses('CakeResponse', 'Network'); /** - * Class ControllerAuthorizeTest + * ControllerAuthorizeTest * * @package Cake.Test.Case.Controller.Component.Auth */ diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php index e87e40937..e649b1c69 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php @@ -23,7 +23,7 @@ App::uses('CakeRequest', 'Network'); App::uses('CakeResponse', 'Network'); /** - * Class CrudAuthorizeTest + * CrudAuthorizeTest * * @package Cake.Test.Case.Controller.Component.Auth */ diff --git a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php index f177488dc..4d85705aa 100644 --- a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php +++ b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php @@ -19,7 +19,7 @@ App::uses('ConsoleLog', 'Log/Engine'); /** - * Class TestConsoleLog + * TestConsoleLog * * @package Cake.Test.Case.Log.Engine */ @@ -28,7 +28,7 @@ class TestConsoleLog extends ConsoleLog { } /** - * Class TestCakeLog + * TestCakeLog * * @package Cake.Test.Case.Log.Engine */ diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index bb263076d..d6cd59fa7 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -21,7 +21,7 @@ App::uses('DatabaseSession', 'Model/Datasource/Session'); App::uses('CacheSession', 'Model/Datasource/Session'); /** - * Class TestCakeSession + * TestCakeSession * * @package Cake.Test.Case.Model.Datasource */ @@ -38,7 +38,7 @@ class TestCakeSession extends CakeSession { } /** - * Class TestCacheSession + * TestCacheSession * * @package Cake.Test.Case.Model.Datasource */ @@ -51,7 +51,7 @@ class TestCacheSession extends CacheSession { } /** - * Class TestDatabaseSession + * TestDatabaseSession * * @package Cake.Test.Case.Model.Datasource */ diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php index 8882282d4..b50ff3136 100644 --- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php @@ -27,7 +27,7 @@ App::uses('MockDataSource', 'Model/Datasource'); require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** - * Class MockPDO + * MockPDO * * @package Cake.Test.Case.Model.Datasource */ @@ -42,7 +42,7 @@ class MockPDO extends PDO { } /** - * Class MockDataSource + * MockDataSource * * @package Cake.Test.Case.Model.Datasource */ @@ -50,7 +50,7 @@ class MockDataSource extends DataSource { } /** - * Class DboTestSource + * DboTestSource * * @package Cake.Test.Case.Model.Datasource */ @@ -81,7 +81,7 @@ class DboTestSource extends DboSource { } /** - * Class DboSecondTestSource + * DboSecondTestSource * * @package Cake.Test.Case.Model.Datasource */ diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php index 387c05fc1..733a24060 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php @@ -21,7 +21,7 @@ App::uses('CacheSession', 'Model/Datasource/Session'); class_exists('CakeSession'); /** - * Class CacheSessionTest + * CacheSessionTest * * @package Cake.Test.Case.Model.Datasource.Session */ diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php index fb5b0bfef..7e7e57ec5 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php @@ -22,7 +22,7 @@ App::uses('DatabaseSession', 'Model/Datasource/Session'); class_exists('CakeSession'); /** - * Class SessionTestModel + * SessionTestModel * * @package Cake.Test.Case.Model.Datasource.Session */ diff --git a/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php b/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php index ed2316d6b..cae9a4c6c 100644 --- a/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php +++ b/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php @@ -21,7 +21,7 @@ require_once dirname(__FILE__) . DS . 'ModelTestBase.php'; /** - * Class ModelCrossSchemaHabtmTest + * ModelCrossSchemaHabtmTest * * @package Cake.Test.Case.Model */ diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php index 66bd69fc5..1472ac666 100644 --- a/lib/Cake/Test/Case/Network/CakeRequestTest.php +++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php @@ -21,7 +21,7 @@ App::uses('Xml', 'Utility'); App::uses('CakeRequest', 'Network'); /** - * Class TestCakeRequest + * TestCakeRequest * * @package Cake.Test.Case.Network */ @@ -55,7 +55,7 @@ class TestCakeRequest extends CakeRequest { } /** - * Class CakeRequestTest + * CakeRequestTest */ class CakeRequestTest extends CakeTestCase { diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php index cff657d62..66e9530a1 100644 --- a/lib/Cake/Test/Case/Network/CakeResponseTest.php +++ b/lib/Cake/Test/Case/Network/CakeResponseTest.php @@ -18,7 +18,7 @@ App::uses('CakeResponse', 'Network'); App::uses('CakeRequest', 'Network'); /** - * Class CakeResponseTest + * CakeResponseTest * * @package Cake.Test.Case.Network */ diff --git a/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php index 7ae8349b3..fd7ec4566 100644 --- a/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php +++ b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php @@ -20,7 +20,7 @@ App::uses('HttpSocket', 'Network/Http'); App::uses('BasicAuthentication', 'Network/Http'); /** - * class TestSslHttpSocket + * TestSslHttpSocket * * @package Cake.Test.Case.Network.Http */ diff --git a/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php index 3610427c5..1b17c6562 100644 --- a/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php +++ b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php @@ -20,7 +20,7 @@ App::uses('HttpSocket', 'Network/Http'); App::uses('DigestAuthentication', 'Network/Http'); /** - * Class DigestHttpSocket + * DigestHttpSocket * * @package Cake.Test.Case.Network.Http */ diff --git a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php index c67cba384..49b4c6656 100644 --- a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php @@ -19,7 +19,7 @@ App::uses('CakeEvent', 'Event'); App::uses('CakeResponse', 'Network'); /** - * Class AssetDispatcherTest + * AssetDispatcherTest * * @package Cake.Test.Case.Routing.Filter */ diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php index 41e158ed8..4f47c1e10 100644 --- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php @@ -65,7 +65,7 @@ if (!class_exists('AppController', false)) { if (!class_exists('PostsController')) { /** - * Class PostsController + * PostsController * * @package Cake.Test.Case.TestSuite */ diff --git a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php index 6763d2f1f..24fe7e866 100644 --- a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php +++ b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php @@ -22,7 +22,7 @@ App::uses('HtmlCoverageReport', 'TestSuite/Coverage'); App::uses('CakeBaseReporter', 'TestSuite/Reporter'); /** - * Class HtmlCoverageReportTest + * HtmlCoverageReportTest * * @package Cake.Test.Case.TestSuite */ diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php index cb97f60e2..d92c7614f 100644 --- a/lib/Cake/Test/Case/Utility/HashTest.php +++ b/lib/Cake/Test/Case/Utility/HashTest.php @@ -17,7 +17,7 @@ App::uses('Hash', 'Utility'); /** - * Class HashTest + * HashTest * * @package Cake.Utility */ diff --git a/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php index 997838c3e..1c1702d7f 100644 --- a/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php @@ -21,7 +21,7 @@ App::uses('JqueryEngineHelper', 'View/Helper'); App::uses('View', 'View'); /** - * Class JqueryEngineHelperTest + * JqueryEngineHelperTest * * @package Cake.Test.Case.View.Helper */ diff --git a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php index f6f458b4b..c7daee5da 100644 --- a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php @@ -26,7 +26,7 @@ App::uses('View', 'View'); App::uses('ClassRegistry', 'Utility'); /** - * Class JsEncodingObject + * JsEncodingObject * * @package Cake.Test.Case.View.Helper */ @@ -41,7 +41,7 @@ class JsEncodingObject { } /** - * Class OptionEngineHelper + * OptionEngineHelper * * @package Cake.Test.Case.View.Helper */ diff --git a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php index 69d7c6244..971faa00c 100644 --- a/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php @@ -21,7 +21,7 @@ App::uses('JsHelper', 'View/Helper'); App::uses('MootoolsEngineHelper', 'View/Helper'); /** - * Class MootoolsEngineHelperTest + * MootoolsEngineHelperTest * * @package Cake.Test.Case.View.Helper */ diff --git a/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php index d60cf1041..404e4b377 100644 --- a/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php @@ -21,7 +21,7 @@ App::uses('JsHelper', 'View/Helper'); App::uses('PrototypeEngineHelper', 'View/Helper'); /** - * Class PrototypeEngineHelperTest + * PrototypeEngineHelperTest * * @package Cake.Test.Case.View.Helper */ diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php index f38dc402a..5ea1abf14 100644 --- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php @@ -20,7 +20,7 @@ App::uses('View', 'View'); App::uses('TextHelper', 'View/Helper'); /** - * Class TextHelperTestObject + * TextHelperTestObject * * @package Cake.Test.Case.View.Helper */ diff --git a/lib/Cake/Test/Case/View/HelperCollectionTest.php b/lib/Cake/Test/Case/View/HelperCollectionTest.php index 179940f0e..eb2961ebf 100644 --- a/lib/Cake/Test/Case/View/HelperCollectionTest.php +++ b/lib/Cake/Test/Case/View/HelperCollectionTest.php @@ -27,7 +27,7 @@ class HtmlAliasHelper extends HtmlHelper { } /** - * Class HelperCollectionTest + * HelperCollectionTest * * @package Cake.Test.Case.View */ diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index fc229464f..8ac8755ec 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -220,7 +220,7 @@ class TestBeforeAfterHelper extends Helper { } /** - * Class TestObjectWithToString + * TestObjectWithToString * * An object with the magic method __toString() for testing with view blocks. */ @@ -233,7 +233,7 @@ class TestObjectWithToString { } /** - * Class TestObjectWithoutToString + * TestObjectWithoutToString * * An object without the magic method __toString() for testing with view blocks. */ @@ -241,7 +241,7 @@ class TestObjectWithoutToString { } /** - * Class TestViewEventListener + * TestViewEventListener * * An event listener to test cakePHP events */ diff --git a/lib/Cake/Test/Fixture/FilmFileFixture.php b/lib/Cake/Test/Fixture/FilmFileFixture.php index 423850481..78bc81a16 100644 --- a/lib/Cake/Test/Fixture/FilmFileFixture.php +++ b/lib/Cake/Test/Fixture/FilmFileFixture.php @@ -17,7 +17,7 @@ */ /** - * Class FilmFileFixture + * FilmFileFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php b/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php index 481550982..dcde11f26 100644 --- a/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php +++ b/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php @@ -17,7 +17,7 @@ */ /** - * Class FruitsUuidTagFixture + * FruitsUuidTagFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php index 07471230e..a34718f79 100644 --- a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php +++ b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php @@ -17,7 +17,7 @@ */ /** - * Class GroupUpdateAllFixture + * GroupUpdateAllFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/GuildFixture.php b/lib/Cake/Test/Fixture/GuildFixture.php index 35ffa602b..d85b30299 100644 --- a/lib/Cake/Test/Fixture/GuildFixture.php +++ b/lib/Cake/Test/Fixture/GuildFixture.php @@ -17,7 +17,7 @@ */ /** - * Class GuildFixture + * GuildFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php index f19ca8d06..910004d7d 100644 --- a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php +++ b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php @@ -17,7 +17,7 @@ */ /** - * Class GuildsPlayerFixture + * GuildsPlayerFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/HomeFixture.php b/lib/Cake/Test/Fixture/HomeFixture.php index 18dd3e9b4..ceda144e1 100644 --- a/lib/Cake/Test/Fixture/HomeFixture.php +++ b/lib/Cake/Test/Fixture/HomeFixture.php @@ -17,7 +17,7 @@ */ /** - * Class HomeFixture + * HomeFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ImageFixture.php b/lib/Cake/Test/Fixture/ImageFixture.php index 00aff3e0e..32e130b18 100644 --- a/lib/Cake/Test/Fixture/ImageFixture.php +++ b/lib/Cake/Test/Fixture/ImageFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ImageFixture + * ImageFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/InnoFixture.php b/lib/Cake/Test/Fixture/InnoFixture.php index 7fa883db5..a37c6498e 100644 --- a/lib/Cake/Test/Fixture/InnoFixture.php +++ b/lib/Cake/Test/Fixture/InnoFixture.php @@ -17,7 +17,7 @@ */ /** - * Class InnoFixture + * InnoFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ItemFixture.php b/lib/Cake/Test/Fixture/ItemFixture.php index d3026b672..f01e54c4a 100644 --- a/lib/Cake/Test/Fixture/ItemFixture.php +++ b/lib/Cake/Test/Fixture/ItemFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ItemFixture + * ItemFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php b/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php index fdcad4fc3..8dc2d3931 100644 --- a/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php +++ b/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ItemsPortfolioFixture + * ItemsPortfolioFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/JoinABFixture.php b/lib/Cake/Test/Fixture/JoinABFixture.php index 2342b840f..9fdfd9419 100644 --- a/lib/Cake/Test/Fixture/JoinABFixture.php +++ b/lib/Cake/Test/Fixture/JoinABFixture.php @@ -17,7 +17,7 @@ */ /** - * Class JoinABFixture + * JoinABFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/JoinACFixture.php b/lib/Cake/Test/Fixture/JoinACFixture.php index 860c8697b..8381b3725 100644 --- a/lib/Cake/Test/Fixture/JoinACFixture.php +++ b/lib/Cake/Test/Fixture/JoinACFixture.php @@ -17,7 +17,7 @@ */ /** - * Class JoinACFixture + * JoinACFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/JoinAFixture.php b/lib/Cake/Test/Fixture/JoinAFixture.php index 5251bb16b..21924fe88 100644 --- a/lib/Cake/Test/Fixture/JoinAFixture.php +++ b/lib/Cake/Test/Fixture/JoinAFixture.php @@ -17,7 +17,7 @@ */ /** - * Class JoinAFixture + * JoinAFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/JoinBFixture.php b/lib/Cake/Test/Fixture/JoinBFixture.php index 12b1acb4f..8701c095b 100644 --- a/lib/Cake/Test/Fixture/JoinBFixture.php +++ b/lib/Cake/Test/Fixture/JoinBFixture.php @@ -17,7 +17,7 @@ */ /** - * Class JoinBFixture + * JoinBFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/JoinCFixture.php b/lib/Cake/Test/Fixture/JoinCFixture.php index 4f792ef91..31a7abf20 100644 --- a/lib/Cake/Test/Fixture/JoinCFixture.php +++ b/lib/Cake/Test/Fixture/JoinCFixture.php @@ -17,7 +17,7 @@ */ /** - * Class JoinCFixture + * JoinCFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/JoinThingFixture.php b/lib/Cake/Test/Fixture/JoinThingFixture.php index 6d6fea225..081586348 100644 --- a/lib/Cake/Test/Fixture/JoinThingFixture.php +++ b/lib/Cake/Test/Fixture/JoinThingFixture.php @@ -17,7 +17,7 @@ */ /** - * Class JoinThingFixture + * JoinThingFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/MessageFixture.php b/lib/Cake/Test/Fixture/MessageFixture.php index ec132b6b0..188525507 100644 --- a/lib/Cake/Test/Fixture/MessageFixture.php +++ b/lib/Cake/Test/Fixture/MessageFixture.php @@ -17,7 +17,7 @@ */ /** - * Class MessageFixture + * MessageFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php index cc345fad2..81eda980c 100644 --- a/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php +++ b/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php @@ -17,7 +17,7 @@ */ /** - * Class MyCategoriesMyProductsFixture + * MyCategoriesMyProductsFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php index ad45f6d9a..13da6da55 100644 --- a/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php +++ b/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php @@ -17,7 +17,7 @@ */ /** - * Class MyCategoriesMyUsersFixture + * MyCategoriesMyUsersFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/MyCategoryFixture.php b/lib/Cake/Test/Fixture/MyCategoryFixture.php index 5a62322b5..227ba1c6f 100644 --- a/lib/Cake/Test/Fixture/MyCategoryFixture.php +++ b/lib/Cake/Test/Fixture/MyCategoryFixture.php @@ -17,7 +17,7 @@ */ /** - * Class MyCategoryFixture + * MyCategoryFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/MyProductFixture.php b/lib/Cake/Test/Fixture/MyProductFixture.php index 834590ecb..162dc4b29 100644 --- a/lib/Cake/Test/Fixture/MyProductFixture.php +++ b/lib/Cake/Test/Fixture/MyProductFixture.php @@ -17,7 +17,7 @@ */ /** - * Class MyProductFixture + * MyProductFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/MyUserFixture.php b/lib/Cake/Test/Fixture/MyUserFixture.php index 619f62c2d..87b781506 100644 --- a/lib/Cake/Test/Fixture/MyUserFixture.php +++ b/lib/Cake/Test/Fixture/MyUserFixture.php @@ -17,7 +17,7 @@ */ /** - * Class MyUserFixture + * MyUserFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/NodeFixture.php b/lib/Cake/Test/Fixture/NodeFixture.php index 1edc2ad75..a8289adbe 100644 --- a/lib/Cake/Test/Fixture/NodeFixture.php +++ b/lib/Cake/Test/Fixture/NodeFixture.php @@ -17,7 +17,7 @@ */ /** - * Class NodeFixture + * NodeFixture * * @package Cake.Test.Fixture * @since CakePHP(tm) v 1.2.0.6879 //Correct version number as needed** diff --git a/lib/Cake/Test/Fixture/NumberTreeFixture.php b/lib/Cake/Test/Fixture/NumberTreeFixture.php index 78d34cf21..09d65aec6 100644 --- a/lib/Cake/Test/Fixture/NumberTreeFixture.php +++ b/lib/Cake/Test/Fixture/NumberTreeFixture.php @@ -19,7 +19,7 @@ */ /** - * Class NumberTreeFixture + * NumberTreeFixture * * Generates a tree of data for use testing the tree behavior * diff --git a/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php b/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php index 4b0eade1f..5eba080b2 100644 --- a/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php +++ b/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php @@ -19,7 +19,7 @@ */ /** - * Class NumberTreeTwoFixture + * NumberTreeTwoFixture * * Generates a tree of data for use testing the tree behavior * diff --git a/lib/Cake/Test/Fixture/NumericArticleFixture.php b/lib/Cake/Test/Fixture/NumericArticleFixture.php index cce0b131d..eb62b0c8d 100644 --- a/lib/Cake/Test/Fixture/NumericArticleFixture.php +++ b/lib/Cake/Test/Fixture/NumericArticleFixture.php @@ -17,7 +17,7 @@ */ /** - * Class NumericArticleFixture + * NumericArticleFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/OverallFavoriteFixture.php b/lib/Cake/Test/Fixture/OverallFavoriteFixture.php index abc651e4d..145b40455 100644 --- a/lib/Cake/Test/Fixture/OverallFavoriteFixture.php +++ b/lib/Cake/Test/Fixture/OverallFavoriteFixture.php @@ -17,7 +17,7 @@ */ /** - * Class OverallFavoriteFixture + * OverallFavoriteFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/PersonFixture.php b/lib/Cake/Test/Fixture/PersonFixture.php index 072f3f120..0747963b0 100644 --- a/lib/Cake/Test/Fixture/PersonFixture.php +++ b/lib/Cake/Test/Fixture/PersonFixture.php @@ -17,7 +17,7 @@ */ /** - * Class PersonFixture + * PersonFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/PlayerFixture.php b/lib/Cake/Test/Fixture/PlayerFixture.php index 9a05703d8..db40ca00a 100644 --- a/lib/Cake/Test/Fixture/PlayerFixture.php +++ b/lib/Cake/Test/Fixture/PlayerFixture.php @@ -17,7 +17,7 @@ */ /** - * Class PlayerFixture + * PlayerFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/PortfolioFixture.php b/lib/Cake/Test/Fixture/PortfolioFixture.php index 6b658589a..23c567138 100644 --- a/lib/Cake/Test/Fixture/PortfolioFixture.php +++ b/lib/Cake/Test/Fixture/PortfolioFixture.php @@ -17,7 +17,7 @@ */ /** - * Class PortfolioFixture + * PortfolioFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/PostsTagFixture.php b/lib/Cake/Test/Fixture/PostsTagFixture.php index a767e8225..d8af5fdb6 100644 --- a/lib/Cake/Test/Fixture/PostsTagFixture.php +++ b/lib/Cake/Test/Fixture/PostsTagFixture.php @@ -17,7 +17,7 @@ */ /** - * Class PostsTagFixture + * PostsTagFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/PrimaryModelFixture.php b/lib/Cake/Test/Fixture/PrimaryModelFixture.php index c2fa4ad3b..80d847b7c 100644 --- a/lib/Cake/Test/Fixture/PrimaryModelFixture.php +++ b/lib/Cake/Test/Fixture/PrimaryModelFixture.php @@ -17,7 +17,7 @@ */ /** - * Class PrimaryModelFixture + * PrimaryModelFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ProductFixture.php b/lib/Cake/Test/Fixture/ProductFixture.php index 5483e19a0..c19b3b541 100644 --- a/lib/Cake/Test/Fixture/ProductFixture.php +++ b/lib/Cake/Test/Fixture/ProductFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ProductFixture + * ProductFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php index eedec7a41..13d707470 100644 --- a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php +++ b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ProductUpdateAllFixture + * ProductUpdateAllFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ProjectFixture.php b/lib/Cake/Test/Fixture/ProjectFixture.php index 3912aee20..b91fefdaa 100644 --- a/lib/Cake/Test/Fixture/ProjectFixture.php +++ b/lib/Cake/Test/Fixture/ProjectFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ProjectFixture + * ProjectFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/SampleFixture.php b/lib/Cake/Test/Fixture/SampleFixture.php index 0611b0b4f..fe46a583f 100644 --- a/lib/Cake/Test/Fixture/SampleFixture.php +++ b/lib/Cake/Test/Fixture/SampleFixture.php @@ -17,7 +17,7 @@ */ /** - * Class SampleFixture + * SampleFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/SecondaryModelFixture.php b/lib/Cake/Test/Fixture/SecondaryModelFixture.php index 6d22aa7ba..dd03b31ad 100644 --- a/lib/Cake/Test/Fixture/SecondaryModelFixture.php +++ b/lib/Cake/Test/Fixture/SecondaryModelFixture.php @@ -17,7 +17,7 @@ */ /** - * Class SecondaryModelFixture + * SecondaryModelFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/SessionFixture.php b/lib/Cake/Test/Fixture/SessionFixture.php index 935ea399a..39f7e1978 100644 --- a/lib/Cake/Test/Fixture/SessionFixture.php +++ b/lib/Cake/Test/Fixture/SessionFixture.php @@ -17,7 +17,7 @@ */ /** - * Class SessionFixture + * SessionFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/SiteFixture.php b/lib/Cake/Test/Fixture/SiteFixture.php index c24556715..a60dddce5 100644 --- a/lib/Cake/Test/Fixture/SiteFixture.php +++ b/lib/Cake/Test/Fixture/SiteFixture.php @@ -17,7 +17,7 @@ */ /** - * Class SiteFixture + * SiteFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/SomethingElseFixture.php b/lib/Cake/Test/Fixture/SomethingElseFixture.php index f14fdcf94..78c6b7911 100644 --- a/lib/Cake/Test/Fixture/SomethingElseFixture.php +++ b/lib/Cake/Test/Fixture/SomethingElseFixture.php @@ -17,7 +17,7 @@ */ /** - * Class SomethingElseFixture + * SomethingElseFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/SomethingFixture.php b/lib/Cake/Test/Fixture/SomethingFixture.php index 9edda8eb6..bc1edd927 100644 --- a/lib/Cake/Test/Fixture/SomethingFixture.php +++ b/lib/Cake/Test/Fixture/SomethingFixture.php @@ -17,7 +17,7 @@ */ /** - * Class SomethingFixture + * SomethingFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/StoriesTagFixture.php b/lib/Cake/Test/Fixture/StoriesTagFixture.php index 02729143c..e2b895db2 100644 --- a/lib/Cake/Test/Fixture/StoriesTagFixture.php +++ b/lib/Cake/Test/Fixture/StoriesTagFixture.php @@ -17,7 +17,7 @@ */ /** - * Class StoriesTagFixture + * StoriesTagFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/StoryFixture.php b/lib/Cake/Test/Fixture/StoryFixture.php index 5eda5a2b5..954582546 100644 --- a/lib/Cake/Test/Fixture/StoryFixture.php +++ b/lib/Cake/Test/Fixture/StoryFixture.php @@ -17,7 +17,7 @@ */ /** - * Class StoryFixture + * StoryFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/SyfileFixture.php b/lib/Cake/Test/Fixture/SyfileFixture.php index cb7aaa1fd..4ad7bb913 100644 --- a/lib/Cake/Test/Fixture/SyfileFixture.php +++ b/lib/Cake/Test/Fixture/SyfileFixture.php @@ -17,7 +17,7 @@ */ /** - * Class SyfileFixture + * SyfileFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TagFixture.php b/lib/Cake/Test/Fixture/TagFixture.php index d69825f0a..cee5cebc9 100644 --- a/lib/Cake/Test/Fixture/TagFixture.php +++ b/lib/Cake/Test/Fixture/TagFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TagFixture + * TagFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TestPluginArticleFixture.php b/lib/Cake/Test/Fixture/TestPluginArticleFixture.php index fd588c207..453fd469c 100644 --- a/lib/Cake/Test/Fixture/TestPluginArticleFixture.php +++ b/lib/Cake/Test/Fixture/TestPluginArticleFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginArticleFixture + * TestPluginArticleFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TestPluginCommentFixture.php b/lib/Cake/Test/Fixture/TestPluginCommentFixture.php index b84ca5074..7553266af 100644 --- a/lib/Cake/Test/Fixture/TestPluginCommentFixture.php +++ b/lib/Cake/Test/Fixture/TestPluginCommentFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginCommentFixture + * TestPluginCommentFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php b/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php index 37c1a5ffb..59b7df437 100644 --- a/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php +++ b/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ThePaperMonkiesFixture + * ThePaperMonkiesFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/ThreadFixture.php b/lib/Cake/Test/Fixture/ThreadFixture.php index 421eb311c..18cff948a 100644 --- a/lib/Cake/Test/Fixture/ThreadFixture.php +++ b/lib/Cake/Test/Fixture/ThreadFixture.php @@ -17,7 +17,7 @@ */ /** - * Class ThreadFixture + * ThreadFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TranslateArticleFixture.php b/lib/Cake/Test/Fixture/TranslateArticleFixture.php index 96483bfb0..2c51b83ea 100644 --- a/lib/Cake/Test/Fixture/TranslateArticleFixture.php +++ b/lib/Cake/Test/Fixture/TranslateArticleFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TranslateArticleFixture + * TranslateArticleFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TranslateFixture.php b/lib/Cake/Test/Fixture/TranslateFixture.php index bd37911d1..2207d3306 100644 --- a/lib/Cake/Test/Fixture/TranslateFixture.php +++ b/lib/Cake/Test/Fixture/TranslateFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TranslateFixture + * TranslateFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TranslateTableFixture.php b/lib/Cake/Test/Fixture/TranslateTableFixture.php index 351bae576..09db6ed7d 100644 --- a/lib/Cake/Test/Fixture/TranslateTableFixture.php +++ b/lib/Cake/Test/Fixture/TranslateTableFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TranslateTableFixture + * TranslateTableFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php index 9787ac85c..a78e0ff2a 100644 --- a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php +++ b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php @@ -18,7 +18,7 @@ * @license http://www.opensource.org/licenses/mit-license.php MIT License */ /** - * Class TranslateWithPrefixFixture + * TranslateWithPrefixFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TranslatedArticleFixture.php b/lib/Cake/Test/Fixture/TranslatedArticleFixture.php index d972348f0..79824a757 100644 --- a/lib/Cake/Test/Fixture/TranslatedArticleFixture.php +++ b/lib/Cake/Test/Fixture/TranslatedArticleFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TranslatedArticleFixture + * TranslatedArticleFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/TranslatedItemFixture.php b/lib/Cake/Test/Fixture/TranslatedItemFixture.php index 79d5ce62a..185f41a97 100644 --- a/lib/Cake/Test/Fixture/TranslatedItemFixture.php +++ b/lib/Cake/Test/Fixture/TranslatedItemFixture.php @@ -17,7 +17,7 @@ */ /** - * Class TranslatedItemFixture + * TranslatedItemFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UserFixture.php b/lib/Cake/Test/Fixture/UserFixture.php index 044965bc7..919143c15 100644 --- a/lib/Cake/Test/Fixture/UserFixture.php +++ b/lib/Cake/Test/Fixture/UserFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UserFixture + * UserFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidFixture.php b/lib/Cake/Test/Fixture/UuidFixture.php index adf4d078a..cc356e643 100644 --- a/lib/Cake/Test/Fixture/UuidFixture.php +++ b/lib/Cake/Test/Fixture/UuidFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidFixture. + * UuidFixture. * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidNativeFixture.php b/lib/Cake/Test/Fixture/UuidNativeFixture.php index 0e03fbab4..55cfa5736 100644 --- a/lib/Cake/Test/Fixture/UuidNativeFixture.php +++ b/lib/Cake/Test/Fixture/UuidNativeFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidNativeFixture. + * UuidNativeFixture. * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidNativeTagFixture.php b/lib/Cake/Test/Fixture/UuidNativeTagFixture.php index 0956ccda1..0dc8b8dce 100644 --- a/lib/Cake/Test/Fixture/UuidNativeTagFixture.php +++ b/lib/Cake/Test/Fixture/UuidNativeTagFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidNativeTagFixture + * UuidNativeTagFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidTagFixture.php b/lib/Cake/Test/Fixture/UuidTagFixture.php index 18b3b1c46..e6b598da7 100644 --- a/lib/Cake/Test/Fixture/UuidTagFixture.php +++ b/lib/Cake/Test/Fixture/UuidTagFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidTagFixture + * UuidTagFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuiditemFixture.php b/lib/Cake/Test/Fixture/UuiditemFixture.php index d548cca9a..0a594a46b 100644 --- a/lib/Cake/Test/Fixture/UuiditemFixture.php +++ b/lib/Cake/Test/Fixture/UuiditemFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuiditemFixture + * UuiditemFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php index 141a418f6..2216456b5 100644 --- a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php +++ b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuiditemsUuidportfolioFixture + * UuiditemsUuidportfolioFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php index 45815b229..44af2892e 100644 --- a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php +++ b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuiditemsUuidportfolioNumericidFixture + * UuiditemsUuidportfolioNumericidFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidnativeitemFixture.php b/lib/Cake/Test/Fixture/UuidnativeitemFixture.php index e810e2af9..195c7aa00 100644 --- a/lib/Cake/Test/Fixture/UuidnativeitemFixture.php +++ b/lib/Cake/Test/Fixture/UuidnativeitemFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidnativeitemFixture + * UuidnativeitemFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php index 39d4535e2..7b3e612b0 100644 --- a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php +++ b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuiditemsUuidportfolioFixture + * UuiditemsUuidportfolioFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php index 6c304324e..ed81f6a1b 100644 --- a/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php +++ b/lib/Cake/Test/Fixture/UuidnativeitemsUuidnativeportfolioNumericidFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidnativeitemsUuidnativeportfolioNumericidFixture + * UuidnativeitemsUuidnativeportfolioNumericidFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php b/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php index 058d79af8..f99d4db96 100644 --- a/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php +++ b/lib/Cake/Test/Fixture/UuidnativeportfolioFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidnativeportfolioFixture + * UuidnativeportfolioFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/Fixture/UuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuidportfolioFixture.php index a5d8ad217..866b3f783 100644 --- a/lib/Cake/Test/Fixture/UuidportfolioFixture.php +++ b/lib/Cake/Test/Fixture/UuidportfolioFixture.php @@ -17,7 +17,7 @@ */ /** - * Class UuidportfolioFixture + * UuidportfolioFixture * * @package Cake.Test.Fixture */ diff --git a/lib/Cake/Test/test_app/Console/Command/SampleShell.php b/lib/Cake/Test/test_app/Console/Command/SampleShell.php index 852164624..1e8ba0147 100644 --- a/lib/Cake/Test/test_app/Console/Command/SampleShell.php +++ b/lib/Cake/Test/test_app/Console/Command/SampleShell.php @@ -17,7 +17,7 @@ */ /** - * Class SampleShell + * SampleShell * * @package Cake.Test.TestApp.Console.Command */ diff --git a/lib/Cake/Test/test_app/Controller/TestsAppsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsController.php index 35783548d..497fe4f75 100644 --- a/lib/Cake/Test/test_app/Controller/TestsAppsController.php +++ b/lib/Cake/Test/test_app/Controller/TestsAppsController.php @@ -17,7 +17,7 @@ */ /** - * Class TestsAppsController + * TestsAppsController * * @package Cake.Test.TestApp.Controller */ diff --git a/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php index 98c9107b0..06a8dac2b 100644 --- a/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php +++ b/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php @@ -17,7 +17,7 @@ */ /** - * Class TestsAppsPostsController + * TestsAppsPostsController * * @package Cake.Test.TestApp.Controller */ diff --git a/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php b/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php index 4d89deb43..8eb9745d4 100644 --- a/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php +++ b/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php @@ -17,7 +17,7 @@ */ /** - * Class TestAppCacheEngine + * TestAppCacheEngine * * @package Cake.Test.TestApp.Lib.Cache.Engine */ diff --git a/lib/Cake/Test/test_app/Lib/Library.php b/lib/Cake/Test/test_app/Lib/Library.php index 1137d7bfe..2998f6965 100644 --- a/lib/Cake/Test/test_app/Lib/Library.php +++ b/lib/Cake/Test/test_app/Lib/Library.php @@ -17,7 +17,7 @@ */ /** - * Class Library + * Library * * @package Cake.Test.TestApp.Lib */ diff --git a/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php b/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php index 20f9db040..53b5f5958 100644 --- a/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php +++ b/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php @@ -19,7 +19,7 @@ App::uses('BaseLog', 'Log/Engine'); /** - * Class TestAppLog + * TestAppLog * * @package Cake.Test.TestApp.Lib.Log.Engine */ diff --git a/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php b/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php index b47269da6..c39099de8 100644 --- a/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php +++ b/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php @@ -17,7 +17,7 @@ */ /** - * Class TestUtilityClass + * TestUtilityClass * * @package Cake.Test.TestApp.Lib.Utility */ diff --git a/lib/Cake/Test/test_app/Model/Extract.php b/lib/Cake/Test/test_app/Model/Extract.php index 2c5469055..56738952a 100644 --- a/lib/Cake/Test/test_app/Model/Extract.php +++ b/lib/Cake/Test/test_app/Model/Extract.php @@ -17,7 +17,7 @@ */ /** - * Class Extract + * Extract * * For testing Console i18n validation message extraction with quotes * diff --git a/lib/Cake/Test/test_app/Model/PersisterOne.php b/lib/Cake/Test/test_app/Model/PersisterOne.php index e5c699945..5ecd40d7b 100644 --- a/lib/Cake/Test/test_app/Model/PersisterOne.php +++ b/lib/Cake/Test/test_app/Model/PersisterOne.php @@ -17,7 +17,7 @@ */ /** - * Class PersisterOne + * PersisterOne * * @package Cake.Test.TestApp.Model */ diff --git a/lib/Cake/Test/test_app/Model/PersisterTwo.php b/lib/Cake/Test/test_app/Model/PersisterTwo.php index a1b2d9cda..73dc218ea 100644 --- a/lib/Cake/Test/test_app/Model/PersisterTwo.php +++ b/lib/Cake/Test/test_app/Model/PersisterTwo.php @@ -17,7 +17,7 @@ */ /** - * Class PersisterTwo + * PersisterTwo * * @package Cake.Test.TestApp.Model */ diff --git a/lib/Cake/Test/test_app/Model/Post.php b/lib/Cake/Test/test_app/Model/Post.php index c11cb1b53..cde64ac13 100644 --- a/lib/Cake/Test/test_app/Model/Post.php +++ b/lib/Cake/Test/test_app/Model/Post.php @@ -17,7 +17,7 @@ */ /** - * Class Post + * Post * * @package Cake.Test.TestApp.Model */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php index cc9e9863c..689bae47b 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php @@ -19,7 +19,7 @@ */ /** - * Class TestPluginAppSchema + * TestPluginAppSchema * * @package Cake.Test.TestApp.Plugin.TestPlugin.Config.Schema */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php index 139cacb59..8d78f4a21 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php @@ -17,7 +17,7 @@ */ /** - * Class ExampleShell + * ExampleShell * @package Cake.Test.TestApp.Plugin.TestPlugin.Console.Command */ class ExampleShell extends Shell { diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php index 6167a72d5..8e67aadb6 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php @@ -17,7 +17,7 @@ */ /** - * Class OtherTaskTask + * OtherTaskTask * * @package Cake.Test.TestApp.Plugin.TestPlugin.Console.Command.Task */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php index b756c643a..c2b365bd8 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php @@ -15,7 +15,7 @@ */ /** - * Class TestPluginShell + * TestPluginShell * @package Cake.Test.TestApp.Plugin.TestPlugin.Console.Command */ class TestPluginShell extends Shell { diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php index 4f45e9db2..6c65ee49c 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php @@ -17,7 +17,7 @@ */ /** - * Class OtherComponent + * OtherComponent * * @package Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php index 896502960..47905947d 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php @@ -17,7 +17,7 @@ */ /** - * Class PluginsComponent + * PluginsComponent * * @package Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php index d83a99b60..8e6d4801a 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginComponent + * TestPluginComponent * * @package Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php index 21e3368c0..cd315651c 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginOtherComponent.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginOtherComponent + * TestPluginOtherComponent * * @package Cake.Test.TestApp.Plugin.TestPlugin.Controller.Component */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php index 8681166d7..097d2968e 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php @@ -19,7 +19,7 @@ App::uses('AppController', 'Controller'); /** - * Class TestPluginAppController + * TestPluginAppController * * @package Cake.Test.TestApp.Plugin.TestPlugin.Controller */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php index fb53d7aee..e18f4d56f 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginController + * TestPluginController * * @package Cake.Test.TestApp.Plugin.TestPlugin.Controller */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php index bbdcb6f51..c58755ce7 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php @@ -17,7 +17,7 @@ */ /** - * Class TestsController + * TestsController * * @package Cake.Test.TestApp.Plugin.TestPlugin.Controller */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php index 6f2a4c792..5cbe512c7 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginCacheEngine + * TestPluginCacheEngine * * @package Cake.Test.TestApp.Plugin.TestPlugin.Lib.Cache.Engine */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php index a96a5d531..c01d05b68 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php @@ -17,7 +17,7 @@ */ /** - * Class CustomLibClass + * CustomLibClass * * @package Cake.Test.TestApp.Plugin.TestPlugin.Lib.Custom.Package */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php index f8f0e8656..7975e7d3a 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php @@ -22,7 +22,7 @@ App::uses('ExceptionRenderer', 'Error'); /** - * Class TestPluginExceptionRenderer + * TestPluginExceptionRenderer * * @package Cake.Test.TestApp.Plugin.TestPlugin.Lib.Error */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php index 1817e11cc..63d9a1fae 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php @@ -19,7 +19,7 @@ App::uses('CakeLogInterface', 'Log'); /** - * Class TestPluginLog + * TestPluginLog * * @package Cake.Test.TestApp.Plugin.TestPlugin.Lib.Log.Engine */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php index 3f86bbc39..5fa3e540b 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php @@ -17,7 +17,7 @@ App::uses('DispatcherFilter', 'Routing'); /** - * Class Test2DispatcherFilter + * Test2DispatcherFilter * * @package Cake.Test.TestApp.Routing.Filter */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php index 708c5626c..286509bc8 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php @@ -17,7 +17,7 @@ App::uses('DispatcherFilter', 'Routing'); /** - * Class TestDispatcherFilter + * TestDispatcherFilter * * @package Cake.Test.TestApp.Routing.Filter */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php index ea8a78194..72e184048 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginLibrary.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginLibrary + * TestPluginLibrary * * @package Cake.Test.TestApp.Plugin.TestPlugin.Lib */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php index 829285273..74d968521 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/TestPluginOtherLibrary.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginOtherLibrary + * TestPluginOtherLibrary * * @package Cake.Test.TestApp.Plugin.TestPlugin.Lib */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php index 118693bb9..9b32459d7 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAppModel.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginAppModel + * TestPluginAppModel * * @package Cake.Test.TestApp.Plugin.TestPlugin.Model */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php index 21162cfff..4c53d7a27 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginAuthUser + * TestPluginAuthUser * * @package Cake.Test.TestApp.Plugin.TestPlugin.Model */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php index a52c21e75..951c60079 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginAuthors + * TestPluginAuthors * * @package Cake.Test.TestApp.Plugin.TestPlugin.Model */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php index 69f83bd9a..d3214ed99 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginComment + * TestPluginComment * * @package Cake.Test.TestApp.Plugin.TestPlugin.Model */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php index e6f1a256c..3589eddc8 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php @@ -17,7 +17,7 @@ */ /** - * Class TestPluginPost + * TestPluginPost * * @package Cake.Test.TestApp.Plugin.TestPlugin.Model */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php index 11a35bcd5..293e268a8 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php @@ -17,7 +17,7 @@ */ /** - * Class SamplePluginClassTestName + * SamplePluginClassTestName * * @package Cake.Test.TestApp.Plugin.TestPlugin.Vendor.sample */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php index fe1698521..303dd150b 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php @@ -19,7 +19,7 @@ App::uses('AppHelper', 'View/Helper'); /** - * Class OtherHelperHelper + * OtherHelperHelper * * @package Cake.Test.TestApp.Plugin.TestPlugin.View.Helper */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php index 571585461..80d19697f 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php +++ b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/PluggedHelperHelper.php @@ -17,7 +17,7 @@ */ /** - * Class PluggedHelperHelper + * PluggedHelperHelper * * @package Cake.Test.TestApp.Plugin.TestPlugin.View.Helper */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php index bddecff72..d5acd6617 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php +++ b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php @@ -17,7 +17,7 @@ */ /** - * Class ExampleShell + * ExampleShell * * @package Cake.Test.TestApp.Plugin.TestPluginTwo.Console.Command */ diff --git a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php index 2ce7d1621..4441762c3 100644 --- a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php +++ b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php @@ -17,7 +17,7 @@ */ /** - * Class WelcomeShell + * WelcomeShell * * @package Cake.Test.TestApp.Plugin.TestPluginTwo.Console.Command */ diff --git a/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php b/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php index b2d014ecb..e76bc174b 100644 --- a/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php +++ b/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php @@ -17,7 +17,7 @@ */ /** - * Class ConfigureTestVendorSample + * ConfigureTestVendorSample * * @package Cake.Test.TestApp.Vendor.sample */ From bc73e928b6f0caca97155ce767a229a461080801 Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 11 Aug 2016 21:53:46 -0400 Subject: [PATCH 02/15] Restore header() behavior inadvertantely removed. In eaa2bbbcaebaa29dc4fb55817b261ccfa9135335 I changed the behavior to now use the TitleCased name as I didn't understand the intended behavior or how apache was working in the reporter's specific case. Refs #9229 --- lib/Cake/Network/CakeRequest.php | 7 +++---- lib/Cake/Test/Case/Network/CakeRequestTest.php | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php index fda635e62..94d981a76 100644 --- a/lib/Cake/Network/CakeRequest.php +++ b/lib/Cake/Network/CakeRequest.php @@ -748,13 +748,12 @@ class CakeRequest implements ArrayAccess { * @return mixed Either false on no header being set or the value of the header. */ public static function header($name) { - $name = strtoupper(str_replace('-', '_', $name)); - $httpName = 'HTTP_' . $name; + $httpName = 'HTTP_' . strtoupper(str_replace('-', '_', $name)); ; if (isset($_SERVER[$httpName])) { return $_SERVER[$httpName]; } - // Work around Apache issues where 'Authorization' is not - // passed to PHP. + // Use the provided value, in some configurations apache will + // pass Authorization with no prefix and in Titlecase. if (isset($_SERVER[$name])) { return $_SERVER[$name]; } diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php index 1472ac666..46774d8ce 100644 --- a/lib/Cake/Test/Case/Network/CakeRequestTest.php +++ b/lib/Cake/Test/Case/Network/CakeRequestTest.php @@ -1147,13 +1147,14 @@ class CakeRequestTest extends CakeTestCase { $_SERVER['HTTP_X_THING'] = ''; $_SERVER['HTTP_HOST'] = 'localhost'; $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-ca) AppleWebKit/534.8+ (KHTML, like Gecko) Version/5.0 Safari/533.16'; - $_SERVER['AUTHORIZATION'] = 'foobar'; + $_SERVER['Authorization'] = 'foobar'; $request = new CakeRequest('/', false); $this->assertEquals($_SERVER['HTTP_HOST'], $request->header('host')); $this->assertEquals($_SERVER['HTTP_USER_AGENT'], $request->header('User-Agent')); $this->assertSame('', $request->header('X-thing')); - $this->assertEquals($_SERVER['AUTHORIZATION'], $request->header('Authorization')); + $this->assertEquals($_SERVER['Authorization'], $request->header('Authorization')); + $this->assertFalse($request->header('authorization')); } /** From a10bdb226a13e801ab0380e3176237695a57e813 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 13 Aug 2016 19:38:31 -0400 Subject: [PATCH 03/15] Document the ext/memcached version requirements. Refs #9252 --- lib/Cake/Cache/Engine/MemcachedEngine.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Cake/Cache/Engine/MemcachedEngine.php b/lib/Cake/Cache/Engine/MemcachedEngine.php index cc101a2bf..241b9824e 100644 --- a/lib/Cake/Cache/Engine/MemcachedEngine.php +++ b/lib/Cake/Cache/Engine/MemcachedEngine.php @@ -23,6 +23,8 @@ * (if memcached extension compiled with --enable-igbinary) * Compressed keys can also be incremented/decremented * + * This cache engine requires at least ext/memcached version 2.0 + * * @package Cake.Cache.Engine */ class MemcachedEngine extends CacheEngine { From 3e16f8911d3caaddb629e403fcda3d0abf0cae72 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 13 Aug 2016 22:48:02 -0400 Subject: [PATCH 04/15] Add tests covering basic use of <> in deleteAll() Refs #9253 --- lib/Cake/Test/Case/Model/ModelDeleteTest.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/Cake/Test/Case/Model/ModelDeleteTest.php b/lib/Cake/Test/Case/Model/ModelDeleteTest.php index f26180847..60ce9970f 100644 --- a/lib/Cake/Test/Case/Model/ModelDeleteTest.php +++ b/lib/Cake/Test/Case/Model/ModelDeleteTest.php @@ -421,6 +421,20 @@ class ModelDeleteTest extends BaseModelTest { $this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s'); } +/** + * testDeleteAll diamond operator method + * + * @return void + */ + public function testDeleteAllDiamondOperator() { + $this->loadFixtures('Article'); + $article = new Article(); + + $result = $article->deleteAll(array('Article.id <>' => 1)); + $this->assertTrue($result); + $this->assertFalse($article->exists(2)); + } + /** * testDeleteAllUnknownColumn method * From 777e39531edb004ff3485d41b9e6f7624bdecf3f Mon Sep 17 00:00:00 2001 From: Kenya Yamaguchi Date: Fri, 19 Aug 2016 02:52:44 +0900 Subject: [PATCH 05/15] fix php document of File::write() --- lib/Cake/Utility/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Utility/File.php b/lib/Cake/Utility/File.php index e1d62c912..f99d07381 100644 --- a/lib/Cake/Utility/File.php +++ b/lib/Cake/Utility/File.php @@ -219,7 +219,7 @@ class File { * * @param string $data Data to write to this File. * @param string $mode Mode of writing. {@link http://php.net/fwrite See fwrite()}. - * @param string $force Force the file to open + * @param bool $force Force the file to open * @return bool Success * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::write */ From 34afc377ec0b84e7c684854a8cd2428084af9abf Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Sat, 20 Aug 2016 12:51:13 +0200 Subject: [PATCH 06/15] Added support for confirm (message) option to submit in FormHelper --- .../Test/Case/View/Helper/FormHelperTest.php | 28 +++++++++++++++++-- lib/Cake/View/Helper.php | 2 +- lib/Cake/View/Helper/FormHelper.php | 15 ++++++++-- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index 6ca879919..fab4f12ef 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -8095,7 +8095,7 @@ class FormHelperTest extends CakeTestCase { ), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'), '/form', - 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ document\.post_\w+\.submit\(\); \} event\.returnValue = false; return false;/'), + 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ document\.post_\w+\.submit\(\); \} else \{ \} event\.returnValue = false; return false;/'), 'Delete', '/a' )); @@ -8108,7 +8108,7 @@ class FormHelperTest extends CakeTestCase { ), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'), '/form', - 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("'Confirm' this \\\\"deletion\\\\"\?"\)\) \{ document\.post_\w+\.submit\(\); \} event\.returnValue = false; return false;/'), + 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("'Confirm' this \\\\"deletion\\\\"\?"\)\) \{ document\.post_\w+\.submit\(\); \} else \{ \} event\.returnValue = false; return false;/'), 'Delete', '/a' )); @@ -8142,7 +8142,7 @@ class FormHelperTest extends CakeTestCase { ), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'), '/form', - 'a' => array('class' => 'btn btn-danger', 'href' => '#', 'onclick' => 'preg:/if \(confirm\(\"\;Confirm thing\"\;\)\) \{ document\.post_\w+\.submit\(\); \} event\.returnValue = false; return false;/'), + 'a' => array('class' => 'btn btn-danger', 'href' => '#', 'onclick' => 'preg:/if \(confirm\(\"\;Confirm thing\"\;\)\) \{ document\.post_\w+\.submit\(\); \} else \{ \} event\.returnValue = false; return false;/'), '/a' )); } @@ -8448,6 +8448,17 @@ class FormHelperTest extends CakeTestCase { '/div' ); $this->assertTags($result, $expected); + + $result = $this->Form->submit('Test', array('confirm' => 'Confirm?')); + $expected = array( + 'div' => array('class' => 'submit'), + 'input' => array( + 'type' => 'submit', 'value' => 'Test', + 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ \} else \{ event\.returnValue = false; return false; \}/' + ), + '/div' + ); + $this->assertTags($result, $expected); } /** @@ -8527,6 +8538,17 @@ class FormHelperTest extends CakeTestCase { '/div' ); $this->assertTags($result, $expected); + + $result = $this->Form->submit('cake.power.gif', array('confirm' => 'Confirm?')); + $expected = array( + 'div' => array('class' => 'submit'), + 'input' => array( + 'type' => 'image', 'src' => 'img/cake.power.gif', + 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ \} else \{ event\.returnValue = false; return false; \}/' + ), + '/div' + ); + $this->assertTags($result, $expected); } /** diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php index 35aefff44..aadbc6c15 100644 --- a/lib/Cake/View/Helper.php +++ b/lib/Cake/View/Helper.php @@ -552,7 +552,7 @@ class Helper extends Object { */ protected function _confirm($message, $okCode, $cancelCode = '', $options = array()) { $message = json_encode($message); - $confirm = "if (confirm({$message})) { {$okCode} } {$cancelCode}"; + $confirm = "if (confirm({$message})) { {$okCode} } else { {$cancelCode} }"; if (isset($options['escape']) && $options['escape'] === false) { $confirm = h($confirm); } diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index ea190ca6b..2199450c0 100644 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -1920,9 +1920,9 @@ class FormHelper extends AppHelper { if ($confirmMessage) { $options['onclick'] = $this->_confirm($confirmMessage, $onClick, '', $options); } else { - $options['onclick'] = $onClick . ' '; + $options['onclick'] = $onClick; } - $options['onclick'] .= 'event.returnValue = false; return false;'; + $options['onclick'] .= ' event.returnValue = false; return false;'; $out .= $this->Html->link($title, $url, $options); return $out; @@ -1940,6 +1940,7 @@ class FormHelper extends AppHelper { * - `before` - Content to include before the input. * - `after` - Content to include after the input. * - `type` - Set to 'reset' for reset inputs. Defaults to 'submit' + * - `confirm` - JavaScript confirmation message. * - Other attributes will be assigned to the input element. * * ### Options @@ -1957,12 +1958,17 @@ class FormHelper extends AppHelper { * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::submit */ public function submit($caption = null, $options = array()) { + $confirmMessage = false; if (!is_string($caption) && empty($caption)) { $caption = __d('cake', 'Submit'); } $out = null; $div = true; + if (!empty($options['confirm'])) { + $confirmMessage = $options['confirm']; + unset($options['confirm']); + } if (isset($options['div'])) { $div = $options['div']; unset($options['div']); @@ -2005,6 +2011,11 @@ class FormHelper extends AppHelper { } } + if ($confirmMessage) { + $cancelCode = 'event.returnValue = false; return false;'; + $options['onclick'] = $this->_confirm($confirmMessage, '', $cancelCode, $options); + } + if ($isUrl) { unset($options['type']); $tag = $this->Html->useTag('submitimage', $caption, $options); From e3b0aca95eea3359c756a6b0a3e7ee272f8d145f Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Sun, 21 Aug 2016 17:09:43 +0200 Subject: [PATCH 07/15] Removed bug fix for Helper::_confirm to keep the code compatible --- lib/Cake/Test/Case/View/Helper/FormHelperTest.php | 10 +++++----- lib/Cake/View/Helper.php | 4 ++-- lib/Cake/View/Helper/FormHelper.php | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index fab4f12ef..58a4545ab 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -8095,7 +8095,7 @@ class FormHelperTest extends CakeTestCase { ), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'), '/form', - 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ document\.post_\w+\.submit\(\); \} else \{ \} event\.returnValue = false; return false;/'), + 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ document\.post_\w+\.submit\(\); \} event\.returnValue = false; return false;/'), 'Delete', '/a' )); @@ -8108,7 +8108,7 @@ class FormHelperTest extends CakeTestCase { ), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'), '/form', - 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("'Confirm' this \\\\"deletion\\\\"\?"\)\) \{ document\.post_\w+\.submit\(\); \} else \{ \} event\.returnValue = false; return false;/'), + 'a' => array('href' => '#', 'onclick' => 'preg:/if \(confirm\("'Confirm' this \\\\"deletion\\\\"\?"\)\) \{ document\.post_\w+\.submit\(\); \} event\.returnValue = false; return false;/'), 'Delete', '/a' )); @@ -8142,7 +8142,7 @@ class FormHelperTest extends CakeTestCase { ), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'), '/form', - 'a' => array('class' => 'btn btn-danger', 'href' => '#', 'onclick' => 'preg:/if \(confirm\(\"\;Confirm thing\"\;\)\) \{ document\.post_\w+\.submit\(\); \} else \{ \} event\.returnValue = false; return false;/'), + 'a' => array('class' => 'btn btn-danger', 'href' => '#', 'onclick' => 'preg:/if \(confirm\(\"\;Confirm thing\"\;\)\) \{ document\.post_\w+\.submit\(\); \} event\.returnValue = false; return false;/'), '/a' )); } @@ -8454,7 +8454,7 @@ class FormHelperTest extends CakeTestCase { 'div' => array('class' => 'submit'), 'input' => array( 'type' => 'submit', 'value' => 'Test', - 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ \} else \{ event\.returnValue = false; return false; \}/' + 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ return true; \} event\.returnValue = false; return false;/' ), '/div' ); @@ -8544,7 +8544,7 @@ class FormHelperTest extends CakeTestCase { 'div' => array('class' => 'submit'), 'input' => array( 'type' => 'image', 'src' => 'img/cake.power.gif', - 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ \} else \{ event\.returnValue = false; return false; \}/' + 'onclick' => 'preg:/if \(confirm\("Confirm\?"\)\) \{ return true; \} event\.returnValue = false; return false;/' ), '/div' ); diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php index aadbc6c15..ef214f368 100644 --- a/lib/Cake/View/Helper.php +++ b/lib/Cake/View/Helper.php @@ -546,13 +546,13 @@ class Helper extends Object { * * @param string $message Message to be displayed * @param string $okCode Code to be executed after user chose 'OK' - * @param string $cancelCode Code to be executed after user chose 'Cancel' + * @param string $cancelCode Code to be executed after user chose 'Cancel', also executed when okCode doesn't return * @param array $options Array of options * @return string onclick JS code */ protected function _confirm($message, $okCode, $cancelCode = '', $options = array()) { $message = json_encode($message); - $confirm = "if (confirm({$message})) { {$okCode} } else { {$cancelCode} }"; + $confirm = "if (confirm({$message})) { {$okCode} } {$cancelCode}"; if (isset($options['escape']) && $options['escape'] === false) { $confirm = h($confirm); } diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index 2199450c0..6896e2b76 100644 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -1920,9 +1920,9 @@ class FormHelper extends AppHelper { if ($confirmMessage) { $options['onclick'] = $this->_confirm($confirmMessage, $onClick, '', $options); } else { - $options['onclick'] = $onClick; + $options['onclick'] = $onClick . ' '; } - $options['onclick'] .= ' event.returnValue = false; return false;'; + $options['onclick'] .= 'event.returnValue = false; return false;'; $out .= $this->Html->link($title, $url, $options); return $out; @@ -2012,8 +2012,9 @@ class FormHelper extends AppHelper { } if ($confirmMessage) { + $okCode = 'return true;'; $cancelCode = 'event.returnValue = false; return false;'; - $options['onclick'] = $this->_confirm($confirmMessage, '', $cancelCode, $options); + $options['onclick'] = $this->_confirm($confirmMessage, $okCode, $cancelCode, $options); } if ($isUrl) { From b096005561b320e57ff3ceb9dbcebd24383b0c75 Mon Sep 17 00:00:00 2001 From: Mark Sch Date: Sun, 21 Aug 2016 20:31:45 +0200 Subject: [PATCH 08/15] Fix CS --- lib/Cake/Network/CakeRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php index 94d981a76..8d1058a14 100644 --- a/lib/Cake/Network/CakeRequest.php +++ b/lib/Cake/Network/CakeRequest.php @@ -748,7 +748,7 @@ class CakeRequest implements ArrayAccess { * @return mixed Either false on no header being set or the value of the header. */ public static function header($name) { - $httpName = 'HTTP_' . strtoupper(str_replace('-', '_', $name)); ; + $httpName = 'HTTP_' . strtoupper(str_replace('-', '_', $name)); if (isset($_SERVER[$httpName])) { return $_SERVER[$httpName]; } From 87d86aaed956edc5feb066eee69253b75bb67ada Mon Sep 17 00:00:00 2001 From: ndm2 Date: Fri, 26 Aug 2016 13:28:02 +0200 Subject: [PATCH 09/15] Fix/tighten `Folder::inPath()` checks. The current checks are way too relaxed, and are more like testing for a substring, which makes it easy for invalid paths to slip trough, for example `/foo/var/www` is falsely tested to reside in `/var/www`. Passing an empty path never worked properly, it was triggering a warning, didn't worked on Windows, and the behavior that the current top level directory would be assumed for empty paths wasn't documented. Similar is true for relative paths. While they did match at one point, this was incorrect behavior, and matching actual path fragments seems out of scope for this method. This change makes the `$path` argument required, requires it to be an absolute path, and throws an exception in case a non-absolute path is being passed. --- lib/Cake/Test/Case/Utility/FolderTest.php | 82 +++++++++++++++++++---- lib/Cake/Utility/Folder.php | 17 +++-- 2 files changed, 81 insertions(+), 18 deletions(-) diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php index 1d53713ae..e417abff9 100644 --- a/lib/Cake/Test/Case/Utility/FolderTest.php +++ b/lib/Cake/Test/Case/Utility/FolderTest.php @@ -109,28 +109,86 @@ class FolderTest extends CakeTestCase { * @return void */ public function testInPath() { - $path = dirname(dirname(__FILE__)); - $inside = dirname($path) . DS; + // "/Test/test_app/" + $basePath = CAKE . 'Test' . DS . 'test_app' . DS; + $Base = new Folder($basePath); - $Folder = new Folder($path); + $result = $Base->pwd(); + $this->assertEquals($basePath, $result); - $result = $Folder->pwd(); - $this->assertEquals($path, $result); + // is "/" in "/Test/test_app/" + $result = $Base->inPath(realpath(DS), true); + $this->assertFalse($result, true); - $result = Folder::isSlashTerm($inside); + // is "/Test/test_app/" in "/Test/test_app/" + $result = $Base->inPath($basePath, true); $this->assertTrue($result); - $result = $Folder->realpath('Test/'); - $this->assertEquals($path . DS . 'Test' . DS, $result); - - $result = $Folder->inPath('Test' . DS); + // is "/Test/test_app" in "/Test/test_app/" + $result = $Base->inPath(mb_substr($basePath, 0, -1), true); $this->assertTrue($result); - $result = $Folder->inPath(DS . 'non-existing' . $inside); + // is "/Test/test_app/sub" in "/Test/test_app/" + $result = $Base->inPath($basePath . 'sub', true); + $this->assertTrue($result); + + // is "/Test" in "/Test/test_app/" + $result = $Base->inPath(dirname($basePath), true); $this->assertFalse($result); - $result = $Folder->inPath($path . DS . 'Model', true); + // is "/Test/other/(...)Test/test_app" in "/Test/test_app/" + $result = $Base->inPath(TMP . 'tests' . DS . 'other' . DS . $basePath, true); + $this->assertFalse($result); + + // is "/Test/test_app/" in "/" + $result = $Base->inPath(realpath(DS)); $this->assertTrue($result); + + // is "/Test/test_app/" in "/Test/test_app/" + $result = $Base->inPath($basePath); + $this->assertTrue($result); + + // is "/Test/test_app/" in "/Test/test_app" + $result = $Base->inPath(mb_substr($basePath, 0, -1)); + $this->assertTrue($result); + + // is "/Test/test_app/" in "/Test" + $result = $Base->inPath(dirname($basePath)); + $this->assertTrue($result); + + // is "/Test/test_app/" in "/Test/test_app/sub" + $result = $Base->inPath($basePath . 'sub'); + $this->assertFalse($result); + + // is "/other/Test/test_app/" in "/Test/test_app/" + $VirtualBase = new Folder(); + $VirtualBase->path = '/other/Test/test_app'; + $result = $VirtualBase->inPath('/Test/test_app/'); + $this->assertFalse($result); + } + +/** + * Data provider for the testInPathInvalidPathArgument test + * + * @return array + */ + public function inPathInvalidPathArgumentDataProvider() { + return array( + array(''), + array('relative/path/'), + array('unknown://stream-wrapper') + ); + } + +/** + * @dataProvider inPathInvalidPathArgumentDataProvider + * @param string $path + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage The $path argument is expected to be an absolute path. + */ + public function testInPathInvalidPathArgument($path) { + $Folder = new Folder(); + $Folder->inPath($path); } /** diff --git a/lib/Cake/Utility/Folder.php b/lib/Cake/Utility/Folder.php index 1b59ba155..861a2d637 100644 --- a/lib/Cake/Utility/Folder.php +++ b/lib/Cake/Utility/Folder.php @@ -385,7 +385,7 @@ class Folder { } /** - * Returns true if the File is in a given CakePath. + * Returns true if the Folder is in the given Cake path. * * @param string $path The path to check. * @return bool @@ -399,21 +399,26 @@ class Folder { } /** - * Returns true if the File is in given path. + * Returns true if the Folder is in the given path. * - * @param string $path The path to check that the current pwd() resides with in. - * @param bool $reverse Reverse the search, check that pwd() resides within $path. + * @param string $path The absolute path to check that the current `pwd()` resides within. + * @param bool $reverse Reverse the search, check if the given `$path` resides within the current `pwd()`. * @return bool + * @throws \InvalidArgumentException When the given `$path` argument is not an absolute path. * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::inPath */ public function inPath($path = '', $reverse = false) { + if (!Folder::isAbsolute($path)) { + throw new InvalidArgumentException(__d('cake_dev', 'The $path argument is expected to be an absolute path.')); + } + $dir = Folder::slashTerm($path); $current = Folder::slashTerm($this->pwd()); if (!$reverse) { - $return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current); + $return = preg_match('/^' . preg_quote($dir, '/') . '(.*)/', $current); } else { - $return = preg_match('/^(.*)' . preg_quote($current, '/') . '(.*)/', $dir); + $return = preg_match('/^' . preg_quote($current, '/') . '(.*)/', $dir); } return (bool)$return; } From dab4b85596f1ce6fbd8ac9891c1226cb1f0387b1 Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 26 Aug 2016 14:32:21 +0200 Subject: [PATCH 10/15] Backport Hash::sort() support for type locale. --- lib/Cake/Test/Case/Utility/HashTest.php | 28 +++++++++++++++++++++++++ lib/Cake/Utility/Hash.php | 3 +++ 2 files changed, 31 insertions(+) diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php index d92c7614f..5af077282 100644 --- a/lib/Cake/Test/Case/Utility/HashTest.php +++ b/lib/Cake/Test/Case/Utility/HashTest.php @@ -1360,6 +1360,34 @@ class HashTest extends CakeTestCase { $this->assertEquals($sorted, $b); } +/** + * Test sort() with locale option. + * + * @return void + */ + public function testSortLocale() { + // get the current locale + $oldLocale = setlocale(LC_COLLATE, '0'); + // the de_DE.utf8 locale must be installed on the system where the test is performed + setlocale(LC_COLLATE, 'de_DE.utf8'); + $items = array( + array('Item' => array('entry' => 'Übergabe')), + array('Item' => array('entry' => 'Ostfriesland')), + array('Item' => array('entry' => 'Äpfel')), + array('Item' => array('entry' => 'Apfel')), + ); + $result = Hash::sort($items, '{n}.Item.entry', 'asc', 'locale'); + $expected = array( + array('Item' => array('entry' => 'Apfel')), + array('Item' => array('entry' => 'Äpfel')), + array('Item' => array('entry' => 'Ostfriesland')), + array('Item' => array('entry' => 'Übergabe')), + ); + $this->assertEquals($expected, $result); + // change to the original locale + setlocale(LC_COLLATE, $oldLocale); + } + /** * test sorting with out of order keys. * diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php index 3669e1a64..1c6e0bf27 100644 --- a/lib/Cake/Utility/Hash.php +++ b/lib/Cake/Utility/Hash.php @@ -836,6 +836,7 @@ class Hash { * - `regular` For regular sorting (don't change types) * - `numeric` Compare values numerically * - `string` Compare values as strings + * - `locale` Compare items as strings, based on the current locale * - `natural` Compare items as strings using "natural ordering" in a human friendly way. * Will sort foo10 below foo2 as an example. Requires PHP 5.4 or greater or it will fallback to 'regular' * @@ -904,6 +905,8 @@ class Hash { $type = SORT_STRING; } elseif ($type === 'natural') { $type = SORT_NATURAL; + } elseif ($type === 'locale') { + $type = SORT_LOCALE_STRING; } else { $type = SORT_REGULAR; } From 03df288e78e7ae334082e3b007ae95890a7cd9ab Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 26 Aug 2016 14:45:59 +0200 Subject: [PATCH 11/15] Re-add spacing. --- lib/Cake/Test/Case/Utility/HashTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php index 5af077282..3dd1fd399 100644 --- a/lib/Cake/Test/Case/Utility/HashTest.php +++ b/lib/Cake/Test/Case/Utility/HashTest.php @@ -1368,14 +1368,17 @@ class HashTest extends CakeTestCase { public function testSortLocale() { // get the current locale $oldLocale = setlocale(LC_COLLATE, '0'); + // the de_DE.utf8 locale must be installed on the system where the test is performed setlocale(LC_COLLATE, 'de_DE.utf8'); + $items = array( array('Item' => array('entry' => 'Übergabe')), array('Item' => array('entry' => 'Ostfriesland')), array('Item' => array('entry' => 'Äpfel')), array('Item' => array('entry' => 'Apfel')), ); + $result = Hash::sort($items, '{n}.Item.entry', 'asc', 'locale'); $expected = array( array('Item' => array('entry' => 'Apfel')), @@ -1384,6 +1387,7 @@ class HashTest extends CakeTestCase { array('Item' => array('entry' => 'Übergabe')), ); $this->assertEquals($expected, $result); + // change to the original locale setlocale(LC_COLLATE, $oldLocale); } From ee319baec173d9f3f322ae04173d98d435e1ef04 Mon Sep 17 00:00:00 2001 From: Mark Sch Date: Fri, 26 Aug 2016 16:15:39 +0200 Subject: [PATCH 12/15] Backport skip --- lib/Cake/Test/Case/Utility/HashTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php index 3dd1fd399..f81316daa 100644 --- a/lib/Cake/Test/Case/Utility/HashTest.php +++ b/lib/Cake/Test/Case/Utility/HashTest.php @@ -1368,9 +1368,9 @@ class HashTest extends CakeTestCase { public function testSortLocale() { // get the current locale $oldLocale = setlocale(LC_COLLATE, '0'); - - // the de_DE.utf8 locale must be installed on the system where the test is performed - setlocale(LC_COLLATE, 'de_DE.utf8'); + + $updated = setlocale(LC_COLLATE, 'de_DE.utf8'); + $this->skipIf($updated === false, 'Could not set locale to de_DE.utf8, skipping test.'); $items = array( array('Item' => array('entry' => 'Übergabe')), From d52b9fc826edd5e30133bbbdb9a8ecb1bf8ee504 Mon Sep 17 00:00:00 2001 From: mscherer Date: Mon, 29 Aug 2016 12:08:57 +0200 Subject: [PATCH 13/15] CakeFixtureManager: Truncate tables only if not dropped. --- lib/Cake/TestSuite/Fixture/CakeFixtureManager.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php index aa9a43cad..8d678047f 100644 --- a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php +++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php @@ -98,7 +98,7 @@ class CakeFixtureManager { /** * Parse the fixture path included in test cases, to get the fixture class name, and the * real fixture path including sub-directories - * + * * @param string $fixturePath the fixture path to parse * @return array containing fixture class name and optional additional path */ @@ -218,7 +218,7 @@ class CakeFixtureManager { if (empty($test->fixtures)) { return; } - $fixtures = $test->fixtures; + $fixtures = array_unique($test->fixtures); if (empty($fixtures) || !$test->autoFixtures) { return; } @@ -229,7 +229,9 @@ class CakeFixtureManager { $db = ConnectionManager::getDataSource($fixture->useDbConfig); $db->begin(); $this->_setupTable($fixture, $db, $test->dropTables); - $fixture->truncate($db); + if (!$test->dropTables) { + $fixture->truncate($db); + } $fixture->insert($db); $db->commit(); } @@ -274,7 +276,9 @@ class CakeFixtureManager { $db = ConnectionManager::getDataSource($fixture->useDbConfig); } $this->_setupTable($fixture, $db, $dropTables); - $fixture->truncate($db); + if (!$dropTables) { + $fixture->truncate($db); + } $fixture->insert($db); } else { throw new UnexpectedValueException(__d('cake_dev', 'Referenced fixture class %s not found', $name)); From d1cfe203c4fc59b2cc1b67ff47184667c07a846a Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 29 Aug 2016 21:53:47 -0400 Subject: [PATCH 14/15] Fix PHPCS error. --- lib/Cake/Test/Case/Utility/HashTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php index f81316daa..a5a577e96 100644 --- a/lib/Cake/Test/Case/Utility/HashTest.php +++ b/lib/Cake/Test/Case/Utility/HashTest.php @@ -1368,7 +1368,7 @@ class HashTest extends CakeTestCase { public function testSortLocale() { // get the current locale $oldLocale = setlocale(LC_COLLATE, '0'); - + $updated = setlocale(LC_COLLATE, 'de_DE.utf8'); $this->skipIf($updated === false, 'Could not set locale to de_DE.utf8, skipping test.'); From 2ffde69d5bd506a10ed4e154ddffc3c545af4008 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 29 Aug 2016 21:56:30 -0400 Subject: [PATCH 15/15] Skip test that always fails on PHP5.3 --- lib/Cake/Test/Case/Utility/CakeTimeTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php index dc2a8887c..09b7b4f93 100644 --- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php @@ -1166,6 +1166,10 @@ class CakeTimeTest extends CakeTestCase { * @return void */ public function testListTimezones() { + $this->skipIf( + version_compare(PHP_VERSION, '5.4.0', '<='), + 'This test requires newer libicu which is in php5.4+' + ); $return = CakeTime::listTimezones(); $this->assertTrue(isset($return['Asia']['Asia/Bangkok'])); $this->assertEquals('Bangkok', $return['Asia']['Asia/Bangkok']);