adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1285 from dereuromark/master-cs-fixes

Browse source 
CS fixes
This commit is contained in:
José Lorenzo Rodríguez 2013-05-17 01:38:43 -07:00
commit 03a96d4f63
8 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Console/Command/Task/ProjectTask.php
View file

@ -404,7 +404,7 @@ class ProjectTask extends AppShell {
}
if ($this->interactive) {
$this->hr();
$this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/Config/core.php to use prefix routing.'));
$this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\', array(\'admin\')) in /app/Config/core.php to use prefix routing.'));
$this->out(__d('cake_console', 'What would you like the prefix route to be?'));
$this->out(__d('cake_console', 'Example: www.example.com/admin/controller'));
while (!$admin) {
@ -412,7 +412,7 @@ class ProjectTask extends AppShell {
}
if ($this->cakeAdmin($admin) !== true) {
$this->out(__d('cake_console', '<error>Unable to write to</error> /app/Config/core.php.'));
$this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/Config/core.php to use prefix routing.'));
$this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\', array(\'admin\')) in /app/Config/core.php to use prefix routing.'));
$this->_stop();
}
return $admin . '_';

2
lib/Cake/I18n/I18n.php
View file

@ -590,7 +590,7 @@ class I18n {
$string = $string[1];
if (substr($string, 0, 2) === $this->_escape . 'x') {
$delimiter = $this->_escape . 'x';
return implode('', array_map('chr', array_map('hexdec',array_filter(explode($delimiter, $string)))));
return implode('', array_map('chr', array_map('hexdec', array_filter(explode($delimiter, $string)))));
}
if (substr($string, 0, 2) === $this->_escape . 'd') {
$delimiter = $this->_escape . 'd';

6
lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
View file

@ -1046,7 +1046,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
array($modelClass => array('name' => '1.2')));
$this->assertEquals($children, $expects);
$topNodes = $this->Tree->children(false, true,array('name'));
$topNodes = $this->Tree->children(false, true, array('name'));
$expects = array(array($modelClass => array('name' => '1. Root')),
array($modelClass => array('name' => '1.1')));
$this->assertEquals($topNodes, $expects);
@ -1077,7 +1077,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
$this->assertEquals($initialCount, $laterCount);
$this->assertEquals($initialTopNodes, $laterTopNodes);
$topNodes = $this->Tree->children(false, true,array('name'));
$topNodes = $this->Tree->children(false, true, array('name'));
$expects = array(array($modelClass => array('name' => '1.1')),
array($modelClass => array('name' => '1.2')),
array($modelClass => array('name' => '1. Root')));
@ -1148,7 +1148,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
);
$this->assertEquals($children, $expects);
$topNodes = $this->Tree->children(false, true,array('name'));
$topNodes = $this->Tree->children(false, true, array('name'));
$expects = array(array($modelClass => array('name' => '1. Root')));
$this->assertEquals($topNodes, $expects);

14
lib/Cake/Test/Case/Model/ModelReadTest.php
View file

@ -232,7 +232,7 @@ class ModelReadTest extends BaseModelTest {
array('Product' => array('type' => 'Music'), array('price' => 4)),
array('Product' => array('type' => 'Toy'), array('price' => 3))
);
$result = $Product->find('all',array(
$result = $Product->find('all', array(
'fields' => array('Product.type', 'MIN(Product.price) as price'),
'group' => 'Product.type',
'order' => 'Product.type ASC'
@ -7717,34 +7717,34 @@ class ModelReadTest extends BaseModelTest {
$this->assertFalse((bool)$result['Author']['false']);
}
$result = $Post->find('first',array('fields' => array('author_id')));
$result = $Post->find('first', array('fields' => array('author_id')));
$this->assertFalse(isset($result['Post']['two']));
$this->assertFalse(isset($result['Author']['false']));
$result = $Post->find('first',array('fields' => array('author_id', 'two')));
$result = $Post->find('first', array('fields' => array('author_id', 'two')));
$this->assertEquals(2, $result['Post']['two']);
$this->assertFalse(isset($result['Author']['false']));
$result = $Post->find('first',array('fields' => array('two')));
$result = $Post->find('first', array('fields' => array('two')));
$this->assertEquals(2, $result['Post']['two']);
$Post->id = 1;
$result = $Post->field('two');
$this->assertEquals(2, $result);
$result = $Post->find('first',array(
$result = $Post->find('first', array(
'conditions' => array('two' => 2),
'limit' => 1
));
$this->assertEquals(2, $result['Post']['two']);
$result = $Post->find('first',array(
$result = $Post->find('first', array(
'conditions' => array('two <' => 3),
'limit' => 1
));
$this->assertEquals(2, $result['Post']['two']);
$result = $Post->find('first',array(
$result = $Post->find('first', array(
'conditions' => array('NOT' => array('two >' => 3)),
'limit' => 1
));

6
lib/Cake/Test/Case/Model/ModelWriteTest.php
View file

@ -396,7 +396,7 @@ class ModelWriteTest extends BaseModelTest {
$data[$Post->alias]['user_id'] = 301;
$Post->save($data);
$users = $User->find('all',array('order' => 'User.id'));
$users = $User->find('all', array('order' => 'User.id'));
$this->assertEquals(1, $users[0]['User']['post_count']);
$this->assertEquals(2, $users[1]['User']['post_count']);
}
@ -423,7 +423,7 @@ class ModelWriteTest extends BaseModelTest {
$data[$Post->alias]['uid'] = 301;
$Post->save($data);
$users = $User->find('all',array('order' => 'User.uid'));
$users = $User->find('all', array('order' => 'User.uid'));
$this->assertEquals(1, $users[0]['User']['post_count']);
$this->assertEquals(2, $users[1]['User']['post_count']);
}
@ -551,7 +551,7 @@ class ModelWriteTest extends BaseModelTest {
));
$data[$Post->alias]['user_id'] = 301;
$Post->save($data);
$result = $User->find('all',array('order' => 'User.id'));
$result = $User->find('all', array('order' => 'User.id'));
$this->assertEquals(2, $result[0]['User']['post_count']);
$this->assertEquals(1, $result[1]['User']['posts_published']);
}

2
lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
View file

@ -1076,7 +1076,7 @@ class HttpSocketTest extends CakeTestCase {
'pass' => 'hunter2'
)
));
$this->assertEquals($socket->request['auth'],array('Basic' => array('user' => 'joel', 'pass' => 'hunter2')));
$this->assertEquals($socket->request['auth'], array('Basic' => array('user' => 'joel', 'pass' => 'hunter2')));
$this->assertTrue(strpos($socket->request['header'], 'Authorization: Basic am9lbDpodW50ZXIy') !== false);
}

12
lib/Cake/Test/Case/Utility/SetTest.php
View file

@ -282,15 +282,15 @@ class SetTest extends CakeTestCase {
$this->assertEquals($a, $b);
$a = array(
array(7,6,4),
array(3,4,5),
array(3,2,array(1,1,1)),
array(7, 6, 4),
array(3, 4, 5),
array(3, 2, array(1, 1, 1)),
);
$b = array(
array(3,2,array(1,1,1)),
array(3,4,5),
array(7,6,4),
array(3, 2, array(1, 1, 1)),
array(3, 4, 5),
array(7, 6, 4),
);
$a = Set::sort($a, '{n}', 'asc');

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

@ -3472,10 +3472,10 @@ class FormHelperTest extends CakeTestCase {
$this->Form->create('ValidateProfile');
$ValidateProfile = ClassRegistry::getObject('ValidateProfile');
$ValidateProfile->validationErrors['city'] = array('required<br>');
$result = $this->Form->input('city',array('error' => array('attributes' => array('escape' => true))));
$result = $this->Form->input('city', array('error' => array('attributes' => array('escape' => true))));
$this->assertRegExp('/required&lt;br&gt;/', $result);
$result = $this->Form->input('city',array('error' => array('attributes' => array('escape' => false))));
$result = $this->Form->input('city', array('error' => array('attributes' => array('escape' => false))));
$this->assertRegExp('/required<br>/', $result);
}
@ -8428,7 +8428,7 @@ class FormHelperTest extends CakeTestCase {
);
$this->assertTags($result, $expected);
$result = $this->Form->input('ValidateProfile.1.ValidateItem.2.created',array('empty' => true));
$result = $this->Form->input('ValidateProfile.1.ValidateItem.2.created', array('empty' => true));
$expected = array(
'div' => array('class' => 'input date'),
'label' => array('for' => 'ValidateProfile1ValidateItem2CreatedMonth'),