From a643295e4c48681d26d775d6f50a395e194eaf04 Mon Sep 17 00:00:00 2001 From: euromark Date: Mon, 8 Jul 2013 15:50:50 +0200 Subject: [PATCH 01/14] remove @access and unnecessary $name --- lib/Cake/Console/Command/TestShell.php | 2 -- lib/Cake/Model/Datasource/DataSource.php | 2 -- lib/Cake/Model/Model.php | 1 - lib/Cake/Test/Case/Core/ObjectTest.php | 3 --- lib/Cake/Test/Case/Model/CakeSchemaTest.php | 1 - lib/Cake/Test/Case/Model/ModelIntegrationTest.php | 1 - lib/Cake/Test/Case/Model/ModelWriteTest.php | 2 -- .../Test/Case/TestSuite/ControllerTestCaseTest.php | 3 --- lib/Cake/Test/Case/View/Helper/FormHelperTest.php | 3 --- lib/Cake/Test/Fixture/AccountFixture.php | 7 ------- lib/Cake/Test/Fixture/AcoActionFixture.php | 7 ------- lib/Cake/Test/Fixture/AcoFixture.php | 7 ------- lib/Cake/Test/Fixture/AcoTwoFixture.php | 7 ------- lib/Cake/Test/Fixture/AdFixture.php | 7 ------- lib/Cake/Test/Fixture/AdvertisementFixture.php | 7 ------- lib/Cake/Test/Fixture/AfterTreeFixture.php | 7 ------- lib/Cake/Test/Fixture/AnotherArticleFixture.php | 7 ------- lib/Cake/Test/Fixture/AppleFixture.php | 7 ------- lib/Cake/Test/Fixture/ArmorFixture.php | 7 ------- lib/Cake/Test/Fixture/ArmorsPlayerFixture.php | 7 ------- lib/Cake/Test/Fixture/AroFixture.php | 7 ------- lib/Cake/Test/Fixture/AroTwoFixture.php | 7 ------- lib/Cake/Test/Fixture/ArosAcoFixture.php | 7 ------- lib/Cake/Test/Fixture/ArosAcoTwoFixture.php | 7 ------- lib/Cake/Test/Fixture/ArticleFeaturedFixture.php | 7 ------- lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php | 7 ------- lib/Cake/Test/Fixture/ArticleFixture.php | 7 ------- lib/Cake/Test/Fixture/ArticlesTagFixture.php | 7 ------- lib/Cake/Test/Fixture/AttachmentFixture.php | 7 ------- lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php | 7 ------- lib/Cake/Test/Fixture/AuthUserFixture.php | 7 ------- lib/Cake/Test/Fixture/AuthorFixture.php | 7 ------- lib/Cake/Test/Fixture/BakeArticleFixture.php | 7 ------- lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php | 7 ------- lib/Cake/Test/Fixture/BakeCommentFixture.php | 7 ------- lib/Cake/Test/Fixture/BakeTagFixture.php | 7 ------- lib/Cake/Test/Fixture/BasketFixture.php | 7 ------- lib/Cake/Test/Fixture/BidFixture.php | 7 ------- lib/Cake/Test/Fixture/BiddingFixture.php | 7 ------- lib/Cake/Test/Fixture/BiddingMessageFixture.php | 7 ------- lib/Cake/Test/Fixture/BinaryTestFixture.php | 7 ------- lib/Cake/Test/Fixture/BookFixture.php | 7 ------- lib/Cake/Test/Fixture/CacheTestModelFixture.php | 7 ------- lib/Cake/Test/Fixture/CakeSessionFixture.php | 7 ------- lib/Cake/Test/Fixture/CallbackFixture.php | 7 ------- lib/Cake/Test/Fixture/CampaignFixture.php | 7 ------- lib/Cake/Test/Fixture/CategoryFixture.php | 7 ------- lib/Cake/Test/Fixture/CategoryThreadFixture.php | 7 ------- lib/Cake/Test/Fixture/CdFixture.php | 7 ------- lib/Cake/Test/Fixture/CommentFixture.php | 7 ------- lib/Cake/Test/Fixture/ContentAccountFixture.php | 7 ------- lib/Cake/Test/Fixture/ContentFixture.php | 7 ------- lib/Cake/Test/Fixture/CounterCachePostFixture.php | 2 -- .../CounterCachePostNonstandardPrimaryKeyFixture.php | 2 -- lib/Cake/Test/Fixture/CounterCacheUserFixture.php | 2 -- .../CounterCacheUserNonstandardPrimaryKeyFixture.php | 2 -- lib/Cake/Test/Fixture/DataTestFixture.php | 7 ------- lib/Cake/Test/Fixture/DatatypeFixture.php | 7 ------- lib/Cake/Test/Fixture/DependencyFixture.php | 7 ------- lib/Cake/Test/Fixture/DeviceFixture.php | 7 ------- lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php | 7 ------- lib/Cake/Test/Fixture/DeviceTypeFixture.php | 7 ------- lib/Cake/Test/Fixture/DocumentDirectoryFixture.php | 7 ------- lib/Cake/Test/Fixture/DocumentFixture.php | 7 ------- lib/Cake/Test/Fixture/DomainFixture.php | 10 ---------- lib/Cake/Test/Fixture/DomainsSiteFixture.php | 10 ---------- lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php | 7 ------- lib/Cake/Test/Fixture/FeatureSetFixture.php | 7 ------- lib/Cake/Test/Fixture/FeaturedFixture.php | 7 ------- lib/Cake/Test/Fixture/FilmFileFixture.php | 7 ------- lib/Cake/Test/Fixture/FlagTreeFixture.php | 7 ------- lib/Cake/Test/Fixture/FruitFixture.php | 7 ------- lib/Cake/Test/Fixture/FruitsUuidTagFixture.php | 7 ------- lib/Cake/Test/Fixture/GroupUpdateAllFixture.php | 2 -- lib/Cake/Test/Fixture/GuildFixture.php | 7 ------- lib/Cake/Test/Fixture/GuildsPlayerFixture.php | 7 ------- lib/Cake/Test/Fixture/HomeFixture.php | 7 ------- lib/Cake/Test/Fixture/ImageFixture.php | 7 ------- lib/Cake/Test/Fixture/InnoFixture.php | 7 ------- lib/Cake/Test/Fixture/ItemFixture.php | 7 ------- lib/Cake/Test/Fixture/ItemsPortfolioFixture.php | 7 ------- lib/Cake/Test/Fixture/JoinAFixture.php | 7 ------- lib/Cake/Test/Fixture/JoinBFixture.php | 7 ------- lib/Cake/Test/Fixture/JoinCFixture.php | 7 ------- lib/Cake/Test/Fixture/JoinThingFixture.php | 7 ------- lib/Cake/Test/Fixture/MessageFixture.php | 7 ------- .../Test/Fixture/MyCategoriesMyProductsFixture.php | 7 ------- lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php | 7 ------- lib/Cake/Test/Fixture/MyCategoryFixture.php | 7 ------- lib/Cake/Test/Fixture/MyProductFixture.php | 7 ------- lib/Cake/Test/Fixture/MyUserFixture.php | 7 ------- lib/Cake/Test/Fixture/NodeFixture.php | 7 ------- lib/Cake/Test/Fixture/NumberTreeFixture.php | 7 ------- lib/Cake/Test/Fixture/NumberTreeTwoFixture.php | 7 ------- lib/Cake/Test/Fixture/NumericArticleFixture.php | 7 ------- lib/Cake/Test/Fixture/OverallFavoriteFixture.php | 7 ------- lib/Cake/Test/Fixture/PersonFixture.php | 7 ------- lib/Cake/Test/Fixture/PlayerFixture.php | 7 ------- lib/Cake/Test/Fixture/PortfolioFixture.php | 7 ------- lib/Cake/Test/Fixture/PostFixture.php | 7 ------- lib/Cake/Test/Fixture/PostsTagFixture.php | 7 ------- lib/Cake/Test/Fixture/PrefixTestFixture.php | 2 -- lib/Cake/Test/Fixture/PrimaryModelFixture.php | 7 ------- lib/Cake/Test/Fixture/ProductFixture.php | 7 ------- lib/Cake/Test/Fixture/ProductUpdateAllFixture.php | 2 -- lib/Cake/Test/Fixture/ProjectFixture.php | 7 ------- lib/Cake/Test/Fixture/SampleFixture.php | 7 ------- lib/Cake/Test/Fixture/SecondaryModelFixture.php | 7 ------- lib/Cake/Test/Fixture/SessionFixture.php | 7 ------- lib/Cake/Test/Fixture/SiteFixture.php | 10 ---------- lib/Cake/Test/Fixture/SomethingElseFixture.php | 7 ------- lib/Cake/Test/Fixture/SomethingFixture.php | 7 ------- lib/Cake/Test/Fixture/StoriesTagFixture.php | 7 ------- lib/Cake/Test/Fixture/StoryFixture.php | 7 ------- lib/Cake/Test/Fixture/SyfileFixture.php | 7 ------- lib/Cake/Test/Fixture/TagFixture.php | 7 ------- lib/Cake/Test/Fixture/TestPluginArticleFixture.php | 7 ------- lib/Cake/Test/Fixture/TestPluginCommentFixture.php | 7 ------- lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php | 7 ------- lib/Cake/Test/Fixture/ThreadFixture.php | 7 ------- lib/Cake/Test/Fixture/TranslateArticleFixture.php | 7 ------- lib/Cake/Test/Fixture/TranslateFixture.php | 7 ------- lib/Cake/Test/Fixture/TranslateTableFixture.php | 7 ------- lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php | 7 ------- lib/Cake/Test/Fixture/TranslatedArticleFixture.php | 7 ------- lib/Cake/Test/Fixture/TranslatedItemFixture.php | 7 ------- lib/Cake/Test/Fixture/UnconventionalTreeFixture.php | 7 ------- lib/Cake/Test/Fixture/UnderscoreFieldFixture.php | 7 ------- lib/Cake/Test/Fixture/UserFixture.php | 7 ------- lib/Cake/Test/Fixture/UuidFixture.php | 7 ------- lib/Cake/Test/Fixture/UuidTagFixture.php | 7 ------- lib/Cake/Test/Fixture/UuidTreeFixture.php | 7 ------- lib/Cake/Test/Fixture/UuiditemFixture.php | 7 ------- .../Test/Fixture/UuiditemsUuidportfolioFixture.php | 7 ------- .../Fixture/UuiditemsUuidportfolioNumericidFixture.php | 7 ------- lib/Cake/Test/Fixture/UuidportfolioFixture.php | 7 ------- 136 files changed, 881 deletions(-) diff --git a/lib/Cake/Console/Command/TestShell.php b/lib/Cake/Console/Command/TestShell.php index 2c474b9c3..e4964137f 100644 --- a/lib/Cake/Console/Command/TestShell.php +++ b/lib/Cake/Console/Command/TestShell.php @@ -338,7 +338,6 @@ class TestShell extends Shell { * @param string $file * @param string $category * @param boolean $throwOnMissingFile - * @access protected * @return array array(type, case) * @throws Exception */ @@ -414,7 +413,6 @@ class TestShell extends Shell { * For the given file, what category of test is it? returns app, core or the name of the plugin * * @param string $file - * @access protected * @return string */ protected function _mapFileToCategory($file) { diff --git a/lib/Cake/Model/Datasource/DataSource.php b/lib/Cake/Model/Datasource/DataSource.php index 94380d7a7..52ffbed9a 100644 --- a/lib/Cake/Model/Datasource/DataSource.php +++ b/lib/Cake/Model/Datasource/DataSource.php @@ -415,7 +415,6 @@ class DataSource extends Object { * Returns the schema name. Override this in subclasses. * * @return string schema name - * @access public */ public function getSchemaName() { return null; @@ -425,7 +424,6 @@ class DataSource extends Object { * Closes a connection. Override in subclasses * * @return boolean - * @access public */ public function close() { return $this->connected = false; diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index 36f651467..6362166a3 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -95,7 +95,6 @@ class Model extends Object implements CakeEventListener { * Holds physical schema/database name for this model. Automatically set during Model creation. * * @var string - * @access public */ public $schemaName = null; diff --git a/lib/Cake/Test/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php index 2c4d64a36..4b3a3b6e6 100644 --- a/lib/Cake/Test/Case/Core/ObjectTest.php +++ b/lib/Cake/Test/Case/Core/ObjectTest.php @@ -49,14 +49,12 @@ class RequestActionController extends Controller { * uses property * * @var array - * @access public */ public $uses = array('RequestActionPost'); /** * test_request_action method * - * @access public * @return void */ public function test_request_action() { @@ -68,7 +66,6 @@ class RequestActionController extends Controller { * * @param mixed $id * @param mixed $other - * @access public * @return void */ public function another_ra_test($id, $other) { diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php index a746a370d..99840c1a3 100644 --- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php +++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php @@ -533,7 +533,6 @@ class CakeSchemaTest extends CakeTestCase { /** * testSchemaReadWithAppModel method * - * @access public * @return void */ public function testSchemaReadWithAppModel() { diff --git a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php index fae7c967c..de05b5193 100644 --- a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php +++ b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php @@ -239,7 +239,6 @@ class ModelIntegrationTest extends BaseModelTest { /** * testFindWithJoinsOption method * - * @access public * @return void */ public function testFindWithJoinsOption() { diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php index c9955d9a9..bc9fb0057 100644 --- a/lib/Cake/Test/Case/Model/ModelWriteTest.php +++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php @@ -63,7 +63,6 @@ class ModelWriteTest extends BaseModelTest { /** * testInsertAnotherHabtmRecordWithSameForeignKey method * - * @access public * @return void */ public function testInsertAnotherHabtmRecordWithSameForeignKey() { @@ -511,7 +510,6 @@ class ModelWriteTest extends BaseModelTest { /** * Tests having multiple counter caches for an associated model * - * @access public * @return void */ public function testCounterCacheMultipleCaches() { diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php index 0c99842e5..301949a73 100644 --- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php @@ -39,7 +39,6 @@ if (!class_exists('AppController', false)) { * helpers property * * @var array - * @access public */ public $helpers = array('Html'); @@ -47,7 +46,6 @@ if (!class_exists('AppController', false)) { * uses property * * @var array - * @access public */ public $uses = array('ControllerPost'); @@ -55,7 +53,6 @@ if (!class_exists('AppController', false)) { * components property * * @var array - * @access public */ public $components = array('Cookie'); diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index 51b90ce86..56b9527be 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -779,7 +779,6 @@ class FormHelperTest extends CakeTestCase { /** * Tests correct generation of number fields for integer fields * - * @access public * @return void */ public function testTextFieldTypeNumberGenerationForIntegers() { @@ -1525,7 +1524,6 @@ class FormHelperTest extends CakeTestCase { /** * Test validation errors, when validation message is an empty string. * - * @access public * @return void */ public function testEmptyErrorValidation() { @@ -1566,7 +1564,6 @@ class FormHelperTest extends CakeTestCase { /** * Test validation errors, when calling input() overriding validation message by an empty string. * - * @access public * @return void */ public function testEmptyInputErrorValidation() { diff --git a/lib/Cake/Test/Fixture/AccountFixture.php b/lib/Cake/Test/Fixture/AccountFixture.php index 529f6f679..fa7b416b4 100644 --- a/lib/Cake/Test/Fixture/AccountFixture.php +++ b/lib/Cake/Test/Fixture/AccountFixture.php @@ -25,13 +25,6 @@ */ class AccountFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Aco' - */ - public $name = 'Account'; - public $table = 'Accounts'; /** diff --git a/lib/Cake/Test/Fixture/AcoActionFixture.php b/lib/Cake/Test/Fixture/AcoActionFixture.php index 7b687a27c..b62eb113d 100644 --- a/lib/Cake/Test/Fixture/AcoActionFixture.php +++ b/lib/Cake/Test/Fixture/AcoActionFixture.php @@ -25,13 +25,6 @@ */ class AcoActionFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'AcoAction' - */ - public $name = 'AcoAction'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AcoFixture.php b/lib/Cake/Test/Fixture/AcoFixture.php index 2903360f6..2305b074f 100644 --- a/lib/Cake/Test/Fixture/AcoFixture.php +++ b/lib/Cake/Test/Fixture/AcoFixture.php @@ -25,13 +25,6 @@ */ class AcoFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Aco' - */ - public $name = 'Aco'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AcoTwoFixture.php b/lib/Cake/Test/Fixture/AcoTwoFixture.php index 8cacd0f1a..376a5c0fa 100644 --- a/lib/Cake/Test/Fixture/AcoTwoFixture.php +++ b/lib/Cake/Test/Fixture/AcoTwoFixture.php @@ -25,13 +25,6 @@ */ class AcoTwoFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'AcoTwo' - */ - public $name = 'AcoTwo'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AdFixture.php b/lib/Cake/Test/Fixture/AdFixture.php index dafc3474d..2e3ac4352 100644 --- a/lib/Cake/Test/Fixture/AdFixture.php +++ b/lib/Cake/Test/Fixture/AdFixture.php @@ -26,13 +26,6 @@ */ class AdFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Ad' - */ - public $name = 'Ad'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AdvertisementFixture.php b/lib/Cake/Test/Fixture/AdvertisementFixture.php index 7e0ab1192..525add271 100644 --- a/lib/Cake/Test/Fixture/AdvertisementFixture.php +++ b/lib/Cake/Test/Fixture/AdvertisementFixture.php @@ -25,13 +25,6 @@ */ class AdvertisementFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Advertisement' - */ - public $name = 'Advertisement'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AfterTreeFixture.php b/lib/Cake/Test/Fixture/AfterTreeFixture.php index b91eedf8b..36a3d1e33 100644 --- a/lib/Cake/Test/Fixture/AfterTreeFixture.php +++ b/lib/Cake/Test/Fixture/AfterTreeFixture.php @@ -26,13 +26,6 @@ */ class AfterTreeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'AfterTree' - */ - public $name = 'AfterTree'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AnotherArticleFixture.php b/lib/Cake/Test/Fixture/AnotherArticleFixture.php index 531eb05e5..8cec8c77b 100644 --- a/lib/Cake/Test/Fixture/AnotherArticleFixture.php +++ b/lib/Cake/Test/Fixture/AnotherArticleFixture.php @@ -25,13 +25,6 @@ */ class AnotherArticleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'AnotherArticle' - */ - public $name = 'AnotherArticle'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AppleFixture.php b/lib/Cake/Test/Fixture/AppleFixture.php index fa9d8d2be..60bdfcb5a 100644 --- a/lib/Cake/Test/Fixture/AppleFixture.php +++ b/lib/Cake/Test/Fixture/AppleFixture.php @@ -25,13 +25,6 @@ */ class AppleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Apple' - */ - public $name = 'Apple'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ArmorFixture.php b/lib/Cake/Test/Fixture/ArmorFixture.php index b8b528f69..b3247380e 100644 --- a/lib/Cake/Test/Fixture/ArmorFixture.php +++ b/lib/Cake/Test/Fixture/ArmorFixture.php @@ -25,13 +25,6 @@ */ class ArmorFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Armor' - */ - public $name = 'Armor'; - /** * Datasource * diff --git a/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php b/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php index bc33fd54d..dedfe5e5a 100644 --- a/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php +++ b/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php @@ -25,13 +25,6 @@ */ class ArmorsPlayerFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ArmorsPlayer' - */ - public $name = 'ArmorsPlayer'; - /** * Datasource * diff --git a/lib/Cake/Test/Fixture/AroFixture.php b/lib/Cake/Test/Fixture/AroFixture.php index 4fe1d2e31..ce21036c4 100644 --- a/lib/Cake/Test/Fixture/AroFixture.php +++ b/lib/Cake/Test/Fixture/AroFixture.php @@ -25,13 +25,6 @@ */ class AroFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Aro' - */ - public $name = 'Aro'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AroTwoFixture.php b/lib/Cake/Test/Fixture/AroTwoFixture.php index b8e25a099..576b07bda 100644 --- a/lib/Cake/Test/Fixture/AroTwoFixture.php +++ b/lib/Cake/Test/Fixture/AroTwoFixture.php @@ -25,13 +25,6 @@ */ class AroTwoFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'AroTwo' - */ - public $name = 'AroTwo'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ArosAcoFixture.php b/lib/Cake/Test/Fixture/ArosAcoFixture.php index 4bb7ea76c..309231f19 100644 --- a/lib/Cake/Test/Fixture/ArosAcoFixture.php +++ b/lib/Cake/Test/Fixture/ArosAcoFixture.php @@ -25,13 +25,6 @@ */ class ArosAcoFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ArosAco' - */ - public $name = 'ArosAco'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ArosAcoTwoFixture.php b/lib/Cake/Test/Fixture/ArosAcoTwoFixture.php index f9c7e0046..3dd810254 100644 --- a/lib/Cake/Test/Fixture/ArosAcoTwoFixture.php +++ b/lib/Cake/Test/Fixture/ArosAcoTwoFixture.php @@ -25,13 +25,6 @@ */ class ArosAcoTwoFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ArosAcoTwo' - */ - public $name = 'ArosAcoTwo'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ArticleFeaturedFixture.php b/lib/Cake/Test/Fixture/ArticleFeaturedFixture.php index 83715ad2f..f5a959ea8 100644 --- a/lib/Cake/Test/Fixture/ArticleFeaturedFixture.php +++ b/lib/Cake/Test/Fixture/ArticleFeaturedFixture.php @@ -25,13 +25,6 @@ */ class ArticleFeaturedFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ArticleFeatured' - */ - public $name = 'ArticleFeatured'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php b/lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php index a12df1fc7..9a009799a 100644 --- a/lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php +++ b/lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php @@ -25,13 +25,6 @@ */ class ArticleFeaturedsTagsFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ArticleFeaturedsTags' - */ - public $name = 'ArticleFeaturedsTags'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ArticleFixture.php b/lib/Cake/Test/Fixture/ArticleFixture.php index 9e0ed5baa..39e3e5c84 100644 --- a/lib/Cake/Test/Fixture/ArticleFixture.php +++ b/lib/Cake/Test/Fixture/ArticleFixture.php @@ -25,13 +25,6 @@ */ class ArticleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Article' - */ - public $name = 'Article'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ArticlesTagFixture.php b/lib/Cake/Test/Fixture/ArticlesTagFixture.php index 585c46803..751cc69fb 100644 --- a/lib/Cake/Test/Fixture/ArticlesTagFixture.php +++ b/lib/Cake/Test/Fixture/ArticlesTagFixture.php @@ -25,13 +25,6 @@ */ class ArticlesTagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ArticlesTag' - */ - public $name = 'ArticlesTag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AttachmentFixture.php b/lib/Cake/Test/Fixture/AttachmentFixture.php index 6b2089909..c63002c8b 100644 --- a/lib/Cake/Test/Fixture/AttachmentFixture.php +++ b/lib/Cake/Test/Fixture/AttachmentFixture.php @@ -25,13 +25,6 @@ */ class AttachmentFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Attachment' - */ - public $name = 'Attachment'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php b/lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php index 5e887867b..89c15775d 100644 --- a/lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php +++ b/lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php @@ -25,13 +25,6 @@ */ class AuthUserCustomFieldFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'AuthUser' - */ - public $name = 'AuthUserCustomField'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AuthUserFixture.php b/lib/Cake/Test/Fixture/AuthUserFixture.php index 8f41031f4..afa38611b 100644 --- a/lib/Cake/Test/Fixture/AuthUserFixture.php +++ b/lib/Cake/Test/Fixture/AuthUserFixture.php @@ -25,13 +25,6 @@ */ class AuthUserFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'AuthUser' - */ - public $name = 'AuthUser'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/AuthorFixture.php b/lib/Cake/Test/Fixture/AuthorFixture.php index 198bf79e1..a2257298a 100644 --- a/lib/Cake/Test/Fixture/AuthorFixture.php +++ b/lib/Cake/Test/Fixture/AuthorFixture.php @@ -25,13 +25,6 @@ */ class AuthorFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Author' - */ - public $name = 'Author'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BakeArticleFixture.php b/lib/Cake/Test/Fixture/BakeArticleFixture.php index 94b520160..34f59b1c4 100644 --- a/lib/Cake/Test/Fixture/BakeArticleFixture.php +++ b/lib/Cake/Test/Fixture/BakeArticleFixture.php @@ -25,13 +25,6 @@ */ class BakeArticleFixture extends CakeTestFixture { -/** - * name property - * - * @var string - */ - public $name = 'BakeArticle'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php b/lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php index ec4d07597..06a3a43b7 100644 --- a/lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php +++ b/lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php @@ -25,13 +25,6 @@ */ class BakeArticlesBakeTagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ArticlesTag' - */ - public $name = 'BakeArticlesBakeTag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BakeCommentFixture.php b/lib/Cake/Test/Fixture/BakeCommentFixture.php index 95137159b..37724f340 100644 --- a/lib/Cake/Test/Fixture/BakeCommentFixture.php +++ b/lib/Cake/Test/Fixture/BakeCommentFixture.php @@ -25,13 +25,6 @@ */ class BakeCommentFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Comment' - */ - public $name = 'BakeComment'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BakeTagFixture.php b/lib/Cake/Test/Fixture/BakeTagFixture.php index 10816df24..3fac6b076 100644 --- a/lib/Cake/Test/Fixture/BakeTagFixture.php +++ b/lib/Cake/Test/Fixture/BakeTagFixture.php @@ -25,13 +25,6 @@ */ class BakeTagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Tag' - */ - public $name = 'BakeTag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BasketFixture.php b/lib/Cake/Test/Fixture/BasketFixture.php index 2a4b4dae0..c58556dbf 100644 --- a/lib/Cake/Test/Fixture/BasketFixture.php +++ b/lib/Cake/Test/Fixture/BasketFixture.php @@ -25,13 +25,6 @@ */ class BasketFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Basket' - */ - public $name = 'Basket'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BidFixture.php b/lib/Cake/Test/Fixture/BidFixture.php index 1c11d080c..e4ea57d84 100644 --- a/lib/Cake/Test/Fixture/BidFixture.php +++ b/lib/Cake/Test/Fixture/BidFixture.php @@ -25,13 +25,6 @@ */ class BidFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Bid' - */ - public $name = 'Bid'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BiddingFixture.php b/lib/Cake/Test/Fixture/BiddingFixture.php index 991bd9447..0ff857c4a 100644 --- a/lib/Cake/Test/Fixture/BiddingFixture.php +++ b/lib/Cake/Test/Fixture/BiddingFixture.php @@ -25,13 +25,6 @@ */ class BiddingFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Bidding' - */ - public $name = 'Bidding'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BiddingMessageFixture.php b/lib/Cake/Test/Fixture/BiddingMessageFixture.php index 3c41fc92d..dc82913a3 100644 --- a/lib/Cake/Test/Fixture/BiddingMessageFixture.php +++ b/lib/Cake/Test/Fixture/BiddingMessageFixture.php @@ -25,13 +25,6 @@ */ class BiddingMessageFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'BiddingMessage' - */ - public $name = 'BiddingMessage'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BinaryTestFixture.php b/lib/Cake/Test/Fixture/BinaryTestFixture.php index 9f5dea490..cb43b3084 100644 --- a/lib/Cake/Test/Fixture/BinaryTestFixture.php +++ b/lib/Cake/Test/Fixture/BinaryTestFixture.php @@ -25,13 +25,6 @@ */ class BinaryTestFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'BinaryTest' - */ - public $name = 'BinaryTest'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/BookFixture.php b/lib/Cake/Test/Fixture/BookFixture.php index 96e06b05b..aa15314b0 100644 --- a/lib/Cake/Test/Fixture/BookFixture.php +++ b/lib/Cake/Test/Fixture/BookFixture.php @@ -25,13 +25,6 @@ */ class BookFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Book' - */ - public $name = 'Book'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CacheTestModelFixture.php b/lib/Cake/Test/Fixture/CacheTestModelFixture.php index da81169bd..0e813f2b2 100644 --- a/lib/Cake/Test/Fixture/CacheTestModelFixture.php +++ b/lib/Cake/Test/Fixture/CacheTestModelFixture.php @@ -25,13 +25,6 @@ */ class CacheTestModelFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'CacheTestModel' - */ - public $name = 'CacheTestModel'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CakeSessionFixture.php b/lib/Cake/Test/Fixture/CakeSessionFixture.php index 4bed4dc39..3526341c5 100644 --- a/lib/Cake/Test/Fixture/CakeSessionFixture.php +++ b/lib/Cake/Test/Fixture/CakeSessionFixture.php @@ -21,13 +21,6 @@ */ class CakeSessionFixture extends CakeTestFixture { -/** - * name property - * - * @var string - */ - public $name = 'CakeSession'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CallbackFixture.php b/lib/Cake/Test/Fixture/CallbackFixture.php index 30f5921ba..c752cc36a 100644 --- a/lib/Cake/Test/Fixture/CallbackFixture.php +++ b/lib/Cake/Test/Fixture/CallbackFixture.php @@ -25,13 +25,6 @@ */ class CallbackFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Callback' - */ - public $name = 'Callback'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CampaignFixture.php b/lib/Cake/Test/Fixture/CampaignFixture.php index 8ebeab994..ea658309b 100644 --- a/lib/Cake/Test/Fixture/CampaignFixture.php +++ b/lib/Cake/Test/Fixture/CampaignFixture.php @@ -26,13 +26,6 @@ */ class CampaignFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Campaign' - */ - public $name = 'Campaign'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CategoryFixture.php b/lib/Cake/Test/Fixture/CategoryFixture.php index 10b0d304b..9fc40c4d2 100644 --- a/lib/Cake/Test/Fixture/CategoryFixture.php +++ b/lib/Cake/Test/Fixture/CategoryFixture.php @@ -25,13 +25,6 @@ */ class CategoryFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Category' - */ - public $name = 'Category'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CategoryThreadFixture.php b/lib/Cake/Test/Fixture/CategoryThreadFixture.php index 40ff469d9..2ab37bdee 100644 --- a/lib/Cake/Test/Fixture/CategoryThreadFixture.php +++ b/lib/Cake/Test/Fixture/CategoryThreadFixture.php @@ -25,13 +25,6 @@ */ class CategoryThreadFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'CategoryThread' - */ - public $name = 'CategoryThread'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CdFixture.php b/lib/Cake/Test/Fixture/CdFixture.php index a93420d5a..b76efd4a5 100644 --- a/lib/Cake/Test/Fixture/CdFixture.php +++ b/lib/Cake/Test/Fixture/CdFixture.php @@ -25,13 +25,6 @@ */ class CdFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Cd' - */ - public $name = 'Cd'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/CommentFixture.php b/lib/Cake/Test/Fixture/CommentFixture.php index da84edc41..b2b83c88e 100644 --- a/lib/Cake/Test/Fixture/CommentFixture.php +++ b/lib/Cake/Test/Fixture/CommentFixture.php @@ -25,13 +25,6 @@ */ class CommentFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Comment' - */ - public $name = 'Comment'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ContentAccountFixture.php b/lib/Cake/Test/Fixture/ContentAccountFixture.php index 3f01f6bd0..59f274a08 100644 --- a/lib/Cake/Test/Fixture/ContentAccountFixture.php +++ b/lib/Cake/Test/Fixture/ContentAccountFixture.php @@ -25,13 +25,6 @@ */ class ContentAccountFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Aco' - */ - public $name = 'ContentAccount'; - public $table = 'ContentAccounts'; /** diff --git a/lib/Cake/Test/Fixture/ContentFixture.php b/lib/Cake/Test/Fixture/ContentFixture.php index b31adfebb..af1e03189 100644 --- a/lib/Cake/Test/Fixture/ContentFixture.php +++ b/lib/Cake/Test/Fixture/ContentFixture.php @@ -25,13 +25,6 @@ */ class ContentFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Aco' - */ - public $name = 'Content'; - public $table = 'Content'; /** diff --git a/lib/Cake/Test/Fixture/CounterCachePostFixture.php b/lib/Cake/Test/Fixture/CounterCachePostFixture.php index f2f40dd23..d8838133d 100644 --- a/lib/Cake/Test/Fixture/CounterCachePostFixture.php +++ b/lib/Cake/Test/Fixture/CounterCachePostFixture.php @@ -25,8 +25,6 @@ */ class CounterCachePostFixture extends CakeTestFixture { - public $name = 'CounterCachePost'; - public $fields = array( 'id' => array('type' => 'integer', 'key' => 'primary'), 'title' => array('type' => 'string', 'length' => 255), diff --git a/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php b/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php index 3c6a09489..399bc226a 100644 --- a/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php +++ b/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php @@ -25,8 +25,6 @@ */ class CounterCachePostNonstandardPrimaryKeyFixture extends CakeTestFixture { - public $name = 'CounterCachePostNonstandardPrimaryKey'; - public $fields = array( 'pid' => array('type' => 'integer', 'key' => 'primary'), 'title' => array('type' => 'string', 'length' => 255, 'null' => false), diff --git a/lib/Cake/Test/Fixture/CounterCacheUserFixture.php b/lib/Cake/Test/Fixture/CounterCacheUserFixture.php index 38b8d56d2..95eaa6859 100644 --- a/lib/Cake/Test/Fixture/CounterCacheUserFixture.php +++ b/lib/Cake/Test/Fixture/CounterCacheUserFixture.php @@ -25,8 +25,6 @@ */ class CounterCacheUserFixture extends CakeTestFixture { - public $name = 'CounterCacheUser'; - public $fields = array( 'id' => array('type' => 'integer', 'key' => 'primary'), 'name' => array('type' => 'string', 'length' => 255, 'null' => false), diff --git a/lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php b/lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php index 3a6bfef7d..030f36204 100644 --- a/lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php +++ b/lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php @@ -25,8 +25,6 @@ */ class CounterCacheUserNonstandardPrimaryKeyFixture extends CakeTestFixture { - public $name = 'CounterCacheUserNonstandardPrimaryKey'; - public $fields = array( 'uid' => array('type' => 'integer', 'key' => 'primary'), 'name' => array('type' => 'string', 'length' => 255, 'null' => false), diff --git a/lib/Cake/Test/Fixture/DataTestFixture.php b/lib/Cake/Test/Fixture/DataTestFixture.php index 719494f76..ba95e3f1c 100644 --- a/lib/Cake/Test/Fixture/DataTestFixture.php +++ b/lib/Cake/Test/Fixture/DataTestFixture.php @@ -25,13 +25,6 @@ */ class DataTestFixture extends CakeTestFixture { -/** - * Name property - * - * @var string 'DataTest' - */ - public $name = 'DataTest'; - /** * Fields property * diff --git a/lib/Cake/Test/Fixture/DatatypeFixture.php b/lib/Cake/Test/Fixture/DatatypeFixture.php index d47a04504..413ca74e3 100644 --- a/lib/Cake/Test/Fixture/DatatypeFixture.php +++ b/lib/Cake/Test/Fixture/DatatypeFixture.php @@ -25,13 +25,6 @@ */ class DatatypeFixture extends CakeTestFixture { -/** - * Name property - * - * @var string 'Datatype' - */ - public $name = 'Datatype'; - /** * Fields property * diff --git a/lib/Cake/Test/Fixture/DependencyFixture.php b/lib/Cake/Test/Fixture/DependencyFixture.php index 8aa7c0482..2f0418797 100644 --- a/lib/Cake/Test/Fixture/DependencyFixture.php +++ b/lib/Cake/Test/Fixture/DependencyFixture.php @@ -26,13 +26,6 @@ */ class DependencyFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Dependency' - */ - public $name = 'Dependency'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/DeviceFixture.php b/lib/Cake/Test/Fixture/DeviceFixture.php index bd1efc994..b4dc268d1 100644 --- a/lib/Cake/Test/Fixture/DeviceFixture.php +++ b/lib/Cake/Test/Fixture/DeviceFixture.php @@ -25,13 +25,6 @@ */ class DeviceFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Device' - */ - public $name = 'Device'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php b/lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php index f0aa9c3e1..32cda4517 100644 --- a/lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php +++ b/lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php @@ -25,13 +25,6 @@ */ class DeviceTypeCategoryFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'DeviceTypeCategory' - */ - public $name = 'DeviceTypeCategory'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/DeviceTypeFixture.php b/lib/Cake/Test/Fixture/DeviceTypeFixture.php index cda239178..a06c40b86 100644 --- a/lib/Cake/Test/Fixture/DeviceTypeFixture.php +++ b/lib/Cake/Test/Fixture/DeviceTypeFixture.php @@ -25,13 +25,6 @@ */ class DeviceTypeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'DeviceType' - */ - public $name = 'DeviceType'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/DocumentDirectoryFixture.php b/lib/Cake/Test/Fixture/DocumentDirectoryFixture.php index d29edaf76..fa2f734f6 100644 --- a/lib/Cake/Test/Fixture/DocumentDirectoryFixture.php +++ b/lib/Cake/Test/Fixture/DocumentDirectoryFixture.php @@ -25,13 +25,6 @@ */ class DocumentDirectoryFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'DocumentDirectory' - */ - public $name = 'DocumentDirectory'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/DocumentFixture.php b/lib/Cake/Test/Fixture/DocumentFixture.php index 8d2137a2e..dd992decc 100644 --- a/lib/Cake/Test/Fixture/DocumentFixture.php +++ b/lib/Cake/Test/Fixture/DocumentFixture.php @@ -25,13 +25,6 @@ */ class DocumentFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Document' - */ - public $name = 'Document'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/DomainFixture.php b/lib/Cake/Test/Fixture/DomainFixture.php index f9c9afd95..409a4585f 100644 --- a/lib/Cake/Test/Fixture/DomainFixture.php +++ b/lib/Cake/Test/Fixture/DomainFixture.php @@ -24,19 +24,10 @@ */ class DomainFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Domain' - * @access public - */ - public $name = 'Domain'; - /** * fields property * * @var array - * @access public */ public $fields = array( 'id' => array('type' => 'integer', 'key' => 'primary'), @@ -49,7 +40,6 @@ class DomainFixture extends CakeTestFixture { * records property * * @var array - * @access public */ public $records = array( array('domain' => 'cakephp.org', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), diff --git a/lib/Cake/Test/Fixture/DomainsSiteFixture.php b/lib/Cake/Test/Fixture/DomainsSiteFixture.php index a8ec89465..bd4ae1466 100644 --- a/lib/Cake/Test/Fixture/DomainsSiteFixture.php +++ b/lib/Cake/Test/Fixture/DomainsSiteFixture.php @@ -24,19 +24,10 @@ */ class DomainsSiteFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Domain' - * @access public - */ - public $name = 'DomainsSite'; - /** * fields property * * @var array - * @access public */ public $fields = array( 'id' => array('type' => 'integer', 'key' => 'primary'), @@ -51,7 +42,6 @@ class DomainsSiteFixture extends CakeTestFixture { * records property * * @var array - * @access public */ public $records = array( array('site_id' => 1, 'domain_id' => 1, 'active' => true, 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), diff --git a/lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php b/lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php index 07789e03d..9359783ef 100644 --- a/lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php +++ b/lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php @@ -25,13 +25,6 @@ */ class ExteriorTypeCategoryFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ExteriorTypeCategory' - */ - public $name = 'ExteriorTypeCategory'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/FeatureSetFixture.php b/lib/Cake/Test/Fixture/FeatureSetFixture.php index 566a5bb2c..ff420aa89 100644 --- a/lib/Cake/Test/Fixture/FeatureSetFixture.php +++ b/lib/Cake/Test/Fixture/FeatureSetFixture.php @@ -25,13 +25,6 @@ */ class FeatureSetFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'FeatureSet' - */ - public $name = 'FeatureSet'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/FeaturedFixture.php b/lib/Cake/Test/Fixture/FeaturedFixture.php index dea152ccb..cd2e43cba 100644 --- a/lib/Cake/Test/Fixture/FeaturedFixture.php +++ b/lib/Cake/Test/Fixture/FeaturedFixture.php @@ -25,13 +25,6 @@ */ class FeaturedFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Featured' - */ - public $name = 'Featured'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/FilmFileFixture.php b/lib/Cake/Test/Fixture/FilmFileFixture.php index cf2d5fa6b..efa369057 100644 --- a/lib/Cake/Test/Fixture/FilmFileFixture.php +++ b/lib/Cake/Test/Fixture/FilmFileFixture.php @@ -25,13 +25,6 @@ */ class FilmFileFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'FilmFile' - */ - public $name = 'FilmFile'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/FlagTreeFixture.php b/lib/Cake/Test/Fixture/FlagTreeFixture.php index b776129a4..8d3268e30 100644 --- a/lib/Cake/Test/Fixture/FlagTreeFixture.php +++ b/lib/Cake/Test/Fixture/FlagTreeFixture.php @@ -29,13 +29,6 @@ */ class FlagTreeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'FlagTree' - */ - public $name = 'FlagTree'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/FruitFixture.php b/lib/Cake/Test/Fixture/FruitFixture.php index 37ff47725..9b4eae2c7 100644 --- a/lib/Cake/Test/Fixture/FruitFixture.php +++ b/lib/Cake/Test/Fixture/FruitFixture.php @@ -25,13 +25,6 @@ */ class FruitFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Fruit' - */ - public $name = 'Fruit'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php b/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php index 194c0642c..9a3a1b93d 100644 --- a/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php +++ b/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php @@ -25,13 +25,6 @@ */ class FruitsUuidTagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'FruitsUuidTag' - */ - public $name = 'FruitsUuidTag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php index 0523a5db3..91d00d9d6 100644 --- a/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php +++ b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php @@ -25,8 +25,6 @@ */ class GroupUpdateAllFixture extends CakeTestFixture { - public $name = 'GroupUpdateAll'; - public $table = 'group_update_all'; public $fields = array( diff --git a/lib/Cake/Test/Fixture/GuildFixture.php b/lib/Cake/Test/Fixture/GuildFixture.php index 1c9b7c096..2d89d2df4 100644 --- a/lib/Cake/Test/Fixture/GuildFixture.php +++ b/lib/Cake/Test/Fixture/GuildFixture.php @@ -25,13 +25,6 @@ */ class GuildFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Guild' - */ - public $name = 'Guild'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php index 58c8259f0..54ce6c7c7 100644 --- a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php +++ b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php @@ -25,13 +25,6 @@ */ class GuildsPlayerFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'GuildsPlayer' - */ - public $name = 'GuildsPlayer'; - public $useDbConfig = 'test2'; /** diff --git a/lib/Cake/Test/Fixture/HomeFixture.php b/lib/Cake/Test/Fixture/HomeFixture.php index abbd27d7e..febd685f1 100644 --- a/lib/Cake/Test/Fixture/HomeFixture.php +++ b/lib/Cake/Test/Fixture/HomeFixture.php @@ -25,13 +25,6 @@ */ class HomeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Home' - */ - public $name = 'Home'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ImageFixture.php b/lib/Cake/Test/Fixture/ImageFixture.php index df18d1196..922bca2cd 100644 --- a/lib/Cake/Test/Fixture/ImageFixture.php +++ b/lib/Cake/Test/Fixture/ImageFixture.php @@ -25,13 +25,6 @@ */ class ImageFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Image' - */ - public $name = 'Image'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/InnoFixture.php b/lib/Cake/Test/Fixture/InnoFixture.php index 41626adc5..1165e5053 100644 --- a/lib/Cake/Test/Fixture/InnoFixture.php +++ b/lib/Cake/Test/Fixture/InnoFixture.php @@ -25,13 +25,6 @@ */ class InnoFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Article' - */ - public $name = 'Inno'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ItemFixture.php b/lib/Cake/Test/Fixture/ItemFixture.php index b660c87de..6f7fcf78c 100644 --- a/lib/Cake/Test/Fixture/ItemFixture.php +++ b/lib/Cake/Test/Fixture/ItemFixture.php @@ -25,13 +25,6 @@ */ class ItemFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Item' - */ - public $name = 'Item'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php b/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php index 79a73203e..29ba126e8 100644 --- a/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php +++ b/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php @@ -25,13 +25,6 @@ */ class ItemsPortfolioFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ItemsPortfolio' - */ - public $name = 'ItemsPortfolio'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/JoinAFixture.php b/lib/Cake/Test/Fixture/JoinAFixture.php index d7996770b..b494c1508 100644 --- a/lib/Cake/Test/Fixture/JoinAFixture.php +++ b/lib/Cake/Test/Fixture/JoinAFixture.php @@ -25,13 +25,6 @@ */ class JoinAFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'JoinA' - */ - public $name = 'JoinA'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/JoinBFixture.php b/lib/Cake/Test/Fixture/JoinBFixture.php index bb229ffd9..b75030b53 100644 --- a/lib/Cake/Test/Fixture/JoinBFixture.php +++ b/lib/Cake/Test/Fixture/JoinBFixture.php @@ -25,13 +25,6 @@ */ class JoinBFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'JoinB' - */ - public $name = 'JoinB'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/JoinCFixture.php b/lib/Cake/Test/Fixture/JoinCFixture.php index cc6f0a7ee..67f4690b5 100644 --- a/lib/Cake/Test/Fixture/JoinCFixture.php +++ b/lib/Cake/Test/Fixture/JoinCFixture.php @@ -25,13 +25,6 @@ */ class JoinCFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'JoinC' - */ - public $name = 'JoinC'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/JoinThingFixture.php b/lib/Cake/Test/Fixture/JoinThingFixture.php index bb1acfaf8..6732f815e 100644 --- a/lib/Cake/Test/Fixture/JoinThingFixture.php +++ b/lib/Cake/Test/Fixture/JoinThingFixture.php @@ -25,13 +25,6 @@ */ class JoinThingFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'JoinThing' - */ - public $name = 'JoinThing'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/MessageFixture.php b/lib/Cake/Test/Fixture/MessageFixture.php index 199cc8083..ecfccd1be 100644 --- a/lib/Cake/Test/Fixture/MessageFixture.php +++ b/lib/Cake/Test/Fixture/MessageFixture.php @@ -25,13 +25,6 @@ */ class MessageFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Message' - */ - public $name = 'Message'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php index 213ff1da8..86febfbd2 100644 --- a/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php +++ b/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php @@ -25,13 +25,6 @@ */ class MyCategoriesMyProductsFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'MyCategoriesMyProducts' - */ - public $name = 'MyCategoriesMyProducts'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php index 665d045d8..393e0628b 100644 --- a/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php +++ b/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php @@ -25,13 +25,6 @@ */ class MyCategoriesMyUsersFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'MyCategoriesMyUsers' - */ - public $name = 'MyCategoriesMyUsers'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/MyCategoryFixture.php b/lib/Cake/Test/Fixture/MyCategoryFixture.php index 7246ff675..32b8d13a5 100644 --- a/lib/Cake/Test/Fixture/MyCategoryFixture.php +++ b/lib/Cake/Test/Fixture/MyCategoryFixture.php @@ -25,13 +25,6 @@ */ class MyCategoryFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'MyCategory' - */ - public $name = 'MyCategory'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/MyProductFixture.php b/lib/Cake/Test/Fixture/MyProductFixture.php index 9f2f82ebb..b729adb3d 100644 --- a/lib/Cake/Test/Fixture/MyProductFixture.php +++ b/lib/Cake/Test/Fixture/MyProductFixture.php @@ -25,13 +25,6 @@ */ class MyProductFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'MyProduct' - */ - public $name = 'MyProduct'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/MyUserFixture.php b/lib/Cake/Test/Fixture/MyUserFixture.php index 34dce316e..3c974a05a 100644 --- a/lib/Cake/Test/Fixture/MyUserFixture.php +++ b/lib/Cake/Test/Fixture/MyUserFixture.php @@ -25,13 +25,6 @@ */ class MyUserFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'MyUser' - */ - public $name = 'MyUser'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/NodeFixture.php b/lib/Cake/Test/Fixture/NodeFixture.php index 02b86b656..7ed358a9a 100644 --- a/lib/Cake/Test/Fixture/NodeFixture.php +++ b/lib/Cake/Test/Fixture/NodeFixture.php @@ -26,13 +26,6 @@ */ class NodeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Node' - */ - public $name = 'Node'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/NumberTreeFixture.php b/lib/Cake/Test/Fixture/NumberTreeFixture.php index e4d87ca41..6c3b37c82 100644 --- a/lib/Cake/Test/Fixture/NumberTreeFixture.php +++ b/lib/Cake/Test/Fixture/NumberTreeFixture.php @@ -29,13 +29,6 @@ */ class NumberTreeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'NumberTree' - */ - public $name = 'NumberTree'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php b/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php index aa7d608e4..8a14ab158 100644 --- a/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php +++ b/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php @@ -29,13 +29,6 @@ */ class NumberTreeTwoFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'NumberTree' - */ - public $name = 'NumberTreeTwo'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/NumericArticleFixture.php b/lib/Cake/Test/Fixture/NumericArticleFixture.php index 313c28365..1e272fc0b 100644 --- a/lib/Cake/Test/Fixture/NumericArticleFixture.php +++ b/lib/Cake/Test/Fixture/NumericArticleFixture.php @@ -25,13 +25,6 @@ */ class NumericArticleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'NumericArticle' - */ - public $name = 'NumericArticle'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/OverallFavoriteFixture.php b/lib/Cake/Test/Fixture/OverallFavoriteFixture.php index 9875e3592..36de88bec 100644 --- a/lib/Cake/Test/Fixture/OverallFavoriteFixture.php +++ b/lib/Cake/Test/Fixture/OverallFavoriteFixture.php @@ -25,13 +25,6 @@ */ class OverallFavoriteFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'OverallFavorite' - */ - public $name = 'OverallFavorite'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/PersonFixture.php b/lib/Cake/Test/Fixture/PersonFixture.php index 683140dc4..42281a514 100644 --- a/lib/Cake/Test/Fixture/PersonFixture.php +++ b/lib/Cake/Test/Fixture/PersonFixture.php @@ -25,13 +25,6 @@ */ class PersonFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Person' - */ - public $name = 'Person'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/PlayerFixture.php b/lib/Cake/Test/Fixture/PlayerFixture.php index f29855451..8abea3924 100644 --- a/lib/Cake/Test/Fixture/PlayerFixture.php +++ b/lib/Cake/Test/Fixture/PlayerFixture.php @@ -25,13 +25,6 @@ */ class PlayerFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Player' - */ - public $name = 'Player'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/PortfolioFixture.php b/lib/Cake/Test/Fixture/PortfolioFixture.php index 8dabefc62..507b08dfa 100644 --- a/lib/Cake/Test/Fixture/PortfolioFixture.php +++ b/lib/Cake/Test/Fixture/PortfolioFixture.php @@ -25,13 +25,6 @@ */ class PortfolioFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Portfolio' - */ - public $name = 'Portfolio'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/PostFixture.php b/lib/Cake/Test/Fixture/PostFixture.php index 95338c497..c141c232c 100644 --- a/lib/Cake/Test/Fixture/PostFixture.php +++ b/lib/Cake/Test/Fixture/PostFixture.php @@ -25,13 +25,6 @@ */ class PostFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Post' - */ - public $name = 'Post'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/PostsTagFixture.php b/lib/Cake/Test/Fixture/PostsTagFixture.php index a5f3abb14..ef2660f62 100644 --- a/lib/Cake/Test/Fixture/PostsTagFixture.php +++ b/lib/Cake/Test/Fixture/PostsTagFixture.php @@ -25,13 +25,6 @@ */ class PostsTagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'PostsTag' - */ - public $name = 'PostsTag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/PrefixTestFixture.php b/lib/Cake/Test/Fixture/PrefixTestFixture.php index 425b6224f..47f36ebd7 100644 --- a/lib/Cake/Test/Fixture/PrefixTestFixture.php +++ b/lib/Cake/Test/Fixture/PrefixTestFixture.php @@ -24,8 +24,6 @@ */ class PrefixTestFixture extends CakeTestFixture { - public $name = 'PrefixTest'; - public $table = 'prefix_prefix_tests'; public $fields = array( diff --git a/lib/Cake/Test/Fixture/PrimaryModelFixture.php b/lib/Cake/Test/Fixture/PrimaryModelFixture.php index b4c5207e1..a16e6c8e5 100644 --- a/lib/Cake/Test/Fixture/PrimaryModelFixture.php +++ b/lib/Cake/Test/Fixture/PrimaryModelFixture.php @@ -25,13 +25,6 @@ */ class PrimaryModelFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'PrimaryModel' - */ - public $name = 'PrimaryModel'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ProductFixture.php b/lib/Cake/Test/Fixture/ProductFixture.php index de4a8112a..3cf6b3263 100644 --- a/lib/Cake/Test/Fixture/ProductFixture.php +++ b/lib/Cake/Test/Fixture/ProductFixture.php @@ -25,13 +25,6 @@ */ class ProductFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Product' - */ - public $name = 'Product'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php index cadbad809..3b115456d 100644 --- a/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php +++ b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php @@ -25,8 +25,6 @@ */ class ProductUpdateAllFixture extends CakeTestFixture { - public $name = 'ProductUpdateAll'; - public $table = 'product_update_all'; public $fields = array( diff --git a/lib/Cake/Test/Fixture/ProjectFixture.php b/lib/Cake/Test/Fixture/ProjectFixture.php index a19efa875..e29b48ea0 100644 --- a/lib/Cake/Test/Fixture/ProjectFixture.php +++ b/lib/Cake/Test/Fixture/ProjectFixture.php @@ -25,13 +25,6 @@ */ class ProjectFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Project' - */ - public $name = 'Project'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/SampleFixture.php b/lib/Cake/Test/Fixture/SampleFixture.php index fa6df4ef5..1d06bc485 100644 --- a/lib/Cake/Test/Fixture/SampleFixture.php +++ b/lib/Cake/Test/Fixture/SampleFixture.php @@ -25,13 +25,6 @@ */ class SampleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Sample' - */ - public $name = 'Sample'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/SecondaryModelFixture.php b/lib/Cake/Test/Fixture/SecondaryModelFixture.php index 65cfa815a..b88596f6a 100644 --- a/lib/Cake/Test/Fixture/SecondaryModelFixture.php +++ b/lib/Cake/Test/Fixture/SecondaryModelFixture.php @@ -25,13 +25,6 @@ */ class SecondaryModelFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'SecondaryModel' - */ - public $name = 'SecondaryModel'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/SessionFixture.php b/lib/Cake/Test/Fixture/SessionFixture.php index c7f8bce00..42ad92348 100644 --- a/lib/Cake/Test/Fixture/SessionFixture.php +++ b/lib/Cake/Test/Fixture/SessionFixture.php @@ -25,13 +25,6 @@ */ class SessionFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Session' - */ - public $name = 'Session'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/SiteFixture.php b/lib/Cake/Test/Fixture/SiteFixture.php index f55b77f5a..158429de4 100644 --- a/lib/Cake/Test/Fixture/SiteFixture.php +++ b/lib/Cake/Test/Fixture/SiteFixture.php @@ -24,19 +24,10 @@ */ class SiteFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Site' - * @access public - */ - public $name = 'Site'; - /** * fields property * * @var array - * @access public */ public $fields = array( 'id' => array('type' => 'integer', 'key' => 'primary'), @@ -49,7 +40,6 @@ class SiteFixture extends CakeTestFixture { * records property * * @var array - * @access public */ public $records = array( array('name' => 'cakephp', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'), diff --git a/lib/Cake/Test/Fixture/SomethingElseFixture.php b/lib/Cake/Test/Fixture/SomethingElseFixture.php index b47c5b26e..1f4eb534a 100644 --- a/lib/Cake/Test/Fixture/SomethingElseFixture.php +++ b/lib/Cake/Test/Fixture/SomethingElseFixture.php @@ -25,13 +25,6 @@ */ class SomethingElseFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'SomethingElse' - */ - public $name = 'SomethingElse'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/SomethingFixture.php b/lib/Cake/Test/Fixture/SomethingFixture.php index e8265b804..b5e20351a 100644 --- a/lib/Cake/Test/Fixture/SomethingFixture.php +++ b/lib/Cake/Test/Fixture/SomethingFixture.php @@ -25,13 +25,6 @@ */ class SomethingFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Something' - */ - public $name = 'Something'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/StoriesTagFixture.php b/lib/Cake/Test/Fixture/StoriesTagFixture.php index fc5e5edbc..66a9705dd 100644 --- a/lib/Cake/Test/Fixture/StoriesTagFixture.php +++ b/lib/Cake/Test/Fixture/StoriesTagFixture.php @@ -25,13 +25,6 @@ */ class StoriesTagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'StoriesTag' - */ - public $name = 'StoriesTag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/StoryFixture.php b/lib/Cake/Test/Fixture/StoryFixture.php index c3d953ae5..b94574277 100644 --- a/lib/Cake/Test/Fixture/StoryFixture.php +++ b/lib/Cake/Test/Fixture/StoryFixture.php @@ -25,13 +25,6 @@ */ class StoryFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Story' - */ - public $name = 'Story'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/SyfileFixture.php b/lib/Cake/Test/Fixture/SyfileFixture.php index ecf362dfd..cb6bd5031 100644 --- a/lib/Cake/Test/Fixture/SyfileFixture.php +++ b/lib/Cake/Test/Fixture/SyfileFixture.php @@ -25,13 +25,6 @@ */ class SyfileFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Syfile' - */ - public $name = 'Syfile'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/TagFixture.php b/lib/Cake/Test/Fixture/TagFixture.php index d36792728..0f12c4009 100644 --- a/lib/Cake/Test/Fixture/TagFixture.php +++ b/lib/Cake/Test/Fixture/TagFixture.php @@ -25,13 +25,6 @@ */ class TagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Tag' - */ - public $name = 'Tag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/TestPluginArticleFixture.php b/lib/Cake/Test/Fixture/TestPluginArticleFixture.php index 4faa56120..d9a4d684f 100644 --- a/lib/Cake/Test/Fixture/TestPluginArticleFixture.php +++ b/lib/Cake/Test/Fixture/TestPluginArticleFixture.php @@ -25,13 +25,6 @@ */ class TestPluginArticleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Article' - */ - public $name = 'TestPluginArticle'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/TestPluginCommentFixture.php b/lib/Cake/Test/Fixture/TestPluginCommentFixture.php index 449aaf321..03c879717 100644 --- a/lib/Cake/Test/Fixture/TestPluginCommentFixture.php +++ b/lib/Cake/Test/Fixture/TestPluginCommentFixture.php @@ -25,13 +25,6 @@ */ class TestPluginCommentFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Comment' - */ - public $name = 'TestPluginComment'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php b/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php index 5b43e6d7c..0ed796922 100644 --- a/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php +++ b/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php @@ -25,13 +25,6 @@ */ class ThePaperMonkiesFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'ThePaperMonkies' - */ - public $name = 'ThePaperMonkies'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/ThreadFixture.php b/lib/Cake/Test/Fixture/ThreadFixture.php index 991baff56..014997c9c 100644 --- a/lib/Cake/Test/Fixture/ThreadFixture.php +++ b/lib/Cake/Test/Fixture/ThreadFixture.php @@ -25,13 +25,6 @@ */ class ThreadFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Thread' - */ - public $name = 'Thread'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/TranslateArticleFixture.php b/lib/Cake/Test/Fixture/TranslateArticleFixture.php index 7582fb726..38196b976 100644 --- a/lib/Cake/Test/Fixture/TranslateArticleFixture.php +++ b/lib/Cake/Test/Fixture/TranslateArticleFixture.php @@ -25,13 +25,6 @@ */ class TranslateArticleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Translate' - */ - public $name = 'TranslateArticle'; - /** * table property * diff --git a/lib/Cake/Test/Fixture/TranslateFixture.php b/lib/Cake/Test/Fixture/TranslateFixture.php index 14a4a8dbb..5242abbed 100644 --- a/lib/Cake/Test/Fixture/TranslateFixture.php +++ b/lib/Cake/Test/Fixture/TranslateFixture.php @@ -25,13 +25,6 @@ */ class TranslateFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Translate' - */ - public $name = 'Translate'; - /** * table property * diff --git a/lib/Cake/Test/Fixture/TranslateTableFixture.php b/lib/Cake/Test/Fixture/TranslateTableFixture.php index c9961d479..0a6543b69 100644 --- a/lib/Cake/Test/Fixture/TranslateTableFixture.php +++ b/lib/Cake/Test/Fixture/TranslateTableFixture.php @@ -25,13 +25,6 @@ */ class TranslateTableFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'TranslateTable' - */ - public $name = 'TranslateTable'; - /** * table property * diff --git a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php index b73b2a624..2dbe8c7ea 100644 --- a/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php +++ b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php @@ -29,13 +29,6 @@ */ class TranslateWithPrefixFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Translate' - */ - public $name = 'TranslateWithPrefix'; - /** * table property * diff --git a/lib/Cake/Test/Fixture/TranslatedArticleFixture.php b/lib/Cake/Test/Fixture/TranslatedArticleFixture.php index 43ec483af..8600bb5d1 100644 --- a/lib/Cake/Test/Fixture/TranslatedArticleFixture.php +++ b/lib/Cake/Test/Fixture/TranslatedArticleFixture.php @@ -25,13 +25,6 @@ */ class TranslatedArticleFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'TranslatedItem' - */ - public $name = 'TranslatedArticle'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/TranslatedItemFixture.php b/lib/Cake/Test/Fixture/TranslatedItemFixture.php index aba61ec5e..2ee509da6 100644 --- a/lib/Cake/Test/Fixture/TranslatedItemFixture.php +++ b/lib/Cake/Test/Fixture/TranslatedItemFixture.php @@ -25,13 +25,6 @@ */ class TranslatedItemFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'TranslatedItem' - */ - public $name = 'TranslatedItem'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UnconventionalTreeFixture.php b/lib/Cake/Test/Fixture/UnconventionalTreeFixture.php index 984e1f8fa..f260ba6e5 100644 --- a/lib/Cake/Test/Fixture/UnconventionalTreeFixture.php +++ b/lib/Cake/Test/Fixture/UnconventionalTreeFixture.php @@ -28,13 +28,6 @@ */ class UnconventionalTreeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'FlagTree' - */ - public $name = 'UnconventionalTree'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UnderscoreFieldFixture.php b/lib/Cake/Test/Fixture/UnderscoreFieldFixture.php index a3091611f..3c02f6086 100644 --- a/lib/Cake/Test/Fixture/UnderscoreFieldFixture.php +++ b/lib/Cake/Test/Fixture/UnderscoreFieldFixture.php @@ -25,13 +25,6 @@ */ class UnderscoreFieldFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'UnderscoreField' - */ - public $name = 'UnderscoreField'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UserFixture.php b/lib/Cake/Test/Fixture/UserFixture.php index 676e2fcb2..6430b677d 100644 --- a/lib/Cake/Test/Fixture/UserFixture.php +++ b/lib/Cake/Test/Fixture/UserFixture.php @@ -25,13 +25,6 @@ */ class UserFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'User' - */ - public $name = 'User'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UuidFixture.php b/lib/Cake/Test/Fixture/UuidFixture.php index 034ddbf77..3a90e9065 100644 --- a/lib/Cake/Test/Fixture/UuidFixture.php +++ b/lib/Cake/Test/Fixture/UuidFixture.php @@ -25,13 +25,6 @@ */ class UuidFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Uuid' - */ - public $name = 'Uuid'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UuidTagFixture.php b/lib/Cake/Test/Fixture/UuidTagFixture.php index c2ecfa474..234fab38a 100644 --- a/lib/Cake/Test/Fixture/UuidTagFixture.php +++ b/lib/Cake/Test/Fixture/UuidTagFixture.php @@ -25,13 +25,6 @@ */ class UuidTagFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'UuidTag' - */ - public $name = 'UuidTag'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UuidTreeFixture.php b/lib/Cake/Test/Fixture/UuidTreeFixture.php index a3fc8f855..f1b5cb150 100644 --- a/lib/Cake/Test/Fixture/UuidTreeFixture.php +++ b/lib/Cake/Test/Fixture/UuidTreeFixture.php @@ -26,13 +26,6 @@ */ class UuidTreeFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'UuidTree' - */ - public $name = 'UuidTree'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UuiditemFixture.php b/lib/Cake/Test/Fixture/UuiditemFixture.php index c8fa9a4a2..27d982376 100644 --- a/lib/Cake/Test/Fixture/UuiditemFixture.php +++ b/lib/Cake/Test/Fixture/UuiditemFixture.php @@ -25,13 +25,6 @@ */ class UuiditemFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Uuiditem' - */ - public $name = 'Uuiditem'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php index fdc9add57..8c5a187e1 100644 --- a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php +++ b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php @@ -25,13 +25,6 @@ */ class UuiditemsUuidportfolioFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'UuiditemsUuidportfolio' - */ - public $name = 'UuiditemsUuidportfolio'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php index fd1318283..a8878934b 100644 --- a/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php +++ b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php @@ -25,13 +25,6 @@ */ class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'UuiditemsUuidportfolioNumericid' - */ - public $name = 'UuiditemsUuidportfolioNumericid'; - /** * fields property * diff --git a/lib/Cake/Test/Fixture/UuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuidportfolioFixture.php index 04c62f8b9..f998b21a0 100644 --- a/lib/Cake/Test/Fixture/UuidportfolioFixture.php +++ b/lib/Cake/Test/Fixture/UuidportfolioFixture.php @@ -25,13 +25,6 @@ */ class UuidportfolioFixture extends CakeTestFixture { -/** - * name property - * - * @var string 'Uuidportfolio' - */ - public $name = 'Uuidportfolio'; - /** * fields property * From 542d594b86e30a527261ab6f0953d36bc4ac3eb6 Mon Sep 17 00:00:00 2001 From: Rachman Chavik Date: Mon, 8 Jul 2013 21:36:16 +0700 Subject: [PATCH 02/14] Fix deprecated value in argument and disable caching This aligns better with changes required in the 3.x branch. Related: 4bb0a122 --- lib/Cake/Console/Command/Task/ExtractTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Console/Command/Task/ExtractTask.php b/lib/Cake/Console/Command/Task/ExtractTask.php index fad4639d0..88b54b916 100644 --- a/lib/Cake/Console/Command/Task/ExtractTask.php +++ b/lib/Cake/Console/Command/Task/ExtractTask.php @@ -443,7 +443,7 @@ class ExtractTask extends AppShell { $plugins = array(null); if (empty($this->params['exclude-plugins'])) { - $plugins = array_merge($plugins, App::objects('plugins')); + $plugins = array_merge($plugins, App::objects('plugin', null, false)); } foreach ($plugins as $plugin) { $this->_extractPluginValidationMessages($plugin); From 2918ae9c7ab86208be25d5652d94c14685c59faa Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 9 Jul 2013 21:01:38 -0400 Subject: [PATCH 03/14] Update index.php to serve static files with query strings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Trim off the query string before attempting to locate the file on the filesystem. Thanks to Marko Marković for the initial patch. Fixes #3910 --- app/webroot/index.php | 3 ++- lib/Cake/Console/Templates/skel/webroot/index.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/webroot/index.php b/app/webroot/index.php index 3a5862bf9..988343293 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -79,7 +79,8 @@ if (!defined('WWW_ROOT')) { // for built-in server if (php_sapi_name() == 'cli-server') { - if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['REQUEST_URI'])) { + $uri = str_replace($_SERVER['SCRIPT_FILENAME'], WWW_ROOT, ''); + if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $uri)) { return false; } $_SERVER['PHP_SELF'] = '/' . basename(__FILE__); diff --git a/lib/Cake/Console/Templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php index 0b4c4d696..58aad8a3b 100644 --- a/lib/Cake/Console/Templates/skel/webroot/index.php +++ b/lib/Cake/Console/Templates/skel/webroot/index.php @@ -79,7 +79,8 @@ if (!defined('WWW_ROOT')) { // for built-in server if (php_sapi_name() === 'cli-server') { - if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['REQUEST_URI'])) { + $uri = str_replace($_SERVER['SCRIPT_FILENAME'], WWW_ROOT, ''); + if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $uri)) { return false; } $_SERVER['PHP_SELF'] = '/' . basename(__FILE__); From cfa260d8c57b80c4dc262d0801f7fdcfc79d2912 Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 9 Jul 2013 21:10:37 -0400 Subject: [PATCH 04/14] Update ServerShell to use provided documentRoot. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix ServerShell from using the wrong path to the routing script when a custom document root is used. Thanks to Marko Marković for the patch. Fixes #3909 --- lib/Cake/Console/Command/ServerShell.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Console/Command/ServerShell.php b/lib/Cake/Console/Command/ServerShell.php index 4ed517571..b850a6d31 100644 --- a/lib/Cake/Console/Command/ServerShell.php +++ b/lib/Cake/Console/Command/ServerShell.php @@ -130,7 +130,7 @@ class ServerShell extends AppShell { $this->_host, $this->_port, $this->_documentRoot, - WWW_ROOT . '/index.php' + $this->_documentRoot . '/index.php' ); $port = ($this->_port == self::DEFAULT_PORT) ? '' : ':' . $this->_port; From 960ce7fa814f213a064c5fc9d49f1f65326f0595 Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 9 Jul 2013 21:11:06 -0400 Subject: [PATCH 05/14] Don't use inline assignment. CakePHP generally avoids inline assignment as it can be confusing and do the wrong thing. --- lib/Cake/Core/App.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index fad7b83a1..ce0177050 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -542,7 +542,8 @@ class App { $parts = explode('.', self::$_classMap[$className], 2); list($plugin, $package) = count($parts) > 1 ? $parts : array(null, current($parts)); - if ($file = self::_mapped($className, $plugin)) { + $file = self::_mapped($className, $plugin); + if ($file) { return include $file; } $paths = self::path($package, $plugin); From a27499d88a22f2abbbd3ce63e2eb8298a2193ad6 Mon Sep 17 00:00:00 2001 From: Werner Pieterson Date: Wed, 10 Jul 2013 17:46:01 +0200 Subject: [PATCH 06/14] Updated Inflector's 'pluralize and singularize to correctly handle addisional words. Updated InflectorTest to test new words. --- lib/Cake/Test/Case/Utility/InflectorTest.php | 13 +++++++++++++ lib/Cake/Utility/Inflector.php | 13 +++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index 0d322a1dc..dfa49656b 100644 --- a/lib/Cake/Test/Case/Utility/InflectorTest.php +++ b/lib/Cake/Test/Case/Utility/InflectorTest.php @@ -109,6 +109,11 @@ class InflectorTest extends CakeTestCase { $this->assertEquals(Inflector::singularize('foes'), 'foe'); $this->assertEquals(Inflector::singularize('databases'), 'database'); $this->assertEquals(Inflector::singularize('cookies'), 'cookie'); + $this->assertEquals(Inflector::singularize('thieves'), 'thief'); + $this->assertEquals(Inflector::singularize('potatoes'), 'potato'); + $this->assertEquals(Inflector::singularize('heroes'), 'hero'); + $this->assertEquals(Inflector::singularize('buffalos'), 'buffalo'); + $this->assertEquals(Inflector::singularize('babies'), 'baby'); $this->assertEquals(Inflector::singularize(''), ''); } @@ -161,6 +166,14 @@ class InflectorTest extends CakeTestCase { $this->assertEquals(Inflector::pluralize('roof'), 'roofs'); $this->assertEquals(Inflector::pluralize('foe'), 'foes'); $this->assertEquals(Inflector::pluralize('cookie'), 'cookies'); + $this->assertEquals(Inflector::pluralize('wolf'), 'wolves'); + $this->assertEquals(Inflector::pluralize('thief'), 'thieves'); + $this->assertEquals(Inflector::pluralize('potato'), 'potatoes'); + $this->assertEquals(Inflector::pluralize('hero'), 'heroes'); + $this->assertEquals(Inflector::pluralize('buffalo'), 'buffalo'); + $this->assertEquals(Inflector::pluralize('tooth'), 'teeth'); + $this->assertEquals(Inflector::pluralize('goose'), 'geese'); + $this->assertEquals(Inflector::pluralize('foot'), 'feet'); $this->assertEquals(Inflector::pluralize(''), ''); } diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php index 26e64a283..93c175e6a 100644 --- a/lib/Cake/Utility/Inflector.php +++ b/lib/Cake/Utility/Inflector.php @@ -40,7 +40,7 @@ class Inflector { '/(x|ch|ss|sh)$/i' => '\1es', '/([^aeiouy]|qu)y$/i' => '\1ies', '/(hive)$/i' => '\1s', - '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves', + '/(?:([^f])fe|([lre])f)$/i' => '\1\2ves', '/sis$/i' => 'ses', '/([ti])um$/i' => '\1a', '/(p)erson$/i' => '\1eople', @@ -90,7 +90,12 @@ class Inflector { 'soliloquy' => 'soliloquies', 'testis' => 'testes', 'trilby' => 'trilbys', - 'turf' => 'turfs' + 'turf' => 'turfs', + 'potato' => 'potatoes', + 'hero' => 'heroes', + 'tooth' => 'teeth', + 'goose' => 'geese', + 'foot' => 'feet' ) ); @@ -120,11 +125,11 @@ class Inflector { '/(m)ovies$/i' => '\1\2ovie', '/(s)eries$/i' => '\1\2eries', '/([^aeiouy]|qu)ies$/i' => '\1y', - '/([lr])ves$/i' => '\1f', + '/([lre])ves$/i' => '\1f', + '/([^fo])ves$/i' => '\1fe', '/(tive)s$/i' => '\1', '/(hive)s$/i' => '\1', '/(drive)s$/i' => '\1', - '/([^fo])ves$/i' => '\1fe', '/(^analy)ses$/i' => '\1sis', '/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis', '/([ti])a$/i' => '\1um', From 3d83c628eb2cd01cfd719a518c2ead4abd60d2d4 Mon Sep 17 00:00:00 2001 From: Werner Pieterson Date: Wed, 10 Jul 2013 17:49:18 +0200 Subject: [PATCH 07/14] Added more words to InflectorTest --- lib/Cake/Test/Case/Utility/InflectorTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index dfa49656b..dc923d63f 100644 --- a/lib/Cake/Test/Case/Utility/InflectorTest.php +++ b/lib/Cake/Test/Case/Utility/InflectorTest.php @@ -114,6 +114,9 @@ class InflectorTest extends CakeTestCase { $this->assertEquals(Inflector::singularize('heroes'), 'hero'); $this->assertEquals(Inflector::singularize('buffalos'), 'buffalo'); $this->assertEquals(Inflector::singularize('babies'), 'baby'); + $this->assertEquals(Inflector::singularize('teeth'), 'tooth'); + $this->assertEquals(Inflector::singularize('geese'), 'goose'); + $this->assertEquals(Inflector::singularize('feet'), 'foot'); $this->assertEquals(Inflector::singularize(''), ''); } From 64ff9ad3872f43309b304601cb1c0223e6478f47 Mon Sep 17 00:00:00 2001 From: Werner Pieterson Date: Wed, 10 Jul 2013 17:51:42 +0200 Subject: [PATCH 08/14] Fixed indenting --- lib/Cake/Utility/Inflector.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php index 93c175e6a..ccd90b576 100644 --- a/lib/Cake/Utility/Inflector.php +++ b/lib/Cake/Utility/Inflector.php @@ -91,11 +91,11 @@ class Inflector { 'testis' => 'testes', 'trilby' => 'trilbys', 'turf' => 'turfs', - 'potato' => 'potatoes', - 'hero' => 'heroes', - 'tooth' => 'teeth', - 'goose' => 'geese', - 'foot' => 'feet' + 'potato' => 'potatoes', + 'hero' => 'heroes', + 'tooth' => 'teeth', + 'goose' => 'geese', + 'foot' => 'feet' ) ); From b3273e9cc2427360c4bf3a10eade2654cd35b8ee Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 11 Jul 2013 20:59:52 -0400 Subject: [PATCH 09/14] Correct documentation. Options are traditionally above the @param block as it results in easier to read API docs. --- lib/Cake/Network/CakeResponse.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php index cc629d672..686ab0476 100644 --- a/lib/Cake/Network/CakeResponse.php +++ b/lib/Cake/Network/CakeResponse.php @@ -1206,13 +1206,18 @@ class CakeResponse { } /** - * Setup for display or download the given file + * Setup for display or download the given file. + * + * If $_SERVER['HTTP_RANGE'] is set a slice of the file will be + * returned instead of the entire file. + * + * ### Options keys + * + * - name: Alternate download name + * - download: If `true` sets download header and forces file to be downloaded rather than displayed in browser * * @param string $path Path to file - * @param array $options Options - * ### Options keys - * - name: Alternate download name - * - download: If `true` sets download header and forces file to be downloaded rather than displayed in browser + * @param array $options Options See above. * @return void * @throws NotFoundException */ @@ -1283,7 +1288,6 @@ class CakeResponse { $this->header('Content-Length', $fileSize); } $this->_clearBuffer(); - $this->_file = $file; } From 494fd05de6a15cadf52fbee3ece789e9a4c841b9 Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 11 Jul 2013 23:20:12 -0400 Subject: [PATCH 10/14] Fix downloading Ranges in files. Correctly handle ranges that don't terminate at the end of the file. Also reject invalid ranges as described in RFC-2616. Thanks to Kim Biesbjerg for the initial patch. Fixes #3914 --- lib/Cake/Network/CakeResponse.php | 82 ++++++++++---- .../Test/Case/Network/CakeResponseTest.php | 100 +++++++++++++++++- 2 files changed, 160 insertions(+), 22 deletions(-) diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php index 686ab0476..998734748 100644 --- a/lib/Cake/Network/CakeResponse.php +++ b/lib/Cake/Network/CakeResponse.php @@ -345,6 +345,13 @@ class CakeResponse { */ protected $_file = null; +/** + * File range. Used for requesting ranges of files. + * + * @var array + */ + protected $_fileRange = null; + /** * The charset the response body is encoded with * @@ -413,8 +420,8 @@ class CakeResponse { $this->_sendHeader($header, $value); } if ($this->_file) { - $this->_sendFile($this->_file); - $this->_file = null; + $this->_sendFile($this->_file, $this->_fileRange); + $this->_file = $this->_fileRange = null; } else { $this->_sendContent($this->_body); } @@ -1268,19 +1275,7 @@ class CakeResponse { $httpRange = env('HTTP_RANGE'); if (isset($httpRange)) { - list(, $range) = explode('=', $httpRange); - - $size = $fileSize - 1; - $length = $fileSize - $range; - - $this->header(array( - 'Content-Length' => $length, - 'Content-Range' => 'bytes ' . $range . $size . '/' . $fileSize - )); - - $this->statusCode(206); - $file->open('rb', true); - $file->offset($range); + $this->_fileRange($file, $httpRange); } else { $this->header('Content-Length', $fileSize); } @@ -1291,22 +1286,73 @@ class CakeResponse { $this->_file = $file; } +/** + * Apply a file range to a file and set the end offset. + * + * If an invalid range is requested a 416 Status code will be used + * in the response. + * + * @param File $file The file to set a range on. + * @param string $httpRange The range to use. + * @return void + */ + protected function _fileRange($file, $httpRange) { + list(, $range) = explode('=', $httpRange); + list($start, $end) = explode('-', $range); + + $fileSize = $file->size(); + $lastByte = $fileSize - 1; + if ($start > $end || $end > $lastByte || $start > $lastByte) { + $this->statusCode(416); + $this->header(array( + 'Content-Range' => 'bytes 0-' . $lastByte . '/' . $fileSize + )); + return; + } + + $this->header(array( + 'Content-Length' => $end - $start + 1, + 'Content-Range' => 'bytes ' . $start . '-' . $end . '/' . $fileSize + )); + + $this->statusCode(206); + $this->_fileRange = array($start, $end); + } + /** * Reads out a file, and echos the content to the client. * * @param File $file File object + * @param array $range The range to read out of the file. * @return boolean True is whole file is echoed successfully or false if client connection is lost in between */ - protected function _sendFile($file) { + protected function _sendFile($file, $range) { $compress = $this->outputCompressed(); $file->open('rb'); + + $end = $start = false; + if ($range) { + list($start, $end) = $range; + } + if ($start !== false) { + $file->offset($start); + } + + $bufferSize = 8192; + set_time_limit(0); while (!feof($file->handle)) { if (!$this->_isActive()) { $file->close(); return false; } - set_time_limit(0); - echo fread($file->handle, 8192); + $offset = $file->offset(); + if ($end && $offset >= $end) { + break; + } + if ($end && $offset + $bufferSize >= $end) { + $bufferSize = $end - $offset; + } + echo fread($file->handle, $bufferSize); if (!$compress) { $this->_flushBuffer(); } diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php index 251487355..598faa5b7 100644 --- a/lib/Cake/Test/Case/Network/CakeResponseTest.php +++ b/lib/Cake/Test/Case/Network/CakeResponseTest.php @@ -1,9 +1,5 @@ file(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'img' . DS . 'test_2.JPG'); } +/** + * Test fetching ranges from a file. + * + * @return void + */ + public function testFileRange() { + $_SERVER['HTTP_RANGE'] = 'bytes=8-25'; + $response = $this->getMock('CakeResponse', array( + 'header', + 'type', + '_sendHeader', + '_setContentType', + '_isActive', + '_clearBuffer', + '_flushBuffer' + )); + + $response->expects($this->exactly(1)) + ->method('type') + ->with('css') + ->will($this->returnArgument(0)); + + $response->expects($this->at(1)) + ->method('header') + ->with('Content-Disposition', 'attachment; filename="test_asset.css"'); + + $response->expects($this->at(2)) + ->method('header') + ->with('Accept-Ranges', 'bytes'); + + $response->expects($this->at(3)) + ->method('header') + ->with(array( + 'Content-Length' => 18, + 'Content-Range' => 'bytes 8-25/38', + )); + + $response->expects($this->once())->method('_clearBuffer'); + + $response->expects($this->any()) + ->method('_isActive') + ->will($this->returnValue(true)); + + $response->file( + CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css', + array('download' => true) + ); + + ob_start(); + $result = $response->send(); + $output = ob_get_clean(); + $this->assertEquals(206, $response->statusCode()); + $this->assertEquals("is the test asset", $output); + $this->assertTrue($result !== false); + } + +/** + * Test invalid file ranges. + * + * @return void + */ + public function testFileRangeInvalid() { + $_SERVER['HTTP_RANGE'] = 'bytes=30-2'; + $response = $this->getMock('CakeResponse', array( + 'header', + 'type', + '_sendHeader', + '_setContentType', + '_isActive', + '_clearBuffer', + '_flushBuffer' + )); + + $response->expects($this->at(1)) + ->method('header') + ->with('Content-Disposition', 'attachment; filename="test_asset.css"'); + + $response->expects($this->at(2)) + ->method('header') + ->with('Accept-Ranges', 'bytes'); + + $response->expects($this->at(3)) + ->method('header') + ->with(array( + 'Content-Range' => 'bytes 0-37/38', + )); + + $response->file( + CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css', + array('download' => true) + ); + + $this->assertEquals(416, $response->statusCode()); + $result = $response->send(); + } + } From 52be365598e64d3f7178475a3a3f0f46245c70e3 Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 12 Jul 2013 21:16:18 -0400 Subject: [PATCH 11/14] Introduce the `strip` argument to Router. This allows callers to request that the basepath *not* be stripped off when normalizing string URL's. This is important in AuthComponent when handling redirect URL's as the redirect location could point to a controller that shares a name with the base path. Refs #3897 Refs #3916 --- lib/Cake/Routing/Router.php | 4 ++-- lib/Cake/Test/Case/Routing/RouterTest.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php index 3babe7c58..e06c6d228 100644 --- a/lib/Cake/Routing/Router.php +++ b/lib/Cake/Routing/Router.php @@ -1053,7 +1053,7 @@ class Router { * @param array|string $url URL to normalize Either an array or a string URL. * @return string Normalized URL */ - public static function normalize($url = '/') { + public static function normalize($url = '/', $strip = true) { if (is_array($url)) { $url = Router::url($url); } @@ -1062,7 +1062,7 @@ class Router { } $request = Router::getRequest(); - if (!empty($request->base) && stristr($url, $request->base)) { + if ($strip && !empty($request->base) && stristr($url, $request->base)) { $url = preg_replace('/^' . preg_quote($request->base, '/') . '/', '', $url, 1); } $url = '/' . $url; diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php index 44c256bd7..bb7038646 100644 --- a/lib/Cake/Test/Case/Routing/RouterTest.php +++ b/lib/Cake/Test/Case/Routing/RouterTest.php @@ -284,6 +284,9 @@ class RouterTest extends CakeTestCase { $result = Router::normalize('/us/users/logout/'); $this->assertEquals('/users/logout', $result); + $result = Router::normalize('/us/users/logout/', false); + $this->assertEquals('/us/users/logout', $result); + Router::reload(); $request = new CakeRequest(); From 8133f72b53c3391025ef62538e9b6627d9dda70a Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 12 Jul 2013 21:17:25 -0400 Subject: [PATCH 12/14] Update AuthComponent to not strip when normalizing URLs. Revert most of the changes done to fix #3897 originally and try a different strategy of solving the base path issues and not breaking apps running in a subdirectory. Fixes #3916 --- lib/Cake/Controller/Component/AuthComponent.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php index fcf791d36..7b49ed55c 100644 --- a/lib/Cake/Controller/Component/AuthComponent.php +++ b/lib/Cake/Controller/Component/AuthComponent.php @@ -311,7 +311,8 @@ class AuthComponent extends Component { if ($loginAction == $url) { if (empty($request->data)) { if (!$this->Session->check('Auth.redirect') && env('HTTP_REFERER')) { - $this->Session->write('Auth.redirect', $controller->referer(null, true)); + $referer = $request->referer(true); + $this->Session->write('Auth.redirect', $referer); } } return true; @@ -666,7 +667,6 @@ class AuthComponent extends Component { $this->Session->write('Auth.redirect', $redir); } elseif ($this->Session->check('Auth.redirect')) { $redir = $this->Session->read('Auth.redirect'); - $redir = is_string($redir) ? ltrim($redir, '/') : $redir; $this->Session->delete('Auth.redirect'); if (Router::normalize($redir) == Router::normalize($this->loginAction)) { @@ -677,7 +677,7 @@ class AuthComponent extends Component { } else { $redir = '/'; } - return Router::normalize($redir); + return Router::normalize($redir, false); } /** From e016f1156ff18b1324c3f8f4108aa6c0b8d3ae8b Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 12 Jul 2013 21:37:22 -0400 Subject: [PATCH 13/14] Revert previous changes. Adding this parameter was a mistake. Remove it. --- lib/Cake/Routing/Router.php | 4 ++-- lib/Cake/Test/Case/Routing/RouterTest.php | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php index e06c6d228..3babe7c58 100644 --- a/lib/Cake/Routing/Router.php +++ b/lib/Cake/Routing/Router.php @@ -1053,7 +1053,7 @@ class Router { * @param array|string $url URL to normalize Either an array or a string URL. * @return string Normalized URL */ - public static function normalize($url = '/', $strip = true) { + public static function normalize($url = '/') { if (is_array($url)) { $url = Router::url($url); } @@ -1062,7 +1062,7 @@ class Router { } $request = Router::getRequest(); - if ($strip && !empty($request->base) && stristr($url, $request->base)) { + if (!empty($request->base) && stristr($url, $request->base)) { $url = preg_replace('/^' . preg_quote($request->base, '/') . '/', '', $url, 1); } $url = '/' . $url; diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php index bb7038646..44c256bd7 100644 --- a/lib/Cake/Test/Case/Routing/RouterTest.php +++ b/lib/Cake/Test/Case/Routing/RouterTest.php @@ -284,9 +284,6 @@ class RouterTest extends CakeTestCase { $result = Router::normalize('/us/users/logout/'); $this->assertEquals('/users/logout', $result); - $result = Router::normalize('/us/users/logout/', false); - $this->assertEquals('/us/users/logout', $result); - Router::reload(); $request = new CakeRequest(); From d40c7376cebaec118221f2c0582c97260e977e68 Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 12 Jul 2013 21:40:38 -0400 Subject: [PATCH 14/14] Rebalance where URL normalization happens in AuthComponent. Make URL's not include the base path when storing them in the session. This makes future redirection simpler. When URL's are an array use Router::url() on them. Fixes #3916 --- lib/Cake/Controller/Component/AuthComponent.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php index 7b49ed55c..833b5f40f 100644 --- a/lib/Cake/Controller/Component/AuthComponent.php +++ b/lib/Cake/Controller/Component/AuthComponent.php @@ -307,7 +307,6 @@ class AuthComponent extends Component { if ($loginAction != $url && in_array($action, array_map('strtolower', $this->allowedActions))) { return true; } - if ($loginAction == $url) { if (empty($request->data)) { if (!$this->Session->check('Auth.redirect') && env('HTTP_REFERER')) { @@ -321,7 +320,7 @@ class AuthComponent extends Component { if (!$this->_getUser()) { if (!$request->is('ajax')) { $this->flash($this->authError); - $this->Session->write('Auth.redirect', $request->here()); + $this->Session->write('Auth.redirect', $request->here(false)); $controller->redirect($loginAction); return false; } @@ -677,7 +676,10 @@ class AuthComponent extends Component { } else { $redir = '/'; } - return Router::normalize($redir, false); + if (is_array($redir)) { + return Router::url($redir); + } + return $redir; } /**