adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more whitespace coding standard corrections

Browse source
This commit is contained in:
euromark 2013-06-09 17:39:48 +02:00
parent a6f065e7a2
commit 4518624187
22 changed files with 71 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/Console/Command/Task/ControllerTask.php
View file

@ -178,7 +178,7 @@ class ControllerTask extends BakeTask {
$components = $this->doComponents(); $components = $this->doComponents();
$wannaUseSession = $this->in( $wannaUseSession = $this->in(
__d('cake_console', "Would you like to use Session flash messages?"), array('y','n'), 'y' __d('cake_console', "Would you like to use Session flash messages?"), array('y', 'n'), 'y'
); );
} }
} else { } else {
@ -196,7 +196,7 @@ class ControllerTask extends BakeTask {
$baked = false; $baked = false;
if ($this->interactive === true) { if ($this->interactive === true) {
$this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components); $this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components);
$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y'); $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
if (strtolower($looksGood) === 'y') { if (strtolower($looksGood) === 'y') {
$baked = $this->bake($controllerName, $actions, $helpers, $components); $baked = $this->bake($controllerName, $actions, $helpers, $components);
@ -263,11 +263,11 @@ class ControllerTask extends BakeTask {
protected function _askAboutMethods() { protected function _askAboutMethods() {
$wannaBakeCrud = $this->in( $wannaBakeCrud = $this->in(
__d('cake_console', "Would you like to create some basic class methods \n(index(), add(), view(), edit())?"), __d('cake_console', "Would you like to create some basic class methods \n(index(), add(), view(), edit())?"),
array('y','n'), 'n' array('y', 'n'), 'n'
); );
$wannaBakeAdminCrud = $this->in( $wannaBakeAdminCrud = $this->in(
__d('cake_console', "Would you like to create the basic class methods for admin routing?"), __d('cake_console', "Would you like to create the basic class methods for admin routing?"),
array('y','n'), 'n' array('y', 'n'), 'n'
); );
return array($wannaBakeCrud, $wannaBakeAdminCrud); return array($wannaBakeCrud, $wannaBakeAdminCrud);
} }
@ -384,7 +384,7 @@ class ControllerTask extends BakeTask {
* @return array Array of values for property. * @return array Array of values for property.
*/ */
protected function _doPropertyChoices($prompt, $example) { protected function _doPropertyChoices($prompt, $example) {
$proceed = $this->in($prompt, array('y','n'), 'n'); $proceed = $this->in($prompt, array('y', 'n'), 'n');
$property = array(); $property = array();
if (strtolower($proceed) === 'y') { if (strtolower($proceed) === 'y') {
$propertyList = $this->in($example); $propertyList = $this->in($example);

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

@ -234,13 +234,13 @@ class ModelTask extends BakeTask {
} }
$prompt = __d('cake_console', "Would you like to supply validation criteria \nfor the fields in your model?"); $prompt = __d('cake_console', "Would you like to supply validation criteria \nfor the fields in your model?");
$wannaDoValidation = $this->in($prompt, array('y','n'), 'y'); $wannaDoValidation = $this->in($prompt, array('y', 'n'), 'y');
if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) === 'y') { if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) === 'y') {
$validate = $this->doValidation($tempModel); $validate = $this->doValidation($tempModel);
} }
$prompt = __d('cake_console', "Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?"); $prompt = __d('cake_console', "Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?");
$wannaDoAssoc = $this->in($prompt, array('y','n'), 'y'); $wannaDoAssoc = $this->in($prompt, array('y', 'n'), 'y');
if (strtolower($wannaDoAssoc) === 'y') { if (strtolower($wannaDoAssoc) === 'y') {
$associations = $this->doAssociations($tempModel); $associations = $this->doAssociations($tempModel);
} }

4
lib/Cake/Controller/Component/Acl/PhpAcl.php
View file

@ -99,11 +99,11 @@ class PhpAcl extends Object implements AclInterface {
*/ */
public function build(array $config) { public function build(array $config) {
if (empty($config['roles'])) { if (empty($config['roles'])) {
throw new AclException(__d('cake_dev','"roles" section not found in configuration.')); throw new AclException(__d('cake_dev', '"roles" section not found in configuration.'));
} }
if (empty($config['rules']['allow']) && empty($config['rules']['deny'])) { if (empty($config['rules']['allow']) && empty($config['rules']['deny'])) {
throw new AclException(__d('cake_dev','Neither "allow" nor "deny" rules were provided in configuration.')); throw new AclException(__d('cake_dev', 'Neither "allow" nor "deny" rules were provided in configuration.'));
} }
$rules['allow'] = !empty($config['rules']['allow']) ? $config['rules']['allow'] : array(); $rules['allow'] = !empty($config['rules']['allow']) ? $config['rules']['allow'] : array();

2
lib/Cake/Core/App.php
View file

@ -590,7 +590,7 @@ class App {
* an single array to $type, * an single array to $type,
* @param string $name Name of the Class or a unique name for the file * @param string $name Name of the Class or a unique name for the file
* @param boolean|array $parent boolean true if Class Parent should be searched, accepts key => value * @param boolean|array $parent boolean true if Class Parent should be searched, accepts key => value
* array('parent' => $parent ,'file' => $file, 'search' => $search, 'ext' => '$ext'); * array('parent' => $parent, 'file' => $file, 'search' => $search, 'ext' => '$ext');
* $ext allows setting the extension of the file name * $ext allows setting the extension of the file name
* based on Inflector::underscore($name) . ".$ext"; * based on Inflector::underscore($name) . ".$ext";
* @param array $search paths to search for files, array('path 1', 'path 2', 'path 3'); * @param array $search paths to search for files, array('path 1', 'path 2', 'path 3');

4
lib/Cake/Test/Case/Console/ShellDispatcherTest.php
View file

@ -154,7 +154,7 @@ class ShellDispatcherTest extends CakeTestCase {
'app' => 'new', 'app' => 'new',
'webroot' => 'webroot', 'webroot' => 'webroot',
'working' => str_replace('/', DS, '/var/www/htdocs/new'), 'working' => str_replace('/', DS, '/var/www/htdocs/new'),
'root' => str_replace('/', DS,'/var/www/htdocs') 'root' => str_replace('/', DS, '/var/www/htdocs')
); );
$Dispatcher->parseParams($params); $Dispatcher->parseParams($params);
$this->assertEquals($expected, $Dispatcher->params); $this->assertEquals($expected, $Dispatcher->params);
@ -380,7 +380,7 @@ class ShellDispatcherTest extends CakeTestCase {
'app' => 'old', 'app' => 'old',
'webroot' => 'webroot', 'webroot' => 'webroot',
'working' => str_replace('/', DS, '/var/www/htdocs/old'), 'working' => str_replace('/', DS, '/var/www/htdocs/old'),
'root' => str_replace('/', DS,'/var/www/htdocs') 'root' => str_replace('/', DS, '/var/www/htdocs')
); );
$Dispatcher->parseParams($params); $Dispatcher->parseParams($params);
$this->assertEquals($expected, $Dispatcher->params); $this->assertEquals($expected, $Dispatcher->params);

2
lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
View file

@ -283,7 +283,7 @@ class DbAclTest extends CakeTestCase {
$this->assertTrue($this->Acl->check('Samir', 'view', 'read')); $this->assertTrue($this->Acl->check('Samir', 'view', 'read'));
$this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/view', 'update')); $this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/view', 'update'));
$this->assertFalse($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/update','*')); $this->assertFalse($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/update', '*'));
$this->assertTrue($this->Acl->allow('root/users/Samir', 'ROOT/tpsReports/update', '*')); $this->assertTrue($this->Acl->allow('root/users/Samir', 'ROOT/tpsReports/update', '*'));
$this->assertTrue($this->Acl->check('Samir', 'update', 'read')); $this->assertTrue($this->Acl->check('Samir', 'update', 'read'));
$this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/update', 'update')); $this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/update', 'update'));

2
lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
View file

@ -857,7 +857,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
$controller = $this->getMock('Controller', array('header')); $controller = $this->getMock('Controller', array('header'));
$RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components)); $RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
$RequestHandler->response = $this->getMock('CakeResponse', array('_sendHeader','statusCode')); $RequestHandler->response = $this->getMock('CakeResponse', array('_sendHeader', 'statusCode'));
$RequestHandler->request = $this->getMock('CakeRequest'); $RequestHandler->request = $this->getMock('CakeRequest');
$RequestHandler->request->expects($this->once())->method('is') $RequestHandler->request->expects($this->once())->method('is')
->with('ajax') ->with('ajax')

2
lib/Cake/Test/Case/Model/CakeSchemaTest.php
View file

@ -130,7 +130,7 @@ class TestAppSchema extends CakeSchema {
* @var array * @var array
*/ */
public $comments = array( public $comments = array(
'id' => array('type' => 'integer', 'null' => false, 'default' => 0,'key' => 'primary'), 'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
'article_id' => array('type' => 'integer', 'null' => false), 'article_id' => array('type' => 'integer', 'null' => false),
'user_id' => array('type' => 'integer', 'null' => false), 'user_id' => array('type' => 'integer', 'null' => false),
'comment' => array('type' => 'text', 'null' => true, 'default' => null), 'comment' => array('type' => 'text', 'null' => true, 'default' => null),

2
lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
View file

@ -260,7 +260,7 @@ class CakeSessionTest extends CakeTestCase {
$result = TestCakeSession::read('testing'); $result = TestCakeSession::read('testing');
$this->assertEquals('1,2,3', $result); $this->assertEquals('1,2,3', $result);
TestCakeSession::write('testing', array('1' => 'one', '2' => 'two','3' => 'three')); TestCakeSession::write('testing', array('1' => 'one', '2' => 'two', '3' => 'three'));
$result = TestCakeSession::read('testing.1'); $result = TestCakeSession::read('testing.1');
$this->assertEquals('one', $result); $this->assertEquals('one', $result);

4
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
View file

@ -741,11 +741,11 @@ class DboSourceTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testGetLogParams() { public function testGetLogParams() {
$this->testDb->logQuery('Query 1', array(1,2,'abc')); $this->testDb->logQuery('Query 1', array(1, 2, 'abc'));
$this->testDb->logQuery('Query 2', array('field1' => 1, 'field2' => 'abc')); $this->testDb->logQuery('Query 2', array('field1' => 1, 'field2' => 'abc'));
$log = $this->testDb->getLog(); $log = $this->testDb->getLog();
$expected = array('query' => 'Query 1', 'params' => array(1,2,'abc'), 'affected' => '', 'numRows' => '', 'took' => ''); $expected = array('query' => 'Query 1', 'params' => array(1, 2, 'abc'), 'affected' => '', 'numRows' => '', 'took' => '');
$this->assertEquals($expected, $log['log'][0]); $this->assertEquals($expected, $log['log'][0]);
$expected = array('query' => 'Query 2', 'params' => array('field1' => 1, 'field2' => 'abc'), 'affected' => '', 'numRows' => '', 'took' => ''); $expected = array('query' => 'Query 2', 'params' => array('field1' => 1, 'field2' => 'abc'), 'affected' => '', 'numRows' => '', 'took' => '');
$this->assertEquals($expected, $log['log'][1]); $this->assertEquals($expected, $log['log'][1]);

2
lib/Cake/Test/Case/Model/ModelDeleteTest.php
View file

@ -151,7 +151,7 @@ class ModelDeleteTest extends BaseModelTest {
* @return void * @return void
*/ */
public function testDeleteDependentWithConditions() { public function testDeleteDependentWithConditions() {
$this->loadFixtures('Cd','Book','OverallFavorite'); $this->loadFixtures('Cd', 'Book', 'OverallFavorite');
$Cd = new Cd(); $Cd = new Cd();
$Book = new Book(); $Book = new Book();

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

@ -2069,7 +2069,7 @@ class ModelWriteTest extends BaseModelTest {
$Comment = new Comment(); $Comment = new Comment();
$articles = $Article->find('all', array( $articles = $Article->find('all', array(
'fields' => array('id','title'), 'fields' => array('id', 'title'),
'recursive' => -1, 'recursive' => -1,
'order' => array('Article.id' => 'ASC') 'order' => array('Article.id' => 'ASC')
)); ));
@ -2089,7 +2089,7 @@ class ModelWriteTest extends BaseModelTest {
$this->assertEquals($expected, $articles); $this->assertEquals($expected, $articles);
$comments = $Comment->find('all', array( $comments = $Comment->find('all', array(
'fields' => array('id','article_id','user_id','comment','published'), 'fields' => array('id', 'article_id', 'user_id', 'comment', 'published'),
'recursive' => -1, 'recursive' => -1,
'order' => array('Comment.id' => 'ASC') 'order' => array('Comment.id' => 'ASC')
)); ));
@ -2156,7 +2156,7 @@ class ModelWriteTest extends BaseModelTest {
$this->assertFalse(empty($result)); $this->assertFalse(empty($result));
$articles = $Article->find('all', array( $articles = $Article->find('all', array(
'fields' => array('id','title'), 'fields' => array('id', 'title'),
'recursive' => -1, 'recursive' => -1,
'order' => array('Article.id' => 'ASC') 'order' => array('Article.id' => 'ASC')
)); ));
@ -2176,7 +2176,7 @@ class ModelWriteTest extends BaseModelTest {
$this->assertEquals($expected, $articles); $this->assertEquals($expected, $articles);
$comments = $Comment->find('all', array( $comments = $Comment->find('all', array(
'fields' => array('id','article_id','user_id','comment','published'), 'fields' => array('id', 'article_id', 'user_id', 'comment', 'published'),
'recursive' => -1, 'recursive' => -1,
'order' => array('Comment.id' => 'ASC') 'order' => array('Comment.id' => 'ASC')
)); ));
@ -2267,7 +2267,7 @@ class ModelWriteTest extends BaseModelTest {
$this->assertEquals('First Article', $result); $this->assertEquals('First Article', $result);
$articles = $Article->find('all', array( $articles = $Article->find('all', array(
'fields' => array('id','title'), 'fields' => array('id', 'title'),
'recursive' => -1, 'recursive' => -1,
'order' => array('Article.id' => 'ASC') 'order' => array('Article.id' => 'ASC')
)); ));
@ -4258,7 +4258,7 @@ class ModelWriteTest extends BaseModelTest {
$result = $TestModel->find('all', array( $result = $TestModel->find('all', array(
'recursive' => -1, 'recursive' => -1,
'fields' => array('author_id', 'title','body','published'), 'fields' => array('author_id', 'title', 'body', 'published'),
'order' => array('Post.created' => 'ASC') 'order' => array('Post.created' => 'ASC')
)); ));
@ -5690,7 +5690,7 @@ class ModelWriteTest extends BaseModelTest {
$result = $TestModel->find('all', array( $result = $TestModel->find('all', array(
'recursive' => -1, 'recursive' => -1,
'fields' => array('author_id', 'title','body','published'), 'fields' => array('author_id', 'title', 'body', 'published'),
'order' => array('Post.created' => 'ASC') 'order' => array('Post.created' => 'ASC')
)); ));

2
lib/Cake/Test/Case/Routing/DispatcherTest.php
View file

@ -870,7 +870,7 @@ class DispatcherTest extends CakeTestCase {
$_POST = array(); $_POST = array();
$Dispatcher = new TestDispatcher(); $Dispatcher = new TestDispatcher();
Configure::write('Routing.prefixes', array('admin')); Configure::write('Routing.prefixes', array('admin'));
Configure::write('App.baseUrl','/cake/repo/branches/1.2.x.x/index.php'); Configure::write('App.baseUrl', '/cake/repo/branches/1.2.x.x/index.php');
$url = new CakeRequest('admin/test_dispatch_pages/index/param:value/param2:value2'); $url = new CakeRequest('admin/test_dispatch_pages/index/param:value/param2:value2');
$response = $this->getMock('CakeResponse'); $response = $this->getMock('CakeResponse');

2
lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
View file

@ -870,7 +870,7 @@ class CakeRouteTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testParseTrailingUTF8() { public function testParseTrailingUTF8() {
$route = new CakeRoute('/category/**', array('controller' => 'categories','action' => 'index')); $route = new CakeRoute('/category/**', array('controller' => 'categories', 'action' => 'index'));
$result = $route->parse('/category/%D9%85%D9%88%D8%A8%D8%A7%DB%8C%D9%84'); $result = $route->parse('/category/%D9%85%D9%88%D8%A8%D8%A7%DB%8C%D9%84');
$expected = array( $expected = array(
'controller' => 'categories', 'controller' => 'categories',

2
lib/Cake/Test/Case/Routing/RouterTest.php
View file

@ -1552,7 +1552,7 @@ class RouterTest extends CakeTestCase {
Router::setRequestInfo( Router::setRequestInfo(
$request->addParams(array( $request->addParams(array(
'plugin' => null, 'controller' => 'images', 'action' => 'index', 'plugin' => null, 'controller' => 'images', 'action' => 'index',
'prefix' => null, 'admin' => false,'url' => array('url' => 'images/index') 'prefix' => null, 'admin' => false, 'url' => array('url' => 'images/index')
))->addPaths(array( ))->addPaths(array(
'base' => '', 'base' => '',
'here' => '/images/index', 'here' => '/images/index',

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

@ -232,10 +232,10 @@ class SetTest extends CakeTestCase {
$a = array( $a = array(
0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))), 0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))) 1 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay')))
); );
$b = array( $b = array(
0 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))), 0 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay'))),
1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))) 1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate')))
); );
@ -244,10 +244,10 @@ class SetTest extends CakeTestCase {
$b = array( $b = array(
0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))), 0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))) 1 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay')))
); );
$a = array( $a = array(
0 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))), 0 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay'))),
1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))) 1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate')))
); );
@ -257,12 +257,12 @@ class SetTest extends CakeTestCase {
$a = array( $a = array(
0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))), 0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))), 1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
2 => array('Person' => array('name' => 'Adam'),'Friend' => array(array('name' => 'Bob'))) 2 => array('Person' => array('name' => 'Adam'), 'Friend' => array(array('name' => 'Bob')))
); );
$b = array( $b = array(
0 => array('Person' => array('name' => 'Adam'),'Friend' => array(array('name' => 'Bob'))), 0 => array('Person' => array('name' => 'Adam'), 'Friend' => array(array('name' => 'Bob'))),
1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))), 1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
2 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))) 2 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay')))
); );
$a = Set::sort($a, '{n}.Person.name', 'asc'); $a = Set::sort($a, '{n}.Person.name', 'asc');
$this->assertEquals($a, $b); $this->assertEquals($a, $b);
@ -880,11 +880,11 @@ class SetTest extends CakeTestCase {
) )
) )
); );
$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x-zip-compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784')); $expected = array(array('name' => 'zipfile2.zip', 'type' => 'application/x-zip-compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784'));
$r = Set::extract('/file/.[type=application/x-zip-compressed]', $f); $r = Set::extract('/file/.[type=application/x-zip-compressed]', $f);
$this->assertEquals($expected, $r); $this->assertEquals($expected, $r);
$expected = array(array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647')); $expected = array(array('name' => 'zipfile.zip', 'type' => 'application/zip','tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'));
$r = Set::extract('/file/.[type=application/zip]', $f); $r = Set::extract('/file/.[type=application/zip]', $f);
$this->assertEquals($expected, $r); $this->assertEquals($expected, $r);
@ -917,13 +917,13 @@ class SetTest extends CakeTestCase {
) )
) )
); );
$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x zip compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784')); $expected = array(array('name' => 'zipfile2.zip', 'type' => 'application/x zip compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784'));
$r = Set::extract('/file/.[type=application/x zip compressed]', $f); $r = Set::extract('/file/.[type=application/x zip compressed]', $f);
$this->assertEquals($expected, $r); $this->assertEquals($expected, $r);
$expected = array( $expected = array(
array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647'), array('name' => 'zipfile.zip','type' => 'application/zip', 'tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'),
array('name' => 'zipfile2.zip','type' => 'application/x zip compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784') array('name' => 'zipfile2.zip','type' => 'application/x zip compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784')
); );
$r = Set::extract('/file/.[tmp_name=/tmp\/php17/]', $f); $r = Set::extract('/file/.[tmp_name=/tmp\/php17/]', $f);
$this->assertEquals($expected, $r); $this->assertEquals($expected, $r);
@ -1560,7 +1560,7 @@ class SetTest extends CakeTestCase {
0 => array('name' => 'zero') 0 => array('name' => 'zero')
); );
$result = Set::extract($a, '{s}.name'); $result = Set::extract($a, '{s}.name');
$expected = array('page','fruit'); $expected = array('page', 'fruit');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$a = array( $a = array(
@ -1860,7 +1860,7 @@ class SetTest extends CakeTestCase {
array('User' => array('id' => 14, 'group_id' => 2, array('User' => array('id' => 14, 'group_id' => 2,
'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))), 'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))),
array('User' => array('id' => 25, 'group_id' => 1, array('User' => array('id' => 25, 'group_id' => 1,
'Data' => array('user' => 'gwoo','name' => 'The Gwoo')))); 'Data' => array('user' => 'gwoo', 'name' => 'The Gwoo'))));
$result = Set::combine($a, '{n}.User.id'); $result = Set::combine($a, '{n}.User.id');
$expected = array(2 => null, 14 => null, 25 => null); $expected = array(2 => null, 14 => null, 25 => null);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
@ -1871,7 +1871,7 @@ class SetTest extends CakeTestCase {
$result = Set::combine($a, '{n}.User.id', '{n}.User.Data'); $result = Set::combine($a, '{n}.User.id', '{n}.User.Data');
$expected = array( $expected = array(
2 => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'), 2 => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'),
14 => array('user' => 'phpnut', 'name' => 'Larry E. Masters'), 14 => array('user' => 'phpnut', 'name' => 'Larry E. Masters'),
25 => array('user' => 'gwoo', 'name' => 'The Gwoo')); 25 => array('user' => 'gwoo', 'name' => 'The Gwoo'));
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
@ -1961,11 +1961,11 @@ class SetTest extends CakeTestCase {
$b = new stdClass(); $b = new stdClass();
$b->users = array( $b->users = array(
array('User' => array('id' => 2, 'group_id' => 1, array('User' => array('id' => 2, 'group_id' => 1,
'Data' => array('user' => 'mariano.iglesias','name' => 'Mariano Iglesias'))), 'Data' => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'))),
array('User' => array('id' => 14, 'group_id' => 2, array('User' => array('id' => 14, 'group_id' => 2,
'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))), 'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))),
array('User' => array('id' => 25, 'group_id' => 1, array('User' => array('id' => 25, 'group_id' => 1,
'Data' => array('user' => 'gwoo','name' => 'The Gwoo')))); 'Data' => array('user' => 'gwoo', 'name' => 'The Gwoo'))));
$result = Set::combine($b, 'users.{n}.User.id'); $result = Set::combine($b, 'users.{n}.User.id');
$expected = array(2 => null, 14 => null, 25 => null); $expected = array(2 => null, 14 => null, 25 => null);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
@ -2032,7 +2032,7 @@ class SetTest extends CakeTestCase {
$expected = array( $expected = array(
'Array1' => array( 'Array1' => array(
'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3','Array1Data4' => 'Array1Data4 value 4', 'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3', 'Array1Data4' => 'Array1Data4 value 4',
'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'), 'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'),
'string' => 1, 'string' => 1,
'another' => 'string', 'another' => 'string',
@ -2055,7 +2055,7 @@ class SetTest extends CakeTestCase {
$expected = array( $expected = array(
'Array1' => array( 'Array1' => array(
'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3','Array1Data4' => 'Array1Data4 value 4', 'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3', 'Array1Data4' => 'Array1Data4 value 4',
'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'), 'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'),
'string' => 1, 'string' => 1,
'another' => 'string', 'another' => 'string',
@ -2357,7 +2357,7 @@ class SetTest extends CakeTestCase {
'Content-Length' => "50210", 'Content-Length' => "50210",
), ),
'meta' => array( 'meta' => array(
'keywords' => array('testing','tests'), 'keywords' => array('testing', 'tests'),
'description' => 'describe me', 'description' => 'describe me',
), ),
'get_vars' => '', 'get_vars' => '',
@ -2384,7 +2384,7 @@ class SetTest extends CakeTestCase {
'Content-Length' => "50210", 'Content-Length' => "50210",
), ),
'meta' => array( 'meta' => array(
'keywords' => array('testing','tests'), 'keywords' => array('testing', 'tests'),
'description' => 'describe me', 'description' => 'describe me',
), ),
'get_vars' => '', 'get_vars' => '',

4
lib/Cake/Test/Case/Utility/ValidationTest.php
View file

@ -945,7 +945,7 @@ class ValidationTest extends CakeTestCase {
$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<', 'check2' => 7))); $this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<', 'check2' => 7)));
$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 7))); $this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 7)));
$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 7))); $this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 7)));
$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal','check2' => 6))); $this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 6)));
$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 6))); $this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 6)));
$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'less or equal', 'check2' => 7))); $this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'less or equal', 'check2' => 7)));
$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<=', 'check2' => 7))); $this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<=', 'check2' => 7)));
@ -964,7 +964,7 @@ class ValidationTest extends CakeTestCase {
$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'less or equal', 'check2' => 6))); $this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'less or equal', 'check2' => 6)));
$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<=', 'check2' => 6))); $this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<=', 'check2' => 6)));
$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 6))); $this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 6)));
$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '==','check2' => 6))); $this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '==', 'check2' => 6)));
$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 7))); $this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 7)));
$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 7))); $this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 7)));
} }

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

@ -1668,7 +1668,7 @@ class FormHelperTest extends CakeTestCase {
$result = $this->Form->create('ValidateUser', array('type' => 'post', 'action' => 'add')); $result = $this->Form->create('ValidateUser', array('type' => 'post', 'action' => 'add'));
$encoding = strtolower(Configure::read('App.encoding')); $encoding = strtolower(Configure::read('App.encoding'));
$expected = array( $expected = array(
'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id','accept-charset' => $encoding), 'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id', 'accept-charset' => $encoding),
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
'/div' '/div'
@ -2270,7 +2270,7 @@ class FormHelperTest extends CakeTestCase {
$result = $this->Form->input('prueba', array( $result = $this->Form->input('prueba', array(
'type' => 'time', 'timeFormat' => 24 , 'dateFormat' => 'DMY' , 'minYear' => 2008, 'type' => 'time', 'timeFormat' => 24 , 'dateFormat' => 'DMY' , 'minYear' => 2008,
'maxYear' => date('Y') + 1 ,'interval' => 15 'maxYear' => date('Y') + 1 , 'interval' => 15
)); ));
$result = explode(':', $result); $result = explode(':', $result);
$this->assertNotRegExp('#<option value="12"[^>]*>12</option>#', $result[1]); $this->assertNotRegExp('#<option value="12"[^>]*>12</option>#', $result[1]);
@ -7236,7 +7236,7 @@ class FormHelperTest extends CakeTestCase {
$expected = array( $expected = array(
'form' => array( 'form' => array(
'id' => 'ContactNonStandardPkEditForm', 'method' => 'post', 'id' => 'ContactNonStandardPkEditForm', 'method' => 'post',
'action' => '/contact_non_standard_pks/edit/1','accept-charset' => $encoding 'action' => '/contact_non_standard_pks/edit/1', 'accept-charset' => $encoding
), ),
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'PUT'), 'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'PUT'),
@ -7481,7 +7481,7 @@ class FormHelperTest extends CakeTestCase {
*/ */
public function testCreateWithAcceptCharset() { public function testCreateWithAcceptCharset() {
$result = $this->Form->create('UserForm', array( $result = $this->Form->create('UserForm', array(
'type' => 'post', 'action' => 'login','encoding' => 'iso-8859-1' 'type' => 'post', 'action' => 'login', 'encoding' => 'iso-8859-1'
) )
); );
$expected = array( $expected = array(

20
lib/Cake/Test/Fixture/AcoTwoFixture.php
View file

@ -53,15 +53,15 @@ class AcoTwoFixture extends CakeTestFixture {
* @var array * @var array
*/ */
public $records = array( public $records = array(
array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 20), array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 20),
array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports','lft' => 2, 'rght' => 9), array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports','lft' => 2, 'rght' => 9),
array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 3, 'rght' => 6), array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 3, 'rght' => 6),
array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'current', 'lft' => 4, 'rght' => 5), array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'current', 'lft' => 4, 'rght' => 5),
array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'update', 'lft' => 7, 'rght' => 8), array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'update', 'lft' => 7, 'rght' => 8),
array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'printers', 'lft' => 10, 'rght' => 19), array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'printers', 'lft' => 10, 'rght' => 19),
array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'print', 'lft' => 11, 'rght' => 14), array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'print', 'lft' => 11, 'rght' => 14),
array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'lettersize','lft' => 12, 'rght' => 13), array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'lettersize','lft' => 12, 'rght' => 13),
array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'refill', 'lft' => 15, 'rght' => 16), array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'refill', 'lft' => 15, 'rght' => 16),
array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'smash', 'lft' => 17, 'rght' => 18), array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'smash', 'lft' => 17, 'rght' => 18),
); );
} }

2
lib/Cake/Test/Fixture/CakeSessionFixture.php
View file

@ -35,7 +35,7 @@ class CakeSessionFixture extends CakeTestFixture {
*/ */
public $fields = array( public $fields = array(
'id' => array('type' => 'string', 'length' => 128, 'key' => 'primary'), 'id' => array('type' => 'string', 'length' => 128, 'key' => 'primary'),
'data' => array('type' => 'text','null' => true), 'data' => array('type' => 'text', 'null' => true),
'expires' => array('type' => 'integer', 'length' => 11, 'null' => true) 'expires' => array('type' => 'integer', 'length' => 11, 'null' => true)
); );

2
lib/Cake/Test/Fixture/SessionFixture.php
View file

@ -39,7 +39,7 @@ class SessionFixture extends CakeTestFixture {
*/ */
public $fields = array( public $fields = array(
'id' => array('type' => 'string', 'length' => 128, 'key' => 'primary'), 'id' => array('type' => 'string', 'length' => 128, 'key' => 'primary'),
'data' => array('type' => 'text','null' => true), 'data' => array('type' => 'text', 'null' => true),
'expires' => array('type' => 'integer', 'length' => 11, 'null' => true) 'expires' => array('type' => 'integer', 'length' => 11, 'null' => true)
); );

6
lib/Cake/Test/Fixture/UuidTreeFixture.php
View file

@ -40,9 +40,9 @@ class UuidTreeFixture extends CakeTestFixture {
*/ */
public $fields = array( public $fields = array(
'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'), 'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
'name' => array('type' => 'string','null' => false), 'name' => array('type' => 'string', 'null' => false),
'parent_id' => array('type' => 'string', 'length' => 36, 'null' => true), 'parent_id' => array('type' => 'string', 'length' => 36, 'null' => true),
'lft' => array('type' => 'integer','null' => false), 'lft' => array('type' => 'integer', 'null' => false),
'rght' => array('type' => 'integer','null' => false) 'rght' => array('type' => 'integer', 'null' => false)
); );
} }