From 6874e4904ef52c4914f228edb49110fd5487c21b Mon Sep 17 00:00:00 2001 From: Rachman Chavik Date: Fri, 25 Nov 2011 20:03:58 +0700 Subject: [PATCH] removing 'id' from fixtures (lh ticket 2296) --- lib/Cake/Test/Fixture/ArmorFixture.php | 10 +++++----- lib/Cake/Test/Fixture/ArmorsPlayerFixture.php | 8 ++++---- lib/Cake/Test/Fixture/GuildFixture.php | 8 ++++---- lib/Cake/Test/Fixture/GuildsPlayerFixture.php | 8 ++++---- lib/Cake/Test/Fixture/PlayerFixture.php | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/Cake/Test/Fixture/ArmorFixture.php b/lib/Cake/Test/Fixture/ArmorFixture.php index 99c9457d0..d5a6ebdbf 100644 --- a/lib/Cake/Test/Fixture/ArmorFixture.php +++ b/lib/Cake/Test/Fixture/ArmorFixture.php @@ -13,7 +13,7 @@ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package Cake.Test.Fixture - * @since CakePHP(tm) v 1.2.0.4667 + * @since CakePHP(tm) v 2.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -58,9 +58,9 @@ class ArmorFixture extends CakeTestFixture { * @var array */ public $records = array( - array('id' => 1, 'name' => 'Leather', 'created' => '2007-03-17 01:16:23'), - array('id' => 2, 'name' => 'Chainmail', 'created' => '2007-03-17 01:18:23'), - array('id' => 3, 'name' => 'Cloak', 'created' => '2007-03-17 01:20:23'), - array('id' => 4, 'name' => 'Bikini', 'created' => '2007-03-17 01:22:23'), + array('name' => 'Leather', 'created' => '2007-03-17 01:16:23'), + array('name' => 'Chainmail', 'created' => '2007-03-17 01:18:23'), + array('name' => 'Cloak', 'created' => '2007-03-17 01:20:23'), + array('name' => 'Bikini', 'created' => '2007-03-17 01:22:23'), ); } diff --git a/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php b/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php index 8e65bfb50..65f747ae9 100644 --- a/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php +++ b/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php @@ -13,7 +13,7 @@ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package Cake.Test.Fixture - * @since CakePHP(tm) v 1.2.0.4667 + * @since CakePHP(tm) v 2.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -60,8 +60,8 @@ class ArmorsPlayerFixture extends CakeTestFixture { * @var array */ public $records = array( - array('id' => 1, 'player_id' => 1, 'armor_id' => 1, 'broken' => false), - array('id' => 2, 'player_id' => 2, 'armor_id' => 2, 'broken' => false), - array('id' => 3, 'player_id' => 3, 'armor_id' => 3, 'broken' => false), + array('player_id' => 1, 'armor_id' => 1, 'broken' => false), + array('player_id' => 2, 'armor_id' => 2, 'broken' => false), + array('player_id' => 3, 'armor_id' => 3, 'broken' => false), ); } diff --git a/lib/Cake/Test/Fixture/GuildFixture.php b/lib/Cake/Test/Fixture/GuildFixture.php index 6a5edd414..92d39afb4 100644 --- a/lib/Cake/Test/Fixture/GuildFixture.php +++ b/lib/Cake/Test/Fixture/GuildFixture.php @@ -13,7 +13,7 @@ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package Cake.Test.Fixture - * @since CakePHP(tm) v 1.2.0.4667 + * @since CakePHP(tm) v 2.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -47,8 +47,8 @@ class GuildFixture extends CakeTestFixture { * @var array */ public $records = array( - array('id' => 1, 'name' => 'Warriors'), - array('id' => 2, 'name' => 'Rangers'), - array('id' => 3, 'name' => 'Wizards'), + array('name' => 'Warriors'), + array('name' => 'Rangers'), + array('name' => 'Wizards'), ); } diff --git a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php index 5e7876a47..b1737209e 100644 --- a/lib/Cake/Test/Fixture/GuildsPlayerFixture.php +++ b/lib/Cake/Test/Fixture/GuildsPlayerFixture.php @@ -13,7 +13,7 @@ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package Cake.Test.Fixture - * @since CakePHP(tm) v 1.2.0.4667 + * @since CakePHP(tm) v 2.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -50,8 +50,8 @@ class GuildsPlayerFixture extends CakeTestFixture { * @var array */ public $records = array( - array('id' => 1, 'player_id' => 1, 'guild_id' => 1), - array('id' => 2, 'player_id' => 1, 'guild_id' => 2), - array('id' => 3, 'player_id' => 4, 'guild_id' => 3), + array('player_id' => 1, 'guild_id' => 1), + array('player_id' => 1, 'guild_id' => 2), + array('player_id' => 4, 'guild_id' => 3), ); } diff --git a/lib/Cake/Test/Fixture/PlayerFixture.php b/lib/Cake/Test/Fixture/PlayerFixture.php index fb8b58201..a6aee736d 100644 --- a/lib/Cake/Test/Fixture/PlayerFixture.php +++ b/lib/Cake/Test/Fixture/PlayerFixture.php @@ -13,7 +13,7 @@ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package Cake.Test.Fixture - * @since CakePHP(tm) v 1.2.0.4667 + * @since CakePHP(tm) v 2.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ @@ -49,9 +49,9 @@ class PlayerFixture extends CakeTestFixture { * @var array */ public $records = array( - array('id' => 1, 'name' => 'mark', 'created' => '2007-03-17 01:16:23'), - array('id' => 2, 'name' => 'jack', 'created' => '2007-03-17 01:18:23'), - array('id' => 3, 'name' => 'larry', 'created' => '2007-03-17 01:20:23'), - array('id' => 4, 'name' => 'jose', 'created' => '2007-03-17 01:22:23'), + array('name' => 'mark', 'created' => '2007-03-17 01:16:23'), + array('name' => 'jack', 'created' => '2007-03-17 01:18:23'), + array('name' => 'larry', 'created' => '2007-03-17 01:20:23'), + array('name' => 'jose', 'created' => '2007-03-17 01:22:23'), ); }