diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index f4eeca6ba..368cab6b5 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -1638,13 +1638,13 @@ class DispatcherTest extends CakeTestCase {
$this->assertEqual($result, $expected);
$filename = $this->__cachePath($dispatcher->here);
unlink($filename);
-
+
$url = 'test_cached_pages/view/foo:bar/value:goo';
-
+
ob_start();
$dispatcher->dispatch($url);
$out = ob_get_clean();
-
+
ob_start();
$dispatcher->cached($url);
$cached = ob_get_clean();
@@ -1652,7 +1652,7 @@ class DispatcherTest extends CakeTestCase {
$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
$cached = preg_replace('//', '', $cached);
$expected = str_replace(array("\t", "\r\n", "\n"), "", $cached);
-
+
$this->assertEqual($result, $expected);
$filename = $this->__cachePath($dispatcher->here);
$this->assertTrue(file_exists($filename));
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index b3349d206..66451cca5 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -47,7 +47,7 @@ class MemcacheEngineTest extends UnitTestCase {
*/
function skip() {
$skip = true;
- if($result = Cache::engine('Memcache')) {
+ if ($result = Cache::engine('Memcache')) {
$skip = false;
}
$this->skipif($skip, 'Memcache is not installed or configured properly');
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index a15d7be0a..ee881f909 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -42,7 +42,7 @@ class XcacheEngineTest extends UnitTestCase {
*/
function skip() {
$skip = true;
- if($result = Cache::engine('Xcache')) {
+ if ($result = Cache::engine('Xcache')) {
$skip = false;
}
$this->skipif($skip, 'Xcache is not installed or configured properly');
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index 5c570fc72..bb688af41 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -34,7 +34,7 @@ App::import('Core', 'Log');
class CakeLogTest extends CakeTestCase {
/**
* testLogFileWriting method
- *
+ *
* @access public
* @return void
*/
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index 1cf15e873..baccab185 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -85,7 +85,7 @@ class CakeTestFixtureImportFixture extends CakeTestFixture {
* Import property
*
* @var array
- */
+ */
var $import = array('table' => 'fixture_tests', 'connection' => 'test_suite');
}
@@ -110,7 +110,7 @@ Mock::generate('DboSource', 'FixtureMockDboSource');
* @subpackage cake.cake.tests.cases.libs
*/
class CakeTestFixtureTest extends CakeTestCase {
-
+
function setUp() {
$this->criticDb =& new FixtureMockDboSource();
$this->criticDb->fullDebug = true;
@@ -176,7 +176,7 @@ class CakeTestFixtureTest extends CakeTestCase {
$return = $Fixture->create($this->criticDb);
$this->assertTrue($this->criticDb->fullDebug);
$this->assertTrue($return);
-
+
unset($Fixture->fields);
$return = $Fixture->create($this->criticDb);
$this->assertFalse($return);
@@ -207,11 +207,11 @@ class CakeTestFixtureTest extends CakeTestCase {
$this->criticDb->setReturnValueAt(0, 'execute', true);
$this->criticDb->expectAtLeastOnce('execute');
$this->criticDb->expectAtLeastOnce('dropSchema');
-
+
$return = $Fixture->drop($this->criticDb);
$this->assertTrue($this->criticDb->fullDebug);
$this->assertTrue($return);
-
+
$this->criticDb->setReturnValueAt(1, 'execute', false);
$return = $Fixture->drop($this->criticDb);
$this->assertFalse($return);
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index 6b58552fe..6f74e8381 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -515,7 +515,7 @@ class AppImportTest extends UnitTestCase {
$result = App::import('Vendor', 'TestHello', array('file' => 'Test'.DS.'hello.php'));
$text = ob_get_clean();
$this->assertTrue($result);
- $this->assertEqual($text, 'This is the hello.php file in Test directoy');
+ $this->assertEqual($text, 'This is the hello.php file in Test directory');
ob_start();
$result = App::import('Vendor', 'MyTest', array('file' => 'Test'.DS.'MyTest.php'));
@@ -527,13 +527,13 @@ class AppImportTest extends UnitTestCase {
$result = App::import('Vendor', 'Welcome');
$text = ob_get_clean();
$this->assertTrue($result);
- $this->assertEqual($text, 'This is the welcome.php file in vendors directoy');
+ $this->assertEqual($text, 'This is the welcome.php file in vendors directory');
ob_start();
$result = App::import('Vendor', 'TestPlugin.Welcome');
$text = ob_get_clean();
$this->assertTrue($result);
- $this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directoy');
+ $this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directory');
}
}
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 064033319..d9c094856 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -287,7 +287,7 @@ class AuthTestController extends Controller {
* @return void
*/
function isAuthorized() {
- if(isset($this->params['testControllerAuth'])) {
+ if (isset($this->params['testControllerAuth'])) {
return false;
}
return true;
diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index dd0fbd1ed..aed270ea0 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -35,14 +35,14 @@ App::import('Core', 'Inflector');
class InflectorTest extends CakeTestCase {
/**
* Inflector property
- *
+ *
* @var mixed null
* @access public
*/
var $Inflector = null;
/**
* setUp method
- *
+ *
* @access public
* @return void
*/
@@ -51,7 +51,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* testInstantiation method
- *
+ *
* @access public
* @return void
*/
@@ -60,7 +60,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* testInflectingSingulars method
- *
+ *
* @access public
* @return void
*/
@@ -106,7 +106,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* testInflectingPlurals method
- *
+ *
* @access public
* @return void
*/
@@ -144,11 +144,11 @@ class InflectorTest extends CakeTestCase {
$this->assertEqual(Inflector::pluralize('person'), 'people');
$this->assertEqual(Inflector::pluralize('people'), 'people');
$this->assertEqual(Inflector::pluralize('glove'), 'gloves');
- $this->assertEqual(Inflector::pluralize(''), '');
+ $this->assertEqual(Inflector::pluralize(''), '');
}
/**
* testInflectorSlug method
- *
+ *
* @access public
* @return void
*/
@@ -168,7 +168,7 @@ class InflectorTest extends CakeTestCase {
$result = Inflector::slug('Foo Bar: Not just for breakfast any-more', "+");
$expected = 'Foo+Bar+Not+just+for+breakfast+any+more';
$this->assertEqual($result, $expected);
-
+
$result = Inflector::slug('Äpfel Über Öl grün ärgert groß öko', '-');
$expected = 'Aepfel-Ueber-Oel-gruen-aergert-gross-oeko';
$this->assertEqual($result, $expected);
@@ -180,7 +180,7 @@ class InflectorTest extends CakeTestCase {
$result = Inflector::slug('The truth: and more news', '-');
$expected = 'The-truth-and-more-news';
$this->assertEqual($result, $expected);
-
+
$result = Inflector::slug('La langue française est un attribut de souveraineté en France', '-');
$expected = 'La-langue-francaise-est-un-attribut-de-souverainete-en-France';
$this->assertEqual($result, $expected);
@@ -199,7 +199,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* testVariableNaming method
- *
+ *
* @access public
* @return void
*/
@@ -211,7 +211,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* testClassNaming method
- *
+ *
* @access public
* @return void
*/
@@ -222,7 +222,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* testTableNaming method
- *
+ *
* @access public
* @return void
*/
@@ -233,7 +233,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* testHumanization method
- *
+ *
* @access public
* @return void
*/
@@ -244,7 +244,7 @@ class InflectorTest extends CakeTestCase {
}
/**
* tearDown method
- *
+ *
* @access public
* @return void
*/
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index 88cd392d7..def8d11de 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -161,7 +161,7 @@ class MagicDbTest extends UnitTestCase {
*/
/**
* MagicDbTestData class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs
*/
@@ -187,7 +187,7 @@ class MagicDbTestData extends Object {
function get($key) {
/**
* data property
- *
+ *
* @var array
* @access public
*/
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
index 6b1e9fd9b..63a80779a 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -39,22 +39,22 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_adodb.php';
class DboAdoTestDb extends DboAdodb {
/**
* simulated property
- *
+ *
* @var array
* @access public
*/
var $simulated = array();
/**
* testing property
- *
+ *
* @var bool true
* @access public
*/
var $testing = true;
/**
* execute method
- *
- * @param mixed $sql
+ *
+ * @param mixed $sql
* @access protected
* @return void
*/
@@ -67,7 +67,7 @@ class DboAdoTestDb extends DboAdodb {
}
/**
* getLastQuery method
- *
+ *
* @access public
* @return void
*/
@@ -85,25 +85,25 @@ class DboAdoTestDb extends DboAdodb {
class AdodbTestModel extends CakeTestModel {
/**
* name property
- *
+ *
* @var string 'AdodbTestModel'
* @access public
*/
var $name = 'AdodbTestModel';
/**
* useTable property
- *
+ *
* @var bool false
* @access public
*/
var $useTable = false;
/**
* find method
- *
- * @param mixed $conditions
- * @param mixed $fields
- * @param mixed $order
- * @param mixed $recursive
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
* @access public
* @return void
*/
@@ -112,11 +112,11 @@ class AdodbTestModel extends CakeTestModel {
}
/**
* findAll method
- *
- * @param mixed $conditions
- * @param mixed $fields
- * @param mixed $order
- * @param mixed $recursive
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
* @access public
* @return void
*/
@@ -125,7 +125,7 @@ class AdodbTestModel extends CakeTestModel {
}
/**
* schema method
- *
+ *
* @access public
* @return void
*/
@@ -156,19 +156,19 @@ class AdodbTestModel extends CakeTestModel {
if (!class_exists('Article')) {
/**
* Article class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs.model.datasources.dbo
*/
class Article extends CakeTestModel {
/**
* name property
- *
+ *
* @var string 'Article'
* @access public
*/
var $name = 'Article';
-
+
}
}
@@ -186,14 +186,14 @@ class DboAdodbTest extends CakeTestCase {
* @access public
*/
var $db = null;
-
+
/**
* undocumented class variable
*
* @var string
**/
var $fixtures = array('core.article');
-
+
/**
* Skip if cannot connect to AdoDb
*
@@ -273,7 +273,7 @@ class DboAdodbTest extends CakeTestCase {
}
/**
* testColumns method
- *
+ *
* @access public
* @return void
*/
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index e254604b1..e7a1362cc 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -32,22 +32,22 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_mssql.php';
/**
* DboMssqlTestDb class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs.model.datasources.dbo
*/
class DboMssqlTestDb extends DboMssql {
/**
* simulated property
- *
+ *
* @var array
* @access public
*/
var $simulated = array();
/**
* execute method
- *
- * @param mixed $sql
+ *
+ * @param mixed $sql
* @access protected
* @return void
*/
@@ -57,7 +57,7 @@ class DboMssqlTestDb extends DboMssql {
}
/**
* getLastQuery method
- *
+ *
* @access public
* @return void
*/
@@ -75,25 +75,25 @@ class DboMssqlTestDb extends DboMssql {
class MssqlTestModel extends Model {
/**
* name property
- *
+ *
* @var string 'MssqlTestModel'
* @access public
*/
var $name = 'MssqlTestModel';
/**
* useTable property
- *
+ *
* @var bool false
* @access public
*/
var $useTable = false;
/**
* find method
- *
- * @param mixed $conditions
- * @param mixed $fields
- * @param mixed $order
- * @param mixed $recursive
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
* @access public
* @return void
*/
@@ -102,11 +102,11 @@ class MssqlTestModel extends Model {
}
/**
* findAll method
- *
- * @param mixed $conditions
- * @param mixed $fields
- * @param mixed $order
- * @param mixed $recursive
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
* @access public
* @return void
*/
@@ -115,7 +115,7 @@ class MssqlTestModel extends Model {
}
/**
* schema method
- *
+ *
* @access public
* @return void
*/
@@ -178,7 +178,7 @@ class DboMssqlTest extends CakeTestCase {
}
/**
* testQuoting method
- *
+ *
* @access public
* @return void
*/
@@ -216,7 +216,7 @@ class DboMssqlTest extends CakeTestCase {
}
/**
* testDistinctFields method
- *
+ *
* @access public
* @return void
*/
@@ -231,7 +231,7 @@ class DboMssqlTest extends CakeTestCase {
}
/**
* testDistinctWithLimit method
- *
+ *
* @access public
* @return void
*/
@@ -245,7 +245,7 @@ class DboMssqlTest extends CakeTestCase {
}
/**
* tearDown method
- *
+ *
* @access public
* @return void
*/
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 7a8aa55c4..b5784db18 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -28,7 +28,6 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
}
App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysql'));
-
/**
* Short description for class.
*
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index ee0775422..37f79d1e6 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -32,7 +32,6 @@ require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo_source.php';
require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo' . DS . 'dbo_postgres.php';
require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
-
/**
* Short description for class.
*
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index e37380ce2..3af15ba52 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -32,7 +32,6 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo_source.php';
require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_sqlite.php';
require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
-
/**
* Short description for class.
*
diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php
index 2eace88be..dc8fd24be 100644
--- a/cake/tests/cases/libs/model/db_acl.test.php
+++ b/cake/tests/cases/libs/model/db_acl.test.php
@@ -40,14 +40,14 @@ App::import('Core', 'db_acl');
class DbAclNodeTestBase extends AclNode {
/**
* useDbConfig property
- *
+ *
* @var string 'test_suite'
* @access public
*/
var $useDbConfig = 'test_suite';
/**
* cacheSources property
- *
+ *
* @var bool false
* @access public
*/
@@ -63,21 +63,21 @@ class DbAclNodeTestBase extends AclNode {
class DbAroTest extends DbAclNodeTestBase {
/**
* name property
- *
+ *
* @var string 'DbAroTest'
* @access public
*/
var $name = 'DbAroTest';
/**
* useTable property
- *
+ *
* @var string 'aros'
* @access public
*/
var $useTable = 'aros';
/**
* hasAndBelongsToMany property
- *
+ *
* @var array
* @access public
*/
@@ -93,21 +93,21 @@ class DbAroTest extends DbAclNodeTestBase {
class DbAcoTest extends DbAclNodeTestBase {
/**
* name property
- *
+ *
* @var string 'DbAcoTest'
* @access public
*/
var $name = 'DbAcoTest';
/**
* useTable property
- *
+ *
* @var string 'acos'
* @access public
*/
var $useTable = 'acos';
/**
* hasAndBelongsToMany property
- *
+ *
* @var array
* @access public
*/
@@ -123,28 +123,28 @@ class DbAcoTest extends DbAclNodeTestBase {
class DbPermissionTest extends CakeTestModel {
/**
* name property
- *
+ *
* @var string 'DbPermissionTest'
* @access public
*/
var $name = 'DbPermissionTest';
/**
* useTable property
- *
+ *
* @var string 'aros_acos'
* @access public
*/
var $useTable = 'aros_acos';
/**
* cacheQueries property
- *
+ *
* @var bool false
* @access public
*/
var $cacheQueries = false;
/**
* belongsTo property
- *
+ *
* @var array
* @access public
*/
@@ -159,21 +159,21 @@ class DbPermissionTest extends CakeTestModel {
class DbAcoActionTest extends CakeTestModel {
/**
* name property
- *
+ *
* @var string 'DbAcoActionTest'
* @access public
*/
var $name = 'DbAcoActionTest';
/**
* useTable property
- *
+ *
* @var string 'aco_actions'
* @access public
*/
var $useTable = 'aco_actions';
/**
* belongsTo property
- *
+ *
* @var array
* @access public
*/
@@ -188,22 +188,22 @@ class DbAcoActionTest extends CakeTestModel {
class DbAroUserTest extends CakeTestModel {
/**
* name property
- *
+ *
* @var string 'AuthUser'
* @access public
*/
var $name = 'AuthUser';
/**
* useTable property
- *
+ *
* @var string 'auth_users'
* @access public
*/
var $useTable = 'auth_users';
/**
* bindNode method
- *
- * @param mixed $ref
+ *
+ * @param mixed $ref
* @access public
* @return void
*/
@@ -225,7 +225,7 @@ class DbAroUserTest extends CakeTestModel {
class DbAclTest extends DbAcl {
/**
* construct method
- *
+ *
* @access private
* @return void
*/
@@ -245,14 +245,14 @@ class DbAclTest extends DbAcl {
class AclNodeTest extends CakeTestCase {
/**
* fixtures property
- *
+ *
* @var array
* @access public
*/
var $fixtures = array('core.aro', 'core.aco', 'core.aros_aco', 'core.aco_action', 'core.auth_user');
/**
* setUp method
- *
+ *
* @access public
* @return void
*/
@@ -262,7 +262,7 @@ class AclNodeTest extends CakeTestCase {
}
/**
* testNode method
- *
+ *
* @access public
* @return void
*/
@@ -297,13 +297,13 @@ class AclNodeTest extends CakeTestCase {
$result = Set::extract($Aco->node('Controller2/action3/record5'), '{n}.DbAcoTest.id');
$this->assertFalse($result);
-
+
$result = $Aco->node('');
$this->assertEqual($result, null);
}
/**
* testNodeArrayFind method
- *
+ *
* @access public
* @return void
*/
@@ -317,11 +317,11 @@ class AclNodeTest extends CakeTestCase {
Configure::write('DbAclbindMode', 'array');
$result = Set::extract($Aro->node(array('DbAroUserTest' => array('id' => 4, 'foreign_key' => 2))), '{n}.DbAroTest.id');
$expected = array(4);
- $this->assertEqual($result, $expected);
+ $this->assertEqual($result, $expected);
}
/**
* testNodeObjectFind method
- *
+ *
* @access public
* @return void
*/
@@ -332,16 +332,16 @@ class AclNodeTest extends CakeTestCase {
$result = Set::extract($Aro->node($Model), '{n}.DbAroTest.id');
$expected = array(3, 2, 1);
$this->assertEqual($result, $expected);
-
+
$Model->id = 2;
$result = Set::extract($Aro->node($Model), '{n}.DbAroTest.id');
$expected = array(4, 2, 1);
$this->assertEqual($result, $expected);
-
+
}
/**
* testNodeAliasParenting method
- *
+ *
* @access public
* @return void
*/
diff --git a/cake/tests/cases/libs/model/schema.test.php b/cake/tests/cases/libs/model/schema.test.php
index 286fcbf34..6f866f324 100644
--- a/cake/tests/cases/libs/model/schema.test.php
+++ b/cake/tests/cases/libs/model/schema.test.php
@@ -102,7 +102,7 @@ class MyAppSchema extends CakeSchema {
/**
* TestAppSchema class
*
- * @package cake
+ * @package cake.tests
* @subpackage cake.tests.cases.libs.model
*/
class TestAppSchema extends CakeSchema {
@@ -323,7 +323,7 @@ class SchemaDatatype extends CakeTestModel {
* listSources has already been called and its source cache populated - I.e. if the test is run within a group
*
* @uses CakeTestModel
- * @package
+ * @package
* @subpackage cake.tests.cases.libs.model
*/
class Testdescribe extends CakeTestModel {
diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php
index b2622d0e9..8e1d24b4f 100644
--- a/cake/tests/cases/libs/overloadable.test.php
+++ b/cake/tests/cases/libs/overloadable.test.php
@@ -34,7 +34,7 @@ App::import('Core', 'Overloadable');
class OverloadableTest extends CakeTestCase {
/**
* skip method
- *
+ *
* @access public
* @return void
*/
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index 94cda87f5..252a5c837 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -1073,7 +1073,7 @@ class RouterTest extends CakeTestCase {
$result = Router::parse('/controller/action/param1=value1/param2=value2');
$expected = array('pass' => array('param2=value2'), 'named' => array('param1' => 'value1'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
$this->assertEqual($result, $expected);
-
+
Router::reload();
Router::connect('/:controller/:action/*');
Router::connectNamed(array('page'), array('default' => false, 'greedy' => false));
diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php
index 48ad6cb38..c62e9c965 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/cake/tests/cases/libs/sanitize.test.php
@@ -27,21 +27,21 @@
App::import('Core', 'Sanitize');
/**
* DataTest class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs
*/
class SanitizeDataTest extends CakeTestModel {
/**
* name property
- *
+ *
* @var string 'SanitizeDataTest'
* @access public
*/
var $name = 'SanitizeDataTest';
/**
* useTable property
- *
+ *
* @var string 'data_tests'
* @access public
*/
@@ -49,21 +49,21 @@ class SanitizeDataTest extends CakeTestModel {
}
/**
* Article class
- *
+ *
* @package cake
* @subpackage cake.tests.cases.libs
*/
class SanitizeArticle extends CakeTestModel {
/**
* name property
- *
+ *
* @var string 'Article'
* @access public
*/
var $name = 'SanitizeArticle';
/**
* useTable property
- *
+ *
* @var string 'articles'
* @access public
*/
@@ -78,22 +78,22 @@ class SanitizeArticle extends CakeTestModel {
class SanitizeTest extends CakeTestCase {
/**
* autoFixtures property
- *
+ *
* @var bool false
* @access public
*/
var $autoFixtures = false;
/**
* fixtures property
- *
+ *
* @var array
* @access public
*/
var $fixtures = array('core.data_test', 'core.article');
/**
* startTest method
- *
- * @param mixed $method
+ *
+ * @param mixed $method
* @access public
* @return void
*/
@@ -103,7 +103,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testEscapeAlphaNumeric method
- *
+ *
* @access public
* @return void
*/
@@ -134,7 +134,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testClean method
- *
+ *
* @access public
* @return void
*/
@@ -183,7 +183,7 @@ class SanitizeTest extends CakeTestCase {
$expected = array(array('$', array('key' => 'test & "quote" \'other\' ;.$ $ symbol.another line')));
$result = Sanitize::clean($array, array('encode' => false, 'escape' => false));
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::clean($string);
@@ -191,7 +191,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testHtml method
- *
+ *
* @access public
* @return void
*/
@@ -200,7 +200,7 @@ class SanitizeTest extends CakeTestCase {
$expected = 'This is a test string & so is this';
$result = Sanitize::html($string, true);
$this->assertEqual($result, $expected);
-
+
$string = 'The "lazy" dog \'jumped\' & flew over the moon. If (1+1) = 2 is true, (2-1) = 1 is also true';
$expected = 'The "lazy" dog 'jumped' & flew over the moon. If (1+1) = 2 <em>is</em> true, (2-1) = 1 is also true';
$result = Sanitize::html($string);
@@ -208,7 +208,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testStripWhitespace method
- *
+ *
* @access public
* @return void
*/
@@ -220,7 +220,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testParanoid method
- *
+ *
* @access public
* @return void
*/
@@ -229,7 +229,7 @@ class SanitizeTest extends CakeTestCase {
$expected = 'Iwouldliketodancesing';
$result = Sanitize::paranoid($string);
$this->assertEqual($result, $expected);
-
+
$string = array('This |s th% s0ng that never ends it g*es',
'on and on my friends, b^ca#use it is the',
'so&g th===t never ends.');
@@ -238,22 +238,22 @@ class SanitizeTest extends CakeTestCase {
'sog tht never ends.');
$result = Sanitize::paranoid($string, array('%', '*', '.', ' '));
$this->assertEqual($result, $expected);
-
+
$string = "anything' OR 1 = 1";
$expected = 'anythingOR11';
$result = Sanitize::paranoid($string);
$this->assertEqual($result, $expected);
-
+
$string = "x' AND email IS NULL; --";
$expected = 'xANDemailISNULL';
$result = Sanitize::paranoid($string);
$this->assertEqual($result, $expected);
-
+
$string = "x' AND 1=(SELECT COUNT(*) FROM users); --";
$expected = "xAND1SELECTCOUNTFROMusers";
$result = Sanitize::paranoid($string);
$this->assertEqual($result, $expected);
-
+
$string = "x'; DROP TABLE members; --";
$expected = "xDROPTABLEmembers";
$result = Sanitize::paranoid($string);
@@ -261,7 +261,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testStripImages method
- *
+ *
* @access public
* @return void
*/
@@ -270,17 +270,17 @@ class SanitizeTest extends CakeTestCase {
$expected = 'my image
';
$result = Sanitize::stripImages($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::stripImages($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = 'test image alt
';
$result = Sanitize::stripImages($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::stripImages($string);
@@ -288,7 +288,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testStripScripts method
- *
+ *
* @access public
* @return void
*/
@@ -297,27 +297,27 @@ class SanitizeTest extends CakeTestCase {
$expected = '';
$result = Sanitize::stripScripts($string);
$this->assertEqual($result, $expected);
-
+
$string = ''."\n".''."\n".''."\n".'';
$expected = "\n".''."\n".''."\n".'';
$result = Sanitize::stripScripts($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::stripScripts($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::stripScripts($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::stripScripts($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::stripScripts($string);
@@ -325,7 +325,7 @@ class SanitizeTest extends CakeTestCase {
}
/**
* testStripAll method
- *
+ *
* @access public
* @return void
*/
@@ -334,17 +334,17 @@ class SanitizeTest extends CakeTestCase {
$expected ='"/>';
$result = Sanitize::stripAll($string);
$this->assertEqual($result, $expected);
-
+
$string = '';
$expected = '';
$result = Sanitize::stripAll($string);
$this->assertEqual($result, $expected);
-
+
$string = '<';
$expected = '<';
$result = Sanitize::stripAll($string);
$this->assertEqual($result, $expected);
-
+
$string = ''."\n".
"
This is ok \t\n text
\n". ''."\n". @@ -352,11 +352,11 @@ class SanitizeTest extends CakeTestCase { $expected = 'This is ok text
'; $result = Sanitize::stripAll($string); $this->assertEqual($result, $expected); - + } /** * testStripTags method - * + * * @access public * @return void */ @@ -365,12 +365,12 @@ class SanitizeTest extends CakeTestCase { $expected = 'HeadlineMy Link could go to a bad site
'; $result = Sanitize::stripTags($string, 'h2', 'a'); $this->assertEqual($result, $expected); - + $string = ''; $expected = ' '; $result = Sanitize::stripTags($string, 'script'); $this->assertEqual($result, $expected); - + $string = 'Additional information here . Read even more here
'; $expected = 'ImportantAdditional information here . Read even more here
'; $result = Sanitize::stripTags($string, 'h2', 'a'); @@ -378,32 +378,32 @@ class SanitizeTest extends CakeTestCase { } /** * testFormatColumns method - * + * * @access public * @return void */ function testFormatColumns() { $this->loadFixtures('DataTest', 'Article'); - + $this->DataTest =& new SanitizeDataTest(array('alias' => 'DataTest')); $data = array('DataTest' => array( 'id' => 'z', 'count' => '12a', 'float' => '2.31456', - 'updated' => '2008-01-01' + 'updated' => '2008-01-01' ) ); - $this->DataTest->set($data); + $this->DataTest->set($data); $expected = array('DataTest' => array( 'id' => '0', 'count' => '12', 'float' => 2.31456, - 'updated' => '2008-01-01 00:00:00', + 'updated' => '2008-01-01 00:00:00', )); Sanitize::formatColumns($this->DataTest); $result = $this->DataTest->data; $this->assertEqual($result, $expected); - + $this->Article =& new SanitizeArticle(array('alias' => 'Article')); $data = array('Article' => array( 'id' => 'ZB', diff --git a/cake/tests/cases/libs/session.test.php b/cake/tests/cases/libs/session.test.php index 73efa1868..91d773cc7 100644 --- a/cake/tests/cases/libs/session.test.php +++ b/cake/tests/cases/libs/session.test.php @@ -80,7 +80,7 @@ class SessionTest extends CakeTestCase { $this->assertTrue(isset($result['testing'])); $this->assertTrue(isset($result['Config'])); $this->assertTrue(isset($result['Config']['userAgent'])); - + $this->Session->write('This.is.a.deep.array.my.friend', 'value'); $result = $this->Session->read('This.is.a.deep.array.my.friend'); $this->assertEqual('value', $result); diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php index 09c3e7083..e3dddcf66 100644 --- a/cake/tests/cases/libs/set.test.php +++ b/cake/tests/cases/libs/set.test.php @@ -1882,7 +1882,7 @@ class SetTest extends CakeTestCase { $expected->Piece = array($piece, $piece2); $this->assertIdentical($expected, $result); - + //Same data, but should work if _name_ has been manually defined: $data = array( 'User' => array( diff --git a/cake/tests/cases/libs/socket.test.php b/cake/tests/cases/libs/socket.test.php index d2d211ecc..c409b1664 100644 --- a/cake/tests/cases/libs/socket.test.php +++ b/cake/tests/cases/libs/socket.test.php @@ -34,7 +34,7 @@ App::import('Core', 'Socket'); class SocketTest extends CakeTestCase { /** * setUp method - * + * * @access public * @return void */ @@ -43,7 +43,7 @@ class SocketTest extends CakeTestCase { } /** * testConstruct method - * + * * @access public * @return void */ @@ -75,7 +75,7 @@ class SocketTest extends CakeTestCase { } /** * testSocketConnection method - * + * * @access public * @return void */ @@ -96,7 +96,7 @@ class SocketTest extends CakeTestCase { } /** * testSocketHost method - * + * * @access public * @return void */ @@ -117,7 +117,7 @@ class SocketTest extends CakeTestCase { } /** * testSocketWriting method - * + * * @access public * @return void */ @@ -127,7 +127,7 @@ class SocketTest extends CakeTestCase { } /** * testSocketReading method - * + * * @access public * @return void */ @@ -138,7 +138,7 @@ class SocketTest extends CakeTestCase { } /** * testLastError method - * + * * @access public * @return void */ @@ -149,7 +149,7 @@ class SocketTest extends CakeTestCase { } /** * testReset method - * + * * @access public * @return void */ @@ -167,7 +167,7 @@ class SocketTest extends CakeTestCase { } /** * tearDown method - * + * * @access public * @return void */ diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php index a58cd7bf1..f544ca41c 100644 --- a/cake/tests/cases/libs/string.test.php +++ b/cake/tests/cases/libs/string.test.php @@ -163,18 +163,18 @@ class StringTest extends CakeTestCase { $expected = "this is a long string with a few? params you know"; $this->assertEqual($result, $expected); - $result = String::insert('update saved_urls set url = :url where id = :id', array('url' => 'http://www.testurl.com/param1:url/param2:id','id' => 1)); + $result = String::insert('update saved_urls set url = :url where id = :id', array('url' => 'http://www.testurl.com/param1:url/param2:id','id' => 1)); $expected = "update saved_urls set url = http://www.testurl.com/param1:url/param2:id where id = 1"; $this->assertEqual($result, $expected); - $result = String::insert('update saved_urls set url = :url where id = :id', array('id' => 1, 'url' => 'http://www.testurl.com/param1:url/param2:id')); + $result = String::insert('update saved_urls set url = :url where id = :id', array('id' => 1, 'url' => 'http://www.testurl.com/param1:url/param2:id')); $expected = "update saved_urls set url = http://www.testurl.com/param1:url/param2:id where id = 1"; $this->assertEqual($result, $expected); - - $result = String::insert(':me cake. :subject :verb fantastic.', array('me' => 'I :verb', 'subject' => 'cake', 'verb' => 'is')); + + $result = String::insert(':me cake. :subject :verb fantastic.', array('me' => 'I :verb', 'subject' => 'cake', 'verb' => 'is')); $expected = "I :verb cake. cake is fantastic."; $this->assertEqual($result, $expected); - + $result = String::insert(':I.am: :not.yet: passing.', array('I.am' => 'We are'), array('before' => ':', 'after' => ':', 'clean' => array('replacement' => ' of course', 'method' => 'text'))); $expected = "We are of course passing."; $this->assertEqual($result, $expected); @@ -191,22 +191,22 @@ class StringTest extends CakeTestCase { function testCleanInsert() { $result = String::cleanInsert(':incomplete', array('clean' => true, 'before' => ':', 'after' => '')); $this->assertEqual($result, ''); - + $result = String::cleanInsert(':incomplete', array( - 'clean' => array('method' => 'text', 'replacement' => 'complete'), + 'clean' => array('method' => 'text', 'replacement' => 'complete'), 'before' => ':', 'after' => '') ); $this->assertEqual($result, 'complete'); - + $result = String::cleanInsert(':in.complete', array('clean' => true, 'before' => ':', 'after' => '')); $this->assertEqual($result, ''); - + $result = String::cleanInsert(':in.complete and', array('clean' => true, 'before' => ':', 'after' => '')); $this->assertEqual($result, ''); - + $result = String::cleanInsert(':in.complete or stuff', array('clean' => true, 'before' => ':', 'after' => '')); $this->assertEqual($result, 'stuff'); - + $result = String::cleanInsert('Text here
', array('clean' => 'html', 'before' => ':', 'after' => '')); $this->assertEqual($result, 'Text here
'); } diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php index 5500d478f..c2e38b699 100644 --- a/cake/tests/cases/libs/validation.test.php +++ b/cake/tests/cases/libs/validation.test.php @@ -1847,7 +1847,7 @@ class ValidationTestCase extends CakeTestCase { $this->assertTrue(Validation::phone('1 (222) 333 4444')); $this->assertTrue(Validation::phone('+1 (222) 333 4444')); $this->assertTrue(Validation::phone('(222) 333 4444')); - + $this->assertTrue(Validation::phone('1-(333)-333-4444')); $this->assertTrue(Validation::phone('1.(333)-333-4444')); $this->assertTrue(Validation::phone('1.(333).333-4444')); diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php index d201c74fc..7b9073097 100644 --- a/cake/tests/cases/libs/view/helpers/ajax.test.php +++ b/cake/tests/cases/libs/view/helpers/ajax.test.php @@ -31,21 +31,21 @@ uses('view'.DS.'helpers'.DS.'app_helper', 'controller'.DS.'controller', 'model'. 'view'.DS.'helpers'.DS.'html', 'view'.DS.'helpers'.DS.'form', 'view'.DS.'helpers'.DS.'javascript'); /** * AjaxTestController class - * + * * @package cake * @subpackage cake.tests.cases.libs.view.helpers */ class AjaxTestController extends Controller { /** * name property - * + * * @var string 'AjaxTest' * @access public */ var $name = 'AjaxTest'; /** * uses property - * + * * @var mixed null * @access public */ @@ -53,28 +53,28 @@ class AjaxTestController extends Controller { } /** * PostAjaxTest class - * + * * @package cake * @subpackage cake.tests.cases.libs.view.helpers */ class PostAjaxTest extends Model { /** * primaryKey property - * + * * @var string 'id' * @access public */ var $primaryKey = 'id'; /** * useTable property - * + * * @var bool false * @access public */ var $useTable = false; /** * schema method - * + * * @access public * @return void */ @@ -89,14 +89,14 @@ class PostAjaxTest extends Model { } /** * TestAjaxHelper class - * + * * @package cake * @subpackage cake.tests.cases.libs.view.helpers */ class TestAjaxHelper extends AjaxHelper { /** * stop method - * + * * @access public * @return void */ @@ -105,22 +105,22 @@ class TestAjaxHelper extends AjaxHelper { } /** * TestJavascriptHelper class - * + * * @package cake * @subpackage cake.tests.cases.libs.view.helpers */ class TestJavascriptHelper extends JavascriptHelper { /** * codeBlocks property - * - * @var mixed + * + * @var mixed * @access public */ var $codeBlocks; /** * codeBlock method - * - * @param mixed $parameter + * + * @param mixed $parameter * @access public * @return void */ @@ -153,7 +153,7 @@ class AjaxTest extends CakeTestCase { var $cDataEnd = 'preg:/[^\]]*\]\]\>[\s\r\n]*/'; /** * setUp method - * + * * @access public * @return void */ @@ -170,7 +170,7 @@ class AjaxTest extends CakeTestCase { } /** * testEvalScripts method - * + * * @access public * @return void */ @@ -203,7 +203,7 @@ class AjaxTest extends CakeTestCase { } /** * testAutoComplete method - * + * * @access public * @return void */ @@ -239,17 +239,17 @@ class AjaxTest extends CakeTestCase { $this->assertPattern('/<\/div>\s+