Skip to content

Commit 1339a9d

Browse files
author
euromark
committed
coding standards according to new sniffer rules
1 parent 19b4021 commit 1339a9d

25 files changed

+75
-75
lines changed

lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,31 +401,31 @@ public function testMaskSetting() {
401401
Cache::config('mask_test', array('engine' => 'File', 'path' => TMP . 'tests'));
402402
$data = 'This is some test content';
403403
$write = Cache::write('masking_test', $data, 'mask_test');
404-
$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
404+
$result = substr(sprintf('%o', fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
405405
$expected = '0664';
406406
$this->assertEquals($expected, $result);
407407
Cache::delete('masking_test', 'mask_test');
408408
Cache::drop('mask_test');
409409

410410
Cache::config('mask_test', array('engine' => 'File', 'mask' => 0666, 'path' => TMP . 'tests'));
411411
$write = Cache::write('masking_test', $data, 'mask_test');
412-
$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
412+
$result = substr(sprintf('%o', fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
413413
$expected = '0666';
414414
$this->assertEquals($expected, $result);
415415
Cache::delete('masking_test', 'mask_test');
416416
Cache::drop('mask_test');
417417

418418
Cache::config('mask_test', array('engine' => 'File', 'mask' => 0644, 'path' => TMP . 'tests'));
419419
$write = Cache::write('masking_test', $data, 'mask_test');
420-
$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
420+
$result = substr(sprintf('%o', fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
421421
$expected = '0644';
422422
$this->assertEquals($expected, $result);
423423
Cache::delete('masking_test', 'mask_test');
424424
Cache::drop('mask_test');
425425

426426
Cache::config('mask_test', array('engine' => 'File', 'mask' => 0640, 'path' => TMP . 'tests'));
427427
$write = Cache::write('masking_test', $data, 'mask_test');
428-
$result = substr(sprintf('%o',fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
428+
$result = substr(sprintf('%o', fileperms(TMP . 'tests' . DS . 'cake_masking_test')), -4);
429429
$expected = '0640';
430430
$this->assertEquals($expected, $result);
431431
Cache::delete('masking_test', 'mask_test');

lib/Cake/Test/Case/Core/ObjectTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ public function testRequestActionParamParseAndPass() {
598598
$this->assertEquals(null, $result['plugin']);
599599

600600
$result = $this->object->requestAction('/request_action/params_pass/sort:desc/limit:5');
601-
$expected = array('sort' => 'desc', 'limit' => 5,);
601+
$expected = array('sort' => 'desc', 'limit' => 5);
602602
$this->assertEquals($expected, $result['named']);
603603

604604
$result = $this->object->requestAction(

lib/Cake/Test/Case/Error/ExceptionRendererTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ public static function testProvider() {
528528
404
529529
),
530530
array(
531-
new PrivateActionException(array('controller' => 'PostsController' , 'action' => '_secretSauce')),
531+
new PrivateActionException(array('controller' => 'PostsController', 'action' => '_secretSauce')),
532532
array(
533533
'/<h2>Private Method in PostsController<\/h2>/',
534534
'/<em>PostsController::<\/em><em>_secretSauce\(\)<\/em>/'

lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2407,7 +2407,7 @@ public function testArrayConditionsParsing() {
24072407
$this->assertEquals($expected, $result);
24082408

24092409
$result = $this->Dbo->conditions(array(
2410-
'NOT' => array('Course.id' => null, 'Course.vet' => 'N', 'level_of_education_id' => array(912,999)),
2410+
'NOT' => array('Course.id' => null, 'Course.vet' => 'N', 'level_of_education_id' => array(912, 999)),
24112411
'Enrollment.yearcompleted >' => '0')
24122412
);
24132413
$this->assertRegExp('/^\s*WHERE\s+\(NOT\s+\(`Course`\.`id` IS NULL\)\s+AND NOT\s+\(`Course`\.`vet`\s+=\s+\'N\'\)\s+AND NOT\s+\(`level_of_education_id` IN \(912, 999\)\)\)\s+AND\s+`Enrollment`\.`yearcompleted`\s+>\s+\'0\'\s*$/', $result);
@@ -3267,7 +3267,7 @@ public function testVirtualFieldsInConditions() {
32673267
$expected = '(1 + 1) = 2';
32683268
$this->assertEquals($expected, $result);
32693269

3270-
$conditions = array('this_moment BETWEEN ? AND ?' => array(1,2));
3270+
$conditions = array('this_moment BETWEEN ? AND ?' => array(1, 2));
32713271
$expected = 'NOW() BETWEEN 1 AND 2';
32723272
$result = $this->Dbo->conditions($conditions, true, false, $Article);
32733273
$this->assertEquals($expected, $result);

lib/Cake/Test/Case/Model/ModelIntegrationTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -836,16 +836,16 @@ public function testHABTMKeepExistingWithThreeDbs() {
836836
$this->assertEquals('test_database_three', $Player->ArmorsPlayer->useDbConfig);
837837

838838
$players = $Player->find('all');
839-
$this->assertEquals(4 , count($players));
839+
$this->assertEquals(4, count($players));
840840
$playersGuilds = Hash::extract($players, '{n}.Guild.{n}.GuildsPlayer');
841-
$this->assertEquals(3 , count($playersGuilds));
841+
$this->assertEquals(3, count($playersGuilds));
842842
$playersArmors = Hash::extract($players, '{n}.Armor.{n}.ArmorsPlayer');
843-
$this->assertEquals(3 , count($playersArmors));
843+
$this->assertEquals(3, count($playersArmors));
844844
unset($players);
845845

846846
$larry = $Player->findByName('larry');
847847
$larrysArmor = Hash::extract($larry, 'Armor.{n}.ArmorsPlayer');
848-
$this->assertEquals(1 , count($larrysArmor));
848+
$this->assertEquals(1, count($larrysArmor));
849849

850850
$larry['Guild']['Guild'] = array(1, 3); // larry joins another guild
851851
$larry['Armor']['Armor'] = array(2, 3); // purchases chainmail
@@ -854,9 +854,9 @@ public function testHABTMKeepExistingWithThreeDbs() {
854854

855855
$larry = $Player->findByName('larry');
856856
$larrysGuild = Hash::extract($larry, 'Guild.{n}.GuildsPlayer');
857-
$this->assertEquals(2 , count($larrysGuild));
857+
$this->assertEquals(2, count($larrysGuild));
858858
$larrysArmor = Hash::extract($larry, 'Armor.{n}.ArmorsPlayer');
859-
$this->assertEquals(2 , count($larrysArmor));
859+
$this->assertEquals(2, count($larrysArmor));
860860

861861
$Player->ArmorsPlayer->id = 3;
862862
$Player->ArmorsPlayer->saveField('broken', true); // larry's cloak broke

lib/Cake/Test/Case/Model/ModelWriteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4941,7 +4941,7 @@ public function testSaveAssociatedAtomicFalseValidateFirstWithErrors() {
49414941
$expected = array(
49424942
'Comment' => array(
49434943
array(
4944-
'comment' => array( 'This field cannot be left blank' )
4944+
'comment' => array('This field cannot be left blank')
49454945
)
49464946
)
49474947
);

lib/Cake/Test/Case/Network/Email/CakeEmailTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ public function testBodyEncoding() {
16691669
$email->to('someone@example.com')->from('someone@example.com');
16701670
$result = $email->send('ってテーブルを作ってやってたらう');
16711671
$this->assertContains('Content-Type: text/plain; charset=ISO-2022-JP', $result['headers']);
1672-
$this->assertContains(mb_convert_encoding('ってテーブルを作ってやってたらう','ISO-2022-JP'), $result['message']);
1672+
$this->assertContains(mb_convert_encoding('ってテーブルを作ってやってたらう', 'ISO-2022-JP'), $result['message']);
16731673
}
16741674

16751675
/**
@@ -1693,7 +1693,7 @@ public function testBodyEncodingIso2022Jp() {
16931693
$result = $email->send('①㈱');
16941694
$this->assertTextContains("Content-Type: text/plain; charset=ISO-2022-JP", $result['headers']);
16951695
$this->assertTextNotContains("Content-Type: text/plain; charset=ISO-2022-JP-MS", $result['headers']); // not charset=iso-2022-jp-ms
1696-
$this->assertTextNotContains(mb_convert_encoding('①㈱','ISO-2022-JP-MS'), $result['message']);
1696+
$this->assertTextNotContains(mb_convert_encoding('①㈱', 'ISO-2022-JP-MS'), $result['message']);
16971697
}
16981698

16991699
/**
@@ -1717,7 +1717,7 @@ public function testBodyEncodingIso2022JpMs() {
17171717
$result = $email->send('①㈱');
17181718
$this->assertTextContains("Content-Type: text/plain; charset=ISO-2022-JP", $result['headers']);
17191719
$this->assertTextNotContains("Content-Type: text/plain; charset=iso-2022-jp-ms", $result['headers']); // not charset=iso-2022-jp-ms
1720-
$this->assertContains(mb_convert_encoding('①㈱','ISO-2022-JP-MS'), $result['message']);
1720+
$this->assertContains(mb_convert_encoding('①㈱', 'ISO-2022-JP-MS'), $result['message']);
17211721
}
17221722

17231723
protected function _checkContentTransferEncoding($message, $charset) {

lib/Cake/Test/Case/Network/Http/HttpSocketTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,8 +1520,8 @@ public function testParseQuery() {
15201520
'name' => 'jim',
15211521
'items' => array(
15221522
'personal' => array(
1523-
'book'
1524-
, 'pen'
1523+
'book',
1524+
'pen'
15251525
),
15261526
'ball'
15271527
)
@@ -1608,10 +1608,10 @@ public function testTokenEscapeChars() {
16081608
$this->Socket->reset();
16091609

16101610
$expected = array(
1611-
'\x22','\x28','\x29','\x3c','\x3e','\x40','\x2c','\x3b','\x3a','\x5c','\x2f','\x5b','\x5d','\x3f','\x3d','\x7b',
1612-
'\x7d','\x20','\x00','\x01','\x02','\x03','\x04','\x05','\x06','\x07','\x08','\x09','\x0a','\x0b','\x0c','\x0d',
1613-
'\x0e','\x0f','\x10','\x11','\x12','\x13','\x14','\x15','\x16','\x17','\x18','\x19','\x1a','\x1b','\x1c','\x1d',
1614-
'\x1e','\x1f','\x7f'
1611+
'\x22', '\x28', '\x29', '\x3c', '\x3e', '\x40', '\x2c', '\x3b', '\x3a', '\x5c', '\x2f', '\x5b', '\x5d', '\x3f', '\x3d', '\x7b',
1612+
'\x7d', '\x20', '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d',
1613+
'\x0e', '\x0f', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d',
1614+
'\x1e', '\x1f', '\x7f'
16151615
);
16161616
$r = $this->Socket->tokenEscapeChars();
16171617
$this->assertEquals($expected, $r);

lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ public function testParseTrailingUTF8() {
923923
public function testUTF8PatternOnSection() {
924924
$route = new CakeRoute(
925925
'/:section',
926-
array('plugin' => 'blogs', 'controller' => 'posts' , 'action' => 'index' ),
926+
array('plugin' => 'blogs', 'controller' => 'posts', 'action' => 'index'),
927927
array(
928928
'persist' => array('section'),
929929
'section' => 'آموزش|weblog'

lib/Cake/Test/Case/Routing/RouterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ public function testCanLeavePlugin() {
944944
public function testUrlParsing() {
945945
extract(Router::getNamedExpressions());
946946

947-
Router::connect('/posts/:value/:somevalue/:othervalue/*', array('controller' => 'posts', 'action' => 'view'), array('value','somevalue', 'othervalue'));
947+
Router::connect('/posts/:value/:somevalue/:othervalue/*', array('controller' => 'posts', 'action' => 'view'), array('value', 'somevalue', 'othervalue'));
948948
$result = Router::parse('/posts/2007/08/01/title-of-post-here');
949949
$expected = array('value' => '2007', 'somevalue' => '08', 'othervalue' => '01', 'controller' => 'posts', 'action' => 'view', 'plugin' => '', 'pass' => array('0' => 'title-of-post-here'), 'named' => array());
950950
$this->assertEquals($expected, $result);

lib/Cake/Test/Case/Utility/SetTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public function testSort() {
256256

257257
$a = array(
258258
0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
259-
1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
259+
1 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay'))),
260260
2 => array('Person' => array('name' => 'Adam'), 'Friend' => array(array('name' => 'Bob')))
261261
);
262262
$b = array(
@@ -268,15 +268,15 @@ public function testSort() {
268268
$this->assertEquals($a, $b);
269269

270270
$a = array(
271-
array(7,6,4),
272-
array(3,4,5),
273-
array(3,2,1),
271+
array(7, 6, 4),
272+
array(3, 4, 5),
273+
array(3, 2, 1),
274274
);
275275

276276
$b = array(
277-
array(3,2,1),
278-
array(3,4,5),
279-
array(7,6,4),
277+
array(3, 2, 1),
278+
array(3, 4, 5),
279+
array(7, 6, 4),
280280
);
281281

282282
$a = Set::sort($a, '{n}.{n}', 'asc');
@@ -884,7 +884,7 @@ public function testExtract() {
884884
$r = Set::extract('/file/.[type=application/x-zip-compressed]', $f);
885885
$this->assertEquals($expected, $r);
886886

887-
$expected = array(array('name' => 'zipfile.zip', 'type' => 'application/zip','tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'));
887+
$expected = array(array('name' => 'zipfile.zip', 'type' => 'application/zip', 'tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'));
888888
$r = Set::extract('/file/.[type=application/zip]', $f);
889889
$this->assertEquals($expected, $r);
890890

@@ -922,8 +922,8 @@ public function testExtract() {
922922
$this->assertEquals($expected, $r);
923923

924924
$expected = array(
925-
array('name' => 'zipfile.zip','type' => 'application/zip', 'tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'),
926-
array('name' => 'zipfile2.zip','type' => 'application/x zip compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784')
925+
array('name' => 'zipfile.zip', 'type' => 'application/zip', 'tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'),
926+
array('name' => 'zipfile2.zip', 'type' => 'application/x zip compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784')
927927
);
928928
$r = Set::extract('/file/.[tmp_name=/tmp\/php17/]', $f);
929929
$this->assertEquals($expected, $r);
@@ -1110,7 +1110,7 @@ public function testExtractParentSelector() {
11101110
)
11111111
);
11121112

1113-
$expected = array(7,2,1);
1113+
$expected = array(7, 2, 1);
11141114
$r = Set::extract('/CallType[name=Internal Voice]/../x/hour', $multiple);
11151115
$this->assertEquals($expected, $r);
11161116

@@ -1856,7 +1856,7 @@ public function testCombine() {
18561856

18571857
$a = array(
18581858
array('User' => array('id' => 2, 'group_id' => 1,
1859-
'Data' => array('user' => 'mariano.iglesias','name' => 'Mariano Iglesias'))),
1859+
'Data' => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'))),
18601860
array('User' => array('id' => 14, 'group_id' => 2,
18611861
'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))),
18621862
array('User' => array('id' => 25, 'group_id' => 1,
@@ -2470,8 +2470,8 @@ public function testNestedMappedData() {
24702470
array(
24712471
'Post' => array('id' => '1', 'author_id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
24722472
'Author' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31', 'test' => 'working'),
2473-
)
2474-
, array(
2473+
),
2474+
array(
24752475
'Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
24762476
'Author' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31', 'test' => 'working'),
24772477
)

lib/Cake/Test/Case/Utility/StringTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public function testInsert() {
180180
$expected = "this is a long string with a few? params you know";
181181
$this->assertEquals($expected, $result);
182182

183-
$result = String::insert('update saved_urls set url = :url where id = :id', array('url' => 'http://www.testurl.com/param1:url/param2:id','id' => 1));
183+
$result = String::insert('update saved_urls set url = :url where id = :id', array('url' => 'http://www.testurl.com/param1:url/param2:id', 'id' => 1));
184184
$expected = "update saved_urls set url = http://www.testurl.com/param1:url/param2:id where id = 1";
185185
$this->assertEquals($expected, $result);
186186

@@ -334,7 +334,7 @@ public function testWrap() {
334334
This is the song th
335335
at never ends. This
336336
is the song that n
337-
ever ends. This is
337+
ever ends. This is
338338
the song that never
339339
ends.
340340
TEXT;

lib/Cake/Test/Case/View/Helper/FormHelperTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ public function testDisableSecurityUsingForm() {
13881388
$this->Form->input('Addresses.first_name', array('secure' => false));
13891389
$this->Form->input('Addresses.city', array('type' => 'textarea', 'secure' => false));
13901390
$this->Form->input('Addresses.zip', array(
1391-
'type' => 'select', 'options' => array(1,2), 'secure' => false
1391+
'type' => 'select', 'options' => array(1, 2), 'secure' => false
13921392
));
13931393

13941394
$result = $this->Form->fields;
@@ -1719,7 +1719,7 @@ public function testFormValidationAssociatedSecondLevel() {
17191719
$result = $this->Form->create('ValidateUser', array('type' => 'post', 'action' => 'add'));
17201720
$encoding = strtolower(Configure::read('App.encoding'));
17211721
$expected = array(
1722-
'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id','accept-charset' => $encoding),
1722+
'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id', 'accept-charset' => $encoding),
17231723
'div' => array('style' => 'display:none;'),
17241724
'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
17251725
'/div'
@@ -2267,8 +2267,8 @@ public function testInputTime() {
22672267
$this->assertRegExp('#<option value="15"[^>]*>15</option>#', $result[1]);
22682268

22692269
$result = $this->Form->input('prueba', array(
2270-
'type' => 'time', 'timeFormat' => 24 , 'dateFormat' => 'DMY' , 'minYear' => 2008,
2271-
'maxYear' => date('Y') + 1 , 'interval' => 15
2270+
'type' => 'time', 'timeFormat' => 24, 'dateFormat' => 'DMY', 'minYear' => 2008,
2271+
'maxYear' => date('Y') + 1, 'interval' => 15
22722272
));
22732273
$result = explode(':', $result);
22742274
$this->assertNotRegExp('#<option value="12"[^>]*>12</option>#', $result[1]);

lib/Cake/Test/Case/View/Helper/JsHelperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ public function testObject() {
873873

874874
$object = new JsEncodingObject();
875875
$object->title = 'New thing';
876-
$object->indexes = array(5,6,7,8);
876+
$object->indexes = array(5, 6, 7, 8);
877877
$result = $this->JsEngine->object($object);
878878
$this->assertEquals($expected, $result);
879879

lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public function testDrag() {
266266
'start' => 'onStart',
267267
'drag' => 'onDrag',
268268
'stop' => 'onStop',
269-
'snapGrid' => array(10,10),
269+
'snapGrid' => array(10, 10),
270270
'wrapCallbacks' => false
271271
));
272272
$expected = '$("drag-me").makeDraggable({onComplete:onStop, onDrag:onDrag, onStart:onStart, snap:[10,10]});';

lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public function testSortLinksUsingDirectionOption() {
290290
Router::setRequestInfo(array(
291291
array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(),
292292
'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true')),
293-
array('base' => '/', 'here' => '/accounts/', 'webroot' => '/',)
293+
array('base' => '/', 'here' => '/accounts/', 'webroot' => '/')
294294
));
295295
$this->Paginator->options(array('url' => array('param')));
296296

lib/Cake/Test/Fixture/AcoTwoFixture.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ class AcoTwoFixture extends CakeTestFixture {
4747
*/
4848
public $records = array(
4949
array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 20),
50-
array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports','lft' => 2, 'rght' => 9),
50+
array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports', 'lft' => 2, 'rght' => 9),
5151
array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 3, 'rght' => 6),
5252
array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'current', 'lft' => 4, 'rght' => 5),
5353
array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'update', 'lft' => 7, 'rght' => 8),
5454
array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'printers', 'lft' => 10, 'rght' => 19),
5555
array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'print', 'lft' => 11, 'rght' => 14),
56-
array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'lettersize','lft' => 12, 'rght' => 13),
56+
array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'lettersize', 'lft' => 12, 'rght' => 13),
5757
array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'refill', 'lft' => 15, 'rght' => 16),
5858
array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'smash', 'lft' => 17, 'rght' => 18),
5959
);

lib/Cake/Test/Fixture/AroTwoFixture.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class AroTwoFixture extends CakeTestFixture {
5151
array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '2', 'alias' => 'managers', 'lft' => '6', 'rght' => '9'),
5252
array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '3', 'alias' => 'users', 'lft' => '10', 'rght' => '19'),
5353
array('parent_id' => 2, 'model' => 'User', 'foreign_key' => '1', 'alias' => 'Bobs', 'lft' => '3', 'rght' => '4'),
54-
array('parent_id' => 3, 'model' => 'User', 'foreign_key' => '2', 'alias' => 'Lumbergh', 'lft' => '7' , 'rght' => '8'),
55-
array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '3', 'alias' => 'Samir', 'lft' => '11' , 'rght' => '12'),
54+
array('parent_id' => 3, 'model' => 'User', 'foreign_key' => '2', 'alias' => 'Lumbergh', 'lft' => '7', 'rght' => '8'),
55+
array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '3', 'alias' => 'Samir', 'lft' => '11', 'rght' => '12'),
5656
array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '4', 'alias' => 'Micheal', 'lft' => '13', 'rght' => '14'),
5757
array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '5', 'alias' => 'Peter', 'lft' => '15', 'rght' => '16'),
5858
array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '6', 'alias' => 'Milton', 'lft' => '17', 'rght' => '18'),

0 commit comments

Comments
 (0)