Skip to content

Commit

Permalink
Remove whitespace [Gun.io WhitespaceBot]
Browse files Browse the repository at this point in the history
  • Loading branch information
Gun.io Whitespace Robot authored and jrbasso committed Oct 28, 2011
1 parent 8945dcb commit 4742168
Show file tree
Hide file tree
Showing 72 changed files with 248 additions and 248 deletions.
2 changes: 1 addition & 1 deletion lib/Cake/Console/Command/Task/TestTask.php
Expand Up @@ -145,7 +145,7 @@ public function bake($type, $className) {
$this->Template->set('fixtures', $this->_fixtures); $this->Template->set('fixtures', $this->_fixtures);
$this->Template->set('plugin', $plugin); $this->Template->set('plugin', $plugin);
$this->Template->set(compact( $this->Template->set(compact(
'className', 'methods', 'type', 'fullClassName', 'mock', 'className', 'methods', 'type', 'fullClassName', 'mock',
'construction', 'realType' 'construction', 'realType'
)); ));
$out = $this->Template->generate('classes', 'test'); $out = $this->Template->generate('classes', 'test');
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/default/classes/test.ctp
Expand Up @@ -24,7 +24,7 @@ App::uses('<?php echo $fullClassName; ?>', '<?php echo $realType; ?>');


<?php if ($mock and strtolower($type) == 'controller'): ?> <?php if ($mock and strtolower($type) == 'controller'): ?>
/** /**
* Test<?php echo $fullClassName; ?> * Test<?php echo $fullClassName; ?>
* *
*/ */
class Test<?php echo $fullClassName; ?> extends <?php echo $fullClassName; ?> { class Test<?php echo $fullClassName; ?> extends <?php echo $fullClassName; ?> {
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/default/views/index.ctp
Expand Up @@ -66,7 +66,7 @@


<div class="paging"> <div class="paging">
<?php <?php
echo "<?php\n"; echo "<?php\n";
echo "\t\techo \$this->Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled'));\n"; echo "\t\techo \$this->Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled'));\n";
echo "\t\techo \$this->Paginator->numbers(array('separator' => ''));\n"; echo "\t\techo \$this->Paginator->numbers(array('separator' => ''));\n";
echo "\t\techo \$this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled'));\n"; echo "\t\techo \$this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled'));\n";
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/skel/Config/bootstrap.php
Expand Up @@ -2,7 +2,7 @@
/** /**
* This file is loaded automatically by the app/webroot/index.php file after core.php * This file is loaded automatically by the app/webroot/index.php file after core.php
* *
* This file should load/create any application wide configuration settings, such as * This file should load/create any application wide configuration settings, such as
* Caching, Logging, loading additional configuration files. * Caching, Logging, loading additional configuration files.
* *
* You should also use this file to include any files that provide global functions/constants * You should also use this file to include any files that provide global functions/constants
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/skel/Config/routes.php
Expand Up @@ -32,7 +32,7 @@
Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display')); Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));


/** /**
* Load all plugin routes. See the CakePlugin documentation on * Load all plugin routes. See the CakePlugin documentation on
* how to customize the loading of plugin routes. * how to customize the loading of plugin routes.
*/ */
CakePlugin::routes(); CakePlugin::routes();
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/Auth/BaseAuthorize.php
Expand Up @@ -131,7 +131,7 @@ public function action($request, $path = '/:plugin/:controller/:action') {
* }}} * }}}
* *
* You can use the custom CRUD operations to create additional generic permissions * You can use the custom CRUD operations to create additional generic permissions
* that behave like CRUD operations. Doing this will require additional columns on the * that behave like CRUD operations. Doing this will require additional columns on the
* permissions lookup. When using with DbAcl, you'll have to add additional _admin type columns * permissions lookup. When using with DbAcl, you'll have to add additional _admin type columns
* to the `aros_acos` table. * to the `aros_acos` table.
* *
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/AuthComponent.php
Expand Up @@ -519,7 +519,7 @@ public function login($user = null) {
* Logs a user out, and returns the login action to redirect to. * Logs a user out, and returns the login action to redirect to.
* Triggers the logout() method of all the authenticate objects, so they can perform * Triggers the logout() method of all the authenticate objects, so they can perform
* custom logout logic. AuthComponent will remove the session data, so * custom logout logic. AuthComponent will remove the session data, so
* there is no need to do that in an authentication object. Logging out * there is no need to do that in an authentication object. Logging out
* will also renew the session id. This helps mitigate issues with session replays. * will also renew the session id. This helps mitigate issues with session replays.
* *
* @return string AuthComponent::$logoutRedirect * @return string AuthComponent::$logoutRedirect
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/RequestHandlerComponent.php
Expand Up @@ -98,7 +98,7 @@ public function __construct(ComponentCollection $collection, $settings = array()
/** /**
* Checks to see if a file extension has been parsed by the Router, or if the * Checks to see if a file extension has been parsed by the Router, or if the
* HTTP_ACCEPT_TYPE has matches only one content type with the supported extensions. * HTTP_ACCEPT_TYPE has matches only one content type with the supported extensions.
* If there is only one matching type between the supported content types & extensions, * If there is only one matching type between the supported content types & extensions,
* and the requested mime-types, RequestHandler::$ext is set to that value. * and the requested mime-types, RequestHandler::$ext is set to that value.
* *
* @param Controller $controller A reference to the controller * @param Controller $controller A reference to the controller
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Routing/Router.php
Expand Up @@ -433,7 +433,7 @@ public static function mapResources($controller, $options = array()) {
Router::connect($url, Router::connect($url,
array( array(
'plugin' => $plugin, 'plugin' => $plugin,
'controller' => $urlName, 'controller' => $urlName,
'action' => $params['action'], 'action' => $params['action'],
'[method]' => $params['method'] '[method]' => $params['method']
), ),
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
Expand Up @@ -157,7 +157,7 @@ public function testDecrement() {


$result = Cache::read('test_decrement', 'apc'); $result = Cache::read('test_decrement', 'apc');
$this->assertEqual(2, $result); $this->assertEqual(2, $result);

} }


/** /**
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
Expand Up @@ -352,7 +352,7 @@ public function testErrorWhenPathDoesNotExist() {


/** /**
* Testing the mask setting in FileEngine * Testing the mask setting in FileEngine
* *
* @return void * @return void
*/ */
public function testMaskSetting() { public function testMaskSetting() {
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
Expand Up @@ -24,13 +24,13 @@ class TestMemcacheEngine extends MemcacheEngine {
/** /**
* public accessor to _parseServerString * public accessor to _parseServerString
* *
* @param string $server * @param string $server
* @return array * @return array
*/ */
public function parseServerString($server) { public function parseServerString($server) {
return $this->_parseServerString($server); return $this->_parseServerString($server);
} }

public function setMemcache($memcache) { public function setMemcache($memcache) {
$this->_Memcache = $memcache; $this->_Memcache = $memcache;
} }
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php
Expand Up @@ -145,7 +145,7 @@ public function testDecrement() {


$result = Cache::read('test_decrement', 'wincache'); $result = Cache::read('test_decrement', 'wincache');
$this->assertEqual(2, $result); $this->assertEqual(2, $result);

} }


/** /**
Expand Down
8 changes: 4 additions & 4 deletions lib/Cake/Test/Case/Console/Command/AclShellTest.php
Expand Up @@ -81,7 +81,7 @@ public function testViewWithModelForeignKeyOutput() {


$this->Task->expects($this->at(4))->method('out') $this->Task->expects($this->at(4))->method('out')
->with($this->stringContains('[3] Gandalf')); ->with($this->stringContains('[3] Gandalf'));

$this->Task->expects($this->at(6))->method('out') $this->Task->expects($this->at(6))->method('out')
->with($this->stringContains('[5] MyModel.2')); ->with($this->stringContains('[5] MyModel.2'));


Expand Down Expand Up @@ -217,7 +217,7 @@ public function testDeny() {
$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create'); $this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
$this->Task->expects($this->at(0))->method('out') $this->Task->expects($this->at(0))->method('out')
->with($this->stringContains('Permission denied'), true); ->with($this->stringContains('Permission denied'), true);

$this->Task->deny(); $this->Task->deny();


$node = $this->Task->Acl->Aro->node(array('model' => 'AuthUser', 'foreign_key' => 2)); $node = $this->Task->Acl->Aro->node(array('model' => 'AuthUser', 'foreign_key' => 2));
Expand Down Expand Up @@ -264,7 +264,7 @@ public function testInherit() {
->with($this->matchesRegularExpression('/Permission .*granted/'), true); ->with($this->matchesRegularExpression('/Permission .*granted/'), true);
$this->Task->expects($this->at(1))->method('out') $this->Task->expects($this->at(1))->method('out')
->with($this->matchesRegularExpression('/Permission .*inherited/'), true); ->with($this->matchesRegularExpression('/Permission .*inherited/'), true);

$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create'); $this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
$this->Task->grant(); $this->Task->grant();


Expand Down Expand Up @@ -302,7 +302,7 @@ public function testGetPath() {
public function testInitDb() { public function testInitDb() {
$this->Task->expects($this->once())->method('dispatchShell') $this->Task->expects($this->once())->method('dispatchShell')
->with('schema create DbAcl'); ->with('schema create DbAcl');

$this->Task->initdb(); $this->Task->initdb();
} }
} }
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Console/Command/BakeShellTest.php
Expand Up @@ -84,10 +84,10 @@ public function testAllWithModelName() {
$this->Shell->DbConfig = $this->getMock('DbConfigTask', array(), array(&$this->Dispatcher)); $this->Shell->DbConfig = $this->getMock('DbConfigTask', array(), array(&$this->Dispatcher));


$this->Shell->DbConfig->expects($this->once())->method('getConfig')->will($this->returnValue('test')); $this->Shell->DbConfig->expects($this->once())->method('getConfig')->will($this->returnValue('test'));

$this->Shell->Model->expects($this->never())->method('getName'); $this->Shell->Model->expects($this->never())->method('getName');
$this->Shell->Model->expects($this->once())->method('bake')->will($this->returnValue(true)); $this->Shell->Model->expects($this->once())->method('bake')->will($this->returnValue(true));

$this->Shell->Controller->expects($this->once())->method('bake')->will($this->returnValue(true)); $this->Shell->Controller->expects($this->once())->method('bake')->will($this->returnValue(true));
$this->Shell->View->expects($this->once())->method('execute'); $this->Shell->View->expects($this->once())->method('execute');


Expand Down
Expand Up @@ -146,7 +146,7 @@ public function testMainXml() {


$output = $this->Shell->stdout->output; $output = $this->Shell->stdout->output;


$find = '<shell name="sample" call_as="sample" provider="app" help="sample -h"/>'; $find = '<shell name="sample" call_as="sample" provider="app" help="sample -h"/>';
$this->assertContains($find, $output); $this->assertContains($find, $output);


$find = '<shell name="bake" call_as="bake" provider="CORE" help="bake -h"/>'; $find = '<shell name="bake" call_as="bake" provider="CORE" help="bake -h"/>';
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Console/Command/ShellTest.php
Expand Up @@ -184,7 +184,7 @@ public function testInitialize() {
$this->assertTrue(isset($this->Shell->Comment)); $this->assertTrue(isset($this->Shell->Comment));
$this->assertInstanceOf('Comment', $this->Shell->Comment); $this->assertInstanceOf('Comment', $this->Shell->Comment);
$this->assertEqual($this->Shell->modelClass, 'Comment'); $this->assertEqual($this->Shell->modelClass, 'Comment');

App::build(); App::build();
} }


Expand Down Expand Up @@ -832,7 +832,7 @@ public function testWrapText() {


/** /**
* Testing camel cased naming of tasks * Testing camel cased naming of tasks
* *
* @return void * @return void
*/ */
public function testShellNaming() { public function testShellNaming() {
Expand Down
Expand Up @@ -40,7 +40,7 @@ public function setUp() {
$out = $this->getMock('ConsoleOutput', array(), array(), '', false); $out = $this->getMock('ConsoleOutput', array(), array(), '', false);
$in = $this->getMock('ConsoleInput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false);


$this->Task = $this->getMock('DbConfigTask', $this->Task = $this->getMock('DbConfigTask',
array('in', 'out', 'err', 'hr', 'createFile', '_stop', '_checkUnitTest', '_verify'), array('in', 'out', 'err', 'hr', 'createFile', '_stop', '_checkUnitTest', '_verify'),
array($out, $out, $in) array($out, $out, $in)
); );
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
Expand Up @@ -188,7 +188,7 @@ function testImportRecordsNoEscaping() {
$this->Task->connection = 'test'; $this->Task->connection = 'test';
$this->Task->path = '/my/path/'; $this->Task->path = '/my/path/';
$result = $this->Task->bake('Article', false, array( $result = $this->Task->bake('Article', false, array(
'fromTable' => true, 'fromTable' => true,
'schema' => 'Article', 'schema' => 'Article',
'records' => false 'records' => false
)); ));
Expand All @@ -209,7 +209,7 @@ public function testExecuteWithNamedModel() {


$this->Task->expects($this->at(0))->method('createFile') $this->Task->expects($this->at(0))->method('createFile')
->with($filename, $this->stringContains('class ArticleFixture')); ->with($filename, $this->stringContains('class ArticleFixture'));

$this->Task->execute(); $this->Task->execute();
} }


Expand Down
12 changes: 6 additions & 6 deletions lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
Expand Up @@ -45,12 +45,12 @@ public function setUp() {
$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false); $this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
$this->in = $this->getMock('ConsoleInput', array(), array(), '', false); $this->in = $this->getMock('ConsoleInput', array(), array(), '', false);


$this->Task = $this->getMock('PluginTask', $this->Task = $this->getMock('PluginTask',
array('in', 'err', 'createFile', '_stop', 'clear'), array('in', 'err', 'createFile', '_stop', 'clear'),
array($this->out, $this->out, $this->in) array($this->out, $this->out, $this->in)
); );
$this->Task->path = TMP . 'tests' . DS; $this->Task->path = TMP . 'tests' . DS;

$this->_paths = $paths = App::path('plugins'); $this->_paths = $paths = App::path('plugins');
foreach ($paths as $i => $p) { foreach ($paths as $i => $p) {
if (!is_dir($p)) { if (!is_dir($p)) {
Expand Down Expand Up @@ -84,7 +84,7 @@ public function testBakeFoldersAndFiles() {


$path = $this->Task->path . 'BakeTestPlugin'; $path = $this->Task->path . 'BakeTestPlugin';
$this->assertTrue(is_dir($path), 'No plugin dir %s'); $this->assertTrue(is_dir($path), 'No plugin dir %s');

$directories = array( $directories = array(
'Config' . DS . 'Schema', 'Config' . DS . 'Schema',
'Model' . DS . 'Behavior', 'Model' . DS . 'Behavior',
Expand Down Expand Up @@ -155,7 +155,7 @@ public function testExecuteWithOneArg() {
$file = $path . DS . 'Model' . DS . 'BakeTestPluginAppModel.php'; $file = $path . DS . 'Model' . DS . 'BakeTestPluginAppModel.php';
$this->Task->expects($this->at(3))->method('createFile') $this->Task->expects($this->at(3))->method('createFile')
->with($file, new PHPUnit_Framework_Constraint_IsAnything()); ->with($file, new PHPUnit_Framework_Constraint_IsAnything());

$this->Task->args = array('BakeTestPlugin'); $this->Task->args = array('BakeTestPlugin');


$this->Task->execute(); $this->Task->execute();
Expand All @@ -174,7 +174,7 @@ public function testFindPathNonExistant() {
$last = count($paths); $last = count($paths);
$paths[] = '/fake/path'; $paths[] = '/fake/path';


$this->Task = $this->getMock('PluginTask', $this->Task = $this->getMock('PluginTask',
array('in', 'out', 'err', 'createFile', '_stop'), array('in', 'out', 'err', 'createFile', '_stop'),
array($this->out, $this->out, $this->in) array($this->out, $this->out, $this->in)
); );
Expand All @@ -183,7 +183,7 @@ public function testFindPathNonExistant() {
// Make sure the added path is filtered out. // Make sure the added path is filtered out.
$this->Task->expects($this->exactly($last)) $this->Task->expects($this->exactly($last))
->method('out'); ->method('out');

$this->Task->expects($this->once()) $this->Task->expects($this->once())
->method('in') ->method('in')
->will($this->returnValue($last)); ->will($this->returnValue($last));
Expand Down
Expand Up @@ -130,7 +130,7 @@ public function testExecuteWithAbsolutePath() {
} }


/** /**
* test bake with CakePHP on the include path. The constants should remain commented out. * test bake with CakePHP on the include path. The constants should remain commented out.
* *
* @return void * @return void
*/ */
Expand Down
8 changes: 4 additions & 4 deletions lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
Expand Up @@ -613,7 +613,7 @@ public function testExecuteInteractive() {
TMP . 'ViewTaskComments' . DS . 'index.ctp', TMP . 'ViewTaskComments' . DS . 'index.ctp',
$this->stringContains('ViewTaskComment') $this->stringContains('ViewTaskComment')
); );

$this->Task->expects($this->at(4))->method('createFile') $this->Task->expects($this->at(4))->method('createFile')
->with( ->with(
TMP . 'ViewTaskComments' . DS . 'view.ctp', TMP . 'ViewTaskComments' . DS . 'view.ctp',
Expand All @@ -631,7 +631,7 @@ public function testExecuteInteractive() {
TMP . 'ViewTaskComments' . DS . 'edit.ctp', TMP . 'ViewTaskComments' . DS . 'edit.ctp',
$this->stringContains('Edit View Task Comment') $this->stringContains('Edit View Task Comment')
); );

$this->Task->expects($this->exactly(4))->method('createFile'); $this->Task->expects($this->exactly(4))->method('createFile');
$this->Task->execute(); $this->Task->execute();
} }
Expand Down Expand Up @@ -678,7 +678,7 @@ public function testExecuteInteractiveWithAdmin() {
TMP . 'ViewTaskComments' . DS . 'admin_index.ctp', TMP . 'ViewTaskComments' . DS . 'admin_index.ctp',
$this->stringContains('ViewTaskComment') $this->stringContains('ViewTaskComment')
); );

$this->Task->expects($this->at(4))->method('createFile') $this->Task->expects($this->at(4))->method('createFile')
->with( ->with(
TMP . 'ViewTaskComments' . DS . 'admin_view.ctp', TMP . 'ViewTaskComments' . DS . 'admin_view.ctp',
Expand All @@ -696,7 +696,7 @@ public function testExecuteInteractiveWithAdmin() {
TMP . 'ViewTaskComments' . DS . 'admin_edit.ctp', TMP . 'ViewTaskComments' . DS . 'admin_edit.ctp',
$this->stringContains('Edit View Task Comment') $this->stringContains('Edit View Task Comment')
); );

$this->Task->expects($this->exactly(4))->method('createFile'); $this->Task->expects($this->exactly(4))->method('createFile');
$this->Task->execute(); $this->Task->execute();
} }
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
Expand Up @@ -87,7 +87,7 @@ public function testNonCakeExceptions() {


ConsoleErrorHandler::$stderr->expects($this->once())->method('write') ConsoleErrorHandler::$stderr->expects($this->once())->method('write')
->with($this->stringContains('Too many parameters.')); ->with($this->stringContains('Too many parameters.'));

$this->Error->expects($this->once()) $this->Error->expects($this->once())
->method('_stop') ->method('_stop')
->with(1); ->with(1);
Expand All @@ -102,7 +102,7 @@ public function testNonCakeExceptions() {
*/ */
public function testError404Exception() { public function testError404Exception() {
$exception = new NotFoundException('dont use me in cli.'); $exception = new NotFoundException('dont use me in cli.');

ConsoleErrorHandler::$stderr->expects($this->once())->method('write') ConsoleErrorHandler::$stderr->expects($this->once())->method('write')
->with($this->stringContains('dont use me in cli.')); ->with($this->stringContains('dont use me in cli.'));


Expand Down

0 comments on commit 4742168

Please sign in to comment.