From 1180f66cc096ce1a54a6d1fe88196fa1ee6cda54 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 2 May 2010 16:28:18 -0700 Subject: [PATCH 001/100] Setting $actions to null so that the controller methods are not always based upon the first controller in an app/plugin. Signed-off-by: Mark Story --- cake/console/libs/tasks/view.php | 1 + 1 file changed, 1 insertion(+) diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php index bdb5a72bc..f3e236013 100644 --- a/cake/console/libs/tasks/view.php +++ b/cake/console/libs/tasks/view.php @@ -197,6 +197,7 @@ class ViewTask extends BakeTask { $actions = $this->_methodsToBake(); } $this->bakeActions($actions, $vars); + $actions = null; } } } From c48f6d6536084a9cbf290861fcea4c23d81637b1 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Sun, 2 May 2010 21:17:10 -0400 Subject: [PATCH 002/100] Fixing safe parameter from leaking into request() calls in JsHelper::submit() and JsHelper::link(). Fixes #656 --- cake/libs/view/helpers/js.php | 24 +++++++++++++------ .../tests/cases/libs/view/helpers/js.test.php | 18 ++++++++------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php index f8caa21e1..ddc926887 100644 --- a/cake/libs/view/helpers/js.php +++ b/cake/libs/view/helpers/js.php @@ -309,17 +309,22 @@ class JsHelper extends AppHelper { list($options, $htmlOptions) = $this->_getHtmlOptions($options); $out = $this->Html->link($title, $url, $htmlOptions); $this->get('#' . $htmlOptions['id']); - $requestString = ''; + $requestString = $event = ''; if (isset($options['confirm'])) { $requestString = $this->confirmReturn($options['confirm']); unset($options['confirm']); } + $buffer = isset($options['buffer']) ? $options['buffer'] : null; + $safe = isset($options['safe']) ? $options['safe'] : true; + unset($options['buffer'], $options['safe']); + $requestString .= $this->request($url, $options); + if (!empty($requestString)) { - $event = $this->event('click', $requestString, $options); + $event = $this->event('click', $requestString, $options + array('buffer' => $buffer)); } - if (isset($options['buffer']) && $options['buffer'] == false) { - $opts = array_intersect_key(array('safe' => null), $options); + if (isset($buffer) && !$buffer) { + $opts = array('safe' => $safe); $out .= $this->Html->scriptBlock($event, $opts); } return $out; @@ -389,12 +394,17 @@ class JsHelper extends AppHelper { $options['method'] = 'post'; } $options['dataExpression'] = true; + + $buffer = isset($options['buffer']) ? $options['buffer'] : null; + $safe = isset($options['safe']) ? $options['safe'] : true; + unset($options['buffer'], $options['safe']); + $requestString .= $this->request($url, $options); if (!empty($requestString)) { - $event = $this->event('click', $requestString, $options); + $event = $this->event('click', $requestString, $options + array('buffer' => $buffer)); } - if (isset($options['buffer']) && $options['buffer'] == false) { - $opts = array_intersect_key(array('safe' => null), $options); + if (isset($buffer) && !$buffer) { + $opts = array('safe' => $safe); $out .= $this->Html->scriptBlock($event, $opts); } return $out; diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php index 0b6f573a0..7e724092d 100644 --- a/cake/tests/cases/libs/view/helpers/js.test.php +++ b/cake/tests/cases/libs/view/helpers/js.test.php @@ -309,7 +309,7 @@ class JsHelperTestCase extends CakeTestCase { 'request', array('/posts/view/1', $options) )); $this->Js->TestJsEngine->expectAt(2, 'dispatchMethod', array( - 'event', array('click', 'ajax code', $options) + 'event', array('click', 'ajax code', $options + array('buffer' => null)) )); $result = $this->Js->link('test link', '/posts/view/1', $options); @@ -362,7 +362,9 @@ CODE; */ function testLinkWithNoBuffering() { $this->_useMock(); - $this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax code', array('request', '*')); + $this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax code', array( + 'request', array('/posts/view/1', array('update' => '#content')) + )); $this->Js->TestJsEngine->setReturnValue('dispatchMethod', '-event handler-', array('event', '*')); $options = array('update' => '#content', 'buffer' => false); @@ -411,7 +413,7 @@ CODE; $params = array( 'update' => $options['update'], 'data' => 'serialize-code', - 'method' => 'post', 'dataExpression' => true + 'method' => 'post', 'dataExpression' => true, 'buffer' => null ); $this->Js->TestJsEngine->expectAt(3, 'dispatchMethod', array( 'event', array('click', "ajax-code", $params) @@ -440,7 +442,7 @@ CODE; $params = array( 'update' => '#content', 'data' => 'serialize-code', - 'method' => 'post', 'dataExpression' => true + 'method' => 'post', 'dataExpression' => true, 'buffer' => null ); $this->Js->TestJsEngine->expectAt(7, 'dispatchMethod', array( 'event', array('click', "ajax-code", $params) @@ -471,11 +473,13 @@ CODE; $this->Js->TestJsEngine->expectAt(0, 'dispatchMethod', array('get', '*')); $this->Js->TestJsEngine->expectAt(1, 'dispatchMethod', array(new PatternExpectation('/serializeForm/i'), '*')); - $this->Js->TestJsEngine->expectAt(2, 'dispatchMethod', array('request', '*')); + $this->Js->TestJsEngine->expectAt(2, 'dispatchMethod', array('request', array( + '', array('update' => $options['update'], 'data' => 'serialize-code', 'method' => 'post', 'dataExpression' => true) + ))); $params = array( - 'update' => $options['update'], 'buffer' => false, 'safe' => false, 'data' => 'serialize-code', - 'method' => 'post', 'dataExpression' => true + 'update' => $options['update'], 'data' => 'serialize-code', + 'method' => 'post', 'dataExpression' => true, 'buffer' => false ); $this->Js->TestJsEngine->expectAt(3, 'dispatchMethod', array( 'event', array('click', "ajax-code", $params) From 95dbae8acf4f87a53bc0a04147a4efe22ae91faa Mon Sep 17 00:00:00 2001 From: Mark Story Date: Mon, 3 May 2010 22:07:13 -0400 Subject: [PATCH 003/100] Making RequestHandler component carry along a passed status code. This fixes issues where RequestHandler hijacks an redirect(). Fixes #658 --- .../controller/components/request_handler.php | 8 ++++++- .../components/request_handler.test.php | 22 +++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php index 6d2c1e96c..d99b9498a 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/cake/libs/controller/components/request_handler.php @@ -262,7 +262,7 @@ class RequestHandlerComponent extends Object { * @param mixed $url A string or array containing the redirect location * @access public */ - function beforeRedirect(&$controller, $url) { + function beforeRedirect(&$controller, $url, $status = null) { if (!$this->isAjax()) { return; } @@ -272,6 +272,12 @@ class RequestHandlerComponent extends Object { if (is_array($url)) { $url = Router::url($url + array('base' => false)); } + if (!empty($status)) { + $statusCode = $controller->httpCodes($status); + $code = key($statusCode); + $msg = $statusCode[$code]; + $controller->header("HTTP/1.1 {$code} {$msg}"); + } echo $this->requestAction($url, array('return')); $this->_stop(); } diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php index 955a99d5b..ff3aa6ad7 100644 --- a/cake/tests/cases/libs/controller/components/request_handler.test.php +++ b/cake/tests/cases/libs/controller/components/request_handler.test.php @@ -21,6 +21,7 @@ App::import('Controller', 'Controller', false); App::import('Component', array('RequestHandler')); Mock::generatePartial('RequestHandlerComponent', 'NoStopRequestHandler', array('_stop')); +Mock::generatePartial('Controller', 'RequestHandlerMockController', array('header')); /** * RequestHandlerTestController class @@ -602,9 +603,7 @@ class RequestHandlerComponentTest extends CakeTestCase { */ function testBeforeRedirectCallbackWithArrayUrl() { $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; - App::build(array( - 'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS) - ), true); + Router::setRequestInfo(array( array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'named' => array(), 'form' => array(), 'url' => array('url' => 'accounts/'), 'bare' => 0), array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/') @@ -619,7 +618,22 @@ class RequestHandlerComponentTest extends CakeTestCase { ); $result = ob_get_clean(); $this->assertEqual($result, 'one: first two: second'); - App::build(); + } + +/** + * assure that beforeRedirect with a status code will correctly set the status header + * + * @return void + */ + function testBeforeRedirectCallingHeader() { + $controller =& new RequestHandlerMockController(); + $RequestHandler =& new NoStopRequestHandler(); + + $controller->expectOnce('header', array('HTTP/1.1 403 Forbidden')); + + ob_start(); + $RequestHandler->beforeRedirect($controller, 'request_handler_test/param_method/first/second', 403); + $result = ob_get_clean(); } } From ce10c85367d7f3d46094d4193c9a44a2119a0a42 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Mon, 3 May 2010 22:31:55 -0400 Subject: [PATCH 004/100] Making Sanitize::stripScripts() to remove multi-line script and style blocks. Fixes #657 --- cake/libs/sanitize.php | 2 +- cake/tests/cases/libs/sanitize.test.php | 26 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php index 4c2da5e4f..5bec53391 100644 --- a/cake/libs/sanitize.php +++ b/cake/libs/sanitize.php @@ -156,7 +156,7 @@ class Sanitize { * @static */ function stripScripts($str) { - return preg_replace('/(]+rel="[^"]*stylesheet"[^>]*>|]*>|style="[^"]*")|]*>.*?<\/script>|]*>.*?<\/style>|/i', '', $str); + return preg_replace('/(]+rel="[^"]*stylesheet"[^>]*>|]*>|style="[^"]*")|]*>.*?<\/script>|]*>.*?<\/style>|/is', '', $str); } /** diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php index b3f472c5b..a67a699be 100644 --- a/cake/tests/cases/libs/sanitize.test.php +++ b/cake/tests/cases/libs/sanitize.test.php @@ -346,6 +346,32 @@ class SanitizeTest extends CakeTestCase { $expected = ''; $result = Sanitize::stripScripts($string); $this->assertEqual($result, $expected); + + $string = << + + +text +HTML; + $expected = "text\n\ntext"; + $result = Sanitize::stripScripts($string); + $this->assertEqual($result, $expected); + + $string = << + + +text +HTML; + $expected = "text\n\ntext"; + $result = Sanitize::stripScripts($string); + $this->assertEqual($result, $expected); } /** From 719836c41ddd61ea0d8a3f90766e0c01e1dd24d9 Mon Sep 17 00:00:00 2001 From: predominant Date: Wed, 5 May 2010 10:09:47 +1000 Subject: [PATCH 005/100] Updated doc block for added HTTP Status. --- cake/libs/controller/components/request_handler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php index d99b9498a..586751676 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/cake/libs/controller/components/request_handler.php @@ -260,6 +260,7 @@ class RequestHandlerComponent extends Object { * * @param object $controller A reference to the controller * @param mixed $url A string or array containing the redirect location + * @param mixed HTTP Status for redirect * @access public */ function beforeRedirect(&$controller, $url, $status = null) { From fcad9b464c7c80b37e68a62c9cf1157f2469ac67 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Tue, 4 May 2010 23:27:41 -0400 Subject: [PATCH 006/100] Fixing tests broken by changes in default bake templates. Fixing issue where admin methods wouldn't be correctly generated. Fixes #664 --- cake/console/libs/tasks/controller.php | 6 ++- .../console/libs/tasks/controller.test.php | 43 ++++++++++++++++--- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php index a32f60bc3..fb9a4bed5 100644 --- a/cake/console/libs/tasks/controller.php +++ b/cake/console/libs/tasks/controller.php @@ -59,7 +59,7 @@ class ControllerTask extends BakeTask { */ function execute() { if (empty($this->args)) { - $this->__interactive(); + return $this->__interactive(); } if (isset($this->args[0])) { @@ -178,7 +178,7 @@ class ControllerTask extends BakeTask { ); } } else { - list($wannaBakeCrud, $wannaBakeCrud) = $this->_askAboutMethods(); + list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods(); } if (strtolower($wannaBakeCrud) == 'y') { @@ -189,6 +189,7 @@ class ControllerTask extends BakeTask { $actions .= $this->bakeActions($controllerName, $admin, strtolower($wannaUseSession) == 'y'); } + $baked = false; if ($this->interactive === true) { $this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components); $looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y'); @@ -205,6 +206,7 @@ class ControllerTask extends BakeTask { $this->bakeTest($controllerName); } } + return $baked; } /** diff --git a/cake/tests/cases/console/libs/tasks/controller.test.php b/cake/tests/cases/console/libs/tasks/controller.test.php index 13b45d7cb..afd575038 100644 --- a/cake/tests/cases/console/libs/tasks/controller.test.php +++ b/cake/tests/cases/console/libs/tasks/controller.test.php @@ -320,20 +320,20 @@ class ControllerTaskTest extends CakeTestCase { $this->assertTrue(strpos($result, "\$this->set('articles', \$this->paginate());") !== false); $this->assertTrue(strpos($result, 'function view($id = null)') !== false); - $this->assertTrue(strpos($result, "\$this->Session->setFlash(sprintf(__('Invalid %s', true), 'article'));") !== false); + $this->assertTrue(strpos($result, "\$this->Session->setFlash(__('Invalid article', true));") !== false); $this->assertTrue(strpos($result, "\$this->set('article', \$this->Article->read(null, \$id)") !== false); $this->assertTrue(strpos($result, 'function add()') !== false); $this->assertTrue(strpos($result, 'if (!empty($this->data))') !== false); $this->assertTrue(strpos($result, 'if ($this->Article->save($this->data))') !== false); - $this->assertTrue(strpos($result, "\$this->Session->setFlash(sprintf(__('The %s has been saved', true), 'article'));") !== false); + $this->assertTrue(strpos($result, "\$this->Session->setFlash(__('The article has been saved', true));") !== false); $this->assertTrue(strpos($result, 'function edit($id = null)') !== false); - $this->assertTrue(strpos($result, "\$this->Session->setFlash(sprintf(__('The %s could not be saved. Please, try again.', true), 'article'));") !== false); + $this->assertTrue(strpos($result, "\$this->Session->setFlash(__('The article could not be saved. Please, try again.', true));") !== false); $this->assertTrue(strpos($result, 'function delete($id = null)') !== false); $this->assertTrue(strpos($result, 'if ($this->Article->delete($id))') !== false); - $this->assertTrue(strpos($result, "\$this->Session->setFlash(sprintf(__('%s deleted', true), 'Article'));") !== false); + $this->assertTrue(strpos($result, "\$this->Session->setFlash(__('Article deleted', true));") !== false); $result = $this->Task->bakeActions('Articles', 'admin_', true); @@ -363,13 +363,13 @@ class ControllerTaskTest extends CakeTestCase { $this->assertTrue(strpos($result, "\$this->set('articles', \$this->paginate());") !== false); $this->assertTrue(strpos($result, 'function view($id = null)') !== false); - $this->assertTrue(strpos($result, "\$this->flash(sprintf(__('Invalid %s', true), 'article'), array('action' => 'index'))") !== false); + $this->assertTrue(strpos($result, "\$this->flash(__('Invalid article', true), array('action' => 'index'))") !== false); $this->assertTrue(strpos($result, "\$this->set('article', \$this->Article->read(null, \$id)") !== false); $this->assertTrue(strpos($result, 'function add()') !== false); $this->assertTrue(strpos($result, 'if (!empty($this->data))') !== false); $this->assertTrue(strpos($result, 'if ($this->Article->save($this->data))') !== false); - $this->assertTrue(strpos($result, "\$this->flash(sprintf(__('The %s has been saved.', true), 'article'), array('action' => 'index'))") !== false); + $this->assertTrue(strpos($result, "\$this->flash(__('The article has been saved.', true), array('action' => 'index'))") !== false); $this->assertTrue(strpos($result, 'function edit($id = null)') !== false); $this->assertTrue(strpos($result, "\$this->Article->Tag->find('list')") !== false); @@ -377,7 +377,7 @@ class ControllerTaskTest extends CakeTestCase { $this->assertTrue(strpos($result, 'function delete($id = null)') !== false); $this->assertTrue(strpos($result, 'if ($this->Article->delete($id))') !== false); - $this->assertTrue(strpos($result, "\$this->flash(sprintf(__('%s deleted', true), 'Article'), array('action' => 'index'))") !== false); + $this->assertTrue(strpos($result, "\$this->flash(__('Article deleted', true), array('action' => 'index'))") !== false); } /** @@ -424,6 +424,35 @@ class ControllerTaskTest extends CakeTestCase { $this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticlesController/'))); } +/** + * test Interactive mode. + * + * @return void + * @access public + */ + function testInteractiveAdminMethodsNotInteractive() { + $this->Task->connection = 'test_suite'; + $this->Task->interactive = true; + $this->Task->path = '/my/path'; + $this->Task->setReturnValue('in', '1'); + $this->Task->setReturnValueAt(1, 'in', 'y'); // build interactive + $this->Task->setReturnValueAt(2, 'in', 'n'); // build no scaffolds + $this->Task->setReturnValueAt(3, 'in', 'y'); // build normal methods + $this->Task->setReturnValueAt(4, 'in', 'y'); // build admin methods + $this->Task->setReturnValueAt(5, 'in', 'n'); // helpers? + $this->Task->setReturnValueAt(6, 'in', 'n'); // components? + $this->Task->setReturnValueAt(7, 'in', 'y'); // use sessions + $this->Task->setReturnValueAt(8, 'in', 'y'); // looks good + $this->Task->setReturnValue('createFile', true); + $this->Task->Project->setReturnValue('getPrefix', 'admin_'); + + $result = $this->Task->execute(); + $this->assertPattern('/admin_index/', $result); + + $filename = '/my/path/articles_controller.php'; + $this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticlesController/'))); + } + /** * test that execute runs all when the first arg == all * From 918e961f7d8773ef5c6f00193e13191ec45a5510 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Tue, 4 May 2010 23:29:54 -0400 Subject: [PATCH 007/100] Fixing typo in testtask. Fixes #659 --- cake/console/libs/tasks/test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php index 9c7e3bc49..aa5f1a1b5 100644 --- a/cake/console/libs/tasks/test.php +++ b/cake/console/libs/tasks/test.php @@ -95,7 +95,7 @@ class TestTask extends BakeTask { $this->out(sprintf(__("Path: %s", true), $this->path)); $this->hr(); - $selection = null; + $type = null; if ($type) { $type = Inflector::camelize($type); if (!in_array($type, $this->classTypes)) { From 5ea4f027db744fba29e94f5a42af0ace13779452 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 6 May 2010 07:31:52 -0400 Subject: [PATCH 008/100] Fixing TestTask so that if you give an invalid class type you get an error. --- cake/console/libs/tasks/test.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php index aa5f1a1b5..0b392391a 100644 --- a/cake/console/libs/tasks/test.php +++ b/cake/console/libs/tasks/test.php @@ -95,14 +95,12 @@ class TestTask extends BakeTask { $this->out(sprintf(__("Path: %s", true), $this->path)); $this->hr(); - $type = null; if ($type) { $type = Inflector::camelize($type); if (!in_array($type, $this->classTypes)) { - unset($type); + $this->error(sprintf('Incorrect type provided. Please choose one of %s', implode(', ', $this->classTypes))); } - } - if (!$type) { + } else { $type = $this->getObjectType(); } $className = $this->getClassName($type); From a8a31899892fa0212d61d0eeab99baa2510bc39d Mon Sep 17 00:00:00 2001 From: predominant Date: Thu, 6 May 2010 23:35:38 +1000 Subject: [PATCH 009/100] Update default core.php to include instructions for Session names. --- app/config/core.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/config/core.php b/app/config/core.php index 66ca1b2d2..2a9c640f5 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -158,6 +158,12 @@ /** * The name of CakePHP's session cookie. + * + * Note the guidelines for Session names states: "The session name references + * the session id in cookies and URLs. It should contain only alphanumeric + * characters; it should be short and descriptive (i.e. for users with enabled + * cookie warnings). " + * @link http://au.php.net/session_name */ Configure::write('Session.cookie', 'CAKEPHP'); From fd7c1d4f7fe0ba55f5c78617a75e31b862400d19 Mon Sep 17 00:00:00 2001 From: predominant Date: Thu, 6 May 2010 23:43:54 +1000 Subject: [PATCH 010/100] Fixing PHP link for Session information in core.php and removing unnecessary quotation. --- app/config/core.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/config/core.php b/app/config/core.php index 2a9c640f5..5a27d0b38 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -161,9 +161,8 @@ * * Note the guidelines for Session names states: "The session name references * the session id in cookies and URLs. It should contain only alphanumeric - * characters; it should be short and descriptive (i.e. for users with enabled - * cookie warnings). " - * @link http://au.php.net/session_name + * characters." + * @link http://php.net/session_name */ Configure::write('Session.cookie', 'CAKEPHP'); From 45d052b55aa0974e24782c52c41d312f7a390ec4 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 6 May 2010 21:38:14 -0400 Subject: [PATCH 011/100] Fixing failing tests in ViewTask test case, caused by changes in core templates. Fixing incorrect variable usage where models would be double singularized causing incorrect names. Fixes #668 --- cake/console/libs/tasks/view.php | 2 +- .../cases/console/libs/tasks/view.test.php | 29 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php index f3e236013..221cc7bb4 100644 --- a/cake/console/libs/tasks/view.php +++ b/cake/console/libs/tasks/view.php @@ -294,7 +294,7 @@ class ViewTask extends BakeTask { $primaryKey = $modelObj->primaryKey; $displayField = $modelObj->displayField; $singularVar = Inflector::variable($modelClass); - $singularHumanName = $this->_singularHumanName($modelClass); + $singularHumanName = $this->_singularHumanName($this->controllerName); $schema = $modelObj->schema(true); $fields = array_keys($schema); $associations = $this->__associations($modelObj); diff --git a/cake/tests/cases/console/libs/tasks/view.test.php b/cake/tests/cases/console/libs/tasks/view.test.php index 7426805ed..b5d0457d3 100644 --- a/cake/tests/cases/console/libs/tasks/view.test.php +++ b/cake/tests/cases/console/libs/tasks/view.test.php @@ -298,10 +298,10 @@ class ViewTaskTest extends CakeTestCase { ); $result = $this->Task->getContent('view', $vars); - $this->assertPattern('/Delete .+Test View Model/', $result); - $this->assertPattern('/Edit .+Test View Model/', $result); - $this->assertPattern('/List .+Test View Models/', $result); - $this->assertPattern('/New .+Test View Model/', $result); + $this->assertPattern('/Delete Test View Model/', $result); + $this->assertPattern('/Edit Test View Model/', $result); + $this->assertPattern('/List Test View Models/', $result); + $this->assertPattern('/New Test View Model/', $result); $this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result); $this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result); @@ -331,10 +331,10 @@ class ViewTaskTest extends CakeTestCase { ); $result = $this->Task->getContent('admin_view', $vars); - $this->assertPattern('/Delete .+Test View Model/', $result); - $this->assertPattern('/Edit .+Test View Model/', $result); - $this->assertPattern('/List .+Test View Models/', $result); - $this->assertPattern('/New .+Test View Model/', $result); + $this->assertPattern('/Delete Test View Model/', $result); + $this->assertPattern('/Edit Test View Model/', $result); + $this->assertPattern('/List Test View Models/', $result); + $this->assertPattern('/New Test View Model/', $result); $this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result); $this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result); @@ -343,7 +343,7 @@ class ViewTaskTest extends CakeTestCase { $result = $this->Task->getContent('admin_add', $vars); $this->assertPattern("/input\('name'\)/", $result); $this->assertPattern("/input\('body'\)/", $result); - $this->assertPattern('/List .+Test View Models/', $result); + $this->assertPattern('/List Test View Models/', $result); Configure::write('Routing', $_back); } @@ -406,7 +406,7 @@ class ViewTaskTest extends CakeTestCase { )); $this->Task->expectAt(1, 'createFile', array( TMP . 'view_task_comments' . DS . 'edit.ctp', - new PatternExpectation('/Edit .+View Task Comment/') + new PatternExpectation('/Edit View Task Comment/') )); $this->Task->expectAt(2, 'createFile', array( TMP . 'view_task_comments' . DS . 'index.ctp', @@ -576,11 +576,11 @@ class ViewTaskTest extends CakeTestCase { )); $this->Task->expectAt(2, 'createFile', array( TMP . 'view_task_comments' . DS . 'add.ctp', - new PatternExpectation('/Add .+View Task Comment/') + new PatternExpectation('/Add View Task Comment/') )); $this->Task->expectAt(3, 'createFile', array( TMP . 'view_task_comments' . DS . 'edit.ctp', - new PatternExpectation('/Edit .+View Task Comment/') + new PatternExpectation('/Edit View Task Comment/') )); $this->Task->execute(); @@ -633,11 +633,11 @@ class ViewTaskTest extends CakeTestCase { )); $this->Task->expectAt(2, 'createFile', array( TMP . 'view_task_comments' . DS . 'admin_add.ctp', - new PatternExpectation('/Add .+View Task Comment/') + new PatternExpectation('/Add View Task Comment/') )); $this->Task->expectAt(3, 'createFile', array( TMP . 'view_task_comments' . DS . 'admin_edit.ctp', - new PatternExpectation('/Edit .+View Task Comment/') + new PatternExpectation('/Edit View Task Comment/') )); $this->Task->execute(); @@ -660,5 +660,6 @@ class ViewTaskTest extends CakeTestCase { $result = $this->Task->getTemplate('admin_add'); $this->assertEqual($result, 'form'); } + } ?> \ No newline at end of file From 1c1c51185309f89d22a6ce7a9cc999354e50c7e5 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 6 May 2010 21:43:58 -0400 Subject: [PATCH 012/100] Changing how email validation methods are applied, to fix issues where getmxrr() exists but the domain being validated does not have MX records correctly configured. Fixes #634 --- cake/libs/validation.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cake/libs/validation.php b/cake/libs/validation.php index 4b732f25e..516945103 100644 --- a/cake/libs/validation.php +++ b/cake/libs/validation.php @@ -501,11 +501,11 @@ class Validation extends Object { } if ($return === true && preg_match('/@(' . $_this->__pattern['hostname'] . ')$/i', $_this->check, $regs)) { - if (function_exists('getmxrr')) { - return getmxrr($regs[1], $mxhosts); + if (function_exists('getmxrr') && getmxrr($regs[1], $mxhosts)) { + return true; } - if (function_exists('checkdnsrr')) { - return checkdnsrr($regs[1], 'MX'); + if (function_exists('checkdnsrr') && checkdnsrr($regs[1], 'MX')) { + return true; } return is_array(gethostbynamel($regs[1])); } From 1c3415759a4e8abe6109be1d95c94db349c3d7ab Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 6 May 2010 22:11:31 -0400 Subject: [PATCH 013/100] Fixing 'Only variables should be assigned by reference' errors in php4 in form helper. Fixes #643 --- cake/libs/view/helpers/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index aa2d5a0cf..ef643eba7 100755 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -213,7 +213,7 @@ class FormHelper extends AppHelper { } } - $object =& $this->_introspectModel($model); + $object = $this->_introspectModel($model); $this->setEntity($model . '.', true); $modelEntity = $this->model(); From f152181c0382fd32d3593ce97136382f8393982f Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 6 May 2010 22:24:11 -0400 Subject: [PATCH 014/100] Adding tests for saving models with id == null. Closes #675 --- cake/tests/cases/libs/model/model_write.test.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index 5a06db1fc..69a0a8bb8 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -899,6 +899,19 @@ class ModelWriteTest extends BaseModelTest { $this->assertEqual($result, $expected); } +/** + * test that a null Id doesn't cause errors + * + * @return void + */ + function testSaveWithNullId() { + $User =& new User(); + $User->read(null, 1); + $User->data['User']['id'] = null; + $this->assertTrue($User->save(array('password' => 'test'))); + $this->assertTrue($User->id > 0); + } + /** * testSaveWithSet method * From 0930b5c63cd6debe73b19c42a04f89bf791ccc61 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 7 May 2010 21:26:44 -0400 Subject: [PATCH 015/100] Adding more documentation for JsHelper::submit(). Closes #681 --- cake/libs/view/helpers/js.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php index ddc926887..a9c660e08 100644 --- a/cake/libs/view/helpers/js.php +++ b/cake/libs/view/helpers/js.php @@ -365,8 +365,16 @@ class JsHelper extends AppHelper { * Forms submitting with this method, cannot send files. Files do not transfer over XmlHttpRequest * and require an iframe or flash. * + * ### Options + * + * - `url` The url you wish the XHR request to submit to. + * - `confirm` A string to use for a confirm() message prior to submitting the request. + * - `method` The method you wish the form to send by, defaults to POST + * - `buffer` Whether or not you wish the script code to be buffered, defaults to true. + * - Also see options for JsHelper::request() and JsHelper::event() + * * @param string $title The display text of the submit button. - * @param array $options Array of options to use. + * @param array $options Array of options to use. See the options for the above mentioned methods. * @return string Completed submit button. * @access public */ From 745afe888b49ae6ecd11b8ccc9b48958eba6dbbb Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 7 May 2010 22:23:18 -0400 Subject: [PATCH 016/100] Adding more tests for saving records with nulls. Closes #675 --- cake/tests/cases/libs/model/model_write.test.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index 69a0a8bb8..f5ed44bcd 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -910,6 +910,11 @@ class ModelWriteTest extends BaseModelTest { $User->data['User']['id'] = null; $this->assertTrue($User->save(array('password' => 'test'))); $this->assertTrue($User->id > 0); + + $User->read(null, 2); + $User->data['User']['id'] = null; + $this->assertTrue($User->save(array('password' => 'test'))); + $this->assertTrue($User->id > 0); } /** From 1a7dce3af6ef5e9ba8cac461ecbeb8a71e0f935f Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 7 May 2010 23:25:10 -0400 Subject: [PATCH 017/100] Updating DboMysql to fix an issue where virtualFields that were simple aliases to fields on other tables would end up in the wrong place. Tests added. Fixes #655 --- cake/libs/model/datasources/dbo/dbo_mysql.php | 4 ++-- cake/tests/cases/libs/model/model_read.test.php | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index d3b415dbf..c8a882556 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -727,8 +727,8 @@ class DboMysql extends DboMysqlBase { $j = 0; while ($j < $numFields) { - $column = mysql_fetch_field($results,$j); - if (!empty($column->table)) { + $column = mysql_fetch_field($results, $j); + if (!empty($column->table) && strpos($column->name, '__') === false) { $this->map[$index++] = array($column->table, $column->name); } else { $this->map[$index++] = array(0, $column->name); diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php index 49e1f39fe..9d1bdace3 100755 --- a/cake/tests/cases/libs/model/model_read.test.php +++ b/cake/tests/cases/libs/model/model_read.test.php @@ -7293,6 +7293,21 @@ class ModelReadTest extends BaseModelTest { $this->assertTrue(isset($result['Author']['full_name'])); } +/** + * test that virtual fields work when they don't contain functions. + * + * @return void + */ + function testVirtualFieldAsAString() { + $this->loadFixtures('Post', 'Author'); + $Post =& new Post(); + $Post->virtualFields = array( + 'writer' => 'Author.user' + ); + $result = $Post->find('first'); + $this->assertTrue(isset($result['Post']['writer']), 'virtual field not fetched %s'); + } + /** * test that isVirtualField will accept both aliased and non aliased fieldnames * From 1ec220dac26109648936dd267d8040ceb20cffaf Mon Sep 17 00:00:00 2001 From: predominant Date: Tue, 11 May 2010 08:07:49 +1000 Subject: [PATCH 018/100] Removing closing PHP tags. --- app/config/bootstrap.php | 1 - app/config/core.php | 1 - app/config/database.php.default | 1 - app/config/routes.php | 1 - app/config/schema/db_acl.php | 1 - app/config/schema/i18n.php | 1 - app/config/schema/sessions.php | 1 - app/index.php | 1 - app/webroot/css.php | 1 - app/webroot/index.php | 1 - app/webroot/test.php | 2 -- cake/basics.php | 1 - cake/bootstrap.php | 1 - cake/config/config.php | 1 - cake/config/paths.php | 1 - cake/config/unicode/casefolding/0080_00ff.php | 1 - cake/config/unicode/casefolding/0100_017f.php | 1 - cake/config/unicode/casefolding/0180_024F.php | 1 - cake/config/unicode/casefolding/0250_02af.php | 1 - cake/config/unicode/casefolding/0370_03ff.php | 1 - cake/config/unicode/casefolding/0400_04ff.php | 1 - cake/config/unicode/casefolding/0500_052f.php | 1 - cake/config/unicode/casefolding/0530_058f.php | 1 - cake/config/unicode/casefolding/1e00_1eff.php | 1 - cake/config/unicode/casefolding/1f00_1fff.php | 1 - cake/config/unicode/casefolding/2100_214f.php | 1 - cake/config/unicode/casefolding/2150_218f.php | 1 - cake/config/unicode/casefolding/2460_24ff.php | 1 - cake/config/unicode/casefolding/2c00_2c5f.php | 1 - cake/config/unicode/casefolding/2c60_2c7f.php | 1 - cake/config/unicode/casefolding/2c80_2cff.php | 1 - cake/config/unicode/casefolding/ff00_ffef.php | 1 - cake/console/cake.php | 1 - cake/console/error.php | 1 - cake/console/libs/acl.php | 1 - cake/console/libs/api.php | 1 - cake/console/libs/bake.php | 1 - cake/console/libs/console.php | 1 - cake/console/libs/i18n.php | 1 - cake/console/libs/schema.php | 1 - cake/console/libs/shell.php | 1 - cake/console/libs/tasks/bake.php | 2 +- cake/console/libs/tasks/controller.php | 1 - cake/console/libs/tasks/db_config.php | 1 - cake/console/libs/tasks/extract.php | 1 - cake/console/libs/tasks/fixture.php | 1 - cake/console/libs/tasks/model.php | 1 - cake/console/libs/tasks/plugin.php | 1 - cake/console/libs/tasks/project.php | 1 - cake/console/libs/tasks/template.php | 1 - cake/console/libs/tasks/test.php | 1 - cake/console/libs/tasks/view.php | 1 - cake/console/libs/testsuite.php | 1 - cake/console/templates/skel/app_controller.php | 1 - cake/console/templates/skel/app_helper.php | 1 - cake/console/templates/skel/app_model.php | 1 - cake/console/templates/skel/config/bootstrap.php | 1 - cake/console/templates/skel/config/core.php | 1 - cake/console/templates/skel/config/database.php.default | 1 - cake/console/templates/skel/config/routes.php | 1 - cake/console/templates/skel/config/schema/db_acl.php | 1 - cake/console/templates/skel/config/schema/i18n.php | 1 - cake/console/templates/skel/config/schema/sessions.php | 1 - cake/console/templates/skel/controllers/pages_controller.php | 2 -- cake/console/templates/skel/index.php | 1 - cake/console/templates/skel/webroot/css.php | 1 - cake/console/templates/skel/webroot/index.php | 1 - cake/console/templates/skel/webroot/test.php | 2 -- cake/dispatcher.php | 2 -- cake/libs/cache.php | 1 - cake/libs/cache/apc.php | 1 - cake/libs/cache/file.php | 1 - cake/libs/cache/memcache.php | 1 - cake/libs/cache/xcache.php | 1 - cake/libs/cake_log.php | 1 - cake/libs/cake_session.php | 1 - cake/libs/cake_socket.php | 1 - cake/libs/class_registry.php | 1 - cake/libs/configure.php | 1 - cake/libs/controller/app_controller.php | 1 - cake/libs/controller/component.php | 2 -- cake/libs/controller/components/acl.php | 1 - cake/libs/controller/components/auth.php | 1 - cake/libs/controller/components/cookie.php | 1 - cake/libs/controller/components/email.php | 2 -- cake/libs/controller/components/request_handler.php | 2 -- cake/libs/controller/components/security.php | 1 - cake/libs/controller/components/session.php | 2 -- cake/libs/controller/controller.php | 1 - cake/libs/controller/pages_controller.php | 2 -- cake/libs/controller/scaffold.php | 1 - cake/libs/debugger.php | 2 -- cake/libs/error.php | 1 - cake/libs/file.php | 1 - cake/libs/folder.php | 1 - cake/libs/http_socket.php | 1 - cake/libs/i18n.php | 1 - cake/libs/inflector.php | 1 - cake/libs/l10n.php | 1 - cake/libs/log/file_log.php | 2 +- cake/libs/magic_db.php | 2 -- cake/libs/model/app_model.php | 1 - cake/libs/model/behaviors/acl.php | 2 -- cake/libs/model/behaviors/containable.php | 1 - cake/libs/model/behaviors/translate.php | 1 - cake/libs/model/behaviors/tree.php | 1 - cake/libs/model/cake_schema.php | 1 - cake/libs/model/connection_manager.php | 1 - cake/libs/model/datasources/datasource.php | 1 - cake/libs/model/datasources/dbo/dbo_mssql.php | 1 - cake/libs/model/datasources/dbo/dbo_mysql.php | 1 - cake/libs/model/datasources/dbo/dbo_mysqli.php | 1 - cake/libs/model/datasources/dbo/dbo_oracle.php | 1 - cake/libs/model/datasources/dbo/dbo_postgres.php | 1 - cake/libs/model/datasources/dbo/dbo_sqlite.php | 1 - cake/libs/model/datasources/dbo_source.php | 1 - cake/libs/model/db_acl.php | 1 - cake/libs/model/model.php | 1 - cake/libs/model/model_behavior.php | 1 - cake/libs/multibyte.php | 1 - cake/libs/object.php | 1 - cake/libs/overloadable.php | 1 - cake/libs/overloadable_php4.php | 2 -- cake/libs/overloadable_php5.php | 1 - cake/libs/router.php | 2 -- cake/libs/sanitize.php | 1 - cake/libs/security.php | 1 - cake/libs/set.php | 1 - cake/libs/string.php | 1 - cake/libs/validation.php | 1 - cake/libs/view/helper.php | 1 - cake/libs/view/helpers/ajax.php | 1 - cake/libs/view/helpers/app_helper.php | 1 - cake/libs/view/helpers/cache.php | 1 - cake/libs/view/helpers/form.php | 2 -- cake/libs/view/helpers/html.php | 1 - cake/libs/view/helpers/javascript.php | 2 -- cake/libs/view/helpers/jquery_engine.php | 1 - cake/libs/view/helpers/js.php | 1 - cake/libs/view/helpers/mootools_engine.php | 1 - cake/libs/view/helpers/number.php | 1 - cake/libs/view/helpers/paginator.php | 1 - cake/libs/view/helpers/prototype_engine.php | 1 - cake/libs/view/helpers/rss.php | 1 - cake/libs/view/helpers/session.php | 1 - cake/libs/view/helpers/text.php | 1 - cake/libs/view/helpers/time.php | 1 - cake/libs/view/helpers/xml.php | 1 - cake/libs/view/media.php | 1 - cake/libs/view/theme.php | 1 - cake/libs/view/view.php | 2 -- cake/libs/xml.php | 1 - cake/tests/cases/basics.test.php | 1 - cake/tests/cases/console/cake.test.php | 1 - cake/tests/cases/console/libs/acl.test.php | 1 - cake/tests/cases/console/libs/api.test.php | 1 - cake/tests/cases/console/libs/bake.test.php | 1 - cake/tests/cases/console/libs/schema.test.php | 1 - cake/tests/cases/console/libs/shell.test.php | 1 - cake/tests/cases/console/libs/tasks/controller.test.php | 1 - cake/tests/cases/console/libs/tasks/db_config.test.php | 1 - cake/tests/cases/console/libs/tasks/extract.test.php | 1 - cake/tests/cases/console/libs/tasks/fixture.test.php | 1 - cake/tests/cases/console/libs/tasks/model.test.php | 1 - cake/tests/cases/console/libs/tasks/plugin.test.php | 1 - cake/tests/cases/console/libs/tasks/project.test.php | 1 - cake/tests/cases/console/libs/tasks/template.test.php | 1 - cake/tests/cases/console/libs/tasks/test.test.php | 1 - cake/tests/cases/console/libs/tasks/view.test.php | 1 - cake/tests/cases/dispatcher.test.php | 1 - cake/tests/cases/libs/cache.test.php | 1 - cake/tests/cases/libs/cache/apc.test.php | 1 - cake/tests/cases/libs/cache/file.test.php | 1 - cake/tests/cases/libs/cache/memcache.test.php | 1 - cake/tests/cases/libs/cache/xcache.test.php | 1 - cake/tests/cases/libs/cake_log.test.php | 1 - cake/tests/cases/libs/cake_session.test.php | 1 - cake/tests/cases/libs/cake_socket.test.php | 1 - cake/tests/cases/libs/cake_test_case.test.php | 1 - cake/tests/cases/libs/cake_test_fixture.test.php | 1 - cake/tests/cases/libs/class_registry.test.php | 1 - cake/tests/cases/libs/code_coverage_manager.test.php | 1 - cake/tests/cases/libs/configure.test.php | 1 - cake/tests/cases/libs/controller/component.test.php | 1 - cake/tests/cases/libs/controller/components/acl.test.php | 1 - cake/tests/cases/libs/controller/components/auth.test.php | 1 - cake/tests/cases/libs/controller/components/cookie.test.php | 1 - cake/tests/cases/libs/controller/components/email.test.php | 1 - .../cases/libs/controller/components/request_handler.test.php | 1 - cake/tests/cases/libs/controller/components/security.test.php | 1 - cake/tests/cases/libs/controller/components/session.test.php | 1 - cake/tests/cases/libs/controller/controller.test.php | 1 - .../tests/cases/libs/controller/controller_merge_vars.test.php | 2 +- cake/tests/cases/libs/controller/pages_controller.test.php | 1 - cake/tests/cases/libs/controller/scaffold.test.php | 1 - cake/tests/cases/libs/debugger.test.php | 1 - cake/tests/cases/libs/error.test.php | 1 - cake/tests/cases/libs/file.test.php | 1 - cake/tests/cases/libs/folder.test.php | 1 - cake/tests/cases/libs/http_socket.test.php | 1 - cake/tests/cases/libs/i18n.test.php | 1 - cake/tests/cases/libs/inflector.test.php | 1 - cake/tests/cases/libs/l10n.test.php | 1 - cake/tests/cases/libs/log/file_log.test.php | 1 - cake/tests/cases/libs/magic_db.test.php | 1 - cake/tests/cases/libs/model/behaviors/acl.test.php | 1 - cake/tests/cases/libs/model/behaviors/containable.test.php | 1 - cake/tests/cases/libs/model/behaviors/translate.test.php | 1 - cake/tests/cases/libs/model/behaviors/tree.test.php | 1 - cake/tests/cases/libs/model/cake_schema.test.php | 1 - cake/tests/cases/libs/model/connection_manager.test.php | 1 - cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php | 1 - cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php | 1 - .../tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php | 1 - .../tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php | 1 - .../cases/libs/model/datasources/dbo/dbo_postgres.test.php | 1 - .../tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php | 1 - cake/tests/cases/libs/model/datasources/dbo_source.test.php | 1 - cake/tests/cases/libs/model/db_acl.test.php | 1 - cake/tests/cases/libs/model/model.test.php | 1 - cake/tests/cases/libs/model/model_behavior.test.php | 1 - cake/tests/cases/libs/model/model_delete.test.php | 2 -- cake/tests/cases/libs/model/model_integration.test.php | 1 - cake/tests/cases/libs/model/model_read.test.php | 1 - cake/tests/cases/libs/model/model_validation.test.php | 1 - cake/tests/cases/libs/model/model_write.test.php | 2 -- cake/tests/cases/libs/model/models.php | 2 -- cake/tests/cases/libs/multibyte.test.php | 1 - cake/tests/cases/libs/object.test.php | 1 - cake/tests/cases/libs/overloadable.test.php | 1 - cake/tests/cases/libs/router.test.php | 2 -- cake/tests/cases/libs/sanitize.test.php | 1 - cake/tests/cases/libs/security.test.php | 1 - cake/tests/cases/libs/set.test.php | 1 - cake/tests/cases/libs/string.test.php | 2 -- cake/tests/cases/libs/test_manager.test.php | 1 - cake/tests/cases/libs/validation.test.php | 1 - cake/tests/cases/libs/view/helper.test.php | 2 -- cake/tests/cases/libs/view/helpers/ajax.test.php | 1 - cake/tests/cases/libs/view/helpers/cache.test.php | 1 - cake/tests/cases/libs/view/helpers/form.test.php | 1 - cake/tests/cases/libs/view/helpers/html.test.php | 1 - cake/tests/cases/libs/view/helpers/javascript.test.php | 1 - cake/tests/cases/libs/view/helpers/jquery_engine.test.php | 1 - cake/tests/cases/libs/view/helpers/js.test.php | 1 - cake/tests/cases/libs/view/helpers/mootools_engine.test.php | 1 - cake/tests/cases/libs/view/helpers/number.test.php | 1 - cake/tests/cases/libs/view/helpers/paginator.test.php | 1 - cake/tests/cases/libs/view/helpers/prototype_engine.test.php | 1 - cake/tests/cases/libs/view/helpers/rss.test.php | 1 - cake/tests/cases/libs/view/helpers/session.test.php | 1 - cake/tests/cases/libs/view/helpers/text.test.php | 1 - cake/tests/cases/libs/view/helpers/time.test.php | 1 - cake/tests/cases/libs/view/helpers/xml.test.php | 1 - cake/tests/cases/libs/view/media.test.php | 1 - cake/tests/cases/libs/view/theme.test.php | 1 - cake/tests/cases/libs/view/view.test.php | 1 - cake/tests/cases/libs/xml.test.php | 1 - cake/tests/fixtures/account_fixture.php | 2 -- cake/tests/fixtures/aco_action_fixture.php | 2 -- cake/tests/fixtures/aco_fixture.php | 2 -- cake/tests/fixtures/aco_two_fixture.php | 2 -- cake/tests/fixtures/ad_fixture.php | 2 -- cake/tests/fixtures/advertisement_fixture.php | 2 -- cake/tests/fixtures/after_tree_fixture.php | 1 - cake/tests/fixtures/another_article_fixture.php | 2 -- cake/tests/fixtures/apple_fixture.php | 2 -- cake/tests/fixtures/aro_fixture.php | 2 -- cake/tests/fixtures/aro_two_fixture.php | 2 -- cake/tests/fixtures/aros_aco_fixture.php | 2 -- cake/tests/fixtures/aros_aco_two_fixture.php | 2 -- cake/tests/fixtures/article_featured_fixture.php | 2 -- cake/tests/fixtures/article_featureds_tags_fixture.php | 2 -- cake/tests/fixtures/article_fixture.php | 2 -- cake/tests/fixtures/articles_tag_fixture.php | 2 -- cake/tests/fixtures/attachment_fixture.php | 2 -- cake/tests/fixtures/auth_user_custom_field_fixture.php | 2 -- cake/tests/fixtures/auth_user_fixture.php | 2 -- cake/tests/fixtures/author_fixture.php | 2 -- cake/tests/fixtures/basket_fixture.php | 2 -- cake/tests/fixtures/bid_fixture.php | 1 - cake/tests/fixtures/binary_test_fixture.php | 2 -- cake/tests/fixtures/book_fixture.php | 1 - cake/tests/fixtures/cache_test_model_fixture.php | 2 -- cake/tests/fixtures/callback_fixture.php | 2 -- cake/tests/fixtures/campaign_fixture.php | 2 -- cake/tests/fixtures/category_fixture.php | 2 -- cake/tests/fixtures/category_thread_fixture.php | 2 -- cake/tests/fixtures/cd_fixture.php | 1 - cake/tests/fixtures/comment_fixture.php | 2 -- cake/tests/fixtures/content_account_fixture.php | 2 -- cake/tests/fixtures/content_fixture.php | 2 -- cake/tests/fixtures/counter_cache_post_fixture.php | 2 -- .../counter_cache_post_nonstandard_primary_key_fixture.php | 2 -- cake/tests/fixtures/counter_cache_user_fixture.php | 2 -- .../counter_cache_user_nonstandard_primary_key_fixture.php | 2 -- cake/tests/fixtures/data_test_fixture.php | 2 -- cake/tests/fixtures/datatype_fixture.php | 2 -- cake/tests/fixtures/dependency_fixture.php | 2 -- cake/tests/fixtures/device_fixture.php | 1 - cake/tests/fixtures/device_type_category_fixture.php | 1 - cake/tests/fixtures/device_type_fixture.php | 1 - cake/tests/fixtures/document_directory_fixture.php | 1 - cake/tests/fixtures/document_fixture.php | 1 - cake/tests/fixtures/exterior_type_category_fixture.php | 1 - cake/tests/fixtures/feature_set_fixture.php | 1 - cake/tests/fixtures/featured_fixture.php | 2 -- cake/tests/fixtures/film_file_fixture.php | 2 -- cake/tests/fixtures/flag_tree_fixture.php | 2 -- cake/tests/fixtures/fruit_fixture.php | 2 -- cake/tests/fixtures/fruits_uuid_tag_fixture.php | 1 - cake/tests/fixtures/group_update_all_fixture.php | 1 - cake/tests/fixtures/home_fixture.php | 2 -- cake/tests/fixtures/image_fixture.php | 1 - cake/tests/fixtures/item_fixture.php | 1 - cake/tests/fixtures/items_portfolio_fixture.php | 1 - cake/tests/fixtures/join_a_b_fixture.php | 2 -- cake/tests/fixtures/join_a_c_fixture.php | 2 -- cake/tests/fixtures/join_a_fixture.php | 2 -- cake/tests/fixtures/join_b_fixture.php | 1 - cake/tests/fixtures/join_c_fixture.php | 1 - cake/tests/fixtures/join_thing_fixture.php | 2 -- cake/tests/fixtures/message_fixture.php | 1 - cake/tests/fixtures/my_categories_my_products_fixture.php | 2 -- cake/tests/fixtures/my_categories_my_users_fixture.php | 2 -- cake/tests/fixtures/my_category_fixture.php | 2 -- cake/tests/fixtures/my_product_fixture.php | 2 -- cake/tests/fixtures/my_user_fixture.php | 2 -- cake/tests/fixtures/node_fixture.php | 2 -- cake/tests/fixtures/number_tree_fixture.php | 2 -- cake/tests/fixtures/number_tree_two_fixture.php | 1 - cake/tests/fixtures/numeric_article_fixture.php | 2 -- cake/tests/fixtures/overall_favorite_fixture.php | 1 - cake/tests/fixtures/person_fixture.php | 1 - cake/tests/fixtures/portfolio_fixture.php | 1 - cake/tests/fixtures/post_fixture.php | 1 - cake/tests/fixtures/posts_tag_fixture.php | 2 -- cake/tests/fixtures/primary_model_fixture.php | 2 -- cake/tests/fixtures/product_fixture.php | 2 -- cake/tests/fixtures/product_update_all_fixture.php | 1 - cake/tests/fixtures/project_fixture.php | 1 - cake/tests/fixtures/sample_fixture.php | 2 +- cake/tests/fixtures/secondary_model_fixture.php | 2 -- cake/tests/fixtures/session_fixture.php | 1 - cake/tests/fixtures/something_else_fixture.php | 2 -- cake/tests/fixtures/something_fixture.php | 2 -- cake/tests/fixtures/stories_tag_fixture.php | 1 - cake/tests/fixtures/story_fixture.php | 1 - cake/tests/fixtures/syfile_fixture.php | 2 -- cake/tests/fixtures/tag_fixture.php | 2 -- cake/tests/fixtures/test_plugin_article_fixture.php | 2 -- cake/tests/fixtures/test_plugin_comment_fixture.php | 2 -- cake/tests/fixtures/the_paper_monkies_fixture.php | 2 -- cake/tests/fixtures/thread_fixture.php | 1 - cake/tests/fixtures/translate_article_fixture.php | 2 -- cake/tests/fixtures/translate_fixture.php | 1 - cake/tests/fixtures/translate_table_fixture.php | 2 -- cake/tests/fixtures/translate_with_prefix_fixture.php | 1 - cake/tests/fixtures/translated_article_fixture.php | 2 -- cake/tests/fixtures/translated_item_fixture.php | 2 -- cake/tests/fixtures/unconventional_tree_fixture.php | 1 - cake/tests/fixtures/underscore_field_fixture.php | 2 -- cake/tests/fixtures/user_fixture.php | 2 -- cake/tests/fixtures/uuid_fixture.php | 2 -- cake/tests/fixtures/uuid_tag_fixture.php | 1 - cake/tests/fixtures/uuid_tree_fixture.php | 1 - cake/tests/fixtures/uuiditem_fixture.php | 1 - cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php | 1 - .../fixtures/uuiditems_uuidportfolio_numericid_fixture.php | 1 - cake/tests/fixtures/uuidportfolio_fixture.php | 1 - cake/tests/groups/acl.group.php | 1 - cake/tests/groups/bake.group.php | 1 - cake/tests/groups/behaviors.group.php | 1 - cake/tests/groups/cache.group.php | 1 - cake/tests/groups/components.group.php | 1 - cake/tests/groups/configure.group.php | 1 - cake/tests/groups/console.group.php | 1 - cake/tests/groups/controller.group.php | 1 - cake/tests/groups/database.group.php | 1 - cake/tests/groups/helpers.group.php | 1 - cake/tests/groups/i18n.group.php | 1 - cake/tests/groups/javascript.group.php | 1 - cake/tests/groups/lib.group.php | 1 - cake/tests/groups/model.group.php | 1 - cake/tests/groups/no_cross_contamination.group.php | 1 - cake/tests/groups/routing_system.group.php | 1 - cake/tests/groups/socket.group.php | 1 - cake/tests/groups/test_suite.group.php | 1 - cake/tests/groups/view.group.php | 1 - cake/tests/groups/xml.group.php | 1 - cake/tests/lib/cake_test_case.php | 1 - cake/tests/lib/cake_test_fixture.php | 1 - cake/tests/lib/cake_test_model.php | 1 - cake/tests/lib/cake_test_suite_dispatcher.php | 1 - cake/tests/lib/cake_web_test_case.php | 1 - cake/tests/lib/code_coverage_manager.php | 1 - cake/tests/lib/reporter/cake_base_reporter.php | 1 - cake/tests/lib/reporter/cake_cli_reporter.php | 1 - cake/tests/lib/reporter/cake_html_reporter.php | 1 - cake/tests/lib/reporter/cake_text_reporter.php | 1 - cake/tests/lib/test_manager.php | 2 -- cake/tests/test_app/controllers/tests_apps_controller.php | 1 - .../tests/test_app/controllers/tests_apps_posts_controller.php | 1 - cake/tests/test_app/libs/cache/test_app_cache.php | 2 +- cake/tests/test_app/libs/library.php | 1 - cake/tests/test_app/libs/log/test_app_log.php | 2 +- .../tests/test_app/models/behaviors/persister_one_behavior.php | 3 --- .../tests/test_app/models/behaviors/persister_two_behavior.php | 3 --- cake/tests/test_app/models/comment.php | 1 - .../test_app/models/datasources/test/test_local_driver.php | 1 - cake/tests/test_app/models/persister_one.php | 1 - cake/tests/test_app/models/persister_two.php | 1 - cake/tests/test_app/models/post.php | 1 - cake/tests/test_app/plugins/test_plugin/config/load.php | 1 - cake/tests/test_app/plugins/test_plugin/config/more.load.php | 1 - .../test_app/plugins/test_plugin/config/schema/schema.php | 2 -- .../test_plugin/controllers/components/other_component.php | 2 -- .../test_plugin/controllers/components/plugins_component.php | 1 - .../controllers/components/test_plugin_component.php | 1 - .../controllers/components/test_plugin_other_component.php | 2 -- .../plugins/test_plugin/controllers/test_plugin_controller.php | 2 +- .../plugins/test_plugin/controllers/tests_controller.php | 1 - .../plugins/test_plugin/libs/cache/test_plugin_cache.php | 3 +-- .../test_app/plugins/test_plugin/libs/log/test_plugin_log.php | 2 +- .../test_app/plugins/test_plugin/libs/test_plugin_library.php | 1 - .../test_plugin/models/behaviors/test_plugin_persister_one.php | 3 --- .../test_plugin/models/behaviors/test_plugin_persister_two.php | 3 --- .../plugins/test_plugin/models/datasources/dbo/dbo_dummy.php | 2 -- .../test_plugin/models/datasources/test/test_driver.php | 2 -- .../plugins/test_plugin/models/datasources/test_source.php | 2 -- .../plugins/test_plugin/models/test_plugin_auth_user.php | 2 +- .../plugins/test_plugin/models/test_plugin_authors.php | 1 - .../plugins/test_plugin/models/test_plugin_comment.php | 1 - .../test_app/plugins/test_plugin/models/test_plugin_post.php | 2 +- .../plugins/test_plugin/test_plugin_app_controller.php | 1 - .../test_app/plugins/test_plugin/test_plugin_app_model.php | 1 - .../plugins/test_plugin/vendors/sample/sample_plugin.php | 1 - .../test_app/plugins/test_plugin/vendors/shells/example.php | 2 +- .../plugins/test_plugin/views/helpers/other_helper.php | 1 - .../plugins/test_plugin/views/helpers/plugged_helper.php | 1 - .../plugins/test_plugin_two/vendors/shells/example.php | 2 +- .../plugins/test_plugin_two/vendors/shells/welcome.php | 2 +- .../test_app/vendors/sample/configure_test_vendor_sample.php | 1 - cake/tests/test_app/vendors/shells/sample.php | 2 +- cake/tests/test_app/views/helpers/banana.php | 3 +-- index.php | 1 - 446 files changed, 16 insertions(+), 558 deletions(-) diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php index b539b323b..51c786373 100644 --- a/app/config/bootstrap.php +++ b/app/config/bootstrap.php @@ -48,4 +48,3 @@ * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array())); * */ -?> \ No newline at end of file diff --git a/app/config/core.php b/app/config/core.php index 5a27d0b38..935863f93 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -300,4 +300,3 @@ * */ Cache::config('default', array('engine' => 'File')); -?> \ No newline at end of file diff --git a/app/config/database.php.default b/app/config/database.php.default index 8549025a6..043ba5ccc 100644 --- a/app/config/database.php.default +++ b/app/config/database.php.default @@ -93,4 +93,3 @@ class DATABASE_CONFIG { 'prefix' => '', ); } -?> \ No newline at end of file diff --git a/app/config/routes.php b/app/config/routes.php index 40738cb3f..3fca7f1bd 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -31,4 +31,3 @@ * ...and connect the rest of 'Pages' controller's urls. */ Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display')); -?> \ No newline at end of file diff --git a/app/config/schema/db_acl.php b/app/config/schema/db_acl.php index 7fc92c3ed..96b96bd9a 100644 --- a/app/config/schema/db_acl.php +++ b/app/config/schema/db_acl.php @@ -71,4 +71,3 @@ class DbAclSchema extends CakeSchema { ); } -?> \ No newline at end of file diff --git a/app/config/schema/i18n.php b/app/config/schema/i18n.php index bcf133dec..27e1ec357 100644 --- a/app/config/schema/i18n.php +++ b/app/config/schema/i18n.php @@ -48,4 +48,3 @@ class i18nSchema extends CakeSchema { ); } -?> \ No newline at end of file diff --git a/app/config/schema/sessions.php b/app/config/schema/sessions.php index a5a0952cf..4581c29c6 100644 --- a/app/config/schema/sessions.php +++ b/app/config/schema/sessions.php @@ -45,4 +45,3 @@ class SessionsSchema extends CakeSchema { ); } -?> \ No newline at end of file diff --git a/app/index.php b/app/index.php index eaf9e2e48..732c01021 100644 --- a/app/index.php +++ b/app/index.php @@ -16,4 +16,3 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ require 'webroot' . DIRECTORY_SEPARATOR . 'index.php'; -?> \ No newline at end of file diff --git a/app/webroot/css.php b/app/webroot/css.php index 1436c5f07..445b2fb2e 100644 --- a/app/webroot/css.php +++ b/app/webroot/css.php @@ -92,4 +92,3 @@ if (!class_exists('File')) { header("Cache-Control: max-age=86400, must-revalidate"); // HTTP/1.1 header("Pragma: cache"); // HTTP/1.0 print $output; -?> \ No newline at end of file diff --git a/app/webroot/index.php b/app/webroot/index.php index 0522c8281..74a356664 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -85,4 +85,3 @@ if (Configure::read() > 0) { echo ""; } -?> \ No newline at end of file diff --git a/app/webroot/test.php b/app/webroot/test.php index d81e2aa50..10d169ffe 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -92,5 +92,3 @@ require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php'; $Dispatcher = new CakeTestSuiteDispatcher(); $Dispatcher->dispatch(); - -?> \ No newline at end of file diff --git a/cake/basics.php b/cake/basics.php index d259edf91..2bfabd743 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -1013,4 +1013,3 @@ if (!function_exists('file_put_contents')) { } return $val2; } -?> \ No newline at end of file diff --git a/cake/bootstrap.php b/cake/bootstrap.php index 8cae68690..b69cb7b75 100644 --- a/cake/bootstrap.php +++ b/cake/bootstrap.php @@ -37,4 +37,3 @@ require LIBS . 'set.php'; require LIBS . 'cache.php'; Configure::getInstance(); require CAKE . 'dispatcher.php'; -?> \ No newline at end of file diff --git a/cake/config/config.php b/cake/config/config.php index 2b603aede..d01327da1 100644 --- a/cake/config/config.php +++ b/cake/config/config.php @@ -18,4 +18,3 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ return $config['Cake.version'] = '1.3.0'; -?> \ No newline at end of file diff --git a/cake/config/paths.php b/cake/config/paths.php index a9e8be92a..f15d3a4f2 100644 --- a/cake/config/paths.php +++ b/cake/config/paths.php @@ -229,4 +229,3 @@ if (!defined('CSS_URL')) { if (!defined('JS_URL')) { define('JS_URL', 'js/'); } -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0080_00ff.php b/cake/config/unicode/casefolding/0080_00ff.php index addab79cc..080ef6279 100644 --- a/cake/config/unicode/casefolding/0080_00ff.php +++ b/cake/config/unicode/casefolding/0080_00ff.php @@ -72,4 +72,3 @@ $config['0080_00ff'][] = array('upper' => 220, 'status' => 'C', 'lower' => array $config['0080_00ff'][] = array('upper' => 221, 'status' => 'C', 'lower' => array(253)); /* LATIN CAPITAL LETTER Y WITH ACUTE */ $config['0080_00ff'][] = array('upper' => 222, 'status' => 'C', 'lower' => array(254)); /* LATIN CAPITAL LETTER THORN */ $config['0080_00ff'][] = array('upper' => 223, 'status' => 'F', 'lower' => array(115, 115)); /* LATIN SMALL LETTER SHARP S */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0100_017f.php b/cake/config/unicode/casefolding/0100_017f.php index bf4efb6a2..35a9f03da 100644 --- a/cake/config/unicode/casefolding/0100_017f.php +++ b/cake/config/unicode/casefolding/0100_017f.php @@ -105,4 +105,3 @@ $config['0100_017f'][] = array('upper' => 377, 'status' => 'C', 'lower' => array $config['0100_017f'][] = array('upper' => 379, 'status' => 'C', 'lower' => array(380)); /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ $config['0100_017f'][] = array('upper' => 381, 'status' => 'C', 'lower' => array(382)); /* LATIN CAPITAL LETTER Z WITH CARON */ $config['0100_017f'][] = array('upper' => 383, 'status' => 'C', 'lower' => array(115)); /* LATIN SMALL LETTER LONG S */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0180_024F.php b/cake/config/unicode/casefolding/0180_024F.php index 6499352cd..1148ccc94 100644 --- a/cake/config/unicode/casefolding/0180_024F.php +++ b/cake/config/unicode/casefolding/0180_024F.php @@ -147,4 +147,3 @@ $config['0180_024F'][] = array('upper' => 584, 'status' => 'C', 'lower' => array $config['0180_024F'][] = array('upper' => 586, 'status' => 'C', 'lower' => array(587)); /* LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL */ $config['0180_024F'][] = array('upper' => 588, 'status' => 'C', 'lower' => array(589)); /* LATIN CAPITAL LETTER R WITH STROKE */ $config['0180_024F'][] = array('upper' => 590, 'status' => 'C', 'lower' => array(591)); /* LATIN CAPITAL LETTER Y WITH STROKE */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0250_02af.php b/cake/config/unicode/casefolding/0250_02af.php index c2215a0aa..0472e297c 100644 --- a/cake/config/unicode/casefolding/0250_02af.php +++ b/cake/config/unicode/casefolding/0250_02af.php @@ -40,4 +40,3 @@ * See the discussions of case mapping in the Unicode Standard for more information. */ $config['0250_02af'][] = array('upper' => 422, 'status' => 'C', 'lower' => array(640)); -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0370_03ff.php b/cake/config/unicode/casefolding/0370_03ff.php index 6ffc87519..90defe832 100644 --- a/cake/config/unicode/casefolding/0370_03ff.php +++ b/cake/config/unicode/casefolding/0370_03ff.php @@ -101,4 +101,3 @@ $config['0370_03ff'][] = array('upper' => 1018, 'status' => 'C', 'lower' => arra $config['0370_03ff'][] = array('upper' => 1021, 'status' => 'C', 'lower' => array(891)); /* GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL */ $config['0370_03ff'][] = array('upper' => 1022, 'status' => 'C', 'lower' => array(892)); /* GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL */ $config['0370_03ff'][] = array('upper' => 1023, 'status' => 'C', 'lower' => array(893)); /* GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0400_04ff.php b/cake/config/unicode/casefolding/0400_04ff.php index 31a91ac47..9900171b2 100644 --- a/cake/config/unicode/casefolding/0400_04ff.php +++ b/cake/config/unicode/casefolding/0400_04ff.php @@ -163,4 +163,3 @@ $config['0400_04ff'][] = array('upper' => 1272, 'status' => 'C', 'lower' => arra $config['0400_04ff'][] = array('upper' => 1274, 'status' => 'C', 'lower' => array(1275)); /* CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK */ $config['0400_04ff'][] = array('upper' => 1276, 'status' => 'C', 'lower' => array(1277)); /* CYRILLIC CAPITAL LETTER HA WITH HOOK */ $config['0400_04ff'][] = array('upper' => 1278, 'status' => 'C', 'lower' => array(1279)); /* CYRILLIC CAPITAL LETTER HA WITH STROKE */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0500_052f.php b/cake/config/unicode/casefolding/0500_052f.php index 3ba76ddd0..7e3c956d1 100644 --- a/cake/config/unicode/casefolding/0500_052f.php +++ b/cake/config/unicode/casefolding/0500_052f.php @@ -47,4 +47,3 @@ $config['0500_052f'][] = array('upper' => 1288, 'status' => 'C', 'lower' => arra $config['0500_052f'][] = array('upper' => 1290, 'status' => 'C', 'lower' => array(1291)); /* CYRILLIC CAPITAL LETTER KOMI NJE */ $config['0500_052f'][] = array('upper' => 1292, 'status' => 'C', 'lower' => array(1293)); /* CYRILLIC CAPITAL LETTER KOMI SJE */ $config['0500_052f'][] = array('upper' => 1294, 'status' => 'C', 'lower' => array(1295)); /* CYRILLIC CAPITAL LETTER KOMI TJE */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/0530_058f.php b/cake/config/unicode/casefolding/0530_058f.php index fb21cecae..9bfd6dc8d 100644 --- a/cake/config/unicode/casefolding/0530_058f.php +++ b/cake/config/unicode/casefolding/0530_058f.php @@ -77,4 +77,3 @@ $config['0530_058f'][] = array('upper' => 1363, 'status' => 'C', 'lower' => arra $config['0530_058f'][] = array('upper' => 1364, 'status' => 'C', 'lower' => array(1412)); /* ARMENIAN CAPITAL LETTER KEH */ $config['0530_058f'][] = array('upper' => 1365, 'status' => 'C', 'lower' => array(1413)); /* ARMENIAN CAPITAL LETTER OH */ $config['0530_058f'][] = array('upper' => 1366, 'status' => 'C', 'lower' => array(1414)); /* ARMENIAN CAPITAL LETTER FEH */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/1e00_1eff.php b/cake/config/unicode/casefolding/1e00_1eff.php index ee3b39436..d4214dda1 100644 --- a/cake/config/unicode/casefolding/1e00_1eff.php +++ b/cake/config/unicode/casefolding/1e00_1eff.php @@ -167,4 +167,3 @@ $config['1e00_1eff'][] = array('upper' => 7922, 'status' => 'C', 'lower' => arra $config['1e00_1eff'][] = array('upper' => 7924, 'status' => 'C', 'lower' => array(7925)); /* LATIN CAPITAL LETTER Y WITH DOT BELOW */ $config['1e00_1eff'][] = array('upper' => 7926, 'status' => 'C', 'lower' => array(7927)); /* LATIN CAPITAL LETTER Y WITH HOOK ABOVE */ $config['1e00_1eff'][] = array('upper' => 7928, 'status' => 'C', 'lower' => array(7929)); /* LATIN CAPITAL LETTER Y WITH TILDE */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/1f00_1fff.php b/cake/config/unicode/casefolding/1f00_1fff.php index b76d4bc8d..b8b25cf0e 100644 --- a/cake/config/unicode/casefolding/1f00_1fff.php +++ b/cake/config/unicode/casefolding/1f00_1fff.php @@ -215,4 +215,3 @@ $config['1f00_1fff'][] = array('upper' => 8186, 'status' => 'C', 'lower' => arra $config['1f00_1fff'][] = array('upper' => 8187, 'status' => 'C', 'lower' => array(8061)); /* GREEK CAPITAL LETTER OMEGA WITH OXIA */ $config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'F', 'lower' => array(969, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */ $config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'S', 'lower' => array(8179)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/2100_214f.php b/cake/config/unicode/casefolding/2100_214f.php index 3fbbc1e7a..e0023500e 100644 --- a/cake/config/unicode/casefolding/2100_214f.php +++ b/cake/config/unicode/casefolding/2100_214f.php @@ -43,4 +43,3 @@ $config['2100_214f'][] = array('upper' => 8486, 'status' => 'C', 'lower' => arra $config['2100_214f'][] = array('upper' => 8490, 'status' => 'C', 'lower' => array(107)); /* KELVIN SIGN */ $config['2100_214f'][] = array('upper' => 8491, 'status' => 'C', 'lower' => array(229)); /* ANGSTROM SIGN */ $config['2100_214f'][] = array('upper' => 8498, 'status' => 'C', 'lower' => array(8526)); /* TURNED CAPITAL F */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/2150_218f.php b/cake/config/unicode/casefolding/2150_218f.php index f8863fa85..6a1e6855c 100644 --- a/cake/config/unicode/casefolding/2150_218f.php +++ b/cake/config/unicode/casefolding/2150_218f.php @@ -56,4 +56,3 @@ $config['2150_218f'][] = array('upper' => 8557, 'status' => 'C', 'lower' => arra $config['2150_218f'][] = array('upper' => 8558, 'status' => 'C', 'lower' => array(8574)); /* ROMAN NUMERAL FIVE HUNDRED */ $config['2150_218f'][] = array('upper' => 8559, 'status' => 'C', 'lower' => array(8575)); /* ROMAN NUMERAL ONE THOUSAND */ $config['2150_218f'][] = array('upper' => 8579, 'status' => 'C', 'lower' => array(8580)); /* ROMAN NUMERAL REVERSED ONE HUNDRED */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/2460_24ff.php b/cake/config/unicode/casefolding/2460_24ff.php index 96e935167..3b8dee7b3 100644 --- a/cake/config/unicode/casefolding/2460_24ff.php +++ b/cake/config/unicode/casefolding/2460_24ff.php @@ -65,4 +65,3 @@ $config['2460_24ff'][] = array('upper' => 9420, 'status' => 'C', 'lower' => arra $config['2460_24ff'][] = array('upper' => 9421, 'status' => 'C', 'lower' => array(9447)); /* CIRCLED LATIN CAPITAL LETTER X */ $config['2460_24ff'][] = array('upper' => 9422, 'status' => 'C', 'lower' => array(9448)); /* CIRCLED LATIN CAPITAL LETTER Y */ $config['2460_24ff'][] = array('upper' => 9423, 'status' => 'C', 'lower' => array(9449)); /* CIRCLED LATIN CAPITAL LETTER Z */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/2c00_2c5f.php b/cake/config/unicode/casefolding/2c00_2c5f.php index af2b7358d..7f80a4185 100644 --- a/cake/config/unicode/casefolding/2c00_2c5f.php +++ b/cake/config/unicode/casefolding/2c00_2c5f.php @@ -86,4 +86,3 @@ $config['2c00_2c5f'][] = array('upper' => 11307, 'status' => 'C', 'lower' => arr $config['2c00_2c5f'][] = array('upper' => 11308, 'status' => 'C', 'lower' => array(11356)); /* GLAGOLITIC CAPITAL LETTER SHTAPIC */ $config['2c00_2c5f'][] = array('upper' => 11309, 'status' => 'C', 'lower' => array(11357)); /* GLAGOLITIC CAPITAL LETTER TROKUTASTI A */ $config['2c00_2c5f'][] = array('upper' => 11310, 'status' => 'C', 'lower' => array(11358)); /* GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/2c60_2c7f.php b/cake/config/unicode/casefolding/2c60_2c7f.php index 5c5c8f91a..299cbdc0b 100644 --- a/cake/config/unicode/casefolding/2c60_2c7f.php +++ b/cake/config/unicode/casefolding/2c60_2c7f.php @@ -47,4 +47,3 @@ $config['2c60_2c7f'][] = array('upper' => 11367, 'status' => 'C', 'lower' => arr $config['2c60_2c7f'][] = array('upper' => 11369, 'status' => 'C', 'lower' => array(11370)); /* LATIN CAPITAL LETTER K WITH DESCENDER */ $config['2c60_2c7f'][] = array('upper' => 11371, 'status' => 'C', 'lower' => array(11372)); /* LATIN CAPITAL LETTER Z WITH DESCENDER */ $config['2c60_2c7f'][] = array('upper' => 11381, 'status' => 'C', 'lower' => array(11382)); /* LATIN CAPITAL LETTER HALF H */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/2c80_2cff.php b/cake/config/unicode/casefolding/2c80_2cff.php index 203e652ed..3836c6451 100644 --- a/cake/config/unicode/casefolding/2c80_2cff.php +++ b/cake/config/unicode/casefolding/2c80_2cff.php @@ -89,4 +89,3 @@ $config['2c80_2cff'][] = array('upper' => 11484, 'status' => 'C', 'lower' => arr $config['2c80_2cff'][] = array('upper' => 11486, 'status' => 'C', 'lower' => array(11487)); /* COPTIC CAPITAL LETTER OLD NUBIAN NGI */ $config['2c80_2cff'][] = array('upper' => 11488, 'status' => 'C', 'lower' => array(11489)); /* COPTIC CAPITAL LETTER OLD NUBIAN NYI */ $config['2c80_2cff'][] = array('upper' => 11490, 'status' => 'C', 'lower' => array(11491)); /* COPTIC CAPITAL LETTER OLD NUBIAN WAU */ -?> \ No newline at end of file diff --git a/cake/config/unicode/casefolding/ff00_ffef.php b/cake/config/unicode/casefolding/ff00_ffef.php index 5acf6465a..1fbb85d97 100644 --- a/cake/config/unicode/casefolding/ff00_ffef.php +++ b/cake/config/unicode/casefolding/ff00_ffef.php @@ -65,4 +65,3 @@ $config['ff00_ffef'][] = array('upper' => 65335, 'status' => 'C', 'lower' => arr $config['ff00_ffef'][] = array('upper' => 65336, 'status' => 'C', 'lower' => array(65368)); /* FULLWIDTH LATIN CAPITAL LETTER X */ $config['ff00_ffef'][] = array('upper' => 65337, 'status' => 'C', 'lower' => array(65369)); /* FULLWIDTH LATIN CAPITAL LETTER Y */ $config['ff00_ffef'][] = array('upper' => 65338, 'status' => 'C', 'lower' => array(65370)); /* FULLWIDTH LATIN CAPITAL LETTER Z */ -?> \ No newline at end of file diff --git a/cake/console/cake.php b/cake/console/cake.php index 5d8669f9e..595ed9c3a 100644 --- a/cake/console/cake.php +++ b/cake/console/cake.php @@ -659,4 +659,3 @@ class ShellDispatcher { if (!defined('DISABLE_AUTO_DISPATCH')) { $dispatcher = new ShellDispatcher($argv); } -?> \ No newline at end of file diff --git a/cake/console/error.php b/cake/console/error.php index 3d1b066a7..5494efcf6 100644 --- a/cake/console/error.php +++ b/cake/console/error.php @@ -263,4 +263,3 @@ class ErrorHandler extends Object { fwrite($this->stderr, "Error: ". $string . "\n"); } } -?> \ No newline at end of file diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php index 1db29bbdd..5ef2c73cd 100644 --- a/cake/console/libs/acl.php +++ b/cake/console/libs/acl.php @@ -599,4 +599,3 @@ class AclShell extends Shell { return $vars; } } -?> \ No newline at end of file diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php index fb7264ecc..0b2c00529 100644 --- a/cake/console/libs/api.php +++ b/cake/console/libs/api.php @@ -211,4 +211,3 @@ class ApiShell extends Shell { return $parsed; } } -?> \ No newline at end of file diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php index 05a5e020a..874957268 100644 --- a/cake/console/libs/bake.php +++ b/cake/console/libs/bake.php @@ -228,4 +228,3 @@ class BakeShell extends Shell { } } -?> \ No newline at end of file diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php index 21044c8b3..41e4d4634 100644 --- a/cake/console/libs/console.php +++ b/cake/console/libs/console.php @@ -359,4 +359,3 @@ class ConsoleShell extends Shell { return true; } } -?> \ No newline at end of file diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php index 0b49c6492..ad41ec148 100644 --- a/cake/console/libs/i18n.php +++ b/cake/console/libs/i18n.php @@ -126,4 +126,3 @@ class I18nShell extends Shell { $this->Extract->help(); } } -?> \ No newline at end of file diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php index e83585417..3629f59ad 100644 --- a/cake/console/libs/schema.php +++ b/cake/console/libs/schema.php @@ -501,4 +501,3 @@ TEXT; $this->_stop(); } } -?> \ No newline at end of file diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php index 1d615fcca..b736a64d7 100644 --- a/cake/console/libs/shell.php +++ b/cake/console/libs/shell.php @@ -645,4 +645,3 @@ class Shell extends Object { return App::pluginPath($pluginName); } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/bake.php b/cake/console/libs/tasks/bake.php index db0aa0aca..8394bb531 100644 --- a/cake/console/libs/tasks/bake.php +++ b/cake/console/libs/tasks/bake.php @@ -57,4 +57,4 @@ class BakeTask extends Shell { } return $path; } -} \ No newline at end of file +} diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php index fb9a4bed5..62bcb7660 100644 --- a/cake/console/libs/tasks/controller.php +++ b/cake/console/libs/tasks/controller.php @@ -478,4 +478,3 @@ class ControllerTask extends BakeTask { $this->_stop(); } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php index 00ad98fcf..df86d19f2 100644 --- a/cake/console/libs/tasks/db_config.php +++ b/cake/console/libs/tasks/db_config.php @@ -366,4 +366,3 @@ class DbConfigTask extends Shell { return $useDbConfig; } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php index f2a1275d8..8ce1be068 100644 --- a/cake/console/libs/tasks/extract.php +++ b/cake/console/libs/tasks/extract.php @@ -492,4 +492,3 @@ class ExtractTask extends Shell { } } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php index 8073cdfd9..48e2be8a4 100644 --- a/cake/console/libs/tasks/fixture.php +++ b/cake/console/libs/tasks/fixture.php @@ -420,4 +420,3 @@ class FixtureTask extends BakeTask { $this->_stop(); } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php index 7a8115831..6e54f0808 100644 --- a/cake/console/libs/tasks/model.php +++ b/cake/console/libs/tasks/model.php @@ -928,4 +928,3 @@ class ModelTask extends BakeTask { $this->Fixture->bake($className, $useTable); } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php index 5ea1caa55..94d9e261c 100644 --- a/cake/console/libs/tasks/plugin.php +++ b/cake/console/libs/tasks/plugin.php @@ -245,4 +245,3 @@ class PluginTask extends Shell { $this->_stop(); } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php index 2c6e701d2..7266dc0a2 100644 --- a/cake/console/libs/tasks/project.php +++ b/cake/console/libs/tasks/project.php @@ -369,4 +369,3 @@ class ProjectTask extends Shell { } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/template.php b/cake/console/libs/tasks/template.php index 72b2c7d17..5f3f3a5fb 100644 --- a/cake/console/libs/tasks/template.php +++ b/cake/console/libs/tasks/template.php @@ -209,4 +209,3 @@ class TemplateTask extends Shell { return false; } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php index 0b392391a..d90a1eb4a 100644 --- a/cake/console/libs/tasks/test.php +++ b/cake/console/libs/tasks/test.php @@ -454,4 +454,3 @@ class TestTask extends BakeTask { $this->_stop(); } } -?> \ No newline at end of file diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php index 221cc7bb4..2ebffc733 100644 --- a/cake/console/libs/tasks/view.php +++ b/cake/console/libs/tasks/view.php @@ -486,4 +486,3 @@ class ViewTask extends BakeTask { return $associations; } } -?> \ No newline at end of file diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php index 6dbd47cb4..16d5cd59e 100644 --- a/cake/console/libs/testsuite.php +++ b/cake/console/libs/testsuite.php @@ -368,4 +368,3 @@ class TestSuiteShell extends Shell { } } } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/app_controller.php b/cake/console/templates/skel/app_controller.php index 96fa35767..a1f50257d 100644 --- a/cake/console/templates/skel/app_controller.php +++ b/cake/console/templates/skel/app_controller.php @@ -32,4 +32,3 @@ */ class AppController extends Controller { } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/app_helper.php b/cake/console/templates/skel/app_helper.php index 2b84e1155..9eb974e9e 100644 --- a/cake/console/templates/skel/app_helper.php +++ b/cake/console/templates/skel/app_helper.php @@ -34,4 +34,3 @@ App::import('Helper', 'Helper', false); */ class AppHelper extends Helper { } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/app_model.php b/cake/console/templates/skel/app_model.php index 7834788fc..ab5113bf5 100644 --- a/cake/console/templates/skel/app_model.php +++ b/cake/console/templates/skel/app_model.php @@ -32,4 +32,3 @@ */ class AppModel extends Model { } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/config/bootstrap.php b/cake/console/templates/skel/config/bootstrap.php index 861972966..ab3f8c558 100644 --- a/cake/console/templates/skel/config/bootstrap.php +++ b/cake/console/templates/skel/config/bootstrap.php @@ -48,4 +48,3 @@ * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array())); * */ -?> \ No newline at end of file diff --git a/cake/console/templates/skel/config/core.php b/cake/console/templates/skel/config/core.php index 017dd9413..f424e218b 100644 --- a/cake/console/templates/skel/config/core.php +++ b/cake/console/templates/skel/config/core.php @@ -300,4 +300,3 @@ * */ Cache::config('default', array('engine' => 'File')); -?> \ No newline at end of file diff --git a/cake/console/templates/skel/config/database.php.default b/cake/console/templates/skel/config/database.php.default index 8549025a6..043ba5ccc 100644 --- a/cake/console/templates/skel/config/database.php.default +++ b/cake/console/templates/skel/config/database.php.default @@ -93,4 +93,3 @@ class DATABASE_CONFIG { 'prefix' => '', ); } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/config/routes.php b/cake/console/templates/skel/config/routes.php index eab4fde1a..696c49a87 100644 --- a/cake/console/templates/skel/config/routes.php +++ b/cake/console/templates/skel/config/routes.php @@ -33,4 +33,3 @@ * ...and connect the rest of 'Pages' controller's urls. */ Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display')); -?> \ No newline at end of file diff --git a/cake/console/templates/skel/config/schema/db_acl.php b/cake/console/templates/skel/config/schema/db_acl.php index bfc59467b..33e49eabd 100644 --- a/cake/console/templates/skel/config/schema/db_acl.php +++ b/cake/console/templates/skel/config/schema/db_acl.php @@ -73,4 +73,3 @@ class DbAclSchema extends CakeSchema { ); } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/config/schema/i18n.php b/cake/console/templates/skel/config/schema/i18n.php index a9fab64a4..52b6e3bd5 100644 --- a/cake/console/templates/skel/config/schema/i18n.php +++ b/cake/console/templates/skel/config/schema/i18n.php @@ -50,4 +50,3 @@ class i18nSchema extends CakeSchema { ); } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/config/schema/sessions.php b/cake/console/templates/skel/config/schema/sessions.php index 7cb1e5470..4f540cfe8 100644 --- a/cake/console/templates/skel/config/schema/sessions.php +++ b/cake/console/templates/skel/config/schema/sessions.php @@ -47,4 +47,3 @@ class SessionsSchema extends CakeSchema { ); } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/controllers/pages_controller.php b/cake/console/templates/skel/controllers/pages_controller.php index bbff1ca8f..28cd78838 100644 --- a/cake/console/templates/skel/controllers/pages_controller.php +++ b/cake/console/templates/skel/controllers/pages_controller.php @@ -82,5 +82,3 @@ class PagesController extends AppController { $this->render(implode('/', $path)); } } - -?> \ No newline at end of file diff --git a/cake/console/templates/skel/index.php b/cake/console/templates/skel/index.php index 11438c33b..d812c3fce 100644 --- a/cake/console/templates/skel/index.php +++ b/cake/console/templates/skel/index.php @@ -16,4 +16,3 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ require 'webroot' . DIRECTORY_SEPARATOR . 'index.php'; -?> \ No newline at end of file diff --git a/cake/console/templates/skel/webroot/css.php b/cake/console/templates/skel/webroot/css.php index a141a965b..464f20987 100644 --- a/cake/console/templates/skel/webroot/css.php +++ b/cake/console/templates/skel/webroot/css.php @@ -95,4 +95,3 @@ if (!class_exists('File')) { header("Cache-Control: max-age=86400, must-revalidate"); // HTTP/1.1 header("Pragma: cache"); // HTTP/1.0 print $output; -?> \ No newline at end of file diff --git a/cake/console/templates/skel/webroot/index.php b/cake/console/templates/skel/webroot/index.php index 0522c8281..74a356664 100644 --- a/cake/console/templates/skel/webroot/index.php +++ b/cake/console/templates/skel/webroot/index.php @@ -85,4 +85,3 @@ if (Configure::read() > 0) { echo ""; } -?> \ No newline at end of file diff --git a/cake/console/templates/skel/webroot/test.php b/cake/console/templates/skel/webroot/test.php index 2e0aacb49..07ce4a3f7 100644 --- a/cake/console/templates/skel/webroot/test.php +++ b/cake/console/templates/skel/webroot/test.php @@ -92,5 +92,3 @@ require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php'; $Dispatcher = new CakeTestSuiteDispatcher(); $Dispatcher->dispatch(); - -?> \ No newline at end of file diff --git a/cake/dispatcher.php b/cake/dispatcher.php index ad93d275a..7ff7f5459 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -654,6 +654,4 @@ class Dispatcher extends Object { ob_end_flush(); } } - } -?> \ No newline at end of file diff --git a/cake/libs/cache.php b/cake/libs/cache.php index a0c448d4d..01acb220d 100644 --- a/cake/libs/cache.php +++ b/cake/libs/cache.php @@ -673,4 +673,3 @@ class CacheEngine { return $key; } } -?> \ No newline at end of file diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php index 3a86e099b..92a458d22 100644 --- a/cake/libs/cache/apc.php +++ b/cake/libs/cache/apc.php @@ -121,4 +121,3 @@ class ApcEngine extends CacheEngine { return apc_clear_cache('user'); } } -?> \ No newline at end of file diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php index 31dd70a5d..e8e8ffdad 100644 --- a/cake/libs/cache/file.php +++ b/cake/libs/cache/file.php @@ -265,4 +265,3 @@ class FileEngine extends CacheEngine { return true; } } -?> \ No newline at end of file diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php index 013ef2759..4209d891c 100644 --- a/cake/libs/cache/memcache.php +++ b/cake/libs/cache/memcache.php @@ -196,4 +196,3 @@ class MemcacheEngine extends CacheEngine { return true; } } -?> \ No newline at end of file diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php index f30531724..db93b8dfd 100644 --- a/cake/libs/cache/xcache.php +++ b/cake/libs/cache/xcache.php @@ -181,4 +181,3 @@ class XcacheEngine extends CacheEngine { } } } -?> \ No newline at end of file diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php index 218ce1556..f05f86490 100644 --- a/cake/libs/cake_log.php +++ b/cake/libs/cake_log.php @@ -289,4 +289,3 @@ class CakeLog { if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) { set_error_handler(array('CakeLog', 'handleError')); } -?> \ No newline at end of file diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index f3875b344..46c2441e9 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -804,4 +804,3 @@ class CakeSession extends Object { return $return; } } -?> \ No newline at end of file diff --git a/cake/libs/cake_socket.php b/cake/libs/cake_socket.php index 0b9394922..e55eb8004 100644 --- a/cake/libs/cake_socket.php +++ b/cake/libs/cake_socket.php @@ -302,4 +302,3 @@ class CakeSocket extends Object { return true; } } -?> \ No newline at end of file diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php index e0eff1832..60d9b4b1d 100644 --- a/cake/libs/class_registry.php +++ b/cake/libs/class_registry.php @@ -362,4 +362,3 @@ class ClassRegistry { $_this->__map = array(); } } -?> \ No newline at end of file diff --git a/cake/libs/configure.php b/cake/libs/configure.php index d42e0eafa..96e3f752a 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -1288,4 +1288,3 @@ class App extends Object { } } } -?> \ No newline at end of file diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php index 5abaac2ad..e2a8302c5 100644 --- a/cake/libs/controller/app_controller.php +++ b/cake/libs/controller/app_controller.php @@ -34,4 +34,3 @@ */ class AppController extends Controller { } -?> \ No newline at end of file diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php index 4df0b1257..75d55f108 100644 --- a/cake/libs/controller/component.php +++ b/cake/libs/controller/component.php @@ -261,5 +261,3 @@ class Component extends Object { } } } - -?> \ No newline at end of file diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php index 7f992ddb0..2e5407739 100644 --- a/cake/libs/controller/components/acl.php +++ b/cake/libs/controller/components/acl.php @@ -636,4 +636,3 @@ class IniAcl extends AclBase { return $array; } } -?> \ No newline at end of file diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php index fe468770c..153172542 100644 --- a/cake/libs/controller/components/auth.php +++ b/cake/libs/controller/components/auth.php @@ -958,4 +958,3 @@ class AuthComponent extends Object { } } } -?> \ No newline at end of file diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php index 6edfb298e..f5ec59f36 100644 --- a/cake/libs/controller/components/cookie.php +++ b/cake/libs/controller/components/cookie.php @@ -469,4 +469,3 @@ class CookieComponent extends Object { return $array; } } -?> \ No newline at end of file diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index 19d7fc379..94ef82a3b 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -927,6 +927,4 @@ class EmailComponent extends Object{ } return $fm; } - } -?> \ No newline at end of file diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php index 586751676..1748c787d 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/cake/libs/controller/components/request_handler.php @@ -815,5 +815,3 @@ class RequestHandlerComponent extends Object { $this->__typesInitialized = true; } } - -?> \ No newline at end of file diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php index b206b0a0e..b92a67dbf 100644 --- a/cake/libs/controller/components/security.php +++ b/cake/libs/controller/components/security.php @@ -744,4 +744,3 @@ class SecurityComponent extends Object { } } } -?> \ No newline at end of file diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php index 3027c1441..60af59b38 100644 --- a/cake/libs/controller/components/session.php +++ b/cake/libs/controller/components/session.php @@ -293,5 +293,3 @@ class SessionComponent extends CakeSession { return $this->started(); } } - -?> \ No newline at end of file diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index f4b5735e3..f3295f33a 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -1320,4 +1320,3 @@ class Controller extends Object { return false; } } -?> \ No newline at end of file diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php index d22e1bb9a..6dcc2a3ec 100644 --- a/cake/libs/controller/pages_controller.php +++ b/cake/libs/controller/pages_controller.php @@ -83,5 +83,3 @@ class PagesController extends AppController { $this->render(implode('/', $path)); } } - -?> \ No newline at end of file diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index 448043712..f75237e16 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -605,4 +605,3 @@ class ScaffoldView extends ThemeView { return $this->_missingView($paths[0] . $name . $this->ext, 'missingView'); } } -?> \ No newline at end of file diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php index e19b5ed66..b28a488c4 100644 --- a/cake/libs/debugger.php +++ b/cake/libs/debugger.php @@ -706,5 +706,3 @@ class Debugger extends Object { if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) { Debugger::invoke(Debugger::getInstance()); } - -?> \ No newline at end of file diff --git a/cake/libs/error.php b/cake/libs/error.php index a56489b57..45c043bf4 100644 --- a/cake/libs/error.php +++ b/cake/libs/error.php @@ -459,4 +459,3 @@ class ErrorHandler extends Object { echo $this->controller->output; } } -?> \ No newline at end of file diff --git a/cake/libs/file.php b/cake/libs/file.php index 1ff463fd2..2d41d7202 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -543,4 +543,3 @@ class File extends Object { return copy($this->path, $dest); } } -?> \ No newline at end of file diff --git a/cake/libs/folder.php b/cake/libs/folder.php index 523d1928d..0f96f7dbd 100644 --- a/cake/libs/folder.php +++ b/cake/libs/folder.php @@ -784,4 +784,3 @@ class Folder extends Object { return $lastChar === '/' || $lastChar === '\\'; } } -?> \ No newline at end of file diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php index 16ea7af77..a5c24c9fc 100644 --- a/cake/libs/http_socket.php +++ b/cake/libs/http_socket.php @@ -1059,4 +1059,3 @@ class HttpSocket extends CakeSocket { return true; } } -?> \ No newline at end of file diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php index 37abc0061..63f0c80f8 100644 --- a/cake/libs/i18n.php +++ b/cake/libs/i18n.php @@ -573,4 +573,3 @@ class I18n extends Object { } } } -?> \ No newline at end of file diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php index 95ca9f945..83590ace9 100644 --- a/cake/libs/inflector.php +++ b/cake/libs/inflector.php @@ -621,4 +621,3 @@ class Inflector { return preg_replace(array_keys($map), array_values($map), $string); } } -?> \ No newline at end of file diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php index 534009f7a..97af9ef15 100644 --- a/cake/libs/l10n.php +++ b/cake/libs/l10n.php @@ -484,4 +484,3 @@ class L10n extends Object { return $this->__l10nCatalog; } } -?> \ No newline at end of file diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php index b5d2bec1c..5d42ddf67 100644 --- a/cake/libs/log/file_log.php +++ b/cake/libs/log/file_log.php @@ -74,4 +74,4 @@ class FileLog { return $log->append($output); } } -} \ No newline at end of file +} diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php index dd37d4d31..0c94426fd 100644 --- a/cake/libs/magic_db.php +++ b/cake/libs/magic_db.php @@ -300,5 +300,3 @@ class MagicFileResource extends Object{ } } } - -?> \ No newline at end of file diff --git a/cake/libs/model/app_model.php b/cake/libs/model/app_model.php index 43d2e0ed1..83b944b83 100644 --- a/cake/libs/model/app_model.php +++ b/cake/libs/model/app_model.php @@ -33,4 +33,3 @@ */ class AppModel extends Model { } -?> \ No newline at end of file diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php index 94f8025e6..e1413916e 100644 --- a/cake/libs/model/behaviors/acl.php +++ b/cake/libs/model/behaviors/acl.php @@ -120,5 +120,3 @@ class AclBehavior extends ModelBehavior { } } } - -?> \ No newline at end of file diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php index c3a5da7fa..138f290d0 100644 --- a/cake/libs/model/behaviors/containable.php +++ b/cake/libs/model/behaviors/containable.php @@ -451,4 +451,3 @@ class ContainableBehavior extends ModelBehavior { return $map; } } -?> \ No newline at end of file diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php index 8b79938a0..53fba8386 100644 --- a/cake/libs/model/behaviors/translate.php +++ b/cake/libs/model/behaviors/translate.php @@ -523,4 +523,3 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { var $displayField = 'field'; } } -?> \ No newline at end of file diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php index 77ebf0889..5a500975b 100644 --- a/cake/libs/model/behaviors/tree.php +++ b/cake/libs/model/behaviors/tree.php @@ -972,4 +972,3 @@ class TreeBehavior extends ModelBehavior { $Model->recursive = $ModelRecursive; } } -?> \ No newline at end of file diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php index 3314548be..adee3df01 100644 --- a/cake/libs/model/cake_schema.php +++ b/cake/libs/model/cake_schema.php @@ -639,4 +639,3 @@ class CakeSchema extends Object { return array_filter(compact('add', 'drop')); } } -?> \ No newline at end of file diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php index 50cfd24da..af3365be3 100644 --- a/cake/libs/model/connection_manager.php +++ b/cake/libs/model/connection_manager.php @@ -290,4 +290,3 @@ class ConnectionManager extends Object { } } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php index eef8a4283..ab45610b1 100644 --- a/cake/libs/model/datasources/datasource.php +++ b/cake/libs/model/datasources/datasource.php @@ -594,4 +594,3 @@ class DataSource extends Object { } } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php index 273d4364c..8ea2e613d 100644 --- a/cake/libs/model/datasources/dbo/dbo_mssql.php +++ b/cake/libs/model/datasources/dbo/dbo_mssql.php @@ -786,4 +786,3 @@ class DboMssql extends DboSource { return null; } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index c8a882556..8648b0a2b 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -782,4 +782,3 @@ class DboMysql extends DboMysqlBase { return false; } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php index 8d5609b86..d42b10eda 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysqli.php +++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php @@ -336,4 +336,3 @@ class DboMysqli extends DboMysqlBase { return is_object($this->_result); } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php index 1e078ccee..9c78d4f75 100644 --- a/cake/libs/model/datasources/dbo/dbo_oracle.php +++ b/cake/libs/model/datasources/dbo/dbo_oracle.php @@ -1157,4 +1157,3 @@ class DboOracle extends DboSource { return $out; } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php index 8ed4cefbc..49dd42cc8 100644 --- a/cake/libs/model/datasources/dbo/dbo_postgres.php +++ b/cake/libs/model/datasources/dbo/dbo_postgres.php @@ -972,4 +972,3 @@ class DboPostgres extends DboSource { } } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php index 6d267060f..1fdba32a8 100644 --- a/cake/libs/model/datasources/dbo/dbo_sqlite.php +++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php @@ -621,4 +621,3 @@ class DboSqlite extends DboSource { } } } -?> \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 42799b1ca..40a74736e 100755 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -2902,4 +2902,3 @@ class DboSource extends DataSource { return 'string'; } } -?> \ No newline at end of file diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php index a497c1da4..5dba318f8 100644 --- a/cake/libs/model/db_acl.php +++ b/cake/libs/model/db_acl.php @@ -330,4 +330,3 @@ class Permission extends AppModel { parent::__construct(); } } -?> \ No newline at end of file diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 9ba54f9bd..6b759ee66 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -3032,4 +3032,3 @@ class Model extends Overloadable { if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { Overloadable::overload('Model'); } -?> \ No newline at end of file diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php index 51273ba62..deb397c75 100644 --- a/cake/libs/model/model_behavior.php +++ b/cake/libs/model/model_behavior.php @@ -531,4 +531,3 @@ class BehaviorCollection extends Object { return $this->_attached; } } -?> \ No newline at end of file diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php index 261960760..71a4ca6ca 100644 --- a/cake/libs/multibyte.php +++ b/cake/libs/multibyte.php @@ -1170,4 +1170,3 @@ class Multibyte extends Object { return false; } } -?> \ No newline at end of file diff --git a/cake/libs/object.php b/cake/libs/object.php index f8034a5aa..8fcb3cf05 100644 --- a/cake/libs/object.php +++ b/cake/libs/object.php @@ -296,4 +296,3 @@ class Object { } } } -?> \ No newline at end of file diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php index 28c244ca1..2d2eea290 100644 --- a/cake/libs/overloadable.php +++ b/cake/libs/overloadable.php @@ -34,4 +34,3 @@ if (!PHP5) { } else { require(LIBS . 'overloadable_php5.php'); } -?> \ No newline at end of file diff --git a/cake/libs/overloadable_php4.php b/cake/libs/overloadable_php4.php index 516f7aa6a..894265ca9 100644 --- a/cake/libs/overloadable_php4.php +++ b/cake/libs/overloadable_php4.php @@ -163,5 +163,3 @@ class Overloadable2 extends Object { } } Overloadable::overload('Overloadable2'); - -?> \ No newline at end of file diff --git a/cake/libs/overloadable_php5.php b/cake/libs/overloadable_php5.php index 6a768ac0b..ed27493b9 100644 --- a/cake/libs/overloadable_php5.php +++ b/cake/libs/overloadable_php5.php @@ -106,4 +106,3 @@ class Overloadable2 extends Object { return $this->set__($name, $value); } } -?> \ No newline at end of file diff --git a/cake/libs/router.php b/cake/libs/router.php index 5f6dccadb..7db844236 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -1630,5 +1630,3 @@ class PluginShortRoute extends CakeRoute { return $result; } } - -?> \ No newline at end of file diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php index 5bec53391..3878ac512 100644 --- a/cake/libs/sanitize.php +++ b/cake/libs/sanitize.php @@ -346,4 +346,3 @@ class Sanitize { } } } -?> \ No newline at end of file diff --git a/cake/libs/security.php b/cake/libs/security.php index 53a5e519b..b7c5f520b 100644 --- a/cake/libs/security.php +++ b/cake/libs/security.php @@ -189,4 +189,3 @@ class Security extends Object { return $out; } } -?> \ No newline at end of file diff --git a/cake/libs/set.php b/cake/libs/set.php index 995f28f5b..9b90a5951 100644 --- a/cake/libs/set.php +++ b/cake/libs/set.php @@ -1150,4 +1150,3 @@ class Set { return $result; } } -?> \ No newline at end of file diff --git a/cake/libs/string.php b/cake/libs/string.php index 119267e78..2e7648583 100644 --- a/cake/libs/string.php +++ b/cake/libs/string.php @@ -326,4 +326,3 @@ class String { return $str; } } -?> \ No newline at end of file diff --git a/cake/libs/validation.php b/cake/libs/validation.php index 516945103..10d2db5d6 100644 --- a/cake/libs/validation.php +++ b/cake/libs/validation.php @@ -1058,4 +1058,3 @@ class Validation extends Object { $this->errors = array(); } } -?> \ No newline at end of file diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index bb1e80429..376d47335 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -890,4 +890,3 @@ class Helper extends Overloadable { $this->__cleaned = str_replace(array("&", "<", ">"), array("&amp;", "&lt;", "&gt;"), $this->__cleaned); } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php index 73c105e69..e2cba1277 100644 --- a/cake/libs/view/helpers/ajax.php +++ b/cake/libs/view/helpers/ajax.php @@ -1034,4 +1034,3 @@ class AjaxHelper extends AppHelper { } } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php index 350313daa..57064f72d 100644 --- a/cake/libs/view/helpers/app_helper.php +++ b/cake/libs/view/helpers/app_helper.php @@ -34,4 +34,3 @@ App::import('View', 'Helper', false); */ class AppHelper extends Helper { } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php index a4d579cd5..adea15cc5 100644 --- a/cake/libs/view/helpers/cache.php +++ b/cake/libs/view/helpers/cache.php @@ -259,4 +259,3 @@ class CacheHelper extends AppHelper { return cache('views' . DS . $cache, $file, $timestamp); } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index ef643eba7..82f3defed 100755 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -2178,5 +2178,3 @@ class FormHelper extends AppHelper { return $result; } } - -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php index 6663abc72..e5658ccd2 100644 --- a/cake/libs/view/helpers/html.php +++ b/cake/libs/view/helpers/html.php @@ -833,4 +833,3 @@ class HtmlHelper extends AppHelper { return $out; } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php index f1269367d..46e8ddd4f 100644 --- a/cake/libs/view/helpers/javascript.php +++ b/cake/libs/view/helpers/javascript.php @@ -719,5 +719,3 @@ class JavascriptHelper extends AppHelper { echo $this->writeEvents(true); } } - -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/jquery_engine.php b/cake/libs/view/helpers/jquery_engine.php index ea14fb8f1..d6da872e3 100644 --- a/cake/libs/view/helpers/jquery_engine.php +++ b/cake/libs/view/helpers/jquery_engine.php @@ -358,4 +358,3 @@ class JqueryEngineHelper extends JsBaseEngineHelper { return $selector . $method; } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php index a9c660e08..546792c68 100644 --- a/cake/libs/view/helpers/js.php +++ b/cake/libs/view/helpers/js.php @@ -1126,4 +1126,3 @@ class JsBaseEngineHelper extends AppHelper { return $out; } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/mootools_engine.php b/cake/libs/view/helpers/mootools_engine.php index 4a67cc98b..5cccfbaf5 100644 --- a/cake/libs/view/helpers/mootools_engine.php +++ b/cake/libs/view/helpers/mootools_engine.php @@ -372,4 +372,3 @@ class MootoolsEngineHelper extends JsBaseEngineHelper { return $selection . $method; } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php index a8f1682ba..da8a565a6 100644 --- a/cake/libs/view/helpers/number.php +++ b/cake/libs/view/helpers/number.php @@ -255,4 +255,3 @@ class NumberHelper extends AppHelper { } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php index acae55ae2..3fee720e4 100644 --- a/cake/libs/view/helpers/paginator.php +++ b/cake/libs/view/helpers/paginator.php @@ -814,4 +814,3 @@ class PaginatorHelper extends AppHelper { return $out; } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/prototype_engine.php b/cake/libs/view/helpers/prototype_engine.php index b838afaca..8840f52a0 100644 --- a/cake/libs/view/helpers/prototype_engine.php +++ b/cake/libs/view/helpers/prototype_engine.php @@ -363,4 +363,3 @@ class PrototypeEngineHelper extends JsBaseEngineHelper { return $selection . $method; } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php index 4f4a3719c..9abe3aeef 100644 --- a/cake/libs/view/helpers/rss.php +++ b/cake/libs/view/helpers/rss.php @@ -288,4 +288,3 @@ class RssHelper extends XmlHelper { return $this->Time->toRSS($time); } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php index 3984f5a85..4db0cc205 100644 --- a/cake/libs/view/helpers/session.php +++ b/cake/libs/view/helpers/session.php @@ -199,4 +199,3 @@ class SessionHelper extends CakeSession { return true; } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php index 16294fa3f..046ce7080 100644 --- a/cake/libs/view/helpers/text.php +++ b/cake/libs/view/helpers/text.php @@ -334,4 +334,3 @@ class TextHelper extends AppHelper { } } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php index 7e0c2b872..0e04c6338 100644 --- a/cake/libs/view/helpers/time.php +++ b/cake/libs/view/helpers/time.php @@ -733,4 +733,3 @@ class TimeHelper extends AppHelper { return strftime($format, $date); } } -?> \ No newline at end of file diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php index b6d4f28a1..d4d824238 100644 --- a/cake/libs/view/helpers/xml.php +++ b/cake/libs/view/helpers/xml.php @@ -172,4 +172,3 @@ class XmlHelper extends AppHelper { return $data->toString($options + array('header' => false)); } } -?> \ No newline at end of file diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php index 93c394a38..c8bb613a7 100644 --- a/cake/libs/view/media.php +++ b/cake/libs/view/media.php @@ -283,4 +283,3 @@ class MediaView extends View { @ob_flush(); } } -?> \ No newline at end of file diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php index 5bda2f720..f161e2685 100644 --- a/cake/libs/view/theme.php +++ b/cake/libs/view/theme.php @@ -71,4 +71,3 @@ class ThemeView extends View { return $paths; } } -?> \ No newline at end of file diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php index 1d80636b5..f5f42067f 100644 --- a/cake/libs/view/view.php +++ b/cake/libs/view/view.php @@ -968,5 +968,3 @@ class View extends Object { return $this->__paths; } } - -?> \ No newline at end of file diff --git a/cake/libs/xml.php b/cake/libs/xml.php index c61cfa0c0..8d5842e1b 100644 --- a/cake/libs/xml.php +++ b/cake/libs/xml.php @@ -1464,4 +1464,3 @@ class XmlManager { return $instance[0]; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php index 1afbe8ae6..f84996ce9 100644 --- a/cake/tests/cases/basics.test.php +++ b/cake/tests/cases/basics.test.php @@ -808,4 +808,3 @@ class BasicsTest extends CakeTestCase { $this->assertEqual($result, array('Blog', 'Post')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php index eb7985e75..beb020e2a 100644 --- a/cake/tests/cases/console/cake.test.php +++ b/cake/tests/cases/console/cake.test.php @@ -937,4 +937,3 @@ class ShellDispatcherTest extends CakeTestCase { $this->assertPattern($expected, $Dispatcher->stdout); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/acl.test.php b/cake/tests/cases/console/libs/acl.test.php index 02aba2c7a..a7dd1b321 100644 --- a/cake/tests/cases/console/libs/acl.test.php +++ b/cake/tests/cases/console/libs/acl.test.php @@ -344,4 +344,3 @@ class AclShellTest extends CakeTestCase { $this->assertEqual($this->Task->Dispatch->args, array('schema', 'create', 'DbAcl')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/api.test.php b/cake/tests/cases/console/libs/api.test.php index 7433245e7..c290ac3e8 100644 --- a/cake/tests/cases/console/libs/api.test.php +++ b/cake/tests/cases/console/libs/api.test.php @@ -114,4 +114,3 @@ class ApiShellTest extends CakeTestCase { $this->Shell->main(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/bake.test.php b/cake/tests/cases/console/libs/bake.test.php index 37a86b259..6e69d5710 100644 --- a/cake/tests/cases/console/libs/bake.test.php +++ b/cake/tests/cases/console/libs/bake.test.php @@ -128,4 +128,3 @@ class BakeShellTestCase extends CakeTestCase { $this->Shell->all(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/schema.test.php b/cake/tests/cases/console/libs/schema.test.php index 78ed58839..83bd25906 100644 --- a/cake/tests/cases/console/libs/schema.test.php +++ b/cake/tests/cases/console/libs/schema.test.php @@ -500,4 +500,3 @@ class SchemaShellTest extends CakeTestCase { App::build(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php index e728ff38d..6ed6dc1e1 100644 --- a/cake/tests/cases/console/libs/shell.test.php +++ b/cake/tests/cases/console/libs/shell.test.php @@ -499,4 +499,3 @@ class ShellTest extends CakeTestCase { $Folder->delete(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/controller.test.php b/cake/tests/cases/console/libs/tasks/controller.test.php index afd575038..0fbc888ff 100644 --- a/cake/tests/cases/console/libs/tasks/controller.test.php +++ b/cake/tests/cases/console/libs/tasks/controller.test.php @@ -629,4 +629,3 @@ class ControllerTaskTest extends CakeTestCase { $this->Task->execute(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/db_config.test.php b/cake/tests/cases/console/libs/tasks/db_config.test.php index 0297e7adc..effa7d469 100644 --- a/cake/tests/cases/console/libs/tasks/db_config.test.php +++ b/cake/tests/cases/console/libs/tasks/db_config.test.php @@ -153,4 +153,3 @@ class DbConfigTaskTest extends CakeTestCase { $result = $this->Task->execute(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/extract.test.php b/cake/tests/cases/console/libs/tasks/extract.test.php index bbef0da97..29c4f2bd8 100644 --- a/cake/tests/cases/console/libs/tasks/extract.test.php +++ b/cake/tests/cases/console/libs/tasks/extract.test.php @@ -156,4 +156,3 @@ class ExtractTaskTest extends CakeTestCase { $Folder->delete(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/fixture.test.php b/cake/tests/cases/console/libs/tasks/fixture.test.php index 06698ab80..7c8c03183 100644 --- a/cake/tests/cases/console/libs/tasks/fixture.test.php +++ b/cake/tests/cases/console/libs/tasks/fixture.test.php @@ -351,4 +351,3 @@ class FixtureTaskTest extends CakeTestCase { $result = $this->Task->generateFixtureFile('Article', array()); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php index e8d7acf64..a343e28a8 100644 --- a/cake/tests/cases/console/libs/tasks/model.test.php +++ b/cake/tests/cases/console/libs/tasks/model.test.php @@ -908,4 +908,3 @@ STRINGEND; $this->Task->execute(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/plugin.test.php b/cake/tests/cases/console/libs/tasks/plugin.test.php index 29521bb38..c7718f9c0 100644 --- a/cake/tests/cases/console/libs/tasks/plugin.test.php +++ b/cake/tests/cases/console/libs/tasks/plugin.test.php @@ -261,4 +261,3 @@ class PluginTaskTest extends CakeTestCase { $Folder->delete(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/project.test.php b/cake/tests/cases/console/libs/tasks/project.test.php index 781aaa493..62a55febc 100644 --- a/cake/tests/cases/console/libs/tasks/project.test.php +++ b/cake/tests/cases/console/libs/tasks/project.test.php @@ -299,4 +299,3 @@ class ProjectTaskTest extends CakeTestCase { $this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/template.test.php b/cake/tests/cases/console/libs/tasks/template.test.php index cc3d87950..1eb7be79d 100644 --- a/cake/tests/cases/console/libs/tasks/template.test.php +++ b/cake/tests/cases/console/libs/tasks/template.test.php @@ -181,4 +181,3 @@ class TemplateTaskTest extends CakeTestCase { $this->assertPattern('/ArticleFixture extends CakeTestFixture/', $result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php index d25de3fbc..e660cdea8 100644 --- a/cake/tests/cases/console/libs/tasks/test.test.php +++ b/cake/tests/cases/console/libs/tasks/test.test.php @@ -623,4 +623,3 @@ class TestTaskTest extends CakeTestCase { $this->Task->execute(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/console/libs/tasks/view.test.php b/cake/tests/cases/console/libs/tasks/view.test.php index b5d0457d3..12f9d79d7 100644 --- a/cake/tests/cases/console/libs/tasks/view.test.php +++ b/cake/tests/cases/console/libs/tasks/view.test.php @@ -662,4 +662,3 @@ class ViewTaskTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php index 5b159ca6a..a7256b16a 100644 --- a/cake/tests/cases/dispatcher.test.php +++ b/cake/tests/cases/dispatcher.test.php @@ -2482,4 +2482,3 @@ class DispatcherTest extends CakeTestCase { return $filename; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php index d66d3a7a0..3d3c07c0d 100644 --- a/cake/tests/cases/libs/cache.test.php +++ b/cake/tests/cases/libs/cache.test.php @@ -369,4 +369,3 @@ class CacheTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php index b15ff2f10..2cca1be97 100644 --- a/cake/tests/cases/libs/cache/apc.test.php +++ b/cake/tests/cases/libs/cache/apc.test.php @@ -194,4 +194,3 @@ class ApcEngineTest extends CakeTestCase { $this->assertEqual(8, $result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php index 16a7bc705..3641b1c29 100644 --- a/cake/tests/cases/libs/cache/file.test.php +++ b/cake/tests/cases/libs/cache/file.test.php @@ -374,4 +374,3 @@ class FileEngineTest extends CakeTestCase { Cache::drop('failure'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php index 5b7c6bd35..d817cd0e4 100644 --- a/cake/tests/cases/libs/cache/memcache.test.php +++ b/cake/tests/cases/libs/cache/memcache.test.php @@ -307,4 +307,3 @@ class MemcacheEngineTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php index a056f4ebb..22b280ecb 100644 --- a/cake/tests/cases/libs/cache/xcache.test.php +++ b/cake/tests/cases/libs/cache/xcache.test.php @@ -220,4 +220,3 @@ class XcacheEngineTest extends UnitTestCase { $this->assertEqual(8, $result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php index 115a468a6..e767db7b9 100644 --- a/cake/tests/cases/libs/cake_log.test.php +++ b/cake/tests/cases/libs/cake_log.test.php @@ -181,4 +181,3 @@ class CakeLogTest extends CakeTestCase { @unlink(LOGS . 'debug.log'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php index ed57729cd..16712136c 100644 --- a/cake/tests/cases/libs/cake_session.test.php +++ b/cake/tests/cases/libs/cake_session.test.php @@ -466,4 +466,3 @@ class CakeSessionTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cake_socket.test.php b/cake/tests/cases/libs/cake_socket.test.php index 7b49d9cec..a2520d106 100644 --- a/cake/tests/cases/libs/cake_socket.test.php +++ b/cake/tests/cases/libs/cake_socket.test.php @@ -190,4 +190,3 @@ class CakeSocketTest extends CakeTestCase { $this->assertEqual(array(), $anotherSocket->config); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php index dd11366f2..f88b99378 100644 --- a/cake/tests/cases/libs/cake_test_case.test.php +++ b/cake/tests/cases/libs/cake_test_case.test.php @@ -500,4 +500,3 @@ class CakeTestCaseTest extends CakeTestCase { $return = $Dispatcher->dispatch('/tests_apps/index', array('autoRender' => 0, 'return' => 1, 'requested' => 1)); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php index 6d33f4ce7..5ecf24c1f 100644 --- a/cake/tests/cases/libs/cake_test_fixture.test.php +++ b/cake/tests/cases/libs/cake_test_fixture.test.php @@ -336,4 +336,3 @@ class CakeTestFixtureTest extends CakeTestCase { $this->assertTrue($this->criticDb->fullDebug); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/class_registry.test.php b/cake/tests/cases/libs/class_registry.test.php index 148faa814..b91186b23 100644 --- a/cake/tests/cases/libs/class_registry.test.php +++ b/cake/tests/cases/libs/class_registry.test.php @@ -323,4 +323,3 @@ class ClassRegistryTest extends CakeTestCase { $this->assertIdentical($PluginUser, $PluginUserCopy); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php index 2058c1fb5..f2768d75b 100644 --- a/cake/tests/cases/libs/code_coverage_manager.test.php +++ b/cake/tests/cases/libs/code_coverage_manager.test.php @@ -514,4 +514,3 @@ HTML; $this->assertError(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php index 46c8ea069..8b7499d43 100644 --- a/cake/tests/cases/libs/configure.test.php +++ b/cake/tests/cases/libs/configure.test.php @@ -798,4 +798,3 @@ class AppImportTest extends CakeTestCase { $this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directory'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php index c739475cd..c9191e37a 100644 --- a/cake/tests/cases/libs/controller/component.test.php +++ b/cake/tests/cases/libs/controller/component.test.php @@ -585,4 +585,3 @@ class ComponentTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php index a65352cb1..3c564ada3 100644 --- a/cake/tests/cases/libs/controller/components/acl.test.php +++ b/cake/tests/cases/libs/controller/components/acl.test.php @@ -644,4 +644,3 @@ class AclComponentTest extends CakeTestCase { return str_pad($string, $len); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php index 122db1b76..b2c93f48b 100644 --- a/cake/tests/cases/libs/controller/components/auth.test.php +++ b/cake/tests/cases/libs/controller/components/auth.test.php @@ -1602,4 +1602,3 @@ class AuthTest extends CakeTestCase { $this->assertNull($this->Controller->Session->read('Auth.redirect')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php index f32381ba0..bd5168934 100644 --- a/cake/tests/cases/libs/controller/components/cookie.test.php +++ b/cake/tests/cases/libs/controller/components/cookie.test.php @@ -466,4 +466,3 @@ class CookieComponentTest extends CakeTestCase { return substr($string, 1); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php index 210c5eeef..3c9d6f0b0 100755 --- a/cake/tests/cases/libs/controller/components/email.test.php +++ b/cake/tests/cases/libs/controller/components/email.test.php @@ -998,4 +998,3 @@ HTMLBLOC; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php index ff3aa6ad7..f4fa5a36d 100644 --- a/cake/tests/cases/libs/controller/components/request_handler.test.php +++ b/cake/tests/cases/libs/controller/components/request_handler.test.php @@ -637,4 +637,3 @@ class RequestHandlerComponentTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php index a1c07d895..11605729c 100644 --- a/cake/tests/cases/libs/controller/components/security.test.php +++ b/cake/tests/cases/libs/controller/components/security.test.php @@ -1235,4 +1235,3 @@ DIGEST; $this->assertTrue($this->Controller->Security->Session->check('_Token'), '_Token was deleted by blackHole %s'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php index 5eb2e39bc..e8b724413 100644 --- a/cake/tests/cases/libs/controller/components/session.test.php +++ b/cake/tests/cases/libs/controller/components/session.test.php @@ -342,4 +342,3 @@ class SessionComponentTest extends CakeTestCase { $this->assertNull($Session->read('Test')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php index 89e94aa3a..0219f2750 100644 --- a/cake/tests/cases/libs/controller/controller.test.php +++ b/cake/tests/cases/libs/controller/controller.test.php @@ -1395,4 +1395,3 @@ class ControllerTest extends CakeTestCase { $MockedController->shutdownProcess(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php index 89d541d52..d2d8fbcde 100644 --- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php +++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php @@ -235,4 +235,4 @@ class ControllerMergeVarsTestCase extends CakeTestCase { $this->assertFalse(isset($Controller->Session)); } -} \ No newline at end of file +} diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/cake/tests/cases/libs/controller/pages_controller.test.php index 3d37080db..cf0a83fd4 100644 --- a/cake/tests/cases/libs/controller/pages_controller.test.php +++ b/cake/tests/cases/libs/controller/pages_controller.test.php @@ -70,4 +70,3 @@ class PagesControllerTest extends CakeTestCase { $this->assertEqual($Pages->viewVars['subpage'], 'posts'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php index 63ebba91e..e9a35a4d8 100644 --- a/cake/tests/cases/libs/controller/scaffold.test.php +++ b/cake/tests/cases/libs/controller/scaffold.test.php @@ -876,4 +876,3 @@ class ScaffoldTest extends CakeTestCase { $this->assertNoPattern('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php index 2b6ce2e4f..ad8596305 100644 --- a/cake/tests/cases/libs/debugger.test.php +++ b/cake/tests/cases/libs/debugger.test.php @@ -334,4 +334,3 @@ class DebuggerTest extends CakeTestCase { $this->assertIsA($result, 'Debugger'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/error.test.php b/cake/tests/cases/libs/error.test.php index 8f53f26b4..755c3f76a 100644 --- a/cake/tests/cases/libs/error.test.php +++ b/cake/tests/cases/libs/error.test.php @@ -610,4 +610,3 @@ class ErrorHandlerTest extends CakeTestCase { $this->assertPattern('/(\/|\\\)article.php/', $result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php index aca8eb63c..b9961aedf 100644 --- a/cake/tests/cases/libs/file.test.php +++ b/cake/tests/cases/libs/file.test.php @@ -467,4 +467,3 @@ class FileTest extends CakeTestCase { return false; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php index 1b9e8cb3b..e6fdf38cf 100644 --- a/cake/tests/cases/libs/folder.test.php +++ b/cake/tests/cases/libs/folder.test.php @@ -789,4 +789,3 @@ class FolderTest extends CakeTestCase { $Folder->delete(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php index 2609596e0..442643e5c 100644 --- a/cake/tests/cases/libs/http_socket.test.php +++ b/cake/tests/cases/libs/http_socket.test.php @@ -1511,4 +1511,3 @@ class HttpSocketTest extends CakeTestCase { $this->assertIdentical($return, true); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php index 1821391f2..883b3c966 100644 --- a/cake/tests/cases/libs/i18n.test.php +++ b/cake/tests/cases/libs/i18n.test.php @@ -2732,4 +2732,3 @@ class I18nTest extends CakeTestCase { return $plurals; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php index 9a01c0dd7..bc93a4170 100644 --- a/cake/tests/cases/libs/inflector.test.php +++ b/cake/tests/cases/libs/inflector.test.php @@ -463,4 +463,3 @@ class InflectorTest extends CakeTestCase { unset($this->Inflector); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php index 6f38c820a..78ff4a301 100644 --- a/cake/tests/cases/libs/l10n.test.php +++ b/cake/tests/cases/libs/l10n.test.php @@ -929,4 +929,3 @@ class L10nTest extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/log/file_log.test.php b/cake/tests/cases/libs/log/file_log.test.php index 8b4549adb..d8cce44c3 100644 --- a/cake/tests/cases/libs/log/file_log.test.php +++ b/cake/tests/cases/libs/log/file_log.test.php @@ -77,4 +77,3 @@ class FileLogTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php index e4fc613d6..c25ee3c63 100644 --- a/cake/tests/cases/libs/magic_db.test.php +++ b/cake/tests/cases/libs/magic_db.test.php @@ -201,4 +201,3 @@ class MagicDbTestData extends Object { return $data[$key]; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php index 8846d4f03..eb08fa9ba 100644 --- a/cake/tests/cases/libs/model/behaviors/acl.test.php +++ b/cake/tests/cases/libs/model/behaviors/acl.test.php @@ -409,4 +409,3 @@ class AclBehaviorTestCase extends CakeTestCase { $this->assertEqual(count($result), 1); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php index 14897039c..694916d57 100644 --- a/cake/tests/cases/libs/model/behaviors/containable.test.php +++ b/cake/tests/cases/libs/model/behaviors/containable.test.php @@ -3716,4 +3716,3 @@ class ContainableBehaviorTest extends CakeTestCase { return $debug; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php index 425bacb57..fa1483376 100644 --- a/cake/tests/cases/libs/model/behaviors/translate.test.php +++ b/cake/tests/cases/libs/model/behaviors/translate.test.php @@ -896,4 +896,3 @@ class TranslateBehaviorTest extends CakeTestCase { $this->assertFalse($result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php index 53f6e029a..914ac8949 100644 --- a/cake/tests/cases/libs/model/behaviors/tree.test.php +++ b/cake/tests/cases/libs/model/behaviors/tree.test.php @@ -1872,4 +1872,3 @@ class UuidTreeTest extends NumberTreeTest { $this->assertIdentical(array_values($result), $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php index 9711b3d42..6f8c3d22d 100644 --- a/cake/tests/cases/libs/model/cake_schema.test.php +++ b/cake/tests/cases/libs/model/cake_schema.test.php @@ -895,4 +895,3 @@ class CakeSchemaTest extends CakeTestCase { $this->assertPattern('/' . preg_quote($column, '/') . '/', $sql); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php index c13b58f50..067ef6c2d 100644 --- a/cake/tests/cases/libs/model/connection_manager.test.php +++ b/cake/tests/cases/libs/model/connection_manager.test.php @@ -277,4 +277,3 @@ class ConnectionManagerTest extends CakeTestCase { $this->assertEqual($source, null); } } -?> \ No newline at end of file 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 b406448f7..dffd1aa53 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 @@ -675,4 +675,3 @@ class DboMssqlTest extends CakeTestCase { Configure::write('debug', $debug); } } -?> \ No newline at end of file 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 1c31c6e30..a017e7788 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 @@ -760,4 +760,3 @@ class DboMysqlTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php index 358845a12..e3a94512b 100644 --- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php @@ -337,4 +337,3 @@ class DboMysqliTest extends CakeTestCase { $this->db->query('DROP TABLE ' . $this->db->fullTableName('tinyint')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php index f879d3bab..00f014451 100644 --- a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php @@ -129,4 +129,3 @@ class DboOracleTest extends CakeTestCase { } } -?> \ No newline at end of file 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 f67caa272..cbdf7a6ca 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 @@ -808,4 +808,3 @@ class DboPostgresTest extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file 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 f5522b973..cd5886e0e 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 @@ -353,4 +353,3 @@ class DboSqliteTest extends CakeTestCase { $this->db->query('DROP TABLE ' . $tableName); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php index fb7c34b7d..a804f22f8 100644 --- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php @@ -4409,4 +4409,3 @@ class DboSourceTest extends CakeTestCase { $this->assertEqual($expected, $result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php index 432bf94b3..806c598af 100644 --- a/cake/tests/cases/libs/model/db_acl.test.php +++ b/cake/tests/cases/libs/model/db_acl.test.php @@ -394,4 +394,3 @@ class AclNodeTest extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php index 016be5b73..d643a4737 100644 --- a/cake/tests/cases/libs/model/model.test.php +++ b/cake/tests/cases/libs/model/model.test.php @@ -101,4 +101,3 @@ class BaseModelTest extends CakeTestCase { ClassRegistry::flush(); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/model_behavior.test.php b/cake/tests/cases/libs/model/model_behavior.test.php index 95daf2ddb..d87bfbef1 100644 --- a/cake/tests/cases/libs/model/model_behavior.test.php +++ b/cake/tests/cases/libs/model/model_behavior.test.php @@ -1114,4 +1114,3 @@ class BehaviorTest extends CakeTestCase { $Sample->Behaviors->trigger($Sample, 'beforeTest'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php index 1cc81cd77..7988fdcec 100644 --- a/cake/tests/cases/libs/model/model_delete.test.php +++ b/cake/tests/cases/libs/model/model_delete.test.php @@ -709,5 +709,3 @@ class ModelDeleteTest extends BaseModelTest { $this->assertEqual(count($before[0]["Tag"]), count($after[0]["Tag"])); } } - -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php index dac593e6d..17ae8f0fa 100644 --- a/cake/tests/cases/libs/model/model_integration.test.php +++ b/cake/tests/cases/libs/model/model_integration.test.php @@ -1928,4 +1928,3 @@ class ModelIntegrationTest extends BaseModelTest { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php index 9d1bdace3..b649d0453 100755 --- a/cake/tests/cases/libs/model/model_read.test.php +++ b/cake/tests/cases/libs/model/model_read.test.php @@ -7339,4 +7339,3 @@ class ModelReadTest extends BaseModelTest { $this->assertEqual($Post->getVirtualField('Post.other_field'), $Post->virtualFields['other_field']); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php index a7a27ebd5..bfe6a68ce 100644 --- a/cake/tests/cases/libs/model/model_validation.test.php +++ b/cake/tests/cases/libs/model/model_validation.test.php @@ -647,4 +647,3 @@ class ModelValidationTest extends BaseModelTest { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index f5ed44bcd..b30a8f25c 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -3845,5 +3845,3 @@ class ModelWriteTest extends BaseModelTest { } } - -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php index 33b2a6720..6ae268663 100644 --- a/cake/tests/cases/libs/model/models.php +++ b/cake/tests/cases/libs/model/models.php @@ -3563,5 +3563,3 @@ class GroupUpdateAll extends CakeTestModel { var $useTable = 'group_update_all'; } - -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php index 00a1ac49b..e75cca0c2 100644 --- a/cake/tests/cases/libs/multibyte.test.php +++ b/cake/tests/cases/libs/multibyte.test.php @@ -9341,4 +9341,3 @@ mb_strtoupper does not work for these strings. $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php index 384bf2bc9..5cf4bc294 100644 --- a/cake/tests/cases/libs/object.test.php +++ b/cake/tests/cases/libs/object.test.php @@ -808,4 +808,3 @@ class ObjectTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php index 976ad7d18..8e48943a1 100644 --- a/cake/tests/cases/libs/overloadable.test.php +++ b/cake/tests/cases/libs/overloadable.test.php @@ -37,4 +37,3 @@ class OverloadableTest extends CakeTestCase { $this->skipIf(true, ' %s OverloadableTest not implemented'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php index d6fdc303a..f5433bb54 100644 --- a/cake/tests/cases/libs/router.test.php +++ b/cake/tests/cases/libs/router.test.php @@ -2564,5 +2564,3 @@ class PluginShortRouteTestCase extends CakeTestCase { $this->assertEqual($result, '/foo'); } } - -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php index a67a699be..fa8ba060f 100644 --- a/cake/tests/cases/libs/sanitize.test.php +++ b/cake/tests/cases/libs/sanitize.test.php @@ -498,4 +498,3 @@ HTML; $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/security.test.php b/cake/tests/cases/libs/security.test.php index 34d1569da..31b775290 100644 --- a/cake/tests/cases/libs/security.test.php +++ b/cake/tests/cases/libs/security.test.php @@ -171,4 +171,3 @@ class SecurityTest extends CakeTestCase { $this->assertEqual(Security::cipher($result, $key), $txt); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php index c2f378649..20853639b 100644 --- a/cake/tests/cases/libs/set.test.php +++ b/cake/tests/cases/libs/set.test.php @@ -2928,4 +2928,3 @@ class SetTest extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php index be30a7548..20a6aa6ee 100644 --- a/cake/tests/cases/libs/string.test.php +++ b/cake/tests/cases/libs/string.test.php @@ -288,5 +288,3 @@ class StringTest extends CakeTestCase { $this->assertEqual($expected, $result); } } - -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php index 6dd59b4ae..144f99ed3 100644 --- a/cake/tests/cases/libs/test_manager.test.php +++ b/cake/tests/cases/libs/test_manager.test.php @@ -118,4 +118,3 @@ class TestManagerTest extends CakeTestCase { function testGetGroupTestList() { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php index dec5b47bf..73f9a5cbd 100644 --- a/cake/tests/cases/libs/validation.test.php +++ b/cake/tests/cases/libs/validation.test.php @@ -2205,4 +2205,3 @@ class ValidationTest extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php index f8454739d..de7539221 100644 --- a/cake/tests/cases/libs/view/helper.test.php +++ b/cake/tests/cases/libs/view/helper.test.php @@ -720,6 +720,4 @@ class HelperTest extends CakeTestCase { Configure::write('App.www_root', $webRoot); } - } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php index 1ed79f567..e19714b8d 100644 --- a/cake/tests/cases/libs/view/helpers/ajax.test.php +++ b/cake/tests/cases/libs/view/helpers/ajax.test.php @@ -906,4 +906,3 @@ class AjaxHelperTest extends CakeTestCase { $this->assertTags($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php index c2ae94ae1..9cd10ca28 100644 --- a/cake/tests/cases/libs/view/helpers/cache.test.php +++ b/cake/tests/cases/libs/view/helpers/cache.test.php @@ -461,4 +461,3 @@ class CacheHelperTest extends CakeTestCase { } */ } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php index 545dae6b8..1209ae6ea 100644 --- a/cake/tests/cases/libs/view/helpers/form.test.php +++ b/cake/tests/cases/libs/view/helpers/form.test.php @@ -6265,4 +6265,3 @@ class FormHelperTest extends CakeTestCase { $this->assertTags($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php index 84c964208..f5917bfee 100644 --- a/cake/tests/cases/libs/view/helpers/html.test.php +++ b/cake/tests/cases/libs/view/helpers/html.test.php @@ -1267,4 +1267,3 @@ class HtmlHelperTest extends CakeTestCase { $this->assertTags($result, array('p' => array('class' => 'class-name'), '<text>', '/p')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php index cec0399a0..70ba01bc0 100644 --- a/cake/tests/cases/libs/view/helpers/javascript.test.php +++ b/cake/tests/cases/libs/view/helpers/javascript.test.php @@ -909,4 +909,3 @@ class JavascriptTest extends CakeTestCase { $this->Javascript->enabled = $old; } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php index 1a2ba66c6..344911043 100644 --- a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php +++ b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php @@ -345,4 +345,3 @@ class JqueryEngineHelperTestCase extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php index 7e724092d..a49ec81bd 100644 --- a/cake/tests/cases/libs/view/helpers/js.test.php +++ b/cake/tests/cases/libs/view/helpers/js.test.php @@ -831,4 +831,3 @@ class JsBaseEngineTestCase extends CakeTestCase { } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php index d3959ac2f..815943891 100644 --- a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php +++ b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php @@ -352,4 +352,3 @@ class MooEngineHelperTestCase extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php index fe0e65816..41783b2d5 100644 --- a/cake/tests/cases/libs/view/helpers/number.test.php +++ b/cake/tests/cases/libs/view/helpers/number.test.php @@ -426,4 +426,3 @@ class NumberHelperTest extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php index a658f0dca..9ee145244 100644 --- a/cake/tests/cases/libs/view/helpers/paginator.test.php +++ b/cake/tests/cases/libs/view/helpers/paginator.test.php @@ -1864,4 +1864,3 @@ class PaginatorHelperTest extends CakeTestCase { $Paginator =& new PaginatorHelper(array('ajax' => 'Form')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php index 6ce9665f4..24fc5ff18 100644 --- a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php +++ b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php @@ -378,4 +378,3 @@ class PrototypeEngineHelperTestCase extends CakeTestCase { $this->assertEqual($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php index 1d567b327..ffb28dabc 100644 --- a/cake/tests/cases/libs/view/helpers/rss.test.php +++ b/cake/tests/cases/libs/view/helpers/rss.test.php @@ -557,4 +557,3 @@ class RssHelperTest extends CakeTestCase { $this->assertTags($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php index e85688424..58c23af6f 100644 --- a/cake/tests/cases/libs/view/helpers/session.test.php +++ b/cake/tests/cases/libs/view/helpers/session.test.php @@ -234,4 +234,3 @@ class SessionHelperTest extends CakeTestCase { //$this->assertFalse($this->Session->valid()); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php index a2a6531b1..9c26f0120 100644 --- a/cake/tests/cases/libs/view/helpers/text.test.php +++ b/cake/tests/cases/libs/view/helpers/text.test.php @@ -405,4 +405,3 @@ class TextHelperTest extends CakeTestCase { $this->assertEqual($result, 'Dusty and Lucky'); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php index 2e8274158..dd5b0c4f9 100644 --- a/cake/tests/cases/libs/view/helpers/time.test.php +++ b/cake/tests/cases/libs/view/helpers/time.test.php @@ -782,4 +782,3 @@ class TimeHelperTest extends CakeTestCase { $this->assertEqual($this->Time->format($time, '%c'), $this->Time->i18nFormat($time, '%c')); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php index 7b4c03ece..d50ae7bbf 100644 --- a/cake/tests/cases/libs/view/helpers/xml.test.php +++ b/cake/tests/cases/libs/view/helpers/xml.test.php @@ -285,4 +285,3 @@ class XmlHelperTest extends CakeTestCase { $this->assertIdentical($result, $expected); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/media.test.php b/cake/tests/cases/libs/view/media.test.php index 23c6f7d04..c30d2fc02 100644 --- a/cake/tests/cases/libs/view/media.test.php +++ b/cake/tests/cases/libs/view/media.test.php @@ -178,4 +178,3 @@ class MediaViewTest extends CakeTestCase { $this->assertFalse($result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php index 8146c6561..4b6bef8a1 100644 --- a/cake/tests/cases/libs/view/theme.test.php +++ b/cake/tests/cases/libs/view/theme.test.php @@ -341,4 +341,3 @@ class ThemeViewTest extends CakeTestCase { $this->assertWithinMargin($start, $end, 3500); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php index 44b750b07..9495aad16 100644 --- a/cake/tests/cases/libs/view/view.test.php +++ b/cake/tests/cases/libs/view/view.test.php @@ -920,4 +920,3 @@ class ViewTest extends CakeTestCase { $this->assertPattern("/
posts index<\/div>/", $result); } } -?> \ No newline at end of file diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php index c8358210a..b07b577f5 100644 --- a/cake/tests/cases/libs/xml.test.php +++ b/cake/tests/cases/libs/xml.test.php @@ -1417,4 +1417,3 @@ class XmlTest extends CakeTestCase { $this->assertWithinMargin($start, $end, 3600, 'Memory leaked %s'); } } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/account_fixture.php b/cake/tests/fixtures/account_fixture.php index c5c0a60a4..34fa67e12 100644 --- a/cake/tests/fixtures/account_fixture.php +++ b/cake/tests/fixtures/account_fixture.php @@ -59,5 +59,3 @@ class AccountFixture extends CakeTestFixture { array('cDescription' => 'dude') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php index 18272396c..dff58d1af 100644 --- a/cake/tests/fixtures/aco_action_fixture.php +++ b/cake/tests/fixtures/aco_action_fixture.php @@ -58,5 +58,3 @@ class AcoActionFixture extends CakeTestFixture { */ var $records = array(); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php index 248b16157..339b2fe3b 100644 --- a/cake/tests/fixtures/aco_fixture.php +++ b/cake/tests/fixtures/aco_fixture.php @@ -71,5 +71,3 @@ class AcoFixture extends CakeTestFixture { array('parent_id' => 10, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 20, 'rght' => 21), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php index 78129bbd3..6c25ecc57 100644 --- a/cake/tests/fixtures/aco_two_fixture.php +++ b/cake/tests/fixtures/aco_two_fixture.php @@ -69,5 +69,3 @@ class AcoTwoFixture extends CakeTestFixture { array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'smash', 'lft' => 17, 'rght' => 18), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/ad_fixture.php b/cake/tests/fixtures/ad_fixture.php index e4d339150..0a62e7243 100644 --- a/cake/tests/fixtures/ad_fixture.php +++ b/cake/tests/fixtures/ad_fixture.php @@ -66,5 +66,3 @@ class AdFixture extends CakeTestFixture { array('parent_id' => null, 'lft' => 13, 'rght' => 14, 'campaign_id' => 3, 'name' => 'New York') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php index 7c7de708b..683e5a111 100644 --- a/cake/tests/fixtures/advertisement_fixture.php +++ b/cake/tests/fixtures/advertisement_fixture.php @@ -58,5 +58,3 @@ class AdvertisementFixture extends CakeTestFixture { array('title' => 'Second Ad', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/after_tree_fixture.php b/cake/tests/fixtures/after_tree_fixture.php index 06440fb5e..e87aeb865 100644 --- a/cake/tests/fixtures/after_tree_fixture.php +++ b/cake/tests/fixtures/after_tree_fixture.php @@ -65,4 +65,3 @@ class AfterTreeFixture extends CakeTestFixture { array('parent_id' => null, 'lft' => 13, 'rght' => 14, 'name' => 'Seven') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php index 3f8ab6bf9..a10151ce1 100644 --- a/cake/tests/fixtures/another_article_fixture.php +++ b/cake/tests/fixtures/another_article_fixture.php @@ -59,5 +59,3 @@ class AnotherArticleFixture extends CakeTestFixture { array('title' => 'Third Article', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php index a49cf34f6..52c5bfcc3 100644 --- a/cake/tests/fixtures/apple_fixture.php +++ b/cake/tests/fixtures/apple_fixture.php @@ -67,5 +67,3 @@ class AppleFixture extends CakeTestFixture { array('apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php index 49b2e6401..5b6a1e3e3 100644 --- a/cake/tests/fixtures/aro_fixture.php +++ b/cake/tests/fixtures/aro_fixture.php @@ -63,5 +63,3 @@ class AroFixture extends CakeTestFixture { array('parent_id' => '2', 'model' => 'AuthUser', 'foreign_key' => '2', 'alias' => 'Elrond', 'lft' => 5, 'rght' => 6) ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php index 214c32d0a..1043fc344 100644 --- a/cake/tests/fixtures/aro_two_fixture.php +++ b/cake/tests/fixtures/aro_two_fixture.php @@ -69,5 +69,3 @@ class AroTwoFixture extends CakeTestFixture { array('id' => 10, 'parent_id' => 4, 'model' => 'User', 'foreign_key' => '6', 'alias' => 'Milton', 'lft' => '17', 'rght' => '18'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php index 4b123c462..c959702d0 100644 --- a/cake/tests/fixtures/aros_aco_fixture.php +++ b/cake/tests/fixtures/aros_aco_fixture.php @@ -58,5 +58,3 @@ class ArosAcoFixture extends CakeTestFixture { */ var $records = array(); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php index eed28cc4a..b2e01db6c 100644 --- a/cake/tests/fixtures/aros_aco_two_fixture.php +++ b/cake/tests/fixtures/aros_aco_two_fixture.php @@ -79,5 +79,3 @@ class ArosAcoTwoFixture extends CakeTestFixture { array('id' => 20, 'aro_id' => '10', 'aco_id' => '10', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php index 811df9b44..7678456ef 100644 --- a/cake/tests/fixtures/article_featured_fixture.php +++ b/cake/tests/fixtures/article_featured_fixture.php @@ -62,5 +62,3 @@ class ArticleFeaturedFixture extends CakeTestFixture { array('user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php index 6fcda75a3..3f80d069a 100644 --- a/cake/tests/fixtures/article_featureds_tags_fixture.php +++ b/cake/tests/fixtures/article_featureds_tags_fixture.php @@ -46,5 +46,3 @@ class ArticleFeaturedsTagsFixture extends CakeTestFixture { 'indexes' => array('UNIQUE_FEATURED' => array('column'=> array('article_featured_id', 'tag_id'), 'unique'=> 1)) ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php index b16189509..5824a549b 100644 --- a/cake/tests/fixtures/article_fixture.php +++ b/cake/tests/fixtures/article_fixture.php @@ -62,5 +62,3 @@ class ArticleFixture extends CakeTestFixture { array('user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php index 9c899c9fd..815bbd1c1 100644 --- a/cake/tests/fixtures/articles_tag_fixture.php +++ b/cake/tests/fixtures/articles_tag_fixture.php @@ -59,5 +59,3 @@ class ArticlesTagFixture extends CakeTestFixture { array('article_id' => 2, 'tag_id' => 3) ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php index 537bf575f..fabd71ce0 100644 --- a/cake/tests/fixtures/attachment_fixture.php +++ b/cake/tests/fixtures/attachment_fixture.php @@ -58,5 +58,3 @@ class AttachmentFixture extends CakeTestFixture { array('comment_id' => 5, 'attachment' => 'attachment.zip', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php index 7b9d7b670..c48cc6c68 100644 --- a/cake/tests/fixtures/auth_user_custom_field_fixture.php +++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php @@ -63,5 +63,3 @@ class AuthUserCustomFieldFixture extends CakeTestFixture { ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php index db37065a9..13e4ce957 100644 --- a/cake/tests/fixtures/auth_user_fixture.php +++ b/cake/tests/fixtures/auth_user_fixture.php @@ -63,5 +63,3 @@ class AuthUserFixture extends CakeTestFixture { ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php index c975b11b9..48e9a5da0 100644 --- a/cake/tests/fixtures/author_fixture.php +++ b/cake/tests/fixtures/author_fixture.php @@ -61,5 +61,3 @@ class AuthorFixture extends CakeTestFixture { array('user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/basket_fixture.php b/cake/tests/fixtures/basket_fixture.php index 7d2994c04..b843e3ff9 100644 --- a/cake/tests/fixtures/basket_fixture.php +++ b/cake/tests/fixtures/basket_fixture.php @@ -59,5 +59,3 @@ class BasketFixture extends CakeTestFixture { array('id' => 2, 'type' => 'file', 'name' => 'basket2', 'object_id' => 2, 'user_id' => 1), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php index 1d06678da..28da835e3 100644 --- a/cake/tests/fixtures/bid_fixture.php +++ b/cake/tests/fixtures/bid_fixture.php @@ -60,4 +60,3 @@ class BidFixture extends CakeTestFixture { array('message_id' => 2, 'name' => 'Bid 2.2') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php index 584492b25..6860a9904 100644 --- a/cake/tests/fixtures/binary_test_fixture.php +++ b/cake/tests/fixtures/binary_test_fixture.php @@ -53,5 +53,3 @@ class BinaryTestFixture extends CakeTestFixture { */ var $records = array(); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/book_fixture.php b/cake/tests/fixtures/book_fixture.php index af4b04375..1d1a0be9e 100644 --- a/cake/tests/fixtures/book_fixture.php +++ b/cake/tests/fixtures/book_fixture.php @@ -59,4 +59,3 @@ class BookFixture extends CakeTestFixture { array('id' => 1, 'isbn' => '1234567890', 'title' => 'Faust', 'author' => 'Johann Wolfgang von Goethe') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php index b4ed55d28..42e2f97fd 100644 --- a/cake/tests/fixtures/cache_test_model_fixture.php +++ b/cake/tests/fixtures/cache_test_model_fixture.php @@ -46,5 +46,3 @@ class CacheTestModelFixture extends CakeTestFixture { 'expires' => array('type' => 'integer', 'length' => 10, 'default' => '0'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php index 5029c4291..dab950689 100644 --- a/cake/tests/fixtures/callback_fixture.php +++ b/cake/tests/fixtures/callback_fixture.php @@ -60,5 +60,3 @@ class CallbackFixture extends CakeTestFixture { array('user' => 'user3', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/campaign_fixture.php b/cake/tests/fixtures/campaign_fixture.php index f546fde22..80a763b82 100644 --- a/cake/tests/fixtures/campaign_fixture.php +++ b/cake/tests/fixtures/campaign_fixture.php @@ -58,5 +58,3 @@ class CampaignFixture extends CakeTestFixture { array('name' => 'Queen of Scandinavia') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php index aa16acb0c..4222baf9f 100644 --- a/cake/tests/fixtures/category_fixture.php +++ b/cake/tests/fixtures/category_fixture.php @@ -65,5 +65,3 @@ class CategoryFixture extends CakeTestFixture { array('parent_id' => 2, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php index c9894ca3e..185ad2be8 100644 --- a/cake/tests/fixtures/category_thread_fixture.php +++ b/cake/tests/fixtures/category_thread_fixture.php @@ -64,5 +64,3 @@ class CategoryThreadFixture extends CakeTestFixture { array('parent_id' => 6, 'name' => 'Category 2.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/cd_fixture.php b/cake/tests/fixtures/cd_fixture.php index 80d3384eb..39b0f7916 100644 --- a/cake/tests/fixtures/cd_fixture.php +++ b/cake/tests/fixtures/cd_fixture.php @@ -57,4 +57,3 @@ class CdFixture extends CakeTestFixture { array('id' => 1, 'title' => 'Grace', 'artist' => 'Jeff Buckley', 'genre' => 'awesome') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php index 2a4d84175..7ca04dfdc 100644 --- a/cake/tests/fixtures/comment_fixture.php +++ b/cake/tests/fixtures/comment_fixture.php @@ -65,5 +65,3 @@ class CommentFixture extends CakeTestFixture { array('article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/content_account_fixture.php b/cake/tests/fixtures/content_account_fixture.php index 7699f86c9..4471b7fed 100644 --- a/cake/tests/fixtures/content_account_fixture.php +++ b/cake/tests/fixtures/content_account_fixture.php @@ -62,5 +62,3 @@ class ContentAccountFixture extends CakeTestFixture { array('iContentId' => 2, 'iAccountId' => 3), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/content_fixture.php b/cake/tests/fixtures/content_fixture.php index ea75c59fa..3ecd20e66 100644 --- a/cake/tests/fixtures/content_fixture.php +++ b/cake/tests/fixtures/content_fixture.php @@ -59,5 +59,3 @@ class ContentFixture extends CakeTestFixture { array('cDescription' => 'Test Content 4') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/cake/tests/fixtures/counter_cache_post_fixture.php index f765a96fd..2a6fcd1a2 100644 --- a/cake/tests/fixtures/counter_cache_post_fixture.php +++ b/cake/tests/fixtures/counter_cache_post_fixture.php @@ -40,5 +40,3 @@ class CounterCachePostFixture extends CakeTestFixture { array('id' => 3, 'title' => 'Food', 'user_id' => 301), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php index a72ba6c25..af9e02701 100644 --- a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php +++ b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php @@ -40,5 +40,3 @@ class CounterCachePostNonstandardPrimaryKeyFixture extends CakeTestFixture { array('pid' => 3, 'title' => 'Food', 'uid' => 301), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/cake/tests/fixtures/counter_cache_user_fixture.php index 4eb1e1427..34f9be763 100644 --- a/cake/tests/fixtures/counter_cache_user_fixture.php +++ b/cake/tests/fixtures/counter_cache_user_fixture.php @@ -39,5 +39,3 @@ class CounterCacheUserFixture extends CakeTestFixture { array('id' => 301, 'name' => 'Steven','post_count' => 1), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php index 790c3a0cc..6c6a336a9 100644 --- a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php +++ b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php @@ -39,5 +39,3 @@ class CounterCacheUserNonstandardPrimaryKeyFixture extends CakeTestFixture { array('uid' => 301, 'name' => 'Steven','post_count' => 1), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php index f775b4366..2326ecf44 100644 --- a/cake/tests/fixtures/data_test_fixture.php +++ b/cake/tests/fixtures/data_test_fixture.php @@ -57,5 +57,3 @@ class DataTestFixture extends CakeTestFixture { */ var $records = array(); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php index 350f283fe..7df574b27 100644 --- a/cake/tests/fixtures/datatype_fixture.php +++ b/cake/tests/fixtures/datatype_fixture.php @@ -55,5 +55,3 @@ class DatatypeFixture extends CakeTestFixture { array('id' => 1, 'float_field' => 42.23), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php index 4464e32a7..c9b155e1c 100644 --- a/cake/tests/fixtures/dependency_fixture.php +++ b/cake/tests/fixtures/dependency_fixture.php @@ -56,5 +56,3 @@ class DependencyFixture extends CakeTestFixture { array('child_id' => 1, 'parent_id' => 2), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php index 2260d7bfc..b088152ae 100644 --- a/cake/tests/fixtures/device_fixture.php +++ b/cake/tests/fixtures/device_fixture.php @@ -59,4 +59,3 @@ class DeviceFixture extends CakeTestFixture { array('device_type_id' => 1, 'name' => 'Device 3', 'typ' => 2) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php index cb43b16d5..e1822ab28 100644 --- a/cake/tests/fixtures/device_type_category_fixture.php +++ b/cake/tests/fixtures/device_type_category_fixture.php @@ -55,4 +55,3 @@ class DeviceTypeCategoryFixture extends CakeTestFixture { array('name' => 'DeviceTypeCategory 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php index ecd910c91..1e845e1fe 100644 --- a/cake/tests/fixtures/device_type_fixture.php +++ b/cake/tests/fixtures/device_type_fixture.php @@ -62,4 +62,3 @@ class DeviceTypeFixture extends CakeTestFixture { array('device_type_category_id' => 1, 'feature_set_id' => 1, 'exterior_type_category_id' => 1, 'image_id' => 1, 'extra1_id' => 1, 'extra2_id' => 1, 'name' => 'DeviceType 1', 'order' => 0) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php index 71eaf5962..ffb6fba6f 100644 --- a/cake/tests/fixtures/document_directory_fixture.php +++ b/cake/tests/fixtures/document_directory_fixture.php @@ -55,4 +55,3 @@ class DocumentDirectoryFixture extends CakeTestFixture { array('name' => 'DocumentDirectory 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php index d4706ae14..479ad2eeb 100644 --- a/cake/tests/fixtures/document_fixture.php +++ b/cake/tests/fixtures/document_fixture.php @@ -56,4 +56,3 @@ class DocumentFixture extends CakeTestFixture { array('document_directory_id' => 1, 'name' => 'Document 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php index 9271393eb..df163bdb2 100644 --- a/cake/tests/fixtures/exterior_type_category_fixture.php +++ b/cake/tests/fixtures/exterior_type_category_fixture.php @@ -56,4 +56,3 @@ class ExteriorTypeCategoryFixture extends CakeTestFixture { array('image_id' => 1, 'name' => 'ExteriorTypeCategory 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php index 564155cdd..363ce5f51 100644 --- a/cake/tests/fixtures/feature_set_fixture.php +++ b/cake/tests/fixtures/feature_set_fixture.php @@ -55,4 +55,3 @@ class FeatureSetFixture extends CakeTestFixture { array('name' => 'FeatureSet 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php index 3b3c81834..b199d441a 100644 --- a/cake/tests/fixtures/featured_fixture.php +++ b/cake/tests/fixtures/featured_fixture.php @@ -61,5 +61,3 @@ class FeaturedFixture extends CakeTestFixture { array('article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/film_file_fixture.php b/cake/tests/fixtures/film_file_fixture.php index 1b3795fed..491971ad7 100644 --- a/cake/tests/fixtures/film_file_fixture.php +++ b/cake/tests/fixtures/film_file_fixture.php @@ -56,5 +56,3 @@ class FilmFileFixture extends CakeTestFixture { array('id' => 2, 'name' => 'two') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php index d5c415800..dc3d23fe3 100644 --- a/cake/tests/fixtures/flag_tree_fixture.php +++ b/cake/tests/fixtures/flag_tree_fixture.php @@ -53,5 +53,3 @@ class FlagTreeFixture extends CakeTestFixture { 'flag' => array('type' => 'integer','null' => false, 'length' => 1, 'default' => 0) ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/fruit_fixture.php b/cake/tests/fixtures/fruit_fixture.php index c593c722e..f900465c0 100644 --- a/cake/tests/fixtures/fruit_fixture.php +++ b/cake/tests/fixtures/fruit_fixture.php @@ -61,5 +61,3 @@ class FruitFixture extends CakeTestFixture { ) ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/cake/tests/fixtures/fruits_uuid_tag_fixture.php index 0008898bd..6e9c68b68 100644 --- a/cake/tests/fixtures/fruits_uuid_tag_fixture.php +++ b/cake/tests/fixtures/fruits_uuid_tag_fixture.php @@ -58,4 +58,3 @@ class FruitsUuidTagFixture extends CakeTestFixture { array('fruit_id' => '481fc6d0-b920-43e0-a40d-6d1740cf8569', 'uuid_tag_id' => '481fc6d0-b920-43e0-e50f-6d1740cf8569') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/group_update_all_fixture.php b/cake/tests/fixtures/group_update_all_fixture.php index b3a7be1aa..500e8a6c5 100644 --- a/cake/tests/fixtures/group_update_all_fixture.php +++ b/cake/tests/fixtures/group_update_all_fixture.php @@ -53,4 +53,3 @@ class GroupUpdateAllFixture extends CakeTestFixture { 'code' => 135) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php index cc6d8d637..714080b0c 100644 --- a/cake/tests/fixtures/home_fixture.php +++ b/cake/tests/fixtures/home_fixture.php @@ -60,5 +60,3 @@ class HomeFixture extends CakeTestFixture { array('another_article_id' => 3, 'advertisement_id' => 1, 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php index 3e7859674..ee994ee6a 100644 --- a/cake/tests/fixtures/image_fixture.php +++ b/cake/tests/fixtures/image_fixture.php @@ -59,4 +59,3 @@ class ImageFixture extends CakeTestFixture { array('name' => 'Image 5') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php index e1988a5df..82c86a7b4 100644 --- a/cake/tests/fixtures/item_fixture.php +++ b/cake/tests/fixtures/item_fixture.php @@ -62,4 +62,3 @@ class ItemFixture extends CakeTestFixture { array('syfile_id' => 6, 'published' => 0, 'name' => 'Item 6') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php index 2f7804952..5dd46d86b 100644 --- a/cake/tests/fixtures/items_portfolio_fixture.php +++ b/cake/tests/fixtures/items_portfolio_fixture.php @@ -61,4 +61,3 @@ class ItemsPortfolioFixture extends CakeTestFixture { array('item_id' => 6, 'portfolio_id' => 2) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php index b4047b49d..a411f9e14 100644 --- a/cake/tests/fixtures/join_a_b_fixture.php +++ b/cake/tests/fixtures/join_a_b_fixture.php @@ -61,5 +61,3 @@ class JoinABFixture extends CakeTestFixture { array('join_a_id' => 3, 'join_b_id' => 1, 'other' => 'Data for Join A 3 Join B 1', 'created' => '2008-01-03 10:56:35', 'updated' => '2008-01-03 10:56:35') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php index 7bc80cff5..3276b1b12 100644 --- a/cake/tests/fixtures/join_a_c_fixture.php +++ b/cake/tests/fixtures/join_a_c_fixture.php @@ -61,5 +61,3 @@ class JoinACFixture extends CakeTestFixture { array('join_a_id' => 3, 'join_c_id' => 1, 'other' => 'Data for Join A 3 Join C 1', 'created' => '2008-01-03 10:57:24', 'updated' => '2008-01-03 10:57:24') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php index f400ba852..089f1b61a 100644 --- a/cake/tests/fixtures/join_a_fixture.php +++ b/cake/tests/fixtures/join_a_fixture.php @@ -60,5 +60,3 @@ class JoinAFixture extends CakeTestFixture { array('name' => 'Join A 3', 'body' => 'Join A 2 Body', 'created' => '2008-01-03 10:54:25', 'updated' => '2008-01-03 10:54:24') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php index 8afa7132d..d599eab70 100644 --- a/cake/tests/fixtures/join_b_fixture.php +++ b/cake/tests/fixtures/join_b_fixture.php @@ -59,4 +59,3 @@ class JoinBFixture extends CakeTestFixture { array('name' => 'Join B 3', 'created' => '2008-01-03 10:55:03', 'updated' => '2008-01-03 10:55:03') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php index 316520188..91246c45e 100644 --- a/cake/tests/fixtures/join_c_fixture.php +++ b/cake/tests/fixtures/join_c_fixture.php @@ -59,4 +59,3 @@ class JoinCFixture extends CakeTestFixture { array('name' => 'Join C 3', 'created' => '2008-01-03 10:56:13', 'updated' => '2008-01-03 10:56:13') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php index 572465aab..4e241d48a 100644 --- a/cake/tests/fixtures/join_thing_fixture.php +++ b/cake/tests/fixtures/join_thing_fixture.php @@ -61,5 +61,3 @@ class JoinThingFixture extends CakeTestFixture { array('something_id' => 3, 'something_else_id' => 1, 'doomed' => '1', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php index 0a07e1082..e351912dd 100644 --- a/cake/tests/fixtures/message_fixture.php +++ b/cake/tests/fixtures/message_fixture.php @@ -58,4 +58,3 @@ class MessageFixture extends CakeTestFixture { array('thread_id' => 3, 'name' => 'Thread 3, Message 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/cake/tests/fixtures/my_categories_my_products_fixture.php index 06e052cd5..ceabdcaa3 100644 --- a/cake/tests/fixtures/my_categories_my_products_fixture.php +++ b/cake/tests/fixtures/my_categories_my_products_fixture.php @@ -58,5 +58,3 @@ class MyCategoriesMyProductsFixture extends CakeTestFixture { array('my_category_id' => 3, 'my_product_id' => 2), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/cake/tests/fixtures/my_categories_my_users_fixture.php index fb7eafb4c..45a0d416f 100644 --- a/cake/tests/fixtures/my_categories_my_users_fixture.php +++ b/cake/tests/fixtures/my_categories_my_users_fixture.php @@ -58,5 +58,3 @@ class MyCategoriesMyUsersFixture extends CakeTestFixture { array('my_category_id' => 2, 'my_user_id' => 2), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/my_category_fixture.php b/cake/tests/fixtures/my_category_fixture.php index 54a686f59..5f84c300d 100644 --- a/cake/tests/fixtures/my_category_fixture.php +++ b/cake/tests/fixtures/my_category_fixture.php @@ -57,5 +57,3 @@ class MyCategoryFixture extends CakeTestFixture { array('id' => 3, 'name' => 'C'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php index 7f5d0030a..0cb37ae88 100644 --- a/cake/tests/fixtures/my_product_fixture.php +++ b/cake/tests/fixtures/my_product_fixture.php @@ -56,5 +56,3 @@ class MyProductFixture extends CakeTestFixture { array('id' => 2, 'name' => 'computer'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/my_user_fixture.php b/cake/tests/fixtures/my_user_fixture.php index 5b475ae4e..0d8bb1bb3 100644 --- a/cake/tests/fixtures/my_user_fixture.php +++ b/cake/tests/fixtures/my_user_fixture.php @@ -56,5 +56,3 @@ class MyUserFixture extends CakeTestFixture { array('id' => 2, 'firstname' => 'userB') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php index 1dc66ef43..0fb6e01d8 100644 --- a/cake/tests/fixtures/node_fixture.php +++ b/cake/tests/fixtures/node_fixture.php @@ -58,5 +58,3 @@ class NodeFixture extends CakeTestFixture { array('id' => 2, 'name' => 'Second', 'state' => 60), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php index 53a9806ae..cec771d78 100644 --- a/cake/tests/fixtures/number_tree_fixture.php +++ b/cake/tests/fixtures/number_tree_fixture.php @@ -52,5 +52,3 @@ class NumberTreeFixture extends CakeTestFixture { 'rght' => array('type' => 'integer','null' => false) ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/cake/tests/fixtures/number_tree_two_fixture.php index 6a274ed8e..ad39c23b6 100644 --- a/cake/tests/fixtures/number_tree_two_fixture.php +++ b/cake/tests/fixtures/number_tree_two_fixture.php @@ -53,4 +53,3 @@ class NumberTreeTwoFixture extends CakeTestFixture { 'rght' => array('type' => 'integer','null' => false) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php index 67d3e1dbe..3b5a50ce6 100644 --- a/cake/tests/fixtures/numeric_article_fixture.php +++ b/cake/tests/fixtures/numeric_article_fixture.php @@ -58,5 +58,3 @@ class NumericArticleFixture extends CakeTestFixture { array('title' => '12345abcde', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/cake/tests/fixtures/overall_favorite_fixture.php index 289dfce49..4785ea042 100644 --- a/cake/tests/fixtures/overall_favorite_fixture.php +++ b/cake/tests/fixtures/overall_favorite_fixture.php @@ -58,4 +58,3 @@ class OverallFavoriteFixture extends CakeTestFixture { array('id' => 2, 'model_type' => 'Book', 'model_id' => '1', 'priority' => '2') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php index f502a6616..0a917aab7 100644 --- a/cake/tests/fixtures/person_fixture.php +++ b/cake/tests/fixtures/person_fixture.php @@ -67,4 +67,3 @@ class PersonFixture extends CakeTestFixture { array('name' => 'father - grand father', 'mother_id' => 0, 'father_id' => 0) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php index f709f32f1..24fe0c836 100644 --- a/cake/tests/fixtures/portfolio_fixture.php +++ b/cake/tests/fixtures/portfolio_fixture.php @@ -58,4 +58,3 @@ class PortfolioFixture extends CakeTestFixture { array('seller_id' => 2, 'name' => 'Portfolio 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php index aad254a61..9ef05504d 100644 --- a/cake/tests/fixtures/post_fixture.php +++ b/cake/tests/fixtures/post_fixture.php @@ -62,4 +62,3 @@ class PostFixture extends CakeTestFixture { array('author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php index a875bb0a2..9a528cef9 100644 --- a/cake/tests/fixtures/posts_tag_fixture.php +++ b/cake/tests/fixtures/posts_tag_fixture.php @@ -59,5 +59,3 @@ class PostsTagFixture extends CakeTestFixture { array('post_id' => 2, 'tag_id' => 'tag3') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php index 2a267faa9..5c70b2d48 100644 --- a/cake/tests/fixtures/primary_model_fixture.php +++ b/cake/tests/fixtures/primary_model_fixture.php @@ -55,5 +55,3 @@ class PrimaryModelFixture extends CakeTestFixture { array('primary_name' => 'Primary Name Existing') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/product_fixture.php b/cake/tests/fixtures/product_fixture.php index 9ef962c9f..93eb130ed 100644 --- a/cake/tests/fixtures/product_fixture.php +++ b/cake/tests/fixtures/product_fixture.php @@ -64,5 +64,3 @@ class ProductFixture extends CakeTestFixture { array('name' => 'Watermelon', 'type' => 'Food', 'price' => 9) ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/product_update_all_fixture.php b/cake/tests/fixtures/product_update_all_fixture.php index b9e48db82..1f89a23f9 100644 --- a/cake/tests/fixtures/product_update_all_fixture.php +++ b/cake/tests/fixtures/product_update_all_fixture.php @@ -59,4 +59,3 @@ class ProductUpdateAllFixture extends CakeTestFixture { 'group_id' => 4) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php index 724d032d7..297085822 100644 --- a/cake/tests/fixtures/project_fixture.php +++ b/cake/tests/fixtures/project_fixture.php @@ -57,4 +57,3 @@ class ProjectFixture extends CakeTestFixture { array('name' => 'Project 3') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php index f2ed850dd..0474274b6 100644 --- a/cake/tests/fixtures/sample_fixture.php +++ b/cake/tests/fixtures/sample_fixture.php @@ -58,4 +58,4 @@ class SampleFixture extends CakeTestFixture { array('apple_id' => 4, 'name' => 'sample3'), array('apple_id' => 5, 'name' => 'sample4') ); -} \ No newline at end of file +} diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php index 47a39de4a..6fb7ff6e2 100644 --- a/cake/tests/fixtures/secondary_model_fixture.php +++ b/cake/tests/fixtures/secondary_model_fixture.php @@ -55,5 +55,3 @@ class SecondaryModelFixture extends CakeTestFixture { array('secondary_name' => 'Secondary Name Existing') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php index ca19e6654..94706dd86 100644 --- a/cake/tests/fixtures/session_fixture.php +++ b/cake/tests/fixtures/session_fixture.php @@ -61,4 +61,3 @@ class SessionFixture extends CakeTestFixture { */ var $records = array(); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php index 39982b89e..b2071e235 100644 --- a/cake/tests/fixtures/something_else_fixture.php +++ b/cake/tests/fixtures/something_else_fixture.php @@ -61,5 +61,3 @@ class SomethingElseFixture extends CakeTestFixture { array('title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php index 16a25b7be..3821eec7d 100644 --- a/cake/tests/fixtures/something_fixture.php +++ b/cake/tests/fixtures/something_fixture.php @@ -61,5 +61,3 @@ class SomethingFixture extends CakeTestFixture { array('title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php index e152a0697..9ce038418 100644 --- a/cake/tests/fixtures/stories_tag_fixture.php +++ b/cake/tests/fixtures/stories_tag_fixture.php @@ -56,4 +56,3 @@ class StoriesTagFixture extends CakeTestFixture { array('story' => 1, 'tag_id' => 1) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php index f7bc60f6b..6bb408095 100644 --- a/cake/tests/fixtures/story_fixture.php +++ b/cake/tests/fixtures/story_fixture.php @@ -56,4 +56,3 @@ class StoryFixture extends CakeTestFixture { array('title' => 'Second Story') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php index ca9c6bbbd..df1a010c9 100644 --- a/cake/tests/fixtures/syfile_fixture.php +++ b/cake/tests/fixtures/syfile_fixture.php @@ -62,5 +62,3 @@ class SyfileFixture extends CakeTestFixture { array('image_id' => null, 'name' => 'Syfile 6') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php index d8be43215..802524b46 100644 --- a/cake/tests/fixtures/tag_fixture.php +++ b/cake/tests/fixtures/tag_fixture.php @@ -59,5 +59,3 @@ class TagFixture extends CakeTestFixture { array('tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php index 936ab241a..f83cb6344 100644 --- a/cake/tests/fixtures/test_plugin_article_fixture.php +++ b/cake/tests/fixtures/test_plugin_article_fixture.php @@ -62,5 +62,3 @@ class TestPluginArticleFixture extends CakeTestFixture { array('user_id' => 1, 'title' => 'Third Plugin Article', 'body' => 'Third Plugin Article Body', 'published' => 'Y', 'created' => '2008-09-24 10:43:23', 'updated' => '2008-09-24 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php index fdcaefc3a..b5d2508e7 100644 --- a/cake/tests/fixtures/test_plugin_comment_fixture.php +++ b/cake/tests/fixtures/test_plugin_comment_fixture.php @@ -65,5 +65,3 @@ class TestPluginCommentFixture extends CakeTestFixture { array('id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:55:23', 'updated' => '2008-09-24 10:57:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php index d3eb52b66..5c9c85cfe 100644 --- a/cake/tests/fixtures/the_paper_monkies_fixture.php +++ b/cake/tests/fixtures/the_paper_monkies_fixture.php @@ -53,5 +53,3 @@ class ThePaperMonkiesFixture extends CakeTestFixture { */ var $records = array(); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php index 32c2406f3..07e54e3e3 100644 --- a/cake/tests/fixtures/thread_fixture.php +++ b/cake/tests/fixtures/thread_fixture.php @@ -58,4 +58,3 @@ class ThreadFixture extends CakeTestFixture { array('project_id' => 2, 'name' => 'Project 2, Thread 1') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php index 6818215f4..2ca5c028c 100644 --- a/cake/tests/fixtures/translate_article_fixture.php +++ b/cake/tests/fixtures/translate_article_fixture.php @@ -84,5 +84,3 @@ class TranslateArticleFixture extends CakeTestFixture { array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedArticle', 'foreign_key' => 3, 'field' => 'body', 'content' => 'Body (cze) #3') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php index bc154112c..0e4ccc0ca 100644 --- a/cake/tests/fixtures/translate_fixture.php +++ b/cake/tests/fixtures/translate_fixture.php @@ -84,4 +84,3 @@ class TranslateFixture extends CakeTestFixture { array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Obsah #3') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php index 4c8543a61..900180b62 100644 --- a/cake/tests/fixtures/translate_table_fixture.php +++ b/cake/tests/fixtures/translate_table_fixture.php @@ -67,5 +67,3 @@ class TranslateTableFixture extends CakeTestFixture { array('locale' => 'eng', 'model' => 'TranslatedItemWithTable', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Another Content #1') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/translate_with_prefix_fixture.php b/cake/tests/fixtures/translate_with_prefix_fixture.php index a26e1e7f0..ddd487966 100644 --- a/cake/tests/fixtures/translate_with_prefix_fixture.php +++ b/cake/tests/fixtures/translate_with_prefix_fixture.php @@ -85,4 +85,3 @@ class TranslateWithPrefixFixture extends CakeTestFixture { array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Obsah #3') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php index e937be316..b98ca44e7 100644 --- a/cake/tests/fixtures/translated_article_fixture.php +++ b/cake/tests/fixtures/translated_article_fixture.php @@ -60,5 +60,3 @@ class TranslatedArticleFixture extends CakeTestFixture { array('id' => 3, 'user_id' => 1, 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php index 44df51549..0f9b126bd 100644 --- a/cake/tests/fixtures/translated_item_fixture.php +++ b/cake/tests/fixtures/translated_item_fixture.php @@ -57,5 +57,3 @@ class TranslatedItemFixture extends CakeTestFixture { array('slug' => 'third_translated') ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/cake/tests/fixtures/unconventional_tree_fixture.php index 42bccd5b7..29a22bea2 100644 --- a/cake/tests/fixtures/unconventional_tree_fixture.php +++ b/cake/tests/fixtures/unconventional_tree_fixture.php @@ -51,4 +51,3 @@ class UnconventionalTreeFixture extends CakeTestFixture { 'right' => array('type' => 'integer','null' => false), ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php index 37e0f96dd..22a81c366 100644 --- a/cake/tests/fixtures/underscore_field_fixture.php +++ b/cake/tests/fixtures/underscore_field_fixture.php @@ -60,5 +60,3 @@ class UnderscoreFieldFixture extends CakeTestFixture { ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php index 6f845ef7e..c0a4397fb 100644 --- a/cake/tests/fixtures/user_fixture.php +++ b/cake/tests/fixtures/user_fixture.php @@ -61,5 +61,3 @@ class UserFixture extends CakeTestFixture { array('user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php index 919a48260..282bcf900 100644 --- a/cake/tests/fixtures/uuid_fixture.php +++ b/cake/tests/fixtures/uuid_fixture.php @@ -61,5 +61,3 @@ class UuidFixture extends CakeTestFixture { array('id' => '47c36f9c-2578-4c2e-aeab-4e183ca6822b', 'title' => 'Unique record 4', 'count' => 3, 'created' => '2008-03-13 01:22:26', 'updated' => '2008-03-13 01:24:34'), ); } - -?> \ No newline at end of file diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/cake/tests/fixtures/uuid_tag_fixture.php index e30653b5b..e9bdfa276 100644 --- a/cake/tests/fixtures/uuid_tag_fixture.php +++ b/cake/tests/fixtures/uuid_tag_fixture.php @@ -56,4 +56,3 @@ class UuidTagFixture extends CakeTestFixture { array('id' => '481fc6d0-b920-43e0-e50f-6d1740cf8569', 'name' => 'MyTag', 'created' => '2009-12-09 12:30:00') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/cake/tests/fixtures/uuid_tree_fixture.php index 36481721e..1d811a908 100644 --- a/cake/tests/fixtures/uuid_tree_fixture.php +++ b/cake/tests/fixtures/uuid_tree_fixture.php @@ -49,4 +49,3 @@ class UuidTreeFixture extends CakeTestFixture { 'rght' => array('type' => 'integer','null' => false) ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/cake/tests/fixtures/uuiditem_fixture.php index 730c382d4..1d3ed9d1c 100644 --- a/cake/tests/fixtures/uuiditem_fixture.php +++ b/cake/tests/fixtures/uuiditem_fixture.php @@ -61,4 +61,3 @@ class UuiditemFixture extends CakeTestFixture { array('id' => '483798c8-c7cc-430e-8cf9-4fcc40cf8569', 'published' => 0, 'name' => 'Item 6') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php index 948cbc878..45cfefaaa 100644 --- a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php +++ b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php @@ -59,4 +59,3 @@ class UuiditemsUuidportfolioFixture extends CakeTestFixture { array('id' => '4851b94c-9790-42dc-b760-4f9240cf8569', 'uuiditem_id' => '482cfd4b-0e7c-4ea3-9582-4cec40cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php index 93e5cedcd..ce6c2e192 100644 --- a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php +++ b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php @@ -59,4 +59,3 @@ class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture { array('uuiditem_id' => '482cfd4b-0e7c-4ea3-9582-4cec40cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569') ); } -?> \ No newline at end of file diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/cake/tests/fixtures/uuidportfolio_fixture.php index a94366ee8..b509fa8c5 100644 --- a/cake/tests/fixtures/uuidportfolio_fixture.php +++ b/cake/tests/fixtures/uuidportfolio_fixture.php @@ -56,4 +56,3 @@ class UuidportfolioFixture extends CakeTestFixture { array('id' => '480af662-eb8c-47d3-886b-230540cf8569', 'name' => 'Portfolio 2'), ); } -?> \ No newline at end of file diff --git a/cake/tests/groups/acl.group.php b/cake/tests/groups/acl.group.php index 412254f08..ce0ac30e4 100644 --- a/cake/tests/groups/acl.group.php +++ b/cake/tests/groups/acl.group.php @@ -48,4 +48,3 @@ class AclAndAuthGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'components' . DS . 'auth'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/bake.group.php b/cake/tests/groups/bake.group.php index 5134f43f6..dc219eeb1 100644 --- a/cake/tests/groups/bake.group.php +++ b/cake/tests/groups/bake.group.php @@ -57,4 +57,3 @@ class BakeGroupTest extends TestSuite { TestManager::addTestFile($this, $path . 'project'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/behaviors.group.php b/cake/tests/groups/behaviors.group.php index f8bb3f508..0f0c69e27 100644 --- a/cake/tests/groups/behaviors.group.php +++ b/cake/tests/groups/behaviors.group.php @@ -46,4 +46,3 @@ class BehaviorsGroupTest extends TestSuite { TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'behaviors'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/cache.group.php b/cake/tests/groups/cache.group.php index 27f303a8e..c4b355e02 100644 --- a/cake/tests/groups/cache.group.php +++ b/cake/tests/groups/cache.group.php @@ -47,4 +47,3 @@ class CacheGroupTest extends TestSuite { TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cache'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/components.group.php b/cake/tests/groups/components.group.php index 1613333c1..08d8f1c86 100644 --- a/cake/tests/groups/components.group.php +++ b/cake/tests/groups/components.group.php @@ -46,4 +46,3 @@ class ComponentsGroupTest extends TestSuite { TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'components'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/configure.group.php b/cake/tests/groups/configure.group.php index c853fd5b6..1d387e6af 100644 --- a/cake/tests/groups/configure.group.php +++ b/cake/tests/groups/configure.group.php @@ -47,4 +47,3 @@ class ConfigureGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/console.group.php b/cake/tests/groups/console.group.php index adeff2722..7b7e59ceb 100644 --- a/cake/tests/groups/console.group.php +++ b/cake/tests/groups/console.group.php @@ -63,4 +63,3 @@ class ConsoleGroupTest extends TestSuite { TestManager::addTestFile($this, $path . 'view'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php index 9c097cea8..4e7086d95 100644 --- a/cake/tests/groups/controller.group.php +++ b/cake/tests/groups/controller.group.php @@ -47,4 +47,3 @@ class ControllerGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller_merge_vars'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/database.group.php b/cake/tests/groups/database.group.php index 5dfe69916..d341ed007 100644 --- a/cake/tests/groups/database.group.php +++ b/cake/tests/groups/database.group.php @@ -50,4 +50,3 @@ class DatabaseGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'datasources' . DS . 'dbo_source'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/helpers.group.php b/cake/tests/groups/helpers.group.php index 7093dfadf..fd30bbf29 100644 --- a/cake/tests/groups/helpers.group.php +++ b/cake/tests/groups/helpers.group.php @@ -47,4 +47,3 @@ class HelpersGroupTest extends TestSuite { TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/i18n.group.php b/cake/tests/groups/i18n.group.php index 03f7f6518..8a37930b5 100644 --- a/cake/tests/groups/i18n.group.php +++ b/cake/tests/groups/i18n.group.php @@ -48,4 +48,3 @@ class i18nGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'multibyte'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/javascript.group.php b/cake/tests/groups/javascript.group.php index 5dbc25bd1..6704cdc30 100644 --- a/cake/tests/groups/javascript.group.php +++ b/cake/tests/groups/javascript.group.php @@ -49,4 +49,3 @@ class AllCoreJavascriptHelpersGroupTest extends TestSuite { TestManager::addTestFile($this, $helperTestPath . 'prototype_engine.test.php'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php index 7306bb210..e7756abcb 100644 --- a/cake/tests/groups/lib.group.php +++ b/cake/tests/groups/lib.group.php @@ -61,4 +61,3 @@ class LibGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/model.group.php b/cake/tests/groups/model.group.php index 9af275d36..6aca57097 100644 --- a/cake/tests/groups/model.group.php +++ b/cake/tests/groups/model.group.php @@ -52,4 +52,3 @@ class ModelGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_validation'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/no_cross_contamination.group.php b/cake/tests/groups/no_cross_contamination.group.php index 4423a74e1..4dc8c8d28 100644 --- a/cake/tests/groups/no_cross_contamination.group.php +++ b/cake/tests/groups/no_cross_contamination.group.php @@ -65,4 +65,3 @@ class NoCrossContaminationGroupTest extends TestSuite { } } } -?> \ No newline at end of file diff --git a/cake/tests/groups/routing_system.group.php b/cake/tests/groups/routing_system.group.php index ccbdb4c88..09365f10b 100644 --- a/cake/tests/groups/routing_system.group.php +++ b/cake/tests/groups/routing_system.group.php @@ -47,4 +47,3 @@ class RoutingSystemGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'router'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/socket.group.php b/cake/tests/groups/socket.group.php index 4df351096..15df88ece 100644 --- a/cake/tests/groups/socket.group.php +++ b/cake/tests/groups/socket.group.php @@ -53,4 +53,3 @@ class SocketGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'http_socket'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/test_suite.group.php b/cake/tests/groups/test_suite.group.php index bc0f8bdd0..82d2ad85e 100644 --- a/cake/tests/groups/test_suite.group.php +++ b/cake/tests/groups/test_suite.group.php @@ -50,4 +50,3 @@ class TestSuiteGroupTest extends TestSuite { } } -?> \ No newline at end of file diff --git a/cake/tests/groups/view.group.php b/cake/tests/groups/view.group.php index c61706bde..62c3a7d86 100644 --- a/cake/tests/groups/view.group.php +++ b/cake/tests/groups/view.group.php @@ -47,4 +47,3 @@ class ViewsGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'theme'); } } -?> \ No newline at end of file diff --git a/cake/tests/groups/xml.group.php b/cake/tests/groups/xml.group.php index 70ed6f7e9..4f26e3c28 100644 --- a/cake/tests/groups/xml.group.php +++ b/cake/tests/groups/xml.group.php @@ -48,4 +48,3 @@ class XmlGroupTest extends TestSuite { TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers' . DS .'xml'); } } -?> \ No newline at end of file diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php index 5f9341387..05a6c8c59 100644 --- a/cake/tests/lib/cake_test_case.php +++ b/cake/tests/lib/cake_test_case.php @@ -829,4 +829,3 @@ class CakeTestCase extends UnitTestCase { } } } -?> \ No newline at end of file diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php index f460fadd3..08fb1e2e4 100644 --- a/cake/tests/lib/cake_test_fixture.php +++ b/cake/tests/lib/cake_test_fixture.php @@ -192,4 +192,3 @@ class CakeTestFixture extends Object { return $return; } } -?> \ No newline at end of file diff --git a/cake/tests/lib/cake_test_model.php b/cake/tests/lib/cake_test_model.php index 46d01d973..7a27f2669 100644 --- a/cake/tests/lib/cake_test_model.php +++ b/cake/tests/lib/cake_test_model.php @@ -29,4 +29,3 @@ class CakeTestModel extends Model { var $useDbConfig = 'test_suite'; var $cacheSources = false; } -?> \ No newline at end of file diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php index 531448d7c..388eab155 100644 --- a/cake/tests/lib/cake_test_suite_dispatcher.php +++ b/cake/tests/lib/cake_test_suite_dispatcher.php @@ -247,4 +247,3 @@ class CakeTestSuiteDispatcher { $this->Manager->runTestCase($this->params['case'], $Reporter); } } -?> \ No newline at end of file diff --git a/cake/tests/lib/cake_web_test_case.php b/cake/tests/lib/cake_web_test_case.php index bd328584e..7ada64474 100644 --- a/cake/tests/lib/cake_web_test_case.php +++ b/cake/tests/lib/cake_web_test_case.php @@ -31,4 +31,3 @@ */ class CakeWebTestCase extends WebTestCase { } -?> \ No newline at end of file diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php index 3b2827ae7..c8dcccecb 100644 --- a/cake/tests/lib/code_coverage_manager.php +++ b/cake/tests/lib/code_coverage_manager.php @@ -802,4 +802,3 @@ class CodeCoverageManager { return false; } } -?> \ No newline at end of file diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/cake/tests/lib/reporter/cake_base_reporter.php index 0c1b12d14..0e54b4269 100644 --- a/cake/tests/lib/reporter/cake_base_reporter.php +++ b/cake/tests/lib/reporter/cake_base_reporter.php @@ -223,4 +223,3 @@ class CakeBaseReporter extends SimpleReporter { } } -?> \ No newline at end of file diff --git a/cake/tests/lib/reporter/cake_cli_reporter.php b/cake/tests/lib/reporter/cake_cli_reporter.php index 654cfce2e..f12eb90db 100644 --- a/cake/tests/lib/reporter/cake_cli_reporter.php +++ b/cake/tests/lib/reporter/cake_cli_reporter.php @@ -176,4 +176,3 @@ class CakeCliReporter extends CakeBaseReporter { return $out; } } -?> \ No newline at end of file diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php index e202a80cc..5d290664f 100755 --- a/cake/tests/lib/reporter/cake_html_reporter.php +++ b/cake/tests/lib/reporter/cake_html_reporter.php @@ -376,4 +376,3 @@ class CakeHtmlReporter extends CakeBaseReporter { return htmlentities($message, ENT_COMPAT, $this->_characterSet); } } -?> \ No newline at end of file diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php index cc4a6ac3e..03e02e1b3 100644 --- a/cake/tests/lib/reporter/cake_text_reporter.php +++ b/cake/tests/lib/reporter/cake_text_reporter.php @@ -196,4 +196,3 @@ class CakeTextReporter extends CakeBaseReporter { echo $buffer; } } -?> \ No newline at end of file diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php index 335fb37e4..22fff3eab 100644 --- a/cake/tests/lib/test_manager.php +++ b/cake/tests/lib/test_manager.php @@ -419,5 +419,3 @@ class TestManager { return $this->_groupExtension; } } - -?> \ No newline at end of file diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/cake/tests/test_app/controllers/tests_apps_controller.php index 69047642c..e3902d4e2 100644 --- a/cake/tests/test_app/controllers/tests_apps_controller.php +++ b/cake/tests/test_app/controllers/tests_apps_controller.php @@ -33,4 +33,3 @@ class TestsAppsController extends AppController { $this->render('index'); } } -?> \ No newline at end of file diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/cake/tests/test_app/controllers/tests_apps_posts_controller.php index 49f396d4d..88bd5f63e 100644 --- a/cake/tests/test_app/controllers/tests_apps_posts_controller.php +++ b/cake/tests/test_app/controllers/tests_apps_posts_controller.php @@ -64,4 +64,3 @@ class TestsAppsPostsController extends AppController { } } -?> \ No newline at end of file diff --git a/cake/tests/test_app/libs/cache/test_app_cache.php b/cake/tests/test_app/libs/cache/test_app_cache.php index 1cc9b7c52..eeb8ec66e 100644 --- a/cake/tests/test_app/libs/cache/test_app_cache.php +++ b/cake/tests/test_app/libs/cache/test_app_cache.php @@ -19,4 +19,4 @@ */ class TestAppCacheEngine extends CacheEngine { -} \ No newline at end of file +} diff --git a/cake/tests/test_app/libs/library.php b/cake/tests/test_app/libs/library.php index ecb12ec91..eaad93f8a 100644 --- a/cake/tests/test_app/libs/library.php +++ b/cake/tests/test_app/libs/library.php @@ -18,4 +18,3 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class Library {} -?> \ No newline at end of file diff --git a/cake/tests/test_app/libs/log/test_app_log.php b/cake/tests/test_app/libs/log/test_app_log.php index 58cb9b5ba..336e3169b 100644 --- a/cake/tests/test_app/libs/log/test_app_log.php +++ b/cake/tests/test_app/libs/log/test_app_log.php @@ -22,4 +22,4 @@ class TestAppLog { function write($type, $message) { } -} \ No newline at end of file +} diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/cake/tests/test_app/models/behaviors/persister_one_behavior.php index 6a5b5a5aa..766b16066 100644 --- a/cake/tests/test_app/models/behaviors/persister_one_behavior.php +++ b/cake/tests/test_app/models/behaviors/persister_one_behavior.php @@ -28,7 +28,4 @@ * @subpackage cake.cake.console.libs */ class PersisterOneBehaviorBehavior extends ModelBehavior { - - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/cake/tests/test_app/models/behaviors/persister_two_behavior.php index 1f619239e..ba9887c1f 100644 --- a/cake/tests/test_app/models/behaviors/persister_two_behavior.php +++ b/cake/tests/test_app/models/behaviors/persister_two_behavior.php @@ -28,7 +28,4 @@ * @subpackage cake.cake.console.libs */ class PersisterTwoBehaviorBehavior extends ModelBehavior { - - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/models/comment.php b/cake/tests/test_app/models/comment.php index 585e8ebfa..59194d768 100644 --- a/cake/tests/test_app/models/comment.php +++ b/cake/tests/test_app/models/comment.php @@ -23,4 +23,3 @@ class Comment extends AppModel { var $useTable = 'comments'; var $name = 'Comment'; } -?> \ No newline at end of file diff --git a/cake/tests/test_app/models/datasources/test/test_local_driver.php b/cake/tests/test_app/models/datasources/test/test_local_driver.php index fe9c9fdd3..e483cb303 100644 --- a/cake/tests/test_app/models/datasources/test/test_local_driver.php +++ b/cake/tests/test_app/models/datasources/test/test_local_driver.php @@ -3,4 +3,3 @@ class TestLocalDriver extends TestSource { } -?> \ No newline at end of file diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php index c12c0ebad..0d2239fb4 100644 --- a/cake/tests/test_app/models/persister_one.php +++ b/cake/tests/test_app/models/persister_one.php @@ -27,4 +27,3 @@ class PersisterOne extends AppModel { var $hasMany = array('Comment', 'TestPlugin.TestPluginComment'); } -?> \ No newline at end of file diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php index 0a2916055..e2d1ce172 100644 --- a/cake/tests/test_app/models/persister_two.php +++ b/cake/tests/test_app/models/persister_two.php @@ -27,4 +27,3 @@ class PersisterTwo extends AppModel { var $hasMany = array('Comment', 'TestPlugin.TestPluginComment'); } -?> \ No newline at end of file diff --git a/cake/tests/test_app/models/post.php b/cake/tests/test_app/models/post.php index bd9188c28..2a0579eaf 100644 --- a/cake/tests/test_app/models/post.php +++ b/cake/tests/test_app/models/post.php @@ -23,4 +23,3 @@ class Post extends AppModel { var $useTable = 'posts'; var $name = 'Post'; } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/config/load.php b/cake/tests/test_app/plugins/test_plugin/config/load.php index 6b2c14b53..c343e54aa 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/load.php +++ b/cake/tests/test_app/plugins/test_plugin/config/load.php @@ -18,4 +18,3 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ $config['plugin_load'] = '/test_app/plugins/test_plugin/config/load.php'; -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/cake/tests/test_app/plugins/test_plugin/config/more.load.php index edb955357..799d8a264 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/more.load.php +++ b/cake/tests/test_app/plugins/test_plugin/config/more.load.php @@ -18,4 +18,3 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ $config['plugin_more_load'] = '/test_app/plugins/test_plugin/config/more.load.php'; -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php index dad4327c8..74d6421aa 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php +++ b/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php @@ -33,6 +33,4 @@ class TestPluginAppSchema extends CakeSchema { 'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10), 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)) ); - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php index a4b9ff437..f3b837ae3 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php @@ -18,6 +18,4 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class OtherComponentComponent extends Object { - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php index 7c80630d4..f59cda650 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php @@ -20,4 +20,3 @@ class PluginsComponentComponent extends Object { var $components = array('TestPlugin.OtherComponent'); } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php index 3121c55e2..f30a8d3b2 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php @@ -20,4 +20,3 @@ class TestPluginComponentComponent extends Object { var $components = array('TestPlugin.TestPluginOtherComponent'); } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php index 840a8d579..6726c0fba 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php @@ -18,6 +18,4 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class TestPluginOtherComponentComponent extends Object { - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php index 1259638f2..5c73647c9 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php @@ -27,4 +27,4 @@ class TestPluginController extends TestPluginAppController { function add() { $this->autoRender = false; } -} \ No newline at end of file +} diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php index 20ea25dc9..1a1244798 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php @@ -30,4 +30,3 @@ class TestsController extends TestPluginAppController { return 25; } } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php index 9b63de842..15529ce91 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php @@ -18,5 +18,4 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class TestPluginCacheEngine extends CacheEngine { - -} \ No newline at end of file +} diff --git a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php index dde74f61a..36687fe81 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php @@ -22,4 +22,4 @@ class TestPluginLog { function write($type, $message) { } -} \ No newline at end of file +} diff --git a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php index 887ed69e0..3dd78d8ad 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php @@ -18,4 +18,3 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class TestPluginLibrary {} -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php index adfda0ab0..4f62e595c 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php +++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php @@ -31,7 +31,4 @@ * @subpackage cake.cake.console.libs */ class TestPluginPersisterOneBehavior extends ModelBehavior { - - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php index dff3d6b1f..3df95a54a 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php +++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php @@ -31,7 +31,4 @@ * @subpackage cake.cake.console.libs */ class TestPluginPersisterTwoBehavior extends ModelBehavior { - - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php b/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php index aee12a17a..779eeb709 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php +++ b/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php @@ -5,5 +5,3 @@ class DboDummy extends DboSource { return true; } } - -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php b/cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php index beae8d0b6..eb7706642 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php +++ b/cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php @@ -2,5 +2,3 @@ class TestDriver extends TestSource { } - -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php b/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php index f940f1ac9..2fc4026b0 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php +++ b/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php @@ -24,6 +24,4 @@ class TestSource extends DataSource { function delete($model, $id) { return compact('model', 'id'); } - } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php index 9732b7371..fd6c92d48 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php @@ -43,4 +43,4 @@ class TestPluginAuthUser extends TestPluginAppModel { * @access public */ var $useDbConfig = 'test_suite'; -} \ No newline at end of file +} diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php index f447c3735..fedd811e2 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php @@ -27,4 +27,3 @@ class TestPluginAuthors extends TestPluginAppModel { var $useTable = 'authors'; var $name = 'TestPluginAuthors'; } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php index 84fbf0c98..2d7c38fdb 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php @@ -27,4 +27,3 @@ class TestPluginComment extends TestPluginAppModel { var $useTable = 'test_plugin_comments'; var $name = 'TestPluginComment'; } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php index fa8ec0e1c..9ab447fae 100644 --- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php +++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php @@ -34,4 +34,4 @@ class TestPluginPost extends TestPluginAppModel { * @var string */ var $useTable = 'posts'; -} \ No newline at end of file +} diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php index 7927bd02d..8919faab1 100644 --- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php @@ -18,4 +18,3 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class TestPluginAppController extends AppController { } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php index a09ca1c60..c2866a1fb 100644 --- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php +++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php @@ -18,4 +18,3 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class TestPluginAppModel extends CakeTestModel {} -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php index 236156ed6..77fd73dc9 100644 --- a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php +++ b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php @@ -19,4 +19,3 @@ */ class SamplePluginClassTestName { } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php index 5cb630519..5e8bfdf98 100644 --- a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php +++ b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php @@ -28,4 +28,4 @@ class ExampleShell extends Shell { function main() { $this->out('This is the main method called from TestPlugin.ExampleShell'); } -} \ No newline at end of file +} diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php index b7e9718b8..9bcc1c47f 100644 --- a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php +++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php @@ -18,4 +18,3 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ class OtherHelperHelper extends AppHelper {} -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php index e94d6810b..755ae6e5a 100644 --- a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php +++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php @@ -20,4 +20,3 @@ class PluggedHelperHelper extends AppHelper { var $helpers = array('TestPlugin.OtherHelper'); } -?> \ No newline at end of file diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php index 2fe7408c9..d3359810e 100644 --- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php +++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php @@ -28,4 +28,4 @@ class ExampleShell extends Shell { function main() { $this->out('This is the main method called from TestPluginTwo.ExampleShell'); } -} \ No newline at end of file +} diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php index 8f7c97c6c..98a71b778 100644 --- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php +++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php @@ -28,4 +28,4 @@ class WelcomeShell extends Shell { function say_hello() { $this->out('This is the say_hello method called from TestPluginTwo.WelcomeShell'); } -} \ No newline at end of file +} diff --git a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php index 251091b40..3540d0f0d 100644 --- a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php +++ b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php @@ -19,4 +19,3 @@ */ class ConfigureTestVendorSample { } -?> \ No newline at end of file diff --git a/cake/tests/test_app/vendors/shells/sample.php b/cake/tests/test_app/vendors/shells/sample.php index 32c76215b..408b22ae5 100644 --- a/cake/tests/test_app/vendors/shells/sample.php +++ b/cake/tests/test_app/vendors/shells/sample.php @@ -28,4 +28,4 @@ class SampleShell extends Shell { function main() { $this->out('This is the main method called from SampleShell'); } -} \ No newline at end of file +} diff --git a/cake/tests/test_app/views/helpers/banana.php b/cake/tests/test_app/views/helpers/banana.php index 514bd3d74..4b020ae6b 100644 --- a/cake/tests/test_app/views/helpers/banana.php +++ b/cake/tests/test_app/views/helpers/banana.php @@ -17,5 +17,4 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ class BananaHelper extends Helper { - -} \ No newline at end of file +} diff --git a/index.php b/index.php index 6fc36bf14..9fd58145e 100644 --- a/index.php +++ b/index.php @@ -53,4 +53,3 @@ define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); } require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php'; -?> \ No newline at end of file From 91a40a01049769e8818643c97d9028e46f74f175 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Mon, 10 May 2010 23:45:47 -0400 Subject: [PATCH 019/100] Making null check explicit so falsey default values can be used. Fixes #695 --- cake/console/cake.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/console/cake.php b/cake/console/cake.php index 595ed9c3a..a4c89b520 100644 --- a/cake/console/cake.php +++ b/cake/console/cake.php @@ -438,7 +438,7 @@ class ShellDispatcher { $printOptions = '(' . implode('/', $options) . ')'; } - if ($default == null) { + if ($default === null) { $this->stdout($prompt . " $printOptions \n" . '> ', false); } else { $this->stdout($prompt . " $printOptions \n" . "[$default] > ", false); From ec10a015045d153f46ff769d9f117447c9523455 Mon Sep 17 00:00:00 2001 From: Robert Sworder Date: Mon, 10 May 2010 06:02:05 -0700 Subject: [PATCH 020/100] Changing home.ctp to remove references to 1.2. Fixes #705 Signed-off-by: Mark Story --- cake/libs/view/pages/home.ctp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp index a217acde2..848ab3ad3 100644 --- a/cake/libs/view/pages/home.ctp +++ b/cake/libs/view/pages/home.ctp @@ -106,8 +106,8 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');

Html->link( - sprintf('%s%s', __('new', true ), __('CakePHP 1.2 Docs', true )), - 'http://book.cakephp.org', + sprintf('%s%s', __('new', true ), __('CakePHP 1.3 Docs', true )), + 'http://book.cakephp.org/view/875/x1-3-Collection', array('target' => '_blank', 'escape' => false) ); ?> From 96d0119abcb1b2f893d865c34f4811168b1e1606 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Mon, 10 May 2010 23:58:22 -0400 Subject: [PATCH 021/100] Applying patches from 'wals' to fix uses where incorrect parameters were being passed into methods, and making methods match their documentation blocks. Fixes #668 --- cake/console/libs/shell.php | 6 +++--- cake/console/libs/tasks/controller.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php index b736a64d7..65333f01d 100644 --- a/cake/console/libs/shell.php +++ b/cake/console/libs/shell.php @@ -570,14 +570,14 @@ class Shell extends Object { } /** - * Creates the proper singular model key for associations + * Creates the proper underscored model key for associations * - * @param string $name Controller class name + * @param string $name Model class name * @return string Singular model key * @access protected */ function _modelKey($name) { - return Inflector::underscore(Inflector::singularize($name)) . '_id'; + return Inflector::underscore($name) . '_id'; } /** diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php index 62bcb7660..36fd91600 100644 --- a/cake/console/libs/tasks/controller.php +++ b/cake/console/libs/tasks/controller.php @@ -287,7 +287,7 @@ class ControllerTask extends BakeTask { $controllerPath = $this->_controllerPath($controllerName); $pluralName = $this->_pluralName($currentModelName); $singularName = Inflector::variable($currentModelName); - $singularHumanName = $this->_singularHumanName($currentModelName); + $singularHumanName = $this->_singularHumanName($controllerName); $pluralHumanName = $this->_pluralName($controllerName); $this->Template->set(compact('admin', 'controllerPath', 'pluralName', 'singularName', 'singularHumanName', From a4950f6940c03c77ae93684dd4e8cc4c88166663 Mon Sep 17 00:00:00 2001 From: Richard Sbresny Date: Thu, 29 Apr 2010 09:45:20 +1000 Subject: [PATCH 022/100] Updated session timeout calculations to use the security level from core.php as the multiplier. Signed-off-by: Mark Story --- cake/libs/cake_session.php | 33 +++++++++++++---- .../controller/components/session.test.php | 37 +++++++++++++++++++ 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index 46c2441e9..900ecf4c8 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -130,6 +130,14 @@ class CakeSession extends Object { */ var $host = null; +/** + * Session timeout multiplier factor + * + * @var ineteger + * @access public + */ + var $timeout = null; + /** * Constructor. * @@ -190,6 +198,18 @@ class CakeSession extends Object { } $this->sessionTime = $this->time + (Security::inactiveMins() * Configure::read('Session.timeout')); $this->security = Configure::read('Security.level'); + switch ($this->security) { + case 'medium': + $this->factor = 100; + break; + case 'low': + $this->factor = 300; + break; + case 'high': + default: + $this->factor = 10; + break; + } } parent::__construct(); } @@ -467,20 +487,20 @@ class CakeSession extends Object { switch ($this->security) { case 'high': - $this->cookieLifeTime = 0; + $this->cookieLifeTime = Configure::read('Session.timeout') * $this->factor; if ($iniSet) { ini_set('session.referer_check', $this->host); } break; case 'medium': - $this->cookieLifeTime = 7 * 86400; + $this->cookieLifeTime = Configure::read('Session.timeout') * $this->factor; if ($iniSet) { ini_set('session.referer_check', $this->host); } break; case 'low': default: - $this->cookieLifeTime = 788940000; + $this->cookieLifeTime = Configure::read('Session.timeout') * $this->factor; break; } @@ -604,15 +624,14 @@ class CakeSession extends Object { if ((Configure::read('Session.checkAgent') === false || $this->_userAgent == $this->read('Config.userAgent')) && $this->time <= $this->read('Config.time')) { $time = $this->read('Config.time'); $this->write('Config.time', $this->sessionTime); - if (Configure::read('Security.level') === 'high') { $check = $this->read('Config.timeout'); $check = $check - 1; - $this->write('Config.timeout', $check); + $this->write('Config.timeout', $this->factor); if (time() > ($time - (Security::inactiveMins() * Configure::read('Session.timeout')) + 2) || $check < 1) { $this->renew(); - $this->write('Config.timeout', 10); + $this->write('Config.timeout', $this->factor); } } $this->valid = true; @@ -624,7 +643,7 @@ class CakeSession extends Object { } else { $this->write('Config.userAgent', $this->_userAgent); $this->write('Config.time', $this->sessionTime); - $this->write('Config.timeout', 10); + $this->write('Config.timeout', $this->factor); $this->valid = true; $this->__setError(1, 'Session is valid'); } diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php index e8b724413..97e00e6f4 100644 --- a/cake/tests/cases/libs/controller/components/session.test.php +++ b/cake/tests/cases/libs/controller/components/session.test.php @@ -341,4 +341,41 @@ class SessionComponentTest extends CakeTestCase { $Session->destroy('Test'); $this->assertNull($Session->read('Test')); } + +/** + * testSessionTimeout method + * + * @access public + * @return void + */ + function testSessionTimeout() { + + session_destroy(); + $Session =& new SessionComponent(); + Configure::write('Security.level', 'low'); + $Session->write('Test', 'some value'); + $this->assertEqual($_SESSION['Config']['timeout'], $Session->factor); + $this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime); + $this->assertEqual($Session->time, mktime()); + $this->assertEqual($_SESSION['Config']['time'], $Session->time + ($Session->factor * Configure::read('Session.timeout'))); + + session_destroy(); + $Session =& new SessionComponent(); + Configure::write('Security.level', 'medium'); + $Session->write('Test', 'some value'); + $this->assertEqual($_SESSION['Config']['timeout'], $Session->factor); + $this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime); + $this->assertEqual($Session->time, mktime()); + $this->assertEqual($_SESSION['Config']['time'], $Session->time + ($Session->factor * Configure::read('Session.timeout'))); + + session_destroy(); + $Session =& new SessionComponent(); + Configure::write('Security.level', 'high'); + $Session->write('Test', 'some value'); + $this->assertEqual($_SESSION['Config']['timeout'], $Session->factor); + $this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime); + $this->assertEqual($Session->time, mktime()); + $this->assertEqual($_SESSION['Config']['time'], $Session->time + ($Session->factor * Configure::read('Session.timeout'))); + + } } From c62ae5e48a7de8cbbf7e0241d201f75ab9ddfb57 Mon Sep 17 00:00:00 2001 From: Richard Sbresny Date: Thu, 29 Apr 2010 09:59:45 +1000 Subject: [PATCH 023/100] Included timeout multiplier factor to be used not just inside a session start Signed-off-by: Mark Story --- cake/libs/cake_session.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index 900ecf4c8..453349acd 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -198,18 +198,18 @@ class CakeSession extends Object { } $this->sessionTime = $this->time + (Security::inactiveMins() * Configure::read('Session.timeout')); $this->security = Configure::read('Security.level'); - switch ($this->security) { - case 'medium': - $this->factor = 100; - break; - case 'low': - $this->factor = 300; - break; - case 'high': - default: - $this->factor = 10; - break; - } + } + switch ($this->security) { + case 'medium': + $this->factor = 100; + break; + case 'low': + $this->factor = 300; + break; + case 'high': + default: + $this->factor = 10; + break; } parent::__construct(); } From 5cf08cbe922e8192750a26b1ec515603ca5367db Mon Sep 17 00:00:00 2001 From: Richard Sbresny Date: Thu, 29 Apr 2010 12:04:50 +1000 Subject: [PATCH 024/100] Updated default values to reflect the static values previously set Signed-off-by: Mark Story --- app/config/core.php | 4 ++-- cake/libs/cake_session.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/config/core.php b/app/config/core.php index 935863f93..18e24cb38 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -189,8 +189,8 @@ * Valid values: * * 'high' Session timeout in 'Session.timeout' x 10 - * 'medium' Session timeout in 'Session.timeout' x 100 - * 'low' Session timeout in 'Session.timeout' x 300 + * 'medium' Session timeout in 'Session.timeout' x 5040 + * 'low' Session timeout in 'Session.timeout' x 2628000 * * CakePHP session IDs are also regenerated between requests if * 'Security.level' is set to 'high'. diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index 453349acd..e43bed944 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -201,10 +201,10 @@ class CakeSession extends Object { } switch ($this->security) { case 'medium': - $this->factor = 100; + $this->factor = 5040; break; case 'low': - $this->factor = 300; + $this->factor = 2628000; break; case 'high': default: @@ -773,10 +773,10 @@ class CakeSession extends Object { function __write($id, $data) { switch (Configure::read('Security.level')) { case 'medium': - $factor = 100; + $factor = 5040; break; case 'low': - $factor = 300; + $factor = 2628000; break; case 'high': default: From b04a3f8514a13d852dd9f713ffcedc201e641b59 Mon Sep 17 00:00:00 2001 From: Richard Sbresny Date: Fri, 7 May 2010 16:37:14 +1000 Subject: [PATCH 025/100] Switched over to using the previously unused Security::inactiveMins() method for getting timeout modifiers Signed-off-by: Mark Story --- cake/libs/cake_session.php | 40 ++++--------------- .../controller/components/session.test.php | 21 +++++----- 2 files changed, 18 insertions(+), 43 deletions(-) diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index e43bed944..3ccfa8e60 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -199,18 +199,6 @@ class CakeSession extends Object { $this->sessionTime = $this->time + (Security::inactiveMins() * Configure::read('Session.timeout')); $this->security = Configure::read('Security.level'); } - switch ($this->security) { - case 'medium': - $this->factor = 5040; - break; - case 'low': - $this->factor = 2628000; - break; - case 'high': - default: - $this->factor = 10; - break; - } parent::__construct(); } @@ -487,20 +475,20 @@ class CakeSession extends Object { switch ($this->security) { case 'high': - $this->cookieLifeTime = Configure::read('Session.timeout') * $this->factor; + $this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins(); if ($iniSet) { ini_set('session.referer_check', $this->host); } break; case 'medium': - $this->cookieLifeTime = Configure::read('Session.timeout') * $this->factor; + $this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins(); if ($iniSet) { ini_set('session.referer_check', $this->host); } break; case 'low': default: - $this->cookieLifeTime = Configure::read('Session.timeout') * $this->factor; + $this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins(); break; } @@ -627,11 +615,11 @@ class CakeSession extends Object { if (Configure::read('Security.level') === 'high') { $check = $this->read('Config.timeout'); $check = $check - 1; - $this->write('Config.timeout', $this->factor); + $this->write('Config.timeout', Security::inactiveMins()); if (time() > ($time - (Security::inactiveMins() * Configure::read('Session.timeout')) + 2) || $check < 1) { $this->renew(); - $this->write('Config.timeout', $this->factor); + $this->write('Config.timeout', Security::inactiveMins()); } } $this->valid = true; @@ -643,7 +631,7 @@ class CakeSession extends Object { } else { $this->write('Config.userAgent', $this->_userAgent); $this->write('Config.time', $this->sessionTime); - $this->write('Config.timeout', $this->factor); + $this->write('Config.timeout', Security::inactiveMins()); $this->valid = true; $this->__setError(1, 'Session is valid'); } @@ -771,21 +759,7 @@ class CakeSession extends Object { * @access private */ function __write($id, $data) { - switch (Configure::read('Security.level')) { - case 'medium': - $factor = 5040; - break; - case 'low': - $factor = 2628000; - break; - case 'high': - default: - $factor = 10; - break; - } - - $expires = time() + Configure::read('Session.timeout') * $factor; - + $expires = time() + Configure::read('Session.timeout') * Security::inactiveMins(); $model =& ClassRegistry::getObject('Session'); $return = $model->save(compact('id', 'data', 'expires')); return $return; diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php index 97e00e6f4..0cb8d1724 100644 --- a/cake/tests/cases/libs/controller/components/session.test.php +++ b/cake/tests/cases/libs/controller/components/session.test.php @@ -351,31 +351,32 @@ class SessionComponentTest extends CakeTestCase { function testSessionTimeout() { session_destroy(); - $Session =& new SessionComponent(); + unset($Session); Configure::write('Security.level', 'low'); + $Session =& new SessionComponent(); $Session->write('Test', 'some value'); - $this->assertEqual($_SESSION['Config']['timeout'], $Session->factor); + $this->assertEqual($_SESSION['Config']['timeout'], Security::inactiveMins()); $this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime); $this->assertEqual($Session->time, mktime()); - $this->assertEqual($_SESSION['Config']['time'], $Session->time + ($Session->factor * Configure::read('Session.timeout'))); - + $this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * Configure::read('Session.timeout'))); + session_destroy(); - $Session =& new SessionComponent(); Configure::write('Security.level', 'medium'); + $Session =& new SessionComponent(); $Session->write('Test', 'some value'); - $this->assertEqual($_SESSION['Config']['timeout'], $Session->factor); + $this->assertEqual($_SESSION['Config']['timeout'], Security::inactiveMins()); $this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime); $this->assertEqual($Session->time, mktime()); - $this->assertEqual($_SESSION['Config']['time'], $Session->time + ($Session->factor * Configure::read('Session.timeout'))); + $this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * Configure::read('Session.timeout'))); session_destroy(); - $Session =& new SessionComponent(); Configure::write('Security.level', 'high'); + $Session =& new SessionComponent(); $Session->write('Test', 'some value'); - $this->assertEqual($_SESSION['Config']['timeout'], $Session->factor); + $this->assertEqual($_SESSION['Config']['timeout'], Security::inactiveMins()); $this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime); $this->assertEqual($Session->time, mktime()); - $this->assertEqual($_SESSION['Config']['time'], $Session->time + ($Session->factor * Configure::read('Session.timeout'))); + $this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * Configure::read('Session.timeout'))); } } From 05beaab272114aac81ee54d4de41490a18ed1f38 Mon Sep 17 00:00:00 2001 From: Richard Sbresny Date: Fri, 7 May 2010 16:38:14 +1000 Subject: [PATCH 026/100] Removed unnecessary unset Signed-off-by: Mark Story --- cake/tests/cases/libs/controller/components/session.test.php | 1 - 1 file changed, 1 deletion(-) diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php index 0cb8d1724..f1da8b0db 100644 --- a/cake/tests/cases/libs/controller/components/session.test.php +++ b/cake/tests/cases/libs/controller/components/session.test.php @@ -351,7 +351,6 @@ class SessionComponentTest extends CakeTestCase { function testSessionTimeout() { session_destroy(); - unset($Session); Configure::write('Security.level', 'low'); $Session =& new SessionComponent(); $Session->write('Test', 'some value'); From 6e355312bbefd69a5bb945caeb5b4b85e1e1e939 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Tue, 11 May 2010 00:39:10 -0400 Subject: [PATCH 027/100] Fixing issue where Config.timeout wouldn't correctly countdown when many quick requests were sent. --- cake/libs/cake_session.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index 3ccfa8e60..97fb04571 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -614,8 +614,8 @@ class CakeSession extends Object { $this->write('Config.time', $this->sessionTime); if (Configure::read('Security.level') === 'high') { $check = $this->read('Config.timeout'); - $check = $check - 1; - $this->write('Config.timeout', Security::inactiveMins()); + $check -= 1; + $this->write('Config.timeout', $check); if (time() > ($time - (Security::inactiveMins() * Configure::read('Session.timeout')) + 2) || $check < 1) { $this->renew(); From 3539660cd042fd028d9e63b455403b8941c6b980 Mon Sep 17 00:00:00 2001 From: ADmad Date: Wed, 12 May 2010 00:42:02 +0530 Subject: [PATCH 028/100] Space is now properly added inbetween when 'asc'/'desc' class is appended to user defined css class in PaginatorHelper::sort. Fixes #710 --- cake/libs/view/helpers/paginator.php | 2 +- cake/tests/cases/libs/view/helpers/paginator.test.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php index 3fee720e4..2c8268ea8 100644 --- a/cake/libs/view/helpers/paginator.php +++ b/cake/libs/view/helpers/paginator.php @@ -316,7 +316,7 @@ class PaginatorHelper extends AppHelper { $dir = $this->sortDir($options['model']) === 'asc' ? 'desc' : 'asc'; $class = $dir === 'asc' ? 'desc' : 'asc'; if (!empty($options['class'])) { - $options['class'] .= $class; + $options['class'] .= ' ' . $class; } else { $options['class'] = $class; } diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php index 9ee145244..398a3e2e2 100644 --- a/cake/tests/cases/libs/view/helpers/paginator.test.php +++ b/cake/tests/cases/libs/view/helpers/paginator.test.php @@ -188,7 +188,6 @@ class PaginatorHelperTest extends CakeTestCase { $result = $this->Paginator->sort('title'); $this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result); - $this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc'); $this->Paginator->params['paging']['Article']['options']['sort'] = null; $result = $this->Paginator->sort('title'); @@ -199,23 +198,25 @@ class PaginatorHelperTest extends CakeTestCase { $result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc')); $this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result); - $this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc'); $this->Paginator->params['paging']['Article']['options']['sort'] = null; $result = $this->Paginator->sort('Title', 'title', array('direction' => 'asc')); $this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result); - $this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc'); $this->Paginator->params['paging']['Article']['options']['sort'] = null; $result = $this->Paginator->sort('Title', 'title', array('direction' => 'asc')); $this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result); - $this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc'); $this->Paginator->params['paging']['Article']['options']['sort'] = null; $result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc')); $this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result); + + $this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc'); + $this->Paginator->params['paging']['Article']['options']['sort'] = null; + $result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc', 'class' => 'foo')); + $this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="foo asc">Title<\/a>$/', $result); } /** From 6add43a4bc250305442d3615bec5e56dde8cb11c Mon Sep 17 00:00:00 2001 From: Mark Story Date: Tue, 11 May 2010 22:40:56 -0400 Subject: [PATCH 029/100] Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675 --- cake/libs/model/model.php | 2 +- cake/tests/cases/libs/model/model_write.test.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 6b759ee66..4efe17e11 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -1281,7 +1281,7 @@ class Model extends Overloadable { } } - if (isset($this->data[$this->alias][$this->primaryKey]) && empty($this->data[$this->alias][$this->primaryKey])) { + if (empty($this->data[$this->alias][$this->primaryKey])) { unset($this->data[$this->alias][$this->primaryKey]); } $fields = $values = array(); diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index b30a8f25c..d405d413e 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -905,13 +905,14 @@ class ModelWriteTest extends BaseModelTest { * @return void */ function testSaveWithNullId() { + $this->loadFixtures('User'); $User =& new User(); $User->read(null, 1); $User->data['User']['id'] = null; $this->assertTrue($User->save(array('password' => 'test'))); $this->assertTrue($User->id > 0); - $User->read(null, 2); + $result = $User->read(null, 2); $User->data['User']['id'] = null; $this->assertTrue($User->save(array('password' => 'test'))); $this->assertTrue($User->id > 0); From 0648c6604bc5fde19e0120c66b78de7f22affdfd Mon Sep 17 00:00:00 2001 From: Mark Story Date: Tue, 11 May 2010 23:01:40 -0400 Subject: [PATCH 030/100] Adding some additional tests for possible php4 compatibility issues. --- cake/tests/cases/libs/model/model_write.test.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index d405d413e..0f567573e 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -916,6 +916,11 @@ class ModelWriteTest extends BaseModelTest { $User->data['User']['id'] = null; $this->assertTrue($User->save(array('password' => 'test'))); $this->assertTrue($User->id > 0); + + $User->data['User'] = array('password' => 'something'); + $this->assertTrue($User->save()); + $result = $User->read(); + $this->assertEqual($User->data['User']['password'], 'something'); } /** From 79839c07d2e9689dbcaaf12a979690c3f1824361 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Tue, 11 May 2010 23:08:14 -0400 Subject: [PATCH 031/100] Fixing issues where ModelBehavior::detach() would not detach behaviors when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711 --- cake/libs/model/model_behavior.php | 1 + .../cases/libs/model/model_behavior.test.php | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php index deb397c75..77a4157ff 100644 --- a/cake/libs/model/model_behavior.php +++ b/cake/libs/model/model_behavior.php @@ -372,6 +372,7 @@ class BehaviorCollection extends Object { * @access public */ function detach($name) { + list($plugin, $name) = pluginSplit($name); if (isset($this->{$name})) { $this->{$name}->cleanup(ClassRegistry::getObject($this->modelName)); unset($this->{$name}); diff --git a/cake/tests/cases/libs/model/model_behavior.test.php b/cake/tests/cases/libs/model/model_behavior.test.php index d87bfbef1..f0a641c7a 100644 --- a/cake/tests/cases/libs/model/model_behavior.test.php +++ b/cake/tests/cases/libs/model/model_behavior.test.php @@ -504,6 +504,28 @@ class BehaviorTest extends CakeTestCase { $this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected); } +/** + * test that attach()/detach() works with plugin.banana + * + * @return void + */ + function testDetachWithPluginNames() { + $Apple = new Apple(); + $Apple->Behaviors->attach('Plugin.Test'); + $this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior'); + $this->assertEqual($Apple->Behaviors->attached(), array('Test')); + + $Apple->Behaviors->detach('Plugin.Test'); + $this->assertEqual($Apple->Behaviors->attached(), array()); + + $Apple->Behaviors->attach('Plugin.Test'); + $this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior'); + $this->assertEqual($Apple->Behaviors->attached(), array('Test')); + + $Apple->Behaviors->detach('Test'); + $this->assertEqual($Apple->Behaviors->attached(), array()); + } + /** * test that attaching a non existant Behavior triggers a cake error. * From 046c233a3454830249ff8c48b13fd42434efcd33 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 13 May 2010 22:13:59 -0400 Subject: [PATCH 032/100] Adding Welsh to the supported lists of locales in l10n. Thanks to 'DanAbel' for the 'patch'. Fixes #714 --- cake/libs/l10n.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php index 97af9ef15..2ec65bbb8 100644 --- a/cake/libs/l10n.php +++ b/cake/libs/l10n.php @@ -172,6 +172,7 @@ class L10n extends Object { /* Urdu */ 'urd' => 'ur', /* Venda */ 'ven' => 've', /* Vietnamese */ 'vie' => 'vi', + /* Welsh */ 'cym' => 'cy', /* Xhosa */ 'xho' => 'xh', /* Yiddish */ 'yid' => 'yi', /* Zulu */ 'zul' => 'zu'); @@ -315,6 +316,7 @@ class L10n extends Object { 'ur' => array('language' => 'Urdu', 'locale' => 'urd', 'localeFallback' => 'urd', 'charset' => 'utf-8', 'direction' => 'rtl'), 've' => array('language' => 'Venda', 'locale' => 'ven', 'localeFallback' => 'ven', 'charset' => 'utf-8', 'direction' => 'ltr'), 'vi' => array('language' => 'Vietnamese', 'locale' => 'vie', 'localeFallback' => 'vie', 'charset' => 'utf-8', 'direction' => 'ltr'), + 'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8', 'direction' => 'ltr'), 'xh' => array('language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8', 'direction' => 'ltr'), 'yi' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr'), 'zh' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'), From 3d98cc6f53a735704f792ddd6c970bfb3960a09a Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 13 May 2010 23:08:15 -0400 Subject: [PATCH 033/100] Adding tests for welsh added in previous commit. --- cake/tests/cases/libs/l10n.test.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php index 78ff4a301..5ae6a091c 100644 --- a/cake/tests/cases/libs/l10n.test.php +++ b/cake/tests/cases/libs/l10n.test.php @@ -426,6 +426,10 @@ class L10nTest extends CakeTestCase { $result = $l10n->map(array('xho', 'xh')); $expected = array('xho' => 'xh', 'xh' => 'xho'); $this->assertEqual($result, $expected); + + $result = $l10n->map(array('cy', 'cym')); + $expected = array('cym' => 'cy', 'cy' => 'cym'); + $this->assertEqual($result, $expected); $result = $l10n->map(array('yid', 'yi')); $expected = array('yid' => 'yi', 'yi' => 'yid'); @@ -878,6 +882,12 @@ class L10nTest extends CakeTestCase { ); $this->assertEqual($result, $expected); + $result = $l10n->catalog(array('cy')); + $expected = array( + 'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8') + ); + $this->assertEqual($result, $expected); + $result = $l10n->catalog(array('xh')); $expected = array( 'xh' => array('language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8', 'direction' => 'ltr') From a29866b7fb82ab8ed23070829be5870185edf764 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 13 May 2010 23:09:23 -0400 Subject: [PATCH 034/100] Updating test for 1.3 --- cake/tests/cases/libs/l10n.test.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php index 5ae6a091c..1aad19ca8 100644 --- a/cake/tests/cases/libs/l10n.test.php +++ b/cake/tests/cases/libs/l10n.test.php @@ -884,7 +884,8 @@ class L10nTest extends CakeTestCase { $result = $l10n->catalog(array('cy')); $expected = array( - 'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8') + 'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8', +'direction' => 'ltr') ); $this->assertEqual($result, $expected); From 353c600cd76339146f64590c1bbcc8d92d596974 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 13 May 2010 23:38:26 -0400 Subject: [PATCH 035/100] Removing unreachable code. Fixes #614 --- cake/libs/view/helpers/paginator.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php index 2c8268ea8..7c4121e5e 100644 --- a/cake/libs/view/helpers/paginator.php +++ b/cake/libs/view/helpers/paginator.php @@ -194,18 +194,10 @@ class PaginatorHelper extends AppHelper { } if (isset($options['sort']) && !empty($options['sort'])) { - if (preg_match('/(?:\w+\.)?(\w+)/', $options['sort'], $result) && isset($result[1])) { - if ($result[0] == $this->defaultModel()) { - return $result[1]; - } - } return $options['sort']; } elseif (isset($options['order']) && is_array($options['order'])) { return key($options['order']); } elseif (isset($options['order']) && is_string($options['order'])) { - if (preg_match('/(?:\w+\.)?(\w+)/', $options['order'], $result) && isset($result[1])) { - return $result[1]; - } return $options['order']; } return null; From 4915645fb14b1f56ee3041cbe1ea9688eca02c97 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 16 May 2010 23:42:14 -0400 Subject: [PATCH 036/100] Applying patch from 'Daren Thomas' fixes issues where sorting on virtualFields did not work properly when using aliased sort link keys. Tests added. Fixes #680 --- cake/libs/view/helpers/paginator.php | 7 ++- .../libs/view/helpers/paginator.test.php | 46 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php index 7c4121e5e..f3bb2cdb0 100644 --- a/cake/libs/view/helpers/paginator.php +++ b/cake/libs/view/helpers/paginator.php @@ -302,7 +302,12 @@ class PaginatorHelper extends AppHelper { unset($options['direction']); $sortKey = $this->sortKey($options['model']); - $isSorted = ($sortKey === $key || $sortKey === $this->defaultModel() . '.' . $key); + $defaultModel = $this->defaultModel(); + $isSorted = ( + $sortKey === $key || + $sortKey === $defaultModel . '.' . $key || + $key === $defaultModel . '.' . $sortKey + ); if ($isSorted) { $dir = $this->sortDir($options['model']) === 'asc' ? 'desc' : 'asc'; diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php index 398a3e2e2..9899b33ab 100644 --- a/cake/tests/cases/libs/view/helpers/paginator.test.php +++ b/cake/tests/cases/libs/view/helpers/paginator.test.php @@ -219,6 +219,52 @@ class PaginatorHelperTest extends CakeTestCase { $this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="foo asc">Title<\/a>$/', $result); } +/** + * test that sort() works with virtual field order options. + * + * @return void + */ + function testSortLinkWithVirtualField() { + Router::setRequestInfo(array( + array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/')), + array('base' => '', 'here' => '/accounts/', 'webroot' => '/') + )); + $this->Paginator->params['paging']['Article']['options']['order'] = array('full_name' => 'asc'); + + $result = $this->Paginator->sort('Article.full_name'); + $expected = array( + 'a' => array('href' => '/accounts/index/page:1/sort:Article.full_name/direction:desc', 'class' => 'asc'), + 'Article.full Name', + '/a' + ); + $this->assertTags($result, $expected); + + $result = $this->Paginator->sort('full_name'); + $expected = array( + 'a' => array('href' => '/accounts/index/page:1/sort:full_name/direction:desc', 'class' => 'asc'), + 'Full Name', + '/a' + ); + $this->assertTags($result, $expected); + + $this->Paginator->params['paging']['Article']['options']['order'] = array('full_name' => 'desc'); + $result = $this->Paginator->sort('Article.full_name'); + $expected = array( + 'a' => array('href' => '/accounts/index/page:1/sort:Article.full_name/direction:asc', 'class' => 'desc'), + 'Article.full Name', + '/a' + ); + $this->assertTags($result, $expected); + + $result = $this->Paginator->sort('full_name'); + $expected = array( + 'a' => array('href' => '/accounts/index/page:1/sort:full_name/direction:asc', 'class' => 'desc'), + 'Full Name', + '/a' + ); + $this->assertTags($result, $expected); + } + /** * testSortLinksUsingDirectionOption method * From cd5aee1bfad681fb0517449ab45873daf25e39de Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 16 May 2010 23:50:17 -0400 Subject: [PATCH 037/100] Applying patch from 'franiglesias'. Fixes issues where str_replace would greedily replace too many occurences of 'libs/'. Fixes #724 --- cake/console/libs/tasks/template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/console/libs/tasks/template.php b/cake/console/libs/tasks/template.php index 5f3f3a5fb..f4338234c 100644 --- a/cake/console/libs/tasks/template.php +++ b/cake/console/libs/tasks/template.php @@ -54,7 +54,7 @@ class TemplateTask extends Shell { function _findThemes() { $paths = App::path('shells'); $core = array_pop($paths); - $core = str_replace('libs' . DS, '', $core); + $core = preg_replace('#libs' . DS . '$#', '', $core); $paths[] = $core; $Folder =& new Folder($core . 'templates' . DS . 'default'); $contents = $Folder->read(); From 3a60aa07de0ac1ea3e738af088b1640a13e4ae31 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 17 May 2010 18:25:50 -0400 Subject: [PATCH 038/100] Fixing issues where setting jQueryObject did not affect request() and its connected methods. Tests added. Fixes #728 --- cake/libs/view/helpers/jquery_engine.php | 10 +++++++--- .../libs/view/helpers/jquery_engine.test.php | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/cake/libs/view/helpers/jquery_engine.php b/cake/libs/view/helpers/jquery_engine.php index d6da872e3..27a7b057a 100644 --- a/cake/libs/view/helpers/jquery_engine.php +++ b/cake/libs/view/helpers/jquery_engine.php @@ -257,9 +257,13 @@ class JqueryEngineHelper extends JsBaseEngineHelper { if (isset($options['update'])) { $wrapCallbacks = isset($options['wrapCallbacks']) ? $options['wrapCallbacks'] : true; if ($wrapCallbacks) { - $success = '$("' . $options['update'] . '").html(data);'; + $success = $this->jQueryObject . '("' . $options['update'] . '").html(data);'; } else { - $success = 'function (data, textStatus) {$("' . $options['update'] . '").html(data);}'; + $success = sprintf( + 'function (data, textStatus) {%s("%s").html(data);}', + $this->jQueryObject, + $options['update'] + ); } $options['dataType'] = 'html'; $options['success'] = $success; @@ -272,7 +276,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper { } $options = $this->_prepareCallbacks('request', $options); $options = $this->_parseOptions($options, $callbacks); - return '$.ajax({' . $options .'});'; + return $this->jQueryObject . '.ajax({' . $options .'});'; } /** diff --git a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php index 344911043..033a32d6a 100644 --- a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php +++ b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php @@ -209,6 +209,26 @@ class JqueryEngineHelperTestCase extends CakeTestCase { $this->assertEqual($result, $expected); } +/** + * test that alternate jQuery object values work for request() + * + * @return void + */ + function testRequestWithAlternateJqueryObject() { + $this->Jquery->jQueryObject = '$j'; + + $result = $this->Jquery->request('/people/edit/1', array( + 'update' => '#updated', + 'success' => 'doFoo', + 'method' => 'post', + 'dataExpression' => true, + 'data' => '$j("#someId").serialize()', + 'wrapCallbacks' => false + )); + $expected = '$j.ajax({data:$j("#someId").serialize(), dataType:"html", success:function (data, textStatus) {$j("#updated").html(data);}, type:"post", url:"\\/people\\/edit\\/1"});'; + $this->assertEqual($result, $expected); + } + /** * test sortable list generation * From a94b9ee95bc59ce735237e6642ff0ac40eefca41 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Tue, 18 May 2010 22:15:13 -0300 Subject: [PATCH 039/100] Update various links. Closes #392 --- app/webroot/test.php | 6 +++--- cake/console/libs/testsuite.php | 4 ++-- cake/console/templates/skel/webroot/test.php | 4 ++-- cake/libs/controller/component.php | 2 +- cake/tests/cases/basics.test.php | 4 ++-- cake/tests/cases/console/cake.test.php | 4 ++-- cake/tests/cases/dispatcher.test.php | 4 ++-- cake/tests/cases/libs/cache.test.php | 4 ++-- cake/tests/cases/libs/cache/apc.test.php | 4 ++-- cake/tests/cases/libs/cache/file.test.php | 4 ++-- cake/tests/cases/libs/cache/memcache.test.php | 4 ++-- cake/tests/cases/libs/cache/xcache.test.php | 4 ++-- cake/tests/cases/libs/cake_log.test.php | 4 ++-- cake/tests/cases/libs/cake_session.test.php | 4 ++-- cake/tests/cases/libs/cake_socket.test.php | 4 ++-- cake/tests/cases/libs/cake_test_fixture.test.php | 4 ++-- cake/tests/cases/libs/class_registry.test.php | 4 ++-- cake/tests/cases/libs/code_coverage_manager.test.php | 4 ++-- cake/tests/cases/libs/configure.test.php | 4 ++-- cake/tests/cases/libs/controller/component.test.php | 4 ++-- cake/tests/cases/libs/controller/components/acl.test.php | 4 ++-- cake/tests/cases/libs/controller/components/auth.test.php | 4 ++-- cake/tests/cases/libs/controller/components/cookie.test.php | 4 ++-- cake/tests/cases/libs/controller/components/email.test.php | 4 ++-- .../libs/controller/components/request_handler.test.php | 4 ++-- .../cases/libs/controller/components/security.test.php | 4 ++-- .../tests/cases/libs/controller/components/session.test.php | 4 ++-- .../cases/libs/controller/controller_merge_vars.test.php | 4 ++-- cake/tests/cases/libs/controller/pages_controller.test.php | 4 ++-- cake/tests/cases/libs/controller/scaffold.test.php | 4 ++-- cake/tests/cases/libs/error.test.php | 4 ++-- cake/tests/cases/libs/file.test.php | 4 ++-- cake/tests/cases/libs/folder.test.php | 4 ++-- cake/tests/cases/libs/http_socket.test.php | 4 ++-- cake/tests/cases/libs/i18n.test.php | 4 ++-- cake/tests/cases/libs/inflector.test.php | 2 +- cake/tests/cases/libs/l10n.test.php | 4 ++-- cake/tests/cases/libs/log/file_log.test.php | 4 ++-- cake/tests/cases/libs/model/behaviors/containable.test.php | 4 ++-- cake/tests/cases/libs/model/behaviors/translate.test.php | 4 ++-- cake/tests/cases/libs/model/behaviors/tree.test.php | 4 ++-- cake/tests/cases/libs/model/cake_schema.test.php | 4 ++-- cake/tests/cases/libs/model/connection_manager.test.php | 2 +- cake/tests/cases/libs/model/datasources/dbo_source.test.php | 4 ++-- cake/tests/cases/libs/model/db_acl.test.php | 4 ++-- cake/tests/cases/libs/model/model.test.php | 4 ++-- cake/tests/cases/libs/model/model_delete.test.php | 4 ++-- cake/tests/cases/libs/model/model_integration.test.php | 4 ++-- cake/tests/cases/libs/model/model_read.test.php | 4 ++-- cake/tests/cases/libs/model/model_validation.test.php | 4 ++-- cake/tests/cases/libs/model/model_write.test.php | 4 ++-- cake/tests/cases/libs/model/models.php | 4 ++-- cake/tests/cases/libs/multibyte.test.php | 4 ++-- cake/tests/cases/libs/object.test.php | 4 ++-- cake/tests/cases/libs/overloadable.test.php | 4 ++-- cake/tests/cases/libs/router.test.php | 4 ++-- cake/tests/cases/libs/sanitize.test.php | 4 ++-- cake/tests/cases/libs/security.test.php | 4 ++-- cake/tests/cases/libs/set.test.php | 4 ++-- cake/tests/cases/libs/string.test.php | 2 +- cake/tests/cases/libs/test_manager.test.php | 4 ++-- cake/tests/cases/libs/validation.test.php | 4 ++-- cake/tests/cases/libs/view/helper.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/ajax.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/cache.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/form.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/html.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/javascript.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/js.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/number.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/paginator.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/rss.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/session.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/text.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/time.test.php | 4 ++-- cake/tests/cases/libs/view/helpers/xml.test.php | 4 ++-- cake/tests/cases/libs/view/media.test.php | 4 ++-- cake/tests/cases/libs/view/theme.test.php | 4 ++-- cake/tests/cases/libs/view/view.test.php | 4 ++-- cake/tests/cases/libs/xml.test.php | 4 ++-- cake/tests/fixtures/account_fixture.php | 4 ++-- cake/tests/fixtures/aco_action_fixture.php | 4 ++-- cake/tests/fixtures/aco_fixture.php | 4 ++-- cake/tests/fixtures/aco_two_fixture.php | 4 ++-- cake/tests/fixtures/advertisement_fixture.php | 4 ++-- cake/tests/fixtures/another_article_fixture.php | 4 ++-- cake/tests/fixtures/apple_fixture.php | 4 ++-- cake/tests/fixtures/aro_fixture.php | 4 ++-- cake/tests/fixtures/aro_two_fixture.php | 4 ++-- cake/tests/fixtures/aros_aco_fixture.php | 4 ++-- cake/tests/fixtures/aros_aco_two_fixture.php | 4 ++-- cake/tests/fixtures/article_featured_fixture.php | 4 ++-- cake/tests/fixtures/article_featureds_tags_fixture.php | 4 ++-- cake/tests/fixtures/article_fixture.php | 4 ++-- cake/tests/fixtures/articles_tag_fixture.php | 4 ++-- cake/tests/fixtures/attachment_fixture.php | 4 ++-- cake/tests/fixtures/auth_user_custom_field_fixture.php | 4 ++-- cake/tests/fixtures/auth_user_fixture.php | 4 ++-- cake/tests/fixtures/author_fixture.php | 4 ++-- cake/tests/fixtures/basket_fixture.php | 4 ++-- cake/tests/fixtures/bid_fixture.php | 4 ++-- cake/tests/fixtures/binary_test_fixture.php | 4 ++-- cake/tests/fixtures/book_fixture.php | 4 ++-- cake/tests/fixtures/cache_test_model_fixture.php | 4 ++-- cake/tests/fixtures/callback_fixture.php | 4 ++-- cake/tests/fixtures/category_fixture.php | 4 ++-- cake/tests/fixtures/category_thread_fixture.php | 4 ++-- cake/tests/fixtures/cd_fixture.php | 4 ++-- cake/tests/fixtures/comment_fixture.php | 4 ++-- cake/tests/fixtures/content_account_fixture.php | 4 ++-- cake/tests/fixtures/content_fixture.php | 4 ++-- cake/tests/fixtures/counter_cache_post_fixture.php | 4 ++-- .../counter_cache_post_nonstandard_primary_key_fixture.php | 4 ++-- cake/tests/fixtures/counter_cache_user_fixture.php | 4 ++-- .../counter_cache_user_nonstandard_primary_key_fixture.php | 4 ++-- cake/tests/fixtures/data_test_fixture.php | 4 ++-- cake/tests/fixtures/device_fixture.php | 4 ++-- cake/tests/fixtures/device_type_category_fixture.php | 4 ++-- cake/tests/fixtures/device_type_fixture.php | 4 ++-- cake/tests/fixtures/document_directory_fixture.php | 4 ++-- cake/tests/fixtures/document_fixture.php | 4 ++-- cake/tests/fixtures/exterior_type_category_fixture.php | 4 ++-- cake/tests/fixtures/feature_set_fixture.php | 4 ++-- cake/tests/fixtures/featured_fixture.php | 4 ++-- cake/tests/fixtures/film_file_fixture.php | 4 ++-- cake/tests/fixtures/flag_tree_fixture.php | 4 ++-- cake/tests/fixtures/fruit_fixture.php | 4 ++-- cake/tests/fixtures/fruits_uuid_tag_fixture.php | 4 ++-- cake/tests/fixtures/group_update_all_fixture.php | 4 ++-- cake/tests/fixtures/home_fixture.php | 4 ++-- cake/tests/fixtures/image_fixture.php | 4 ++-- cake/tests/fixtures/item_fixture.php | 4 ++-- cake/tests/fixtures/items_portfolio_fixture.php | 4 ++-- cake/tests/fixtures/join_a_b_fixture.php | 4 ++-- cake/tests/fixtures/join_a_c_fixture.php | 4 ++-- cake/tests/fixtures/join_a_fixture.php | 4 ++-- cake/tests/fixtures/join_b_fixture.php | 4 ++-- cake/tests/fixtures/join_c_fixture.php | 4 ++-- cake/tests/fixtures/join_thing_fixture.php | 4 ++-- cake/tests/fixtures/message_fixture.php | 4 ++-- cake/tests/fixtures/my_categories_my_products_fixture.php | 4 ++-- cake/tests/fixtures/my_categories_my_users_fixture.php | 4 ++-- cake/tests/fixtures/my_category_fixture.php | 4 ++-- cake/tests/fixtures/my_product_fixture.php | 4 ++-- cake/tests/fixtures/my_user_fixture.php | 4 ++-- cake/tests/fixtures/number_tree_fixture.php | 4 ++-- cake/tests/fixtures/number_tree_two_fixture.php | 4 ++-- cake/tests/fixtures/numeric_article_fixture.php | 4 ++-- cake/tests/fixtures/overall_favorite_fixture.php | 4 ++-- cake/tests/fixtures/person_fixture.php | 4 ++-- cake/tests/fixtures/portfolio_fixture.php | 4 ++-- cake/tests/fixtures/post_fixture.php | 4 ++-- cake/tests/fixtures/posts_tag_fixture.php | 4 ++-- cake/tests/fixtures/primary_model_fixture.php | 4 ++-- cake/tests/fixtures/product_fixture.php | 4 ++-- cake/tests/fixtures/product_update_all_fixture.php | 4 ++-- cake/tests/fixtures/project_fixture.php | 4 ++-- cake/tests/fixtures/sample_fixture.php | 4 ++-- cake/tests/fixtures/secondary_model_fixture.php | 4 ++-- cake/tests/fixtures/session_fixture.php | 4 ++-- cake/tests/fixtures/something_else_fixture.php | 4 ++-- cake/tests/fixtures/something_fixture.php | 4 ++-- cake/tests/fixtures/stories_tag_fixture.php | 4 ++-- cake/tests/fixtures/story_fixture.php | 4 ++-- cake/tests/fixtures/syfile_fixture.php | 4 ++-- cake/tests/fixtures/tag_fixture.php | 4 ++-- cake/tests/fixtures/test_plugin_article_fixture.php | 4 ++-- cake/tests/fixtures/test_plugin_comment_fixture.php | 4 ++-- cake/tests/fixtures/the_paper_monkies_fixture.php | 4 ++-- cake/tests/fixtures/thread_fixture.php | 4 ++-- cake/tests/fixtures/translate_article_fixture.php | 4 ++-- cake/tests/fixtures/translate_fixture.php | 4 ++-- cake/tests/fixtures/translate_table_fixture.php | 4 ++-- cake/tests/fixtures/translate_with_prefix_fixture.php | 4 ++-- cake/tests/fixtures/translated_article_fixture.php | 4 ++-- cake/tests/fixtures/translated_item_fixture.php | 4 ++-- cake/tests/fixtures/unconventional_tree_fixture.php | 4 ++-- cake/tests/fixtures/underscore_field_fixture.php | 4 ++-- cake/tests/fixtures/user_fixture.php | 4 ++-- cake/tests/fixtures/uuid_fixture.php | 4 ++-- cake/tests/fixtures/uuid_tag_fixture.php | 4 ++-- cake/tests/fixtures/uuid_tree_fixture.php | 4 ++-- cake/tests/fixtures/uuiditem_fixture.php | 4 ++-- cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php | 4 ++-- .../fixtures/uuiditems_uuidportfolio_numericid_fixture.php | 4 ++-- cake/tests/fixtures/uuidportfolio_fixture.php | 4 ++-- cake/tests/groups/acl.group.php | 4 ++-- cake/tests/groups/bake.group.php | 4 ++-- cake/tests/groups/behaviors.group.php | 4 ++-- cake/tests/groups/cache.group.php | 4 ++-- cake/tests/groups/components.group.php | 4 ++-- cake/tests/groups/configure.group.php | 4 ++-- cake/tests/groups/console.group.php | 4 ++-- cake/tests/groups/controller.group.php | 4 ++-- cake/tests/groups/database.group.php | 4 ++-- cake/tests/groups/helpers.group.php | 4 ++-- cake/tests/groups/i18n.group.php | 4 ++-- cake/tests/groups/javascript.group.php | 4 ++-- cake/tests/groups/lib.group.php | 4 ++-- cake/tests/groups/model.group.php | 4 ++-- cake/tests/groups/no_cross_contamination.group.php | 4 ++-- cake/tests/groups/routing_system.group.php | 4 ++-- cake/tests/groups/socket.group.php | 4 ++-- cake/tests/groups/test_suite.group.php | 4 ++-- cake/tests/groups/view.group.php | 4 ++-- cake/tests/groups/xml.group.php | 4 ++-- cake/tests/lib/cake_test_case.php | 4 ++-- cake/tests/lib/cake_test_fixture.php | 4 ++-- cake/tests/lib/cake_test_model.php | 4 ++-- cake/tests/lib/cake_test_suite_dispatcher.php | 2 +- cake/tests/lib/cake_web_test_case.php | 4 ++-- cake/tests/lib/code_coverage_manager.php | 4 ++-- cake/tests/lib/reporter/cake_base_reporter.php | 2 +- cake/tests/lib/reporter/cake_cli_reporter.php | 4 ++-- cake/tests/lib/reporter/cake_html_reporter.php | 2 +- cake/tests/lib/reporter/cake_text_reporter.php | 2 +- cake/tests/lib/templates/footer.php | 4 ++-- cake/tests/lib/templates/header.php | 4 ++-- cake/tests/lib/templates/menu.php | 4 ++-- cake/tests/lib/templates/simpletest.php | 4 ++-- cake/tests/lib/templates/xdebug.php | 4 ++-- cake/tests/lib/test_manager.php | 4 ++-- cake/tests/test_app/controllers/tests_apps_controller.php | 4 ++-- .../test_app/controllers/tests_apps_posts_controller.php | 4 ++-- cake/tests/test_app/libs/cache/test_app_cache.php | 4 ++-- cake/tests/test_app/libs/library.php | 4 ++-- cake/tests/test_app/libs/log/test_app_log.php | 4 ++-- cake/tests/test_app/plugins/test_plugin/config/load.php | 4 ++-- .../tests/test_app/plugins/test_plugin/config/more.load.php | 4 ++-- .../test_plugin/controllers/components/other_component.php | 4 ++-- .../controllers/components/plugins_component.php | 4 ++-- .../controllers/components/test_plugin_component.php | 4 ++-- .../controllers/components/test_plugin_other_component.php | 4 ++-- .../test_plugin/controllers/test_plugin_controller.php | 4 ++-- .../plugins/test_plugin/controllers/tests_controller.php | 4 ++-- .../plugins/test_plugin/libs/cache/test_plugin_cache.php | 4 ++-- .../plugins/test_plugin/libs/log/test_plugin_log.php | 4 ++-- .../plugins/test_plugin/libs/test_plugin_library.php | 4 ++-- .../plugins/test_plugin/test_plugin_app_controller.php | 4 ++-- .../test_app/plugins/test_plugin/test_plugin_app_model.php | 4 ++-- .../plugins/test_plugin/vendors/sample/sample_plugin.php | 4 ++-- .../test_app/plugins/test_plugin/vendors/shells/example.php | 4 ++-- cake/tests/test_app/plugins/test_plugin/vendors/welcome.php | 4 ++-- .../plugins/test_plugin/views/helpers/other_helper.php | 4 ++-- .../plugins/test_plugin/views/helpers/plugged_helper.php | 4 ++-- .../plugins/test_plugin_two/vendors/shells/example.php | 4 ++-- .../plugins/test_plugin_two/vendors/shells/welcome.php | 4 ++-- cake/tests/test_app/vendors/Test/MyTest.php | 4 ++-- cake/tests/test_app/vendors/Test/hello.php | 4 ++-- .../vendors/sample/configure_test_vendor_sample.php | 4 ++-- cake/tests/test_app/vendors/shells/sample.php | 4 ++-- cake/tests/test_app/vendors/somename/some.name.php | 4 ++-- cake/tests/test_app/vendors/welcome.php | 4 ++-- 253 files changed, 499 insertions(+), 499 deletions(-) diff --git a/app/webroot/test.php b/app/webroot/test.php index 10d169ffe..2c2e9a82b 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -4,16 +4,16 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing * @package cake - * @subpackage cake.cake.tests.libs + * @subpackage cake.app.webroot * @since CakePHP(tm) v 1.2.0.4433 * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php index 16d5cd59e..1a815f802 100644 --- a/cake/console/libs/testsuite.php +++ b/cake/console/libs/testsuite.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.console.libs * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/console/templates/skel/webroot/test.php b/cake/console/templates/skel/webroot/test.php index 07ce4a3f7..0655a6579 100644 --- a/cake/console/templates/skel/webroot/test.php +++ b/cake/console/templates/skel/webroot/test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php index 75d55f108..d2d708cc3 100644 --- a/cake/libs/controller/component.php +++ b/cake/libs/controller/component.php @@ -22,7 +22,7 @@ * * @package cake * @subpackage cake.cake.libs.controller - * @link http://book.cakephp.org/view/62/Components + * @link http://book.cakephp.org/view/993/Components */ class Component extends Object { diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php index f84996ce9..07455d0f8 100644 --- a/cake/tests/cases/basics.test.php +++ b/cake/tests/cases/basics.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php index beb020e2a..a09ecf35e 100644 --- a/cake/tests/cases/console/cake.test.php +++ b/cake/tests/cases/console/cake.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.console * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php index a7256b16a..8e9ed61eb 100644 --- a/cake/tests/cases/dispatcher.test.php +++ b/cake/tests/cases/dispatcher.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php index 3d3c07c0d..a5ca8af73 100644 --- a/cake/tests/cases/libs/cache.test.php +++ b/cake/tests/cases/libs/cache.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php index 2cca1be97..883f9b852 100644 --- a/cake/tests/cases/libs/cache/apc.test.php +++ b/cake/tests/cases/libs/cache/apc.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php index 3641b1c29..15ee52673 100644 --- a/cake/tests/cases/libs/cache/file.test.php +++ b/cake/tests/cases/libs/cache/file.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php index d817cd0e4..30b84bb66 100644 --- a/cake/tests/cases/libs/cache/memcache.test.php +++ b/cake/tests/cases/libs/cache/memcache.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php index 22b280ecb..b104c9564 100644 --- a/cake/tests/cases/libs/cache/xcache.test.php +++ b/cake/tests/cases/libs/cache/xcache.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.cache * @since CakePHP(tm) v 1.2.0.5434 diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php index e767db7b9..7394eddf5 100644 --- a/cake/tests/cases/libs/cake_log.test.php +++ b/cake/tests/cases/libs/cake_log.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php index 16712136c..b58700bc3 100644 --- a/cake/tests/cases/libs/cake_session.test.php +++ b/cake/tests/cases/libs/cake_session.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/cake_socket.test.php b/cake/tests/cases/libs/cake_socket.test.php index a2520d106..152c9e0fd 100644 --- a/cake/tests/cases/libs/cake_socket.test.php +++ b/cake/tests/cases/libs/cake_socket.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php index 5ecf24c1f..554e6119c 100644 --- a/cake/tests/cases/libs/cake_test_fixture.test.php +++ b/cake/tests/cases/libs/cake_test_fixture.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/cases/libs/class_registry.test.php b/cake/tests/cases/libs/class_registry.test.php index b91186b23..252c840e8 100644 --- a/cake/tests/cases/libs/class_registry.test.php +++ b/cake/tests/cases/libs/class_registry.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php index f2768d75b..d0b5cf2c5 100644 --- a/cake/tests/cases/libs/code_coverage_manager.test.php +++ b/cake/tests/cases/libs/code_coverage_manager.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php index 8b7499d43..faa2551c3 100644 --- a/cake/tests/cases/libs/configure.test.php +++ b/cake/tests/cases/libs/configure.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php index c9191e37a..770aacc2c 100644 --- a/cake/tests/cases/libs/controller/component.test.php +++ b/cake/tests/cases/libs/controller/component.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.0.5436 diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php index 3c564ada3..11faa3aa2 100644 --- a/cake/tests/cases/libs/controller/components/acl.test.php +++ b/cake/tests/cases/libs/controller/components/acl.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php index b2c93f48b..618b5eb88 100644 --- a/cake/tests/cases/libs/controller/components/auth.test.php +++ b/cake/tests/cases/libs/controller/components/auth.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5347 diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php index bd5168934..86e7789b5 100644 --- a/cake/tests/cases/libs/controller/components/cookie.test.php +++ b/cake/tests/cases/libs/controller/components/cookie.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php index 3c9d6f0b0..1267c96a7 100755 --- a/cake/tests/cases/libs/controller/components/email.test.php +++ b/cake/tests/cases/libs/controller/components/email.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5347 diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php index f4fa5a36d..abeaa0531 100644 --- a/cake/tests/cases/libs/controller/components/request_handler.test.php +++ b/cake/tests/cases/libs/controller/components/request_handler.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php index 11605729c..cdb604ffb 100644 --- a/cake/tests/cases/libs/controller/components/security.test.php +++ b/cake/tests/cases/libs/controller/components/security.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5435 diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php index f1da8b0db..022cf35d2 100644 --- a/cake/tests/cases/libs/controller/components/session.test.php +++ b/cake/tests/cases/libs/controller/components/session.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller.components * @since CakePHP(tm) v 1.2.0.5436 diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php index d2d8fbcde..c85e5312b 100644 --- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php +++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.3 diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/cake/tests/cases/libs/controller/pages_controller.test.php index cf0a83fd4..a80cf56ed 100644 --- a/cake/tests/cases/libs/controller/pages_controller.test.php +++ b/cake/tests/cases/libs/controller/pages_controller.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.0.5436 diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php index e9a35a4d8..c0ba1b4d3 100644 --- a/cake/tests/cases/libs/controller/scaffold.test.php +++ b/cake/tests/cases/libs/controller/scaffold.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller * @since CakePHP(tm) v 1.2.0.5436 diff --git a/cake/tests/cases/libs/error.test.php b/cake/tests/cases/libs/error.test.php index 755c3f76a..4b181c3e5 100644 --- a/cake/tests/cases/libs/error.test.php +++ b/cake/tests/cases/libs/error.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php index b9961aedf..10ff17ac0 100644 --- a/cake/tests/cases/libs/file.test.php +++ b/cake/tests/cases/libs/file.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php index e6fdf38cf..95db64cd4 100644 --- a/cake/tests/cases/libs/folder.test.php +++ b/cake/tests/cases/libs/folder.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php index 442643e5c..1c3d04f6c 100644 --- a/cake/tests/cases/libs/http_socket.test.php +++ b/cake/tests/cases/libs/http_socket.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php index 883b3c966..3a0fa1362 100644 --- a/cake/tests/cases/libs/i18n.test.php +++ b/cake/tests/cases/libs/i18n.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php index bc93a4170..e50855915 100644 --- a/cake/tests/cases/libs/inflector.test.php +++ b/cake/tests/cases/libs/inflector.test.php @@ -13,7 +13,7 @@ * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link http://book.cakephp.org/view/160/Testing + * @link http://book.cakephp.org/view/1196/Testing * @package cake.tests * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php index 1aad19ca8..6efd3954e 100644 --- a/cake/tests/cases/libs/l10n.test.php +++ b/cake/tests/cases/libs/l10n.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/log/file_log.test.php b/cake/tests/cases/libs/log/file_log.test.php index d8cce44c3..b62c2ed91 100644 --- a/cake/tests/cases/libs/log/file_log.test.php +++ b/cake/tests/cases/libs/log/file_log.test.php @@ -4,7 +4,7 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License @@ -12,7 +12,7 @@ * * @filesource * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.log * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php index 694916d57..c00151c7b 100644 --- a/cake/tests/cases/libs/model/behaviors/containable.test.php +++ b/cake/tests/cases/libs/model/behaviors/containable.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model.behaviors * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php index fa1483376..c5c293bc5 100644 --- a/cake/tests/cases/libs/model/behaviors/translate.test.php +++ b/cake/tests/cases/libs/model/behaviors/translate.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model.behaviors * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php index 914ac8949..c0dc9ccc0 100644 --- a/cake/tests/cases/libs/model/behaviors/tree.test.php +++ b/cake/tests/cases/libs/model/behaviors/tree.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model.behaviors * @since CakePHP(tm) v 1.2.0.5330 diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php index 6f8c3d22d..664364e3d 100644 --- a/cake/tests/cases/libs/model/cake_schema.test.php +++ b/cake/tests/cases/libs/model/cake_schema.test.php @@ -5,14 +5,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5550 diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php index 067ef6c2d..049ad5276 100644 --- a/cake/tests/cases/libs/model/connection_manager.test.php +++ b/cake/tests/cases/libs/model/connection_manager.test.php @@ -11,7 +11,7 @@ * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5550 diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php index a804f22f8..ead5a9d7b 100644 --- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model.datasources * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php index 806c598af..73e9cf6a6 100644 --- a/cake/tests/cases/libs/model/db_acl.test.php +++ b/cake/tests/cases/libs/model/db_acl.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.controller.components.dbacl.models * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php index d643a4737..14d57f9ab 100644 --- a/cake/tests/cases/libs/model/model.test.php +++ b/cake/tests/cases/libs/model/model.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php index 7988fdcec..c44bad3fd 100644 --- a/cake/tests/cases/libs/model/model_delete.test.php +++ b/cake/tests/cases/libs/model/model_delete.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php index 17ae8f0fa..3d951e434 100644 --- a/cake/tests/cases/libs/model/model_integration.test.php +++ b/cake/tests/cases/libs/model/model_integration.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php index b649d0453..341d73b35 100755 --- a/cake/tests/cases/libs/model/model_read.test.php +++ b/cake/tests/cases/libs/model/model_read.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php index bfe6a68ce..6da40853d 100644 --- a/cake/tests/cases/libs/model/model_validation.test.php +++ b/cake/tests/cases/libs/model/model_validation.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index 0f567573e..3beb16d44 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php index 6ae268663..7f1df3492 100644 --- a/cake/tests/cases/libs/model/models.php +++ b/cake/tests/cases/libs/model/models.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.model * @since CakePHP(tm) v 1.2.0.6464 diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php index e75cca0c2..47149c708 100644 --- a/cake/tests/cases/libs/multibyte.test.php +++ b/cake/tests/cases/libs/multibyte.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.6833 diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php index 5cf4bc294..0ad8bc020 100644 --- a/cake/tests/cases/libs/object.test.php +++ b/cake/tests/cases/libs/object.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php index 8e48943a1..2b0fd31a8 100644 --- a/cake/tests/cases/libs/overloadable.test.php +++ b/cake/tests/cases/libs/overloadable.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php index f5433bb54..581b55940 100644 --- a/cake/tests/cases/libs/router.test.php +++ b/cake/tests/cases/libs/router.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php index fa8ba060f..f564ac1e2 100644 --- a/cake/tests/cases/libs/sanitize.test.php +++ b/cake/tests/cases/libs/sanitize.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5428 diff --git a/cake/tests/cases/libs/security.test.php b/cake/tests/cases/libs/security.test.php index 31b775290..ec2819a62 100644 --- a/cake/tests/cases/libs/security.test.php +++ b/cake/tests/cases/libs/security.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php index 20853639b..a6518155e 100644 --- a/cake/tests/cases/libs/set.test.php +++ b/cake/tests/cases/libs/set.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php index 20a6aa6ee..c1b8f1adb 100644 --- a/cake/tests/cases/libs/string.test.php +++ b/cake/tests/cases/libs/string.test.php @@ -11,7 +11,7 @@ * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php index 144f99ed3..a55149988 100644 --- a/cake/tests/cases/libs/test_manager.test.php +++ b/cake/tests/cases/libs/test_manager.test.php @@ -4,7 +4,7 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. * 1785 E. Sahara Avenue, Suite 490-204 * Las Vegas, Nevada 89104 @@ -13,7 +13,7 @@ * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php index 73f9a5cbd..5c51b1bad 100644 --- a/cake/tests/cases/libs/validation.test.php +++ b/cake/tests/cases/libs/validation.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php index de7539221..db60c94cd 100644 --- a/cake/tests/cases/libs/view/helper.test.php +++ b/cake/tests/cases/libs/view/helper.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php index e19714b8d..588221560 100644 --- a/cake/tests/cases/libs/view/helpers/ajax.test.php +++ b/cake/tests/cases/libs/view/helpers/ajax.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php index 9cd10ca28..470c19695 100644 --- a/cake/tests/cases/libs/view/helpers/cache.test.php +++ b/cake/tests/cases/libs/view/helpers/cache.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php index 1209ae6ea..1a3b06d22 100644 --- a/cake/tests/cases/libs/view/helpers/form.test.php +++ b/cake/tests/cases/libs/view/helpers/form.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2006-2010, Cake Software Foundation, Inc. * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php index f5917bfee..6ea20bb28 100644 --- a/cake/tests/cases/libs/view/helpers/html.test.php +++ b/cake/tests/cases/libs/view/helpers/html.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2006-2010, Cake Software Foundation, Inc. * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php index 70ba01bc0..60b78b2f8 100644 --- a/cake/tests/cases/libs/view/helpers/javascript.test.php +++ b/cake/tests/cases/libs/view/helpers/javascript.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2006-2010, Cake Software Foundation, Inc. * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2006-2010, Cake Software Foundation, Inc. - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php index a49ec81bd..b4dfecb60 100644 --- a/cake/tests/cases/libs/view/helpers/js.test.php +++ b/cake/tests/cases/libs/view/helpers/js.test.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php index 41783b2d5..9f2d238de 100644 --- a/cake/tests/cases/libs/view/helpers/number.test.php +++ b/cake/tests/cases/libs/view/helpers/number.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php index 9899b33ab..f2f1a25e7 100644 --- a/cake/tests/cases/libs/view/helpers/paginator.test.php +++ b/cake/tests/cases/libs/view/helpers/paginator.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php index ffb28dabc..2b083c5ab 100644 --- a/cake/tests/cases/libs/view/helpers/rss.test.php +++ b/cake/tests/cases/libs/view/helpers/rss.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php index 58c23af6f..fdaba33a9 100644 --- a/cake/tests/cases/libs/view/helpers/session.test.php +++ b/cake/tests/cases/libs/view/helpers/session.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php index 9c26f0120..eb674d3e5 100644 --- a/cake/tests/cases/libs/view/helpers/text.test.php +++ b/cake/tests/cases/libs/view/helpers/text.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php index dd5b0c4f9..dbaceee23 100644 --- a/cake/tests/cases/libs/view/helpers/time.test.php +++ b/cake/tests/cases/libs/view/helpers/time.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php index d50ae7bbf..f5d8e12ba 100644 --- a/cake/tests/cases/libs/view/helpers/xml.test.php +++ b/cake/tests/cases/libs/view/helpers/xml.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs.view.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/media.test.php b/cake/tests/cases/libs/view/media.test.php index c30d2fc02..d39e01848 100644 --- a/cake/tests/cases/libs/view/media.test.php +++ b/cake/tests/cases/libs/view/media.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php index 4b6bef8a1..15cba28fb 100644 --- a/cake/tests/cases/libs/view/theme.test.php +++ b/cake/tests/cases/libs/view/theme.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php index 9495aad16..03ee9c681 100644 --- a/cake/tests/cases/libs/view/view.test.php +++ b/cake/tests/cases/libs/view/view.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php index b07b577f5..c1b1de70c 100644 --- a/cake/tests/cases/libs/xml.test.php +++ b/cake/tests/cases/libs/xml.test.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/fixtures/account_fixture.php b/cake/tests/fixtures/account_fixture.php index 34fa67e12..8c9b230b2 100644 --- a/cake/tests/fixtures/account_fixture.php +++ b/cake/tests/fixtures/account_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php index dff58d1af..40deb2ca6 100644 --- a/cake/tests/fixtures/aco_action_fixture.php +++ b/cake/tests/fixtures/aco_action_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php index 339b2fe3b..72288c6cf 100644 --- a/cake/tests/fixtures/aco_fixture.php +++ b/cake/tests/fixtures/aco_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php index 6c25ecc57..daa93dfa1 100644 --- a/cake/tests/fixtures/aco_two_fixture.php +++ b/cake/tests/fixtures/aco_two_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php index 683e5a111..0661a3bb5 100644 --- a/cake/tests/fixtures/advertisement_fixture.php +++ b/cake/tests/fixtures/advertisement_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php index a10151ce1..3b6f020bf 100644 --- a/cake/tests/fixtures/another_article_fixture.php +++ b/cake/tests/fixtures/another_article_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php index 52c5bfcc3..42894aebb 100644 --- a/cake/tests/fixtures/apple_fixture.php +++ b/cake/tests/fixtures/apple_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php index 5b6a1e3e3..2c7b681dd 100644 --- a/cake/tests/fixtures/aro_fixture.php +++ b/cake/tests/fixtures/aro_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php index 1043fc344..c133abb38 100644 --- a/cake/tests/fixtures/aro_two_fixture.php +++ b/cake/tests/fixtures/aro_two_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php index c959702d0..59076c230 100644 --- a/cake/tests/fixtures/aros_aco_fixture.php +++ b/cake/tests/fixtures/aros_aco_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php index b2e01db6c..a6f5cc6ab 100644 --- a/cake/tests/fixtures/aros_aco_two_fixture.php +++ b/cake/tests/fixtures/aros_aco_two_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php index 7678456ef..b1bdb3b8f 100644 --- a/cake/tests/fixtures/article_featured_fixture.php +++ b/cake/tests/fixtures/article_featured_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php index 3f80d069a..325ffd89b 100644 --- a/cake/tests/fixtures/article_featureds_tags_fixture.php +++ b/cake/tests/fixtures/article_featureds_tags_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php index 5824a549b..0908c4ad2 100644 --- a/cake/tests/fixtures/article_fixture.php +++ b/cake/tests/fixtures/article_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php index 815bbd1c1..84a5e9e5b 100644 --- a/cake/tests/fixtures/articles_tag_fixture.php +++ b/cake/tests/fixtures/articles_tag_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php index fabd71ce0..ebd4e0749 100644 --- a/cake/tests/fixtures/attachment_fixture.php +++ b/cake/tests/fixtures/attachment_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php index c48cc6c68..cee9c3471 100644 --- a/cake/tests/fixtures/auth_user_custom_field_fixture.php +++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.1.8013 diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php index 13e4ce957..c0ebaf615 100644 --- a/cake/tests/fixtures/auth_user_fixture.php +++ b/cake/tests/fixtures/auth_user_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php index 48e9a5da0..8b78144bb 100644 --- a/cake/tests/fixtures/author_fixture.php +++ b/cake/tests/fixtures/author_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/basket_fixture.php b/cake/tests/fixtures/basket_fixture.php index b843e3ff9..5e9fd0ea5 100644 --- a/cake/tests/fixtures/basket_fixture.php +++ b/cake/tests/fixtures/basket_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php index 28da835e3..e4dba3b9f 100644 --- a/cake/tests/fixtures/bid_fixture.php +++ b/cake/tests/fixtures/bid_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php index 6860a9904..ba5f77a26 100644 --- a/cake/tests/fixtures/binary_test_fixture.php +++ b/cake/tests/fixtures/binary_test_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 diff --git a/cake/tests/fixtures/book_fixture.php b/cake/tests/fixtures/book_fixture.php index 1d1a0be9e..f3e66fea3 100644 --- a/cake/tests/fixtures/book_fixture.php +++ b/cake/tests/fixtures/book_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7198 diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php index 42e2f97fd..029693b86 100644 --- a/cake/tests/fixtures/cache_test_model_fixture.php +++ b/cake/tests/fixtures/cache_test_model_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php index dab950689..a2cf8b588 100644 --- a/cake/tests/fixtures/callback_fixture.php +++ b/cake/tests/fixtures/callback_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php index 4222baf9f..e29ecaa99 100644 --- a/cake/tests/fixtures/category_fixture.php +++ b/cake/tests/fixtures/category_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php index 185ad2be8..84f77b84f 100644 --- a/cake/tests/fixtures/category_thread_fixture.php +++ b/cake/tests/fixtures/category_thread_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/cd_fixture.php b/cake/tests/fixtures/cd_fixture.php index 39b0f7916..ad8cf24ef 100644 --- a/cake/tests/fixtures/cd_fixture.php +++ b/cake/tests/fixtures/cd_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7198 diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php index 7ca04dfdc..7f80fe543 100644 --- a/cake/tests/fixtures/comment_fixture.php +++ b/cake/tests/fixtures/comment_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/content_account_fixture.php b/cake/tests/fixtures/content_account_fixture.php index 4471b7fed..773938f3f 100644 --- a/cake/tests/fixtures/content_account_fixture.php +++ b/cake/tests/fixtures/content_account_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/content_fixture.php b/cake/tests/fixtures/content_fixture.php index 3ecd20e66..e92e09cff 100644 --- a/cake/tests/fixtures/content_fixture.php +++ b/cake/tests/fixtures/content_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/cake/tests/fixtures/counter_cache_post_fixture.php index 2a6fcd1a2..6fc67fbbc 100644 --- a/cake/tests/fixtures/counter_cache_post_fixture.php +++ b/cake/tests/fixtures/counter_cache_post_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php index af9e02701..be8c5b6fc 100644 --- a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php +++ b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/cake/tests/fixtures/counter_cache_user_fixture.php index 34f9be763..799ff69aa 100644 --- a/cake/tests/fixtures/counter_cache_user_fixture.php +++ b/cake/tests/fixtures/counter_cache_user_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php index 6c6a336a9..d75f7ab45 100644 --- a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php +++ b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php index 2326ecf44..54af3a200 100644 --- a/cake/tests/fixtures/data_test_fixture.php +++ b/cake/tests/fixtures/data_test_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php index b088152ae..463d22557 100644 --- a/cake/tests/fixtures/device_fixture.php +++ b/cake/tests/fixtures/device_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php index e1822ab28..09f533ed4 100644 --- a/cake/tests/fixtures/device_type_category_fixture.php +++ b/cake/tests/fixtures/device_type_category_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php index 1e845e1fe..9708798f4 100644 --- a/cake/tests/fixtures/device_type_fixture.php +++ b/cake/tests/fixtures/device_type_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php index ffb6fba6f..079a5bfde 100644 --- a/cake/tests/fixtures/document_directory_fixture.php +++ b/cake/tests/fixtures/document_directory_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php index 479ad2eeb..3d403334d 100644 --- a/cake/tests/fixtures/document_fixture.php +++ b/cake/tests/fixtures/document_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php index df163bdb2..4b0ad7c71 100644 --- a/cake/tests/fixtures/exterior_type_category_fixture.php +++ b/cake/tests/fixtures/exterior_type_category_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php index 363ce5f51..041130993 100644 --- a/cake/tests/fixtures/feature_set_fixture.php +++ b/cake/tests/fixtures/feature_set_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php index b199d441a..d98e57426 100644 --- a/cake/tests/fixtures/featured_fixture.php +++ b/cake/tests/fixtures/featured_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/film_file_fixture.php b/cake/tests/fixtures/film_file_fixture.php index 491971ad7..82cee0d22 100644 --- a/cake/tests/fixtures/film_file_fixture.php +++ b/cake/tests/fixtures/film_file_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php index dc3d23fe3..38ed2eb5a 100644 --- a/cake/tests/fixtures/flag_tree_fixture.php +++ b/cake/tests/fixtures/flag_tree_fixture.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5331 diff --git a/cake/tests/fixtures/fruit_fixture.php b/cake/tests/fixtures/fruit_fixture.php index f900465c0..e25be9664 100644 --- a/cake/tests/fixtures/fruit_fixture.php +++ b/cake/tests/fixtures/fruit_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7953 diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/cake/tests/fixtures/fruits_uuid_tag_fixture.php index 6e9c68b68..35f600aec 100644 --- a/cake/tests/fixtures/fruits_uuid_tag_fixture.php +++ b/cake/tests/fixtures/fruits_uuid_tag_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7953 diff --git a/cake/tests/fixtures/group_update_all_fixture.php b/cake/tests/fixtures/group_update_all_fixture.php index 500e8a6c5..efa949e6b 100644 --- a/cake/tests/fixtures/group_update_all_fixture.php +++ b/cake/tests/fixtures/group_update_all_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php index 714080b0c..61459dae3 100644 --- a/cake/tests/fixtures/home_fixture.php +++ b/cake/tests/fixtures/home_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php index ee994ee6a..fa9cd5268 100644 --- a/cake/tests/fixtures/image_fixture.php +++ b/cake/tests/fixtures/image_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php index 82c86a7b4..1743e086f 100644 --- a/cake/tests/fixtures/item_fixture.php +++ b/cake/tests/fixtures/item_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php index 5dd46d86b..0e6dca3fa 100644 --- a/cake/tests/fixtures/items_portfolio_fixture.php +++ b/cake/tests/fixtures/items_portfolio_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php index a411f9e14..837cd0ccb 100644 --- a/cake/tests/fixtures/join_a_b_fixture.php +++ b/cake/tests/fixtures/join_a_b_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php index 3276b1b12..828bf0971 100644 --- a/cake/tests/fixtures/join_a_c_fixture.php +++ b/cake/tests/fixtures/join_a_c_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php index 089f1b61a..6f5781280 100644 --- a/cake/tests/fixtures/join_a_fixture.php +++ b/cake/tests/fixtures/join_a_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php index d599eab70..a7544c56b 100644 --- a/cake/tests/fixtures/join_b_fixture.php +++ b/cake/tests/fixtures/join_b_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php index 91246c45e..d33e1153c 100644 --- a/cake/tests/fixtures/join_c_fixture.php +++ b/cake/tests/fixtures/join_c_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6317 diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php index 4e241d48a..66abba646 100644 --- a/cake/tests/fixtures/join_thing_fixture.php +++ b/cake/tests/fixtures/join_thing_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php index e351912dd..94a63a674 100644 --- a/cake/tests/fixtures/message_fixture.php +++ b/cake/tests/fixtures/message_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/cake/tests/fixtures/my_categories_my_products_fixture.php index ceabdcaa3..271c9d7a5 100644 --- a/cake/tests/fixtures/my_categories_my_products_fixture.php +++ b/cake/tests/fixtures/my_categories_my_products_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/cake/tests/fixtures/my_categories_my_users_fixture.php index 45a0d416f..a015a5ca2 100644 --- a/cake/tests/fixtures/my_categories_my_users_fixture.php +++ b/cake/tests/fixtures/my_categories_my_users_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/my_category_fixture.php b/cake/tests/fixtures/my_category_fixture.php index 5f84c300d..2b0416f75 100644 --- a/cake/tests/fixtures/my_category_fixture.php +++ b/cake/tests/fixtures/my_category_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php index 0cb37ae88..dfa93c58b 100644 --- a/cake/tests/fixtures/my_product_fixture.php +++ b/cake/tests/fixtures/my_product_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/my_user_fixture.php b/cake/tests/fixtures/my_user_fixture.php index 0d8bb1bb3..67dadd952 100644 --- a/cake/tests/fixtures/my_user_fixture.php +++ b/cake/tests/fixtures/my_user_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php index cec771d78..fc829346f 100644 --- a/cake/tests/fixtures/number_tree_fixture.php +++ b/cake/tests/fixtures/number_tree_fixture.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5331 diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/cake/tests/fixtures/number_tree_two_fixture.php index ad39c23b6..bd07894f7 100644 --- a/cake/tests/fixtures/number_tree_two_fixture.php +++ b/cake/tests/fixtures/number_tree_two_fixture.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5331 diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php index 3b5a50ce6..2b5a1b229 100644 --- a/cake/tests/fixtures/numeric_article_fixture.php +++ b/cake/tests/fixtures/numeric_article_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/cake/tests/fixtures/overall_favorite_fixture.php index 4785ea042..684f86c2a 100644 --- a/cake/tests/fixtures/overall_favorite_fixture.php +++ b/cake/tests/fixtures/overall_favorite_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7198 diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php index 0a917aab7..4233f9678 100644 --- a/cake/tests/fixtures/person_fixture.php +++ b/cake/tests/fixtures/person_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php index 24fe0c836..4d82464d5 100644 --- a/cake/tests/fixtures/portfolio_fixture.php +++ b/cake/tests/fixtures/portfolio_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php index 9ef05504d..90dfb2284 100644 --- a/cake/tests/fixtures/post_fixture.php +++ b/cake/tests/fixtures/post_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php index 9a528cef9..25c0e5699 100644 --- a/cake/tests/fixtures/posts_tag_fixture.php +++ b/cake/tests/fixtures/posts_tag_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php index 5c70b2d48..e4a824475 100644 --- a/cake/tests/fixtures/primary_model_fixture.php +++ b/cake/tests/fixtures/primary_model_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/product_fixture.php b/cake/tests/fixtures/product_fixture.php index 93eb130ed..acc86dcad 100644 --- a/cake/tests/fixtures/product_fixture.php +++ b/cake/tests/fixtures/product_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/product_update_all_fixture.php b/cake/tests/fixtures/product_update_all_fixture.php index 1f89a23f9..751561fd8 100644 --- a/cake/tests/fixtures/product_update_all_fixture.php +++ b/cake/tests/fixtures/product_update_all_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php index 297085822..f86eec1b2 100644 --- a/cake/tests/fixtures/project_fixture.php +++ b/cake/tests/fixtures/project_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php index 0474274b6..fa4983b2b 100644 --- a/cake/tests/fixtures/sample_fixture.php +++ b/cake/tests/fixtures/sample_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php index 6fb7ff6e2..db361d806 100644 --- a/cake/tests/fixtures/secondary_model_fixture.php +++ b/cake/tests/fixtures/secondary_model_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php index 94706dd86..03f7dea1f 100644 --- a/cake/tests/fixtures/session_fixture.php +++ b/cake/tests/fixtures/session_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php index b2071e235..2f9ffbe58 100644 --- a/cake/tests/fixtures/something_else_fixture.php +++ b/cake/tests/fixtures/something_else_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php index 3821eec7d..7be1357b5 100644 --- a/cake/tests/fixtures/something_fixture.php +++ b/cake/tests/fixtures/something_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php index 9ce038418..374f540b4 100644 --- a/cake/tests/fixtures/stories_tag_fixture.php +++ b/cake/tests/fixtures/stories_tag_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php index 6bb408095..2ca56b681 100644 --- a/cake/tests/fixtures/story_fixture.php +++ b/cake/tests/fixtures/story_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php index df1a010c9..dd9720585 100644 --- a/cake/tests/fixtures/syfile_fixture.php +++ b/cake/tests/fixtures/syfile_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php index 802524b46..217fdb27d 100644 --- a/cake/tests/fixtures/tag_fixture.php +++ b/cake/tests/fixtures/tag_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php index f83cb6344..dc3300ce0 100644 --- a/cake/tests/fixtures/test_plugin_article_fixture.php +++ b/cake/tests/fixtures/test_plugin_article_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 7660 diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php index b5d2508e7..09eb23e73 100644 --- a/cake/tests/fixtures/test_plugin_comment_fixture.php +++ b/cake/tests/fixtures/test_plugin_comment_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 7660 diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php index 5c9c85cfe..a44d24e82 100644 --- a/cake/tests/fixtures/the_paper_monkies_fixture.php +++ b/cake/tests/fixtures/the_paper_monkies_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php index 07e54e3e3..cd2069608 100644 --- a/cake/tests/fixtures/thread_fixture.php +++ b/cake/tests/fixtures/thread_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php index 2ca5c028c..3344cf1c1 100644 --- a/cake/tests/fixtures/translate_article_fixture.php +++ b/cake/tests/fixtures/translate_article_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php index 0e4ccc0ca..0f62d91cb 100644 --- a/cake/tests/fixtures/translate_fixture.php +++ b/cake/tests/fixtures/translate_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php index 900180b62..7e41af7d4 100644 --- a/cake/tests/fixtures/translate_table_fixture.php +++ b/cake/tests/fixtures/translate_table_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/fixtures/translate_with_prefix_fixture.php b/cake/tests/fixtures/translate_with_prefix_fixture.php index ddd487966..1fec1d63c 100644 --- a/cake/tests/fixtures/translate_with_prefix_fixture.php +++ b/cake/tests/fixtures/translate_with_prefix_fixture.php @@ -7,14 +7,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php index b98ca44e7..f8bd4c31c 100644 --- a/cake/tests/fixtures/translated_article_fixture.php +++ b/cake/tests/fixtures/translated_article_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php index 0f9b126bd..33eb3e39c 100644 --- a/cake/tests/fixtures/translated_item_fixture.php +++ b/cake/tests/fixtures/translated_item_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.5669 diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/cake/tests/fixtures/unconventional_tree_fixture.php index 29a22bea2..0d63119b0 100644 --- a/cake/tests/fixtures/unconventional_tree_fixture.php +++ b/cake/tests/fixtures/unconventional_tree_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7879 diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php index 22a81c366..99f0ceb3d 100644 --- a/cake/tests/fixtures/underscore_field_fixture.php +++ b/cake/tests/fixtures/underscore_field_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php index c0a4397fb..d257ff9cf 100644 --- a/cake/tests/fixtures/user_fixture.php +++ b/cake/tests/fixtures/user_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php index 282bcf900..cc5b6e401 100644 --- a/cake/tests/fixtures/uuid_fixture.php +++ b/cake/tests/fixtures/uuid_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.6700 diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/cake/tests/fixtures/uuid_tag_fixture.php index e9bdfa276..9d76316b2 100644 --- a/cake/tests/fixtures/uuid_tag_fixture.php +++ b/cake/tests/fixtures/uuid_tag_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7953 diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/cake/tests/fixtures/uuid_tree_fixture.php index 1d811a908..009e1aace 100644 --- a/cake/tests/fixtures/uuid_tree_fixture.php +++ b/cake/tests/fixtures/uuid_tree_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.7984 diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/cake/tests/fixtures/uuiditem_fixture.php index 1d3ed9d1c..c0cb3ea94 100644 --- a/cake/tests/fixtures/uuiditem_fixture.php +++ b/cake/tests/fixtures/uuiditem_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php index 45cfefaaa..c0ed13027 100644 --- a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php +++ b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php index ce6c2e192..ac47514cc 100644 --- a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php +++ b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/cake/tests/fixtures/uuidportfolio_fixture.php index b509fa8c5..74f1f9298 100644 --- a/cake/tests/fixtures/uuidportfolio_fixture.php +++ b/cake/tests/fixtures/uuidportfolio_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.fixtures * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/groups/acl.group.php b/cake/tests/groups/acl.group.php index ce0ac30e4..14fa0bb3c 100644 --- a/cake/tests/groups/acl.group.php +++ b/cake/tests/groups/acl.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/bake.group.php b/cake/tests/groups/bake.group.php index dc219eeb1..4da961808 100644 --- a/cake/tests/groups/bake.group.php +++ b/cake/tests/groups/bake.group.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/groups/behaviors.group.php b/cake/tests/groups/behaviors.group.php index 0f0c69e27..c254c7f01 100644 --- a/cake/tests/groups/behaviors.group.php +++ b/cake/tests/groups/behaviors.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/groups/cache.group.php b/cake/tests/groups/cache.group.php index c4b355e02..6428cb13f 100644 --- a/cake/tests/groups/cache.group.php +++ b/cake/tests/groups/cache.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/components.group.php b/cake/tests/groups/components.group.php index 08d8f1c86..3bd93bc5d 100644 --- a/cake/tests/groups/components.group.php +++ b/cake/tests/groups/components.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/configure.group.php b/cake/tests/groups/configure.group.php index 1d387e6af..a29caff82 100644 --- a/cake/tests/groups/configure.group.php +++ b/cake/tests/groups/configure.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/console.group.php b/cake/tests/groups/console.group.php index 7b7e59ceb..83c8a0ca4 100644 --- a/cake/tests/groups/console.group.php +++ b/cake/tests/groups/console.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php index 4e7086d95..02d121df2 100644 --- a/cake/tests/groups/controller.group.php +++ b/cake/tests/groups/controller.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/database.group.php b/cake/tests/groups/database.group.php index d341ed007..f891a2eed 100644 --- a/cake/tests/groups/database.group.php +++ b/cake/tests/groups/database.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.5517 diff --git a/cake/tests/groups/helpers.group.php b/cake/tests/groups/helpers.group.php index fd30bbf29..5b1d09f94 100644 --- a/cake/tests/groups/helpers.group.php +++ b/cake/tests/groups/helpers.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/i18n.group.php b/cake/tests/groups/i18n.group.php index 8a37930b5..4064df330 100644 --- a/cake/tests/groups/i18n.group.php +++ b/cake/tests/groups/i18n.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/groups/javascript.group.php b/cake/tests/groups/javascript.group.php index 6704cdc30..4969cf5a4 100644 --- a/cake/tests/groups/javascript.group.php +++ b/cake/tests/groups/javascript.group.php @@ -5,14 +5,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php index e7756abcb..520f53086 100644 --- a/cake/tests/groups/lib.group.php +++ b/cake/tests/groups/lib.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/model.group.php b/cake/tests/groups/model.group.php index 6aca57097..33f51bf81 100644 --- a/cake/tests/groups/model.group.php +++ b/cake/tests/groups/model.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.5517 diff --git a/cake/tests/groups/no_cross_contamination.group.php b/cake/tests/groups/no_cross_contamination.group.php index 4dc8c8d28..4fec61fae 100644 --- a/cake/tests/groups/no_cross_contamination.group.php +++ b/cake/tests/groups/no_cross_contamination.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/routing_system.group.php b/cake/tests/groups/routing_system.group.php index 09365f10b..628b40321 100644 --- a/cake/tests/groups/routing_system.group.php +++ b/cake/tests/groups/routing_system.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.5517 diff --git a/cake/tests/groups/socket.group.php b/cake/tests/groups/socket.group.php index 15df88ece..0b5e295e5 100644 --- a/cake/tests/groups/socket.group.php +++ b/cake/tests/groups/socket.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake.tests * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/test_suite.group.php b/cake/tests/groups/test_suite.group.php index 82d2ad85e..038ccc4a8 100644 --- a/cake/tests/groups/test_suite.group.php +++ b/cake/tests/groups/test_suite.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/view.group.php b/cake/tests/groups/view.group.php index 62c3a7d86..fe1d48c39 100644 --- a/cake/tests/groups/view.group.php +++ b/cake/tests/groups/view.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/groups/xml.group.php b/cake/tests/groups/xml.group.php index 4f26e3c28..8377c4055 100644 --- a/cake/tests/groups/xml.group.php +++ b/cake/tests/groups/xml.group.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.groups * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php index 05a6c8c59..06a96b51d 100644 --- a/cake/tests/lib/cake_test_case.php +++ b/cake/tests/lib/cake_test_case.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php index 08fb1e2e4..efebbbe08 100644 --- a/cake/tests/lib/cake_test_fixture.php +++ b/cake/tests/lib/cake_test_fixture.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/lib/cake_test_model.php b/cake/tests/lib/cake_test_model.php index 7a27f2669..759e7393b 100644 --- a/cake/tests/lib/cake_test_model.php +++ b/cake/tests/lib/cake_test_model.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4667 diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php index 388eab155..072328573 100644 --- a/cake/tests/lib/cake_test_suite_dispatcher.php +++ b/cake/tests/lib/cake_test_suite_dispatcher.php @@ -4,7 +4,7 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License diff --git a/cake/tests/lib/cake_web_test_case.php b/cake/tests/lib/cake_web_test_case.php index 7ada64474..34ac3b6d9 100644 --- a/cake/tests/lib/cake_web_test_case.php +++ b/cake/tests/lib/cake_web_test_case.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php index c8dcccecb..22dce2dc3 100644 --- a/cake/tests/lib/code_coverage_manager.php +++ b/cake/tests/lib/code_coverage_manager.php @@ -6,14 +6,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/cake/tests/lib/reporter/cake_base_reporter.php index 0e54b4269..2561f8c69 100644 --- a/cake/tests/lib/reporter/cake_base_reporter.php +++ b/cake/tests/lib/reporter/cake_base_reporter.php @@ -4,7 +4,7 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License diff --git a/cake/tests/lib/reporter/cake_cli_reporter.php b/cake/tests/lib/reporter/cake_cli_reporter.php index f12eb90db..a424e28a5 100644 --- a/cake/tests/lib/reporter/cake_cli_reporter.php +++ b/cake/tests/lib/reporter/cake_cli_reporter.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php index 5d290664f..aa0fcb526 100755 --- a/cake/tests/lib/reporter/cake_html_reporter.php +++ b/cake/tests/lib/reporter/cake_html_reporter.php @@ -4,7 +4,7 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php index 03e02e1b3..48cd052dd 100644 --- a/cake/tests/lib/reporter/cake_text_reporter.php +++ b/cake/tests/lib/reporter/cake_text_reporter.php @@ -4,7 +4,7 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License diff --git a/cake/tests/lib/templates/footer.php b/cake/tests/lib/templates/footer.php index eda055f2e..63b5b058d 100644 --- a/cake/tests/lib/templates/footer.php +++ b/cake/tests/lib/templates/footer.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/templates/header.php b/cake/tests/lib/templates/header.php index 5715d511f..fb098d4e6 100644 --- a/cake/tests/lib/templates/header.php +++ b/cake/tests/lib/templates/header.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/templates/menu.php b/cake/tests/lib/templates/menu.php index 42d14fddb..c678e496d 100644 --- a/cake/tests/lib/templates/menu.php +++ b/cake/tests/lib/templates/menu.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/templates/simpletest.php b/cake/tests/lib/templates/simpletest.php index f93997783..65231599c 100644 --- a/cake/tests/lib/templates/simpletest.php +++ b/cake/tests/lib/templates/simpletest.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/templates/xdebug.php b/cake/tests/lib/templates/xdebug.php index 6367827e0..4c9763961 100644 --- a/cake/tests/lib/templates/xdebug.php +++ b/cake/tests/lib/templates/xdebug.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.libs * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php index 22fff3eab..3aff52023 100644 --- a/cake/tests/lib/test_manager.php +++ b/cake/tests/lib/test_manager.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.cake.tests.lib * @since CakePHP(tm) v 1.2.0.4433 diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/cake/tests/test_app/controllers/tests_apps_controller.php index e3902d4e2..c5e240db6 100644 --- a/cake/tests/test_app/controllers/tests_apps_controller.php +++ b/cake/tests/test_app/controllers/tests_apps_controller.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/cake/tests/test_app/controllers/tests_apps_posts_controller.php index 88bd5f63e..b0fbecbb1 100644 --- a/cake/tests/test_app/controllers/tests_apps_posts_controller.php +++ b/cake/tests/test_app/controllers/tests_apps_posts_controller.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/libs/cache/test_app_cache.php b/cake/tests/test_app/libs/cache/test_app_cache.php index eeb8ec66e..02114e1ae 100644 --- a/cake/tests/test_app/libs/cache/test_app_cache.php +++ b/cake/tests/test_app/libs/cache/test_app_cache.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/libs/library.php b/cake/tests/test_app/libs/library.php index eaad93f8a..3d032329f 100644 --- a/cake/tests/test_app/libs/library.php +++ b/cake/tests/test_app/libs/library.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/libs/log/test_app_log.php b/cake/tests/test_app/libs/log/test_app_log.php index 336e3169b..d5e51c4ea 100644 --- a/cake/tests/test_app/libs/log/test_app_log.php +++ b/cake/tests/test_app/libs/log/test_app_log.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/plugins/test_plugin/config/load.php b/cake/tests/test_app/plugins/test_plugin/config/load.php index c343e54aa..2e52936ef 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/load.php +++ b/cake/tests/test_app/plugins/test_plugin/config/load.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/cake/tests/test_app/plugins/test_plugin/config/more.load.php index 799d8a264..b03c90c30 100644 --- a/cake/tests/test_app/plugins/test_plugin/config/more.load.php +++ b/cake/tests/test_app/plugins/test_plugin/config/more.load.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php index f3b837ae3..d5de57839 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php index f59cda650..2544376d9 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php index f30a8d3b2..40e97ef88 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php index 6726c0fba..a773b4256 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php index 5c73647c9..1cd7bca83 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php index 1a1244798..12246f8c3 100644 --- a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php index 15529ce91..203a9847b 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php index 36687fe81..a6bf2b2a2 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.3 diff --git a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php index 3dd78d8ad..463a2ccd8 100644 --- a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php +++ b/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php index 8919faab1..e7d7d38af 100644 --- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php +++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php index c2866a1fb..f87427508 100644 --- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php +++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.cases.libs * @since CakePHP(tm) v 1.2.0.5432 diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php index 77fd73dc9..6fad5d955 100644 --- a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php +++ b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.vendors.sample * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php index 5e8bfdf98..9bc11c04f 100644 --- a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php +++ b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php index 7758fbff9..3fb5ff867 100644 --- a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php +++ b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.vendors * @since CakePHP(tm) v 1.2.0.7629 diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php index 9bcc1c47f..5f35e2e6b 100644 --- a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php +++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php index 755ae6e5a..647a891bb 100644 --- a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php +++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin.views.helpers * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php index d3359810e..807cb45fa 100644 --- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php +++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin_two.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php index 98a71b778..0721db4fb 100644 --- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php +++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.plugins.test_plugin_two.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 diff --git a/cake/tests/test_app/vendors/Test/MyTest.php b/cake/tests/test_app/vendors/Test/MyTest.php index c7c7ad117..8ab33e869 100644 --- a/cake/tests/test_app/vendors/Test/MyTest.php +++ b/cake/tests/test_app/vendors/Test/MyTest.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.vendors.somename * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/vendors/Test/hello.php b/cake/tests/test_app/vendors/Test/hello.php index 5a89180e5..b738e022e 100644 --- a/cake/tests/test_app/vendors/Test/hello.php +++ b/cake/tests/test_app/vendors/Test/hello.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.vendors.Test * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php index 3540d0f0d..fe57a4768 100644 --- a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php +++ b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.vendors.sample * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/vendors/shells/sample.php b/cake/tests/test_app/vendors/shells/sample.php index 408b22ae5..69080285f 100644 --- a/cake/tests/test_app/vendors/shells/sample.php +++ b/cake/tests/test_app/vendors/shells/sample.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.vendors.shells * @since CakePHP(tm) v 1.2.0.7871 diff --git a/cake/tests/test_app/vendors/somename/some.name.php b/cake/tests/test_app/vendors/somename/some.name.php index 41dee84a7..fb8bfad62 100644 --- a/cake/tests/test_app/vendors/somename/some.name.php +++ b/cake/tests/test_app/vendors/somename/some.name.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.vendors.somename * @since CakePHP(tm) v 1.2.0.4206 diff --git a/cake/tests/test_app/vendors/welcome.php b/cake/tests/test_app/vendors/welcome.php index 32a531ffc..0fc08ec6f 100644 --- a/cake/tests/test_app/vendors/welcome.php +++ b/cake/tests/test_app/vendors/welcome.php @@ -4,14 +4,14 @@ * * PHP versions 4 and 5 * - * CakePHP(tm) Tests + * CakePHP(tm) Tests * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * * Licensed under The Open Group Test Suite License * Redistributions of files must retain the above copyright notice. * * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) - * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests * @package cake * @subpackage cake.tests.test_app.vendors * @since CakePHP(tm) v 1.2.0.7629 From 385ceb434e333c13e79ec418755ab9bce7dd8256 Mon Sep 17 00:00:00 2001 From: Robert Sworder Date: Tue, 18 May 2010 17:26:12 -0700 Subject: [PATCH 040/100] When using Digest Authentication the passwords do not need to be md5 hashed. Removed incorrect comment. Fixes #733 Signed-off-by: mark_story --- cake/libs/controller/components/security.php | 1 - 1 file changed, 1 deletion(-) diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php index b92a67dbf..65c00e630 100644 --- a/cake/libs/controller/components/security.php +++ b/cake/libs/controller/components/security.php @@ -109,7 +109,6 @@ class SecurityComponent extends Object { /** * An associative array of usernames/passwords used for HTTP-authenticated logins. - * If using digest authentication, passwords should be MD5-hashed. * * @var array * @access public From 3a81a9e6f28d3512ee2dc8c8cf127432a2e327a6 Mon Sep 17 00:00:00 2001 From: predominant Date: Thu, 20 May 2010 12:17:52 +1000 Subject: [PATCH 041/100] Remove unnecessary spaces. --- cake/libs/view/pages/home.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp index 848ab3ad3..e61349ade 100644 --- a/cake/libs/view/pages/home.ctp +++ b/cake/libs/view/pages/home.ctp @@ -106,7 +106,7 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');

Html->link( - sprintf('%s%s', __('new', true ), __('CakePHP 1.3 Docs', true )), + sprintf('%s%s', __('new', true), __('CakePHP 1.3 Docs', true)), 'http://book.cakephp.org/view/875/x1-3-Collection', array('target' => '_blank', 'escape' => false) ); From 82250efc3e31e7ed802c2bd6f2d032055ac93229 Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 20 May 2010 22:58:20 -0400 Subject: [PATCH 042/100] Updating doc blocks for FormHelper::input() refs #735 --- cake/libs/view/helpers/form.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index 82f3defed..5e2fb57c5 100755 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -684,9 +684,10 @@ class FormHelper extends AppHelper { * - `after` - Content to place after the label + input. * - `between` - Content to place between the label + input. * - `format` - format template for element order. Any element that is not in the array, will not be in the output. - * Default input format order: array('before', 'label', 'between', 'input', 'after', 'error') - * Default checkbox format order: array('before', 'input', 'between', 'label', 'after', 'error') - * Hidden input will not be formatted + * - Default input format order: array('before', 'label', 'between', 'input', 'after', 'error') + * - Default checkbox format order: array('before', 'input', 'between', 'label', 'after', 'error') + * - Hidden input will not be formatted + * - Radio buttons cannot have the order of input and label elements controlled with these settings. * * @param string $fieldName This should be "Modelname.fieldname" * @param array $options Each type of input takes different options. From 78653347b2ad9ad2124e4ddf0be0ac81d5b5f227 Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 20 May 2010 23:13:45 -0400 Subject: [PATCH 043/100] Removing request time output from index.php. Makes non sgml requests like json easier to do. Fixes #720 --- app/webroot/index.php | 3 --- cake/console/templates/skel/webroot/index.php | 3 --- 2 files changed, 6 deletions(-) diff --git a/app/webroot/index.php b/app/webroot/index.php index 74a356664..396775b73 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -82,6 +82,3 @@ $Dispatcher = new Dispatcher(); $Dispatcher->dispatch(); } - if (Configure::read() > 0) { - echo ""; - } diff --git a/cake/console/templates/skel/webroot/index.php b/cake/console/templates/skel/webroot/index.php index 74a356664..396775b73 100644 --- a/cake/console/templates/skel/webroot/index.php +++ b/cake/console/templates/skel/webroot/index.php @@ -82,6 +82,3 @@ $Dispatcher = new Dispatcher(); $Dispatcher->dispatch(); } - if (Configure::read() > 0) { - echo ""; - } From 23d4bafd39fe6334511b357e63ade319a924631b Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 21 May 2010 23:49:49 -0400 Subject: [PATCH 044/100] Fixing inflection of words ending in causes. Fixes #736 --- cake/libs/inflector.php | 2 +- cake/tests/cases/libs/inflector.test.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php index 83590ace9..46fc540be 100644 --- a/cake/libs/inflector.php +++ b/cake/libs/inflector.php @@ -121,7 +121,7 @@ class Inflector { '/(shoe|slave)s$/i' => '\1', '/(o)es$/i' => '\1', '/ouses$/' => 'ouse', - '/uses$/' => 'us', + '/([^a])uses$/' => '\1us', '/([m|l])ice$/i' => '\1ouse', '/(x|ch|ss|sh)es$/i' => '\1', '/(m)ovies$/i' => '\1\2ovie', diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php index e50855915..c894e8a65 100644 --- a/cake/tests/cases/libs/inflector.test.php +++ b/cake/tests/cases/libs/inflector.test.php @@ -119,6 +119,8 @@ class InflectorTest extends CakeTestCase { $this->assertEqual(Inflector::singularize('genetic_analyses'), 'genetic_analysis'); $this->assertEqual(Inflector::singularize('doctor_diagnoses'), 'doctor_diagnosis'); $this->assertEqual(Inflector::singularize('parantheses'), 'paranthesis'); + $this->assertEqual(Inflector::singularize('Causes'), 'Cause'); + $this->assertEqual(Inflector::singularize('colossuses'), 'colossus'); $this->assertEqual(Inflector::singularize(''), ''); } From 29f2223c6de2d1ce99dc83625f7449d97fbe1799 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 22 May 2010 00:58:54 -0400 Subject: [PATCH 045/100] Removing hardcoded '__' for virtualField separators. Making it an instance property instead. This allows the customization of the separator if needed. Tests added for DboMysql. Refs #655, #730 --- cake/libs/model/datasources/dbo/dbo_mysql.php | 2 +- cake/libs/model/datasources/dbo_source.php | 13 ++++++++++--- .../model/datasources/dbo/dbo_mysql.test.php | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index 8648b0a2b..d06d71830 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -728,7 +728,7 @@ class DboMysql extends DboMysqlBase { while ($j < $numFields) { $column = mysql_fetch_field($results, $j); - if (!empty($column->table) && strpos($column->name, '__') === false) { + if (!empty($column->table) && strpos($column->name, $this->virtualFieldSeparator) === false) { $this->map[$index++] = array($column->table, $column->name); } else { $this->map[$index++] = array(0, $column->name); diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 40a74736e..69945aeaf 100755 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -97,6 +97,13 @@ class DboSource extends DataSource { 'rollback' => 'ROLLBACK' ); +/** + * Separator string for virtualField composition + * + * @var string + */ + var $virtualFieldSeparator = '__'; + /** * List of table engine specific parameters used on table creating * @@ -432,10 +439,10 @@ class DboSource extends DataSource { function fetchVirtualField(&$result) { if (isset($result[0]) && is_array($result[0])) { foreach ($result[0] as $field => $value) { - if (strpos($field, '__') === false) { + if (strpos($field, $this->virtualFieldSeparator) === false) { continue; } - list($alias, $virtual) = explode('__', $field); + list($alias, $virtual) = explode($this->virtualFieldSeparator, $field); if (!ClassRegistry::isKeySet($alias)) { return; @@ -1902,7 +1909,7 @@ class DboSource extends DataSource { function _constructVirtualFields(&$model, $alias, $fields) { $virtual = array(); foreach ($fields as $field) { - $virtualField = $this->name("{$alias}__{$field}"); + $virtualField = $this->name($alias . $this->virtualFieldSeparator . $field); $expression = $this->__quoteFields($model->getVirtualField($field)); $virtual[] = '(' .$expression . ") {$this->alias} {$virtualField}"; } 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 a017e7788..f79b84298 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 @@ -759,4 +759,22 @@ class DboMysqlTest extends CakeTestCase { $this->assertEqual($result, 'cp1250'); } +/** + * test that changing the virtualFieldSeparator allows for __ fields. + * + * @return void + */ + function testVirtualFieldSeparators() { + $model =& new CakeTestModel(array('table' => 'binary_tests', 'ds' => 'test_suite', 'name' => 'BinaryTest')); + $model->virtualFields = array( + 'other__field' => 'SUM(id)' + ); + + $this->db->virtualFieldSeparator = '_$_'; + $result = $this->db->fields($model, null, array('data', 'other__field')); + $expected = array('`BinaryTest`.`data`', '(SUM(id)) AS BinaryTest_$_other__field'); + $this->assertEqual($result, $expected); + + } + } From 06c1b583f8f3297153be978e1e192a3dd18e66b5 Mon Sep 17 00:00:00 2001 From: tarcisio Date: Fri, 21 May 2010 22:47:53 -0300 Subject: [PATCH 046/100] fix typo in CakeLog::config() Signed-off-by: mark_story --- cake/libs/cake_log.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php index f05f86490..efac12bcf 100644 --- a/cake/libs/cake_log.php +++ b/cake/libs/cake_log.php @@ -91,7 +91,7 @@ class CakeLog { * * For an explaination of these parameters, see CakeLog::write() * - * @param string $key The keyname for this logger, used to revmoe the logger later. + * @param string $key The keyname for this logger, used to remove the logger later. * @param array $config Array of configuration information for the logger * @return boolean success of configuration. * @static From 7d51952801c14a88caa5ad7a1729e4de871e60ba Mon Sep 17 00:00:00 2001 From: ADmad Date: Sun, 23 May 2010 02:14:07 +0530 Subject: [PATCH 047/100] Removing protected var CakeSession::_started and instead session_id() is now used to check if session is started in CakeSession::started(). This fixes issue where CakeSession::started() returned incorrect value when used across multiple objects. Closes #731 --- cake/libs/cake_session.php | 14 +++----------- cake/tests/cases/libs/cake_session.test.php | 4 ++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index 97fb04571..ddefa4506 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -114,14 +114,6 @@ class CakeSession extends Object { */ var $id = null; -/** - * Session Started - * - * @var boolean - * @access protected - */ - var $_started = false; - /** * Hostname * @@ -216,7 +208,7 @@ class CakeSession extends Object { session_write_close(); } $this->__initSession(); - $this->_started = $this->__startSession(); + $this->__startSession(); return $this->started(); } @@ -227,7 +219,7 @@ class CakeSession extends Object { * @return boolean True if session has been started. */ function started() { - if (isset($_SESSION) && $this->_started) { + if (isset($_SESSION) && session_id()) { return true; } return false; @@ -795,5 +787,5 @@ class CakeSession extends Object { $return = $model->deleteAll(array($model->alias . ".expires <" => $expires), false, false); return $return; - } + } } diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php index b58700bc3..c80eb3c26 100644 --- a/cake/tests/cases/libs/cake_session.test.php +++ b/cake/tests/cases/libs/cake_session.test.php @@ -170,6 +170,10 @@ class CakeSessionTest extends CakeTestCase { $_SESSION = null; $this->assertFalse($this->Session->started()); $this->assertTrue($this->Session->start()); + + $session = new CakeSession(null, false); + $this->assertTrue($session->started()); + unset($session); } /** From 2d449295981fbcceb9217a82e680383e0ee41c02 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sun, 18 Apr 2010 22:22:09 -0300 Subject: [PATCH 048/100] Optimization on dbo datasource to not repeat ids in find. Fixes #601 Signed-off-by: mark_story --- cake/libs/model/datasources/dbo_source.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 69945aeaf..db5dca354 100755 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -924,6 +924,7 @@ class DboSource extends DataSource { } if (!empty($ins)) { + $ins = array_unique($ins); $fetch = $this->fetchAssociated($model, $query, $ins); } @@ -955,10 +956,10 @@ class DboSource extends DataSource { } } if (!empty($ins)) { + $ins = array_unique($ins); if (count($ins) > 1) { $query = str_replace('{$__cakeID__$}', '(' .implode(', ', $ins) .')', $query); $query = str_replace('= (', 'IN (', $query); - $query = str_replace('= (', 'IN (', $query); } else { $query = str_replace('{$__cakeID__$}',$ins[0], $query); } @@ -1060,7 +1061,6 @@ class DboSource extends DataSource { $query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query); if (count($ids) > 1) { $query = str_replace('= (', 'IN (', $query); - $query = str_replace('= (', 'IN (', $query); } return $this->fetchAll($query, $model->cacheQueries, $model->alias); } @@ -2179,7 +2179,7 @@ class DboSource extends DataSource { } } elseif (is_array($value) && !empty($value) && !$valueInsert) { $keys = array_keys($value); - if (array_keys($value) === array_values(array_keys($value))) { + if ($keys === array_values($keys)) { $count = count($value); if ($count === 1) { $data = $this->__quoteFields($key) . ' = ('; From bc3e745673385e0f48da3fa90cda5cc6fbaddf26 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Mon, 24 May 2010 22:24:58 -0300 Subject: [PATCH 049/100] Support to EHLO in SMTP server for EmailComponent. Fixes #54, #712, #737 --- cake/libs/controller/components/email.php | 16 ++++-- .../libs/controller/components/email.test.php | 55 +++++++++++++++++++ 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index 94ef82a3b..d18784abb 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -808,7 +808,7 @@ class EmailComponent extends Object{ $host = 'localhost'; } - if (!$this->_smtpSend("HELO {$host}", '250')) { + if (!$this->_smtpSend("EHLO {$host}", '250') || !$this->_smtpSend("HELO {$host}", '250')) { return false; } @@ -868,22 +868,26 @@ class EmailComponent extends Object{ } /** - * Private method for sending data to SMTP connection + * Protected method for sending data to SMTP connection * * @param string $data data to be sent to SMTP server * @param mixed $checkCode code to check for in server response, false to skip * @return bool Success - * @access private + * @access protected */ function _smtpSend($data, $checkCode = '250') { if (!is_null($data)) { $this->__smtpConnection->write($data . "\r\n"); } - if ($checkCode !== false) { + while ($checkCode !== false) { $response = $this->__smtpConnection->read(); + $response = end(explode("\r\n", rtrim($response, "\r\n"))); - if (preg_match('/^(' . $checkCode . ')/', $response, $code)) { - return $code[0]; + if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) { + if ($code[2] === '-') { + continue; + } + return $code[1]; } $this->smtpError = $response; return false; diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php index 1267c96a7..f5de3e9d2 100755 --- a/cake/tests/cases/libs/controller/components/email.test.php +++ b/cake/tests/cases/libs/controller/components/email.test.php @@ -295,6 +295,61 @@ TEMPDOC; $this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect)); } +/** + * testSmtpEhlo method + * + * @access public + * @return void + */ + function testSmtpEhlo() { + if (!$this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) { + return; + } + + $connection =& new CakeSocket(array('protocol'=>'smtp', 'host' => 'localhost', 'port' => 25)); + $this->Controller->EmailTest->setConnectionSocket($connection); + $this->assertTrue($connection->connect()); + $this->assertTrue($this->Controller->EmailTest->smtpSend(null, '220') !== false); + $this->skipIf($this->Controller->EmailTest->smtpSend('EHLO locahost', '250') === false, '%s do not support EHLO.'); + $connection->disconnect(); + + $this->Controller->EmailTest->to = 'postmaster@localhost'; + $this->Controller->EmailTest->from = 'noreply@example.com'; + $this->Controller->EmailTest->subject = 'Cake SMTP test'; + $this->Controller->EmailTest->replyTo = 'noreply@example.com'; + $this->Controller->EmailTest->template = null; + + $this->Controller->EmailTest->delivery = 'smtp'; + $this->assertTrue($this->Controller->EmailTest->send('This is the body of the message')); + + $this->Controller->EmailTest->_debug = true; + $this->Controller->EmailTest->sendAs = 'text'; + $expect = <<Host: localhost +Port: 25 +Timeout: 30 +To: postmaster@localhost +From: noreply@example.com +Subject: Cake SMTP test +Header: + +To: postmaster@localhost +From: noreply@example.com +Reply-To: noreply@example.com +Subject: Cake SMTP test +X-Mailer: CakePHP Email Component +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 7bitParameters: + +Message: + +This is the body of the message + + +TEMPDOC; + $this->assertTrue($this->Controller->EmailTest->send('This is the body of the message')); + $this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect)); + } /** * testSmtpSendMultipleTo method From 64adfacd3ec9ef11c9c29218e972059bdb6be9f7 Mon Sep 17 00:00:00 2001 From: Martin Radosta Date: Wed, 19 May 2010 05:54:51 -0300 Subject: [PATCH 050/100] Making DboSource::order() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax. Tests added. Fixes #747 Signed-off-by: mark_story --- cake/libs/model/datasources/dbo_source.php | 3 +++ .../libs/model/datasources/dbo_source.test.php | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index db5dca354..4bd56e849 100755 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -2411,6 +2411,9 @@ class DboSource extends DataSource { } } continue; + } elseif (is_object($key) && isset($key->type) && $key->type === 'expression') { + $result[] = $key->value; + continue; } if (preg_match('/\\x20(ASC|DESC).*/i', $key, $_dir)) { diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php index ead5a9d7b..73f86be55 100644 --- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php @@ -2966,6 +2966,19 @@ class DboSourceTest extends CakeTestCase { ); $this->assertEqual($result, $expected); } + +/** + * test that order() will accept objects made from DboSource::expression + * + * @return void + */ + function testOrderWithExpression() { + $expression = $this->testDb->expression("CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col"); + $result = $this->testDb->order($expression); + $expected = " ORDER BY CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col"; + $this->assertEqual($result, $expected); + } + /** * testMergeAssociations method * From 8b6c974cd0879228a5f9363450763eeaf71963cd Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 27 May 2010 00:01:17 -0400 Subject: [PATCH 051/100] Making FileEngine not greedily clear files in a directory that may belong to another cache configuration. Tests added. Fixes #754 --- cake/libs/cache/file.php | 4 ++++ cake/tests/cases/libs/cache/file.test.php | 28 +++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php index e8e8ffdad..3494c62ce 100644 --- a/cake/libs/cache/file.php +++ b/cake/libs/cache/file.php @@ -209,7 +209,11 @@ class FileEngine extends CacheEngine { $now = time(); $threshold = $now - $this->settings['duration']; } + $prefixLength = strlen($this->settings['prefix']); while (($entry = $dir->read()) !== false) { + if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) { + continue; + } if ($this->_setKey($entry) === false) { continue; } diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php index 15ee52673..ffb571f73 100644 --- a/cake/tests/cases/libs/cache/file.test.php +++ b/cake/tests/cases/libs/cache/file.test.php @@ -273,6 +273,34 @@ class FileEngineTest extends CakeTestCase { Cache::config('default', array('engine' => 'File', 'path' => CACHE)); } +/** + * test that clear() doesn't wipe files not in the current engine's prefix. + * + * @return void + */ + function testClearWithPrefixes() { + $FileOne =& new FileEngine(); + $FileOne->init(array( + 'prefix' => 'prefix_one_', + 'duration' => DAY + )); + $FileTwo =& new FileEngine(); + $FileTwo->init(array( + 'prefix' => 'prefix_two_', + 'duration' => DAY + )); + + $data1 = $data2 = $expected = 'content to cache'; + $FileOne->write('key_one', $data1, DAY); + $FileTwo->write('key_two', $data2, DAY); + + $this->assertEqual($FileOne->read('key_one'), $expected); + $this->assertEqual($FileTwo->read('key_two'), $expected); + + $FileOne->clear(false); + $this->assertEqual($FileTwo->read('key_two'), $expected, 'secondary config was cleared by accident.'); + } + /** * testKeyPath method * From e02cb81a6707332bf01d8268a0073ae47d8c228f Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sat, 29 May 2010 12:04:29 -0300 Subject: [PATCH 052/100] Reading a smtp response until EOL. Fixes #378 --- cake/libs/controller/components/email.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index d18784abb..5ee9f531f 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -880,7 +880,15 @@ class EmailComponent extends Object{ $this->__smtpConnection->write($data . "\r\n"); } while ($checkCode !== false) { - $response = $this->__smtpConnection->read(); + $response = ''; + $startTime = time(); + while (substr($response, -2) !== "\r\n" && ((time() - $startTime) < $this->smtpOptions['timeout'])) { + $response .= $this->__smtpConnection->read(); + } + if (substr($response, -2) === "\r\n") { + $this->smtpError = 'timeout'; + return false; + } $response = end(explode("\r\n", rtrim($response, "\r\n"))); if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) { From f06f0dae8be7be2cf6ed571d5e46c58959814f53 Mon Sep 17 00:00:00 2001 From: predominant Date: Sun, 30 May 2010 01:10:48 +1000 Subject: [PATCH 053/100] Numerous "Enter description here" block comments updated to have meaningful descriptions. --- app/webroot/css.php | 10 ++-- cake/console/templates/skel/webroot/css.php | 6 +-- cake/libs/model/datasources/datasource.php | 2 +- cake/libs/model/datasources/dbo/dbo_mysql.php | 4 +- .../libs/model/datasources/dbo/dbo_mysqli.php | 4 +- .../libs/model/datasources/dbo/dbo_oracle.php | 46 +++++++++---------- .../libs/model/datasources/dbo/dbo_sqlite.php | 4 +- cake/libs/view/helpers/number.php | 2 +- 8 files changed, 40 insertions(+), 38 deletions(-) diff --git a/app/webroot/css.php b/app/webroot/css.php index 445b2fb2e..aae68cba8 100644 --- a/app/webroot/css.php +++ b/app/webroot/css.php @@ -1,6 +1,6 @@ array('name' => 'inet')); /** - * Enter description here... + * Connection object * - * @var unknown_type + * @var mixed * @access protected */ var $connection; /** - * Enter description here... + * Query limit * - * @var unknown_type + * @var int * @access protected */ var $_limit = -1; /** - * Enter description here... + * Query offset * - * @var unknown_type + * @var int * @access protected */ var $_offset = 0; @@ -109,25 +109,25 @@ class DboOracle extends DboSource { var $_map; /** - * Enter description here... + * Current Row * - * @var unknown_type + * @var mixed * @access protected */ var $_currentRow; /** - * Enter description here... + * Number of rows * - * @var unknown_type + * @var int * @access protected */ var $_numRows; /** - * Enter description here... + * Query results * - * @var unknown_type + * @var mixed * @access protected */ var $_results; @@ -378,9 +378,9 @@ class DboOracle extends DboSource { } /** - * Enter description here... + * Fetch result row * - * @return unknown + * @return array * @access public */ function fetchRow() { @@ -444,10 +444,10 @@ class DboOracle extends DboSource { } /** - * Enter description here... + * Create trigger * - * @param unknown_type $table - * @return unknown + * @param string $table + * @return mixed * @access public */ function createTrigger($table) { diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php index 1fdba32a8..efc660f33 100644 --- a/cake/libs/model/datasources/dbo/dbo_sqlite.php +++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php @@ -29,9 +29,9 @@ class DboSqlite extends DboSource { /** - * Enter description here... + * Datasource Description * - * @var unknown_type + * @var string */ var $description = "SQLite DBO Driver"; diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php index da8a565a6..236732a92 100644 --- a/cake/libs/view/helpers/number.php +++ b/cake/libs/view/helpers/number.php @@ -69,7 +69,7 @@ class NumberHelper extends AppHelper { * * @param float $number A floating point number. * @param integer $precision The precision of the returned number. - * @return float Enter description here... + * @return float Formatted float. * @access public * @link http://book.cakephp.org/view/1454/precision */ From 8decc683ac46f5f00e026ef2cbeb4873330f3e2e Mon Sep 17 00:00:00 2001 From: predominant Date: Sun, 30 May 2010 01:20:28 +1000 Subject: [PATCH 054/100] Numerous 'shoer description' documentation entries updated to contain useful comments. --- cake/console/libs/console.php | 2 +- cake/console/libs/i18n.php | 2 +- cake/console/templates/skel/app_controller.php | 4 ++-- cake/console/templates/skel/app_helper.php | 2 +- cake/console/templates/skel/config/acl.ini.php | 2 +- cake/console/templates/skel/config/routes.php | 2 +- cake/console/templates/skel/webroot/css.php | 2 +- cake/libs/controller/app_controller.php | 2 +- cake/libs/controller/components/cookie.php | 2 +- cake/libs/controller/components/email.php | 2 +- cake/libs/controller/components/security.php | 5 +++-- cake/libs/i18n.php | 2 +- cake/libs/l10n.php | 4 ++-- cake/libs/model/behaviors/acl.php | 2 +- cake/libs/model/behaviors/translate.php | 4 ++-- cake/libs/model/datasources/dbo/dbo_mssql.php | 2 +- cake/libs/model/datasources/dbo/dbo_oracle.php | 2 +- cake/libs/model/datasources/dbo_source.php | 2 +- cake/libs/model/db_acl.php | 2 +- cake/libs/security.php | 2 +- cake/libs/view/helpers/app_helper.php | 2 +- cake/tests/cases/libs/controller/components/acl.test.php | 2 +- 22 files changed, 27 insertions(+), 26 deletions(-) diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php index 41e4d4634..ac7b595bb 100644 --- a/cake/console/libs/console.php +++ b/cake/console/libs/console.php @@ -1,6 +1,6 @@ ; SVN FILE: $Id$ ;/** -; * Short description for file. +; * ACL Configuration ; * ; * ; * PHP versions 4 and 5 diff --git a/cake/console/templates/skel/config/routes.php b/cake/console/templates/skel/config/routes.php index 696c49a87..9e4a28c14 100644 --- a/cake/console/templates/skel/config/routes.php +++ b/cake/console/templates/skel/config/routes.php @@ -1,6 +1,6 @@ Date: Sat, 29 May 2010 12:06:36 -0300 Subject: [PATCH 055/100] Changing break; to continue; so it will process the next tables on the array, tests added. --- cake/libs/model/cake_schema.php | 2 +- .../cases/libs/model/cake_schema.test.php | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php index adee3df01..7901cdf09 100644 --- a/cake/libs/model/cake_schema.php +++ b/cake/libs/model/cake_schema.php @@ -451,7 +451,7 @@ class CakeSchema extends Object { $tables = array(); foreach ($new as $table => $fields) { if ($table == 'missing') { - break; + continue; } if (!array_key_exists($table, $old)) { $tables[$table]['add'] = $fields; diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php index 664364e3d..c07b9d998 100644 --- a/cake/tests/cases/libs/model/cake_schema.test.php +++ b/cake/tests/cases/libs/model/cake_schema.test.php @@ -743,6 +743,45 @@ class CakeSchemaTest extends CakeTestCase { ), ); $this->assertEqual($expected, $compare); + + $tables = array( + 'missing' => array( + 'categories' => array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'), + 'created' => array('type' => 'datetime', 'null' => false, 'default' => NULL), + 'modified' => array('type' => 'datetime', 'null' => false, 'default' => NULL), + 'name' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 100), + 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)), + 'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'MyISAM') + ) + ), + 'ratings' => array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'), + 'foreign_key' => array('type' => 'integer', 'null' => false, 'default' => NULL), + 'model' => array('type' => 'varchar', 'null' => false, 'default' => NULL), + 'value' => array('type' => 'float', 'null' => false, 'length' => '5,2', 'default' => NULL), + 'created' => array('type' => 'datetime', 'null' => false, 'default' => NULL), + 'modified' => array('type' => 'datetime', 'null' => false, 'default' => NULL), + 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)), + 'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'MyISAM') + ) + ); + $compare = $New->compare($this->Schema, $tables); + $expected = array( + 'ratings' => array( + 'add' => array( + 'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'), + 'foreign_key' => array('type' => 'integer', 'null' => false, 'default' => NULL), + 'model' => array('type' => 'varchar', 'null' => false, 'default' => NULL), + 'value' => array('type' => 'float', 'null' => false, 'length' => '5,2', 'default' => NULL), + 'created' => array('type' => 'datetime', 'null' => false, 'default' => NULL), + 'modified' => array('type' => 'datetime', 'null' => false, 'default' => NULL), + 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)), + 'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'MyISAM') + ) + ) + ); + $this->assertEqual($expected, $compare); } /** From 25a6a3cac84b34a3d5a93cbca0ec4e1910dc4901 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 29 May 2010 12:47:31 -0400 Subject: [PATCH 056/100] Correcting spacing in file test. Correctly constructing a File object, so testRead does not rely on the previous test to leave the object in the correct state. --- cake/tests/cases/libs/file.test.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php index 10ff17ac0..8cb372eff 100644 --- a/cake/tests/cases/libs/file.test.php +++ b/cake/tests/cases/libs/file.test.php @@ -104,6 +104,9 @@ class FileTest extends CakeTestCase { * @return void */ function testRead() { + $file = __FILE__; + $this->File =& new File($file); + $result = $this->File->read(); $expecting = file_get_contents(__FILE__); $this->assertEqual($result, $expecting); @@ -445,7 +448,7 @@ class FileTest extends CakeTestCase { * @return void */ function _getTmpFile($paintSkip = true) { - $tmpFile = TMP.'tests'.DS.'cakephp.file.test.tmp'; + $tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp'; if (is_writable(dirname($tmpFile)) && (!file_exists($tmpFile) || is_writable($tmpFile))) { return $tmpFile; }; @@ -454,14 +457,14 @@ class FileTest extends CakeTestCase { $caller = 'test'; if (function_exists('debug_backtrace')) { $trace = debug_backtrace(); - $caller = $trace[1]['function'].'()'; + $caller = $trace[1]['function'] . '()'; } $assertLine = new SimpleStackTrace(array(__FUNCTION__)); $assertLine = $assertLine->traceMethod(); $shortPath = substr($tmpFile, strlen(ROOT)); $message = '[FileTest] Skipping %s because "%s" not writeable!'; - $message = sprintf(__($message, true), $caller, $shortPath).$assertLine; + $message = sprintf(__($message, true), $caller, $shortPath) . $assertLine; $this->_reporter->paintSkip($message); } return false; From 7cde3094f0c741abbe6b0b14d8894da343c9bf7b Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 29 May 2010 12:50:42 -0400 Subject: [PATCH 057/100] Removing trim() that was performed when reading a file with a lock() enabled. This was causing a failure in php5. --- cake/libs/file.php | 1 - 1 file changed, 1 deletion(-) diff --git a/cake/libs/file.php b/cake/libs/file.php index 2d41d7202..ed0e2334f 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -185,7 +185,6 @@ class File extends Object { while (!feof($this->handle)) { $data .= fgets($this->handle, 4096); } - $data = trim($data); if ($this->lock !== null) { flock($this->handle, LOCK_UN); From dea33f64520eb181c0bfcba73201858a9024d720 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 29 May 2010 13:19:12 -0400 Subject: [PATCH 058/100] Fixing pass by reference errors in php5.3. Fixes #451 --- cake/libs/model/model_behavior.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php index 77a4157ff..140a8831d 100644 --- a/cake/libs/model/model_behavior.php +++ b/cake/libs/model/model_behavior.php @@ -176,7 +176,7 @@ class ModelBehavior extends Object { case 5: return $this->{$method}($model, $params[0], $params[1], $params[2], $params[3], $params[4]); default: - array_unshift($params, $model); + $params = array_merge(array(&$model), $params); return call_user_func_array(array(&$this, $method), $params); break; } From 0180daaad372063f42e4850d0f35ccfc9ce874fb Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 29 May 2010 13:26:34 -0400 Subject: [PATCH 059/100] Updating version numbers to 1.3.1 --- cake/VERSION.txt | 3 +-- cake/config/config.php | 2 +- cake/libs/view/pages/home.ctp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cake/VERSION.txt b/cake/VERSION.txt index 4276a6cf6..271b0e83c 100644 --- a/cake/VERSION.txt +++ b/cake/VERSION.txt @@ -18,5 +18,4 @@ // @license MIT License (http://www.opensource.org/licenses/mit-license.php) // +--------------------------------------------------------------------------------------------+ // //////////////////////////////////////////////////////////////////////////////////////////////////// -1.3.0 - +1.3.1 diff --git a/cake/config/config.php b/cake/config/config.php index d01327da1..ce6f59afd 100644 --- a/cake/config/config.php +++ b/cake/config/config.php @@ -17,4 +17,4 @@ * @since CakePHP(tm) v 1.1.11.4062 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -return $config['Cake.version'] = '1.3.0'; +return $config['Cake.version'] = '1.3.1'; diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp index e61349ade..fa2eb4a95 100644 --- a/cake/libs/view/pages/home.ctp +++ b/cake/libs/view/pages/home.ctp @@ -21,7 +21,7 @@ if (Configure::read() == 0): endif; ?>

- + 0): Debugger::checkSecurityKeys(); From 9cd73c345e043c878c69df40286ae407d6ba165e Mon Sep 17 00:00:00 2001 From: predominant Date: Sun, 30 May 2010 14:29:32 +1000 Subject: [PATCH 060/100] Update short description doc blocks. --- app/config/acl.ini.php | 2 +- app/config/routes.php | 2 +- cake/config/paths.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php index 84fce6d91..0907fbd4d 100644 --- a/app/config/acl.ini.php +++ b/app/config/acl.ini.php @@ -1,7 +1,7 @@ ; ; SVN FILE: $Id$ ;/** -; * Short description for file. +; * ACL configuration ; * ; * ; * PHP versions 4 and 5 diff --git a/app/config/routes.php b/app/config/routes.php index 3fca7f1bd..a186e49b4 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -1,6 +1,6 @@ Date: Sun, 30 May 2010 11:16:40 -0400 Subject: [PATCH 061/100] Reverting change made in [7cde309]. Readding trim() to fix issues on windows. Updating tests so they continue to pass on macos. Fixes #769 --- cake/libs/file.php | 2 +- cake/tests/cases/libs/file.test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/libs/file.php b/cake/libs/file.php index ed0e2334f..6d01fa29f 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -192,7 +192,7 @@ class File extends Object { if ($bytes === false) { $this->close(); } - return $data; + return trim($data); } /** diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php index 8cb372eff..978c68c43 100644 --- a/cake/tests/cases/libs/file.test.php +++ b/cake/tests/cases/libs/file.test.php @@ -115,7 +115,7 @@ class FileTest extends CakeTestCase { $this->File->lock = true; $result = $this->File->read(); $expecting = file_get_contents(__FILE__); - $this->assertEqual($result, $expecting); + $this->assertEqual($result, trim($expecting)); $this->File->lock = null; $data = $expecting; From 66a8890f4fcc6c8271da2181ac66deb1f7291772 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 30 May 2010 12:51:48 -0400 Subject: [PATCH 062/100] Fixing code formatting in test cases. --- cake/tests/cases/libs/model/datasources/dbo_source.test.php | 2 +- cake/tests/cases/libs/model/model_read.test.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php index 73f86be55..b3b7030db 100644 --- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php @@ -4316,7 +4316,7 @@ class DboSourceTest extends CakeTestCase { ' WHERE Article.id = ' . $this->db->fullTableName('comments') . '.article_id' ); $conditions = array('two' => 2); - $result = $this->db->conditions($conditions,true,false,$Article); + $result = $this->db->conditions($conditions, true, false, $Article); $expected = '(1 + 1) = 2'; $this->assertEqual($expected, $result); diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php index 341d73b35..745858b97 100755 --- a/cake/tests/cases/libs/model/model_read.test.php +++ b/cake/tests/cases/libs/model/model_read.test.php @@ -7223,7 +7223,7 @@ class ModelReadTest extends BaseModelTest { $dbo =& $Post->getDataSource(); $Post->virtualFields = array('other_field' => 'Post.id + 1'); - $result = $Post->find('first',array( + $result = $Post->find('first', array( 'conditions' => array('other_field' => 3), 'limit' => 1 )); @@ -7231,7 +7231,7 @@ class ModelReadTest extends BaseModelTest { $Post->virtualFields = array('other_field' => 'Post.id + 1'); $result = $Post->find('all',array( - 'fields' => array($dbo->calculate($Post, 'max',array('other_field'))) + 'fields' => array($dbo->calculate($Post, 'max', array('other_field'))) )); $this->assertEqual($result[0][0]['other_field'], 4); From c98a82c61c5ebc0733da89c0cbae179a2d170d97 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 30 May 2010 20:28:00 -0400 Subject: [PATCH 063/100] Fixing whitespace. --- cake/tests/cases/libs/model/model_read.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php index 745858b97..621bd6dfc 100755 --- a/cake/tests/cases/libs/model/model_read.test.php +++ b/cake/tests/cases/libs/model/model_read.test.php @@ -7230,7 +7230,7 @@ class ModelReadTest extends BaseModelTest { $this->assertEqual($result['Post']['id'], 2); $Post->virtualFields = array('other_field' => 'Post.id + 1'); - $result = $Post->find('all',array( + $result = $Post->find('all', array( 'fields' => array($dbo->calculate($Post, 'max', array('other_field'))) )); $this->assertEqual($result[0][0]['other_field'], 4); From 7ed67e59598e71987168fba2db20362c9ffb4223 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 30 May 2010 20:30:58 -0400 Subject: [PATCH 064/100] Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768 --- cake/libs/model/datasources/dbo_source.php | 16 ++++++++-------- .../libs/model/datasources/dbo_source.test.php | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 128b0c309..29bd1fcb8 100755 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -2421,17 +2421,17 @@ class DboSource extends DataSource { $key = preg_replace('/\\x20(ASC|DESC).*/i', '', $key); } + $key = trim($key); + + if (is_object($model) && $model->isVirtualField($key)) { + $key = '(' . $this->__quoteFields($model->getVirtualField($key)) . ')'; + } + if (strpos($key, '.')) { $key = preg_replace_callback('/([a-zA-Z0-9_]{1,})\\.([a-zA-Z0-9_]{1,})/', array(&$this, '__quoteMatchedField'), $key); } - - $key = trim($key); - if (!preg_match('/\s/', $key) && !strpos($key,'.')) { - if (is_object($model) && $model->isVirtualField($key)) { - $key = '('.$this->__quoteFields($model->getVirtualField($key)).')'; - } else { - $key = $this->name($key); - } + if (!preg_match('/\s/', $key) && !strpos($key, '.')) { + $key = $this->name($key); } $key .= ' ' . trim($dir); $result[] = $key; diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php index b3b7030db..2ba412ab4 100644 --- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php @@ -4353,6 +4353,11 @@ class DboSourceTest extends CakeTestCase { $result = $this->db->order($order, 'ASC', $Article); $expected = ' ORDER BY (1 + 1) ASC, (NOW()) ASC'; $this->assertEqual($expected, $result); + + $order = array('Article.two', 'Article.this_moment'); + $result = $this->db->order($order, 'ASC', $Article); + $expected = ' ORDER BY (1 + 1) ASC, (NOW()) ASC'; + $this->assertEqual($expected, $result); } /** From 74dad04323e289c2259e77d6d6e4bb696fba32b4 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sun, 30 May 2010 23:29:21 -0300 Subject: [PATCH 065/100] Fixing read from SMTP by EmailComponent. Closes #772 --- cake/libs/controller/components/email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index 202f45384..bbc41e72d 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -885,7 +885,7 @@ class EmailComponent extends Object{ while (substr($response, -2) !== "\r\n" && ((time() - $startTime) < $this->smtpOptions['timeout'])) { $response .= $this->__smtpConnection->read(); } - if (substr($response, -2) === "\r\n") { + if (substr($response, -2) !== "\r\n") { $this->smtpError = 'timeout'; return false; } From 8d8fce4429d0e24d575d5e1a9290b6816baa1024 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 31 May 2010 21:26:55 -0400 Subject: [PATCH 066/100] Fixing template task path replacements under windows. Fixes #771 --- cake/console/libs/tasks/template.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cake/console/libs/tasks/template.php b/cake/console/libs/tasks/template.php index f4338234c..84c921d25 100644 --- a/cake/console/libs/tasks/template.php +++ b/cake/console/libs/tasks/template.php @@ -54,7 +54,8 @@ class TemplateTask extends Shell { function _findThemes() { $paths = App::path('shells'); $core = array_pop($paths); - $core = preg_replace('#libs' . DS . '$#', '', $core); + $separator = DS === '/' ? '/' : '\\\\'; + $core = preg_replace('#libs' . $separator . '$#', '', $core); $paths[] = $core; $Folder =& new Folder($core . 'templates' . DS . 'default'); $contents = $Folder->read(); From 7682c5896e269797741417c5d40db2f5024d387f Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 1 Jun 2010 23:41:51 -0400 Subject: [PATCH 067/100] Changing how merged rules are cleared so it doesn't generated notice errors in PHP4. Test added. Fixes #762 --- cake/libs/inflector.php | 5 +++- cake/tests/cases/libs/inflector.test.php | 35 ++++++++++-------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php index 46fc540be..dc0f78f6b 100644 --- a/cake/libs/inflector.php +++ b/cake/libs/inflector.php @@ -369,7 +369,10 @@ class Inflector { } else { $_this->{$var}[$rule] = array_merge($pattern, $_this->{$var}[$rule]); } - unset($rules[$rule], $_this->{$var}['cache' . ucfirst($rule)], $_this->{$var}['merged'][$rule]); + unset($rules[$rule], $_this->{$var}['cache' . ucfirst($rule)]); + if (isset($_this->{$var}['merged'][$rule])) { + unset($_this->{$var}['merged'][$rule]); + } if ($type === 'plural') { $_this->_pluralized = $_this->_tableize = array(); } elseif ($type === 'singular') { diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php index c894e8a65..519b39978 100644 --- a/cake/tests/cases/libs/inflector.test.php +++ b/cake/tests/cases/libs/inflector.test.php @@ -42,16 +42,6 @@ class InflectorTest extends CakeTestCase { */ var $Inflector = null; -/** - * setUp method - * - * @access public - * @return void - */ - function setUp() { - $this->Inflector = Inflector::getInstance(); - } - /** * testInstantiation method * @@ -59,7 +49,8 @@ class InflectorTest extends CakeTestCase { * @return void */ function testInstantiation() { - $this->assertEqual(Inflector::getInstance(), $this->Inflector); + $Inflector =& Inflector::getInstance(); + $this->assertEqual(Inflector::getInstance(), $Inflector); } /** @@ -339,6 +330,19 @@ class InflectorTest extends CakeTestCase { $this->assertEqual(Inflector::humanize('file_systems'), 'File Systems'); } +/** + * This test if run in isolation should not cause errors in PHP4. + * + * @return void + */ + function testRulesNoErrorPHP4() { + Inflector::rules('plural', array( + 'rules' => array(), + 'irregular' => array(), + 'uninflected' => array('pays') + )); + } + /** * testCustomPluralRule method * @@ -455,13 +459,4 @@ class InflectorTest extends CakeTestCase { $this->assertEqual(Inflector::singularize('Atlas'), 'Atlas'); } -/** - * tearDown method - * - * @access public - * @return void - */ - function tearDown() { - unset($this->Inflector); - } } From b480d80c825fdbb1fee892b1ec18f8483e832f4d Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Wed, 2 Jun 2010 18:14:58 -0300 Subject: [PATCH 068/100] Avoid undefined index if not define timeout in EmailComponent. Fixes #779 --- cake/libs/controller/components/email.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index bbc41e72d..5f42bf3cf 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -228,9 +228,7 @@ class EmailComponent extends Object{ * @access public * @link http://book.cakephp.org/view/1290/Sending-A-Message-Using-SMTP */ - var $smtpOptions = array( - 'port'=> 25, 'host' => 'localhost', 'timeout' => 30 - ); + var $smtpOptions = array(); /** * Placeholder for any errors that might happen with the @@ -789,7 +787,13 @@ class EmailComponent extends Object{ function _smtp() { App::import('Core', array('CakeSocket')); - $this->__smtpConnection =& new CakeSocket(array_merge(array('protocol'=>'smtp'), $this->smtpOptions)); + $defaults = array( + 'host' => 'localhost', + 'port' => 25, + 'protocol' => 'smtp', + 'timeout' => 30 + ); + $this->__smtpConnection =& new CakeSocket(array_merge($defaults, $this->smtpOptions)); if (!$this->__smtpConnection->connect()) { $this->smtpError = $this->__smtpConnection->lastError(); From 3c27c4c41e853be54ebf7434b6f94ac06f99b242 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Thu, 3 Jun 2010 14:46:20 -0300 Subject: [PATCH 069/100] Ajusting smtpOption in EmailComponent. Fixes #779 --- cake/libs/controller/components/email.php | 3 ++- .../libs/controller/components/email.test.php | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index 5f42bf3cf..dbd9ef233 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -793,7 +793,8 @@ class EmailComponent extends Object{ 'protocol' => 'smtp', 'timeout' => 30 ); - $this->__smtpConnection =& new CakeSocket(array_merge($defaults, $this->smtpOptions)); + $this->smtpOptions = array_merge($defaults, $this->smtpOptions); + $this->__smtpConnection =& new CakeSocket($this->smtpOptions); if (!$this->__smtpConnection->connect()) { $this->smtpError = $this->__smtpConnection->lastError(); diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php index f5de3e9d2..512dfe97e 100755 --- a/cake/tests/cases/libs/controller/components/email.test.php +++ b/cake/tests/cases/libs/controller/components/email.test.php @@ -234,6 +234,30 @@ class EmailComponentTest extends CakeTestCase { return str_replace(array("\r\n", "\r"), "\n", $string); } +/** + * testSmtpConfig method + * + * @access public + * @return void + */ + function testSmtpConfig() { + $this->Controller->EmailTest->delivery = 'smtp'; + $this->Controller->EmailTest->smtpOptions = array(); + $this->Controller->EmailTest->send('anything'); + $config = array( + 'host' => 'localhost', + 'port' => 25, + 'protocol' => 'smtp', + 'timeout' => 30 + ); + $this->assertEqual($config, $this->Controller->EmailTest->smtpOptions); + + $this->Controller->EmailTest->smtpOptions = array('port' => 80); + $this->Controller->EmailTest->send('anything'); + $config['port'] = 80; + $this->assertEqual($config, $this->Controller->EmailTest->smtpOptions); + } + /** * testBadSmtpSend method * @@ -308,6 +332,7 @@ TEMPDOC; $connection =& new CakeSocket(array('protocol'=>'smtp', 'host' => 'localhost', 'port' => 25)); $this->Controller->EmailTest->setConnectionSocket($connection); + $this->Controller->EmailTest->smtpOptions['timeout'] = 10; $this->assertTrue($connection->connect()); $this->assertTrue($this->Controller->EmailTest->smtpSend(null, '220') !== false); $this->skipIf($this->Controller->EmailTest->smtpSend('EHLO locahost', '250') === false, '%s do not support EHLO.'); @@ -600,6 +625,7 @@ TEXTBLOC; function testSmtpSendSocket() { $this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost'); + $this->Controller->EmailTest->smtpOptions['timeout'] = 10; $socket =& new CakeSocket(array_merge(array('protocol'=>'smtp'), $this->Controller->EmailTest->smtpOptions)); $this->Controller->EmailTest->setConnectionSocket($socket); From bd6e16be261d532da30d417e48c7f57c9be21550 Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 3 Jun 2010 23:20:37 -0400 Subject: [PATCH 070/100] Fixing issue where join tables would be filed under 'missing' and found. Test added. Fixes #789 --- cake/libs/model/cake_schema.php | 3 +-- cake/tests/cases/libs/model/cake_schema.test.php | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php index 7901cdf09..a1ea24ace 100644 --- a/cake/libs/model/cake_schema.php +++ b/cake/libs/model/cake_schema.php @@ -246,7 +246,6 @@ class CakeSchema extends Object { if (is_object($Object) && $Object->useTable !== false) { $Object->setDataSource($connection); $table = $db->fullTableName($Object, false); - if (in_array($table, $currentTables)) { $key = array_search($table, $currentTables); if (empty($tables[$table])) { @@ -263,7 +262,7 @@ class CakeSchema extends Object { if (is_object($Object->$class)) { $withTable = $db->fullTableName($Object->$class, false); if (in_array($withTable, $currentTables)) { - $key = array_search($table, $currentTables); + $key = array_search($withTable, $currentTables); $tables[$withTable] = $this->__columns($Object->$class); $tables[$withTable]['indexes'] = $db->index($Object->$class); $tables[$withTable]['tableParameters'] = $db->readTableParameters($withTable); diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php index c07b9d998..3a769356a 100644 --- a/cake/tests/cases/libs/model/cake_schema.test.php +++ b/cake/tests/cases/libs/model/cake_schema.test.php @@ -575,6 +575,13 @@ class CakeSchemaTest extends CakeTestCase { 'models' => array('SchemaPost') )); $this->assertFalse(isset($read['tables']['missing']['posts']), 'Posts table was not read from tablePrefix %s'); + + $read = $this->Schema->read(array( + 'connection' => 'test_suite', + 'name' => 'TestApp', + 'models' => array('SchemaComment', 'SchemaTag', 'SchemaPost') + )); + $this->assertFalse(isset($read['tables']['missing']['posts_tags']), 'Join table marked as missing %s'); } /** From e41e89cd2a6d7e5bd71911fab14e756648126f4c Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 4 Jun 2010 00:20:14 -0400 Subject: [PATCH 071/100] Making magic select not override magic hidden. Tests added. Fixes #782 --- cake/libs/view/helpers/form.php | 2 +- .../cases/libs/view/helpers/form.test.php | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index 5e2fb57c5..3de99f084 100755 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -740,7 +740,7 @@ class FormHelper extends AppHelper { $options['type'] = 'hidden'; } } - if (preg_match('/_id$/', $fieldKey)) { + if (preg_match('/_id$/', $fieldKey) && $options['type'] !== 'hidden') { $options['type'] = 'select'; } diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php index 1a3b06d22..892e2be8d 100644 --- a/cake/tests/cases/libs/view/helpers/form.test.php +++ b/cake/tests/cases/libs/view/helpers/form.test.php @@ -2118,6 +2118,29 @@ class FormHelperTest extends CakeTestCase { $this->assertTags($result, $expected); } +/** + * test that input() and a non standard primary key makes a hidden input by default. + * + * @return void + */ + function testInputWithNonStandardPrimaryKeyMakesHidden() { + $this->Form->create('User'); + $this->Form->fieldset = array( + 'User' => array( + 'fields' => array( + 'model_id' => array('type' => 'integer') + ), + 'validates' => array(), + 'key' => 'model_id' + ) + ); + $result = $this->Form->input('model_id'); + $expected = array( + 'input' => array('type' => 'hidden', 'name' => 'data[User][model_id]', 'id' => 'UserModelId'), + ); + $this->assertTags($result, $expected); + } + /** * test that overriding the magic select type widget is possible * From 26d526f6240239094aa714b86093cd36fbb9a1f3 Mon Sep 17 00:00:00 2001 From: predominant Date: Mon, 7 Jun 2010 01:20:54 +1000 Subject: [PATCH 072/100] Fix AuthComponent tests for windows newlines. --- cake/tests/cases/libs/controller/components/auth.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php index 618b5eb88..ba4fa181f 100644 --- a/cake/tests/cases/libs/controller/components/auth.test.php +++ b/cake/tests/cases/libs/controller/components/auth.test.php @@ -1456,7 +1456,7 @@ class AuthTest extends CakeTestCase { $Dispatcher =& new Dispatcher(); $Dispatcher->dispatch('/ajax_auth/add', array('return' => 1)); $result = ob_get_clean(); - $this->assertEqual("Ajax!\nthis is the test element", $result); + $this->assertEqual("Ajax!\nthis is the test element", str_replace("\r\n", "\n", $result)); unset($_SERVER['HTTP_X_REQUESTED_WITH']); } From d803b303886d569cff16bf975567b3d909e6a780 Mon Sep 17 00:00:00 2001 From: predominant Date: Mon, 7 Jun 2010 01:39:24 +1000 Subject: [PATCH 073/100] Fix Model validation bake tests for Windows. --- cake/tests/cases/console/libs/tasks/model.test.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php index a343e28a8..9eb1e4e68 100644 --- a/cake/tests/cases/console/libs/tasks/model.test.php +++ b/cake/tests/cases/console/libs/tasks/model.test.php @@ -647,8 +647,9 @@ array( //'on' => 'create', // Limit validation to 'create' or 'update' operations ), STRINGEND; - - $this->assertPattern('/' . preg_quote($expected, '/') . '/', $result); +debug($expected); +debug($result); + $this->assertPattern('/' . preg_quote(str_replace("\r\n", "\n", $expected), '/') . '/', $result); } /** From e47c9660f99c6b8b1748f2d712c910a7b9c60918 Mon Sep 17 00:00:00 2001 From: predominant Date: Mon, 7 Jun 2010 02:03:41 +1000 Subject: [PATCH 074/100] Remove debugging. --- cake/tests/cases/console/libs/tasks/model.test.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php index 9eb1e4e68..656ded486 100644 --- a/cake/tests/cases/console/libs/tasks/model.test.php +++ b/cake/tests/cases/console/libs/tasks/model.test.php @@ -647,8 +647,6 @@ array( //'on' => 'create', // Limit validation to 'create' or 'update' operations ), STRINGEND; -debug($expected); -debug($result); $this->assertPattern('/' . preg_quote(str_replace("\r\n", "\n", $expected), '/') . '/', $result); } From 0eea0ce0f89e195efb20727319427f960824fecb Mon Sep 17 00:00:00 2001 From: predominant Date: Mon, 7 Jun 2010 02:21:51 +1000 Subject: [PATCH 075/100] Updating version numbers to 1.3.2 --- cake/VERSION.txt | 3 ++- cake/config/config.php | 2 +- cake/libs/view/pages/home.ctp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cake/VERSION.txt b/cake/VERSION.txt index 271b0e83c..5f08ec3dc 100644 --- a/cake/VERSION.txt +++ b/cake/VERSION.txt @@ -18,4 +18,5 @@ // @license MIT License (http://www.opensource.org/licenses/mit-license.php) // +--------------------------------------------------------------------------------------------+ // //////////////////////////////////////////////////////////////////////////////////////////////////// -1.3.1 +1.3.2 + diff --git a/cake/config/config.php b/cake/config/config.php index ce6f59afd..65dd5a77c 100644 --- a/cake/config/config.php +++ b/cake/config/config.php @@ -17,4 +17,4 @@ * @since CakePHP(tm) v 1.1.11.4062 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -return $config['Cake.version'] = '1.3.1'; +return $config['Cake.version'] = '1.3.2'; diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp index fa2eb4a95..f5a774fa3 100644 --- a/cake/libs/view/pages/home.ctp +++ b/cake/libs/view/pages/home.ctp @@ -21,7 +21,7 @@ if (Configure::read() == 0): endif; ?>

- + 0): Debugger::checkSecurityKeys(); From 94fc492623fbc4f6dd042cca84109dcb8cc45194 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 6 Jun 2010 22:39:04 -0400 Subject: [PATCH 076/100] Correcting how ExtractTask collects files. Test added. Fixes #775 --- cake/console/libs/tasks/extract.php | 2 +- .../cases/console/libs/tasks/extract.test.php | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php index 8ce1be068..5dc928b04 100644 --- a/cake/console/libs/tasks/extract.php +++ b/cake/console/libs/tasks/extract.php @@ -488,7 +488,7 @@ class ExtractTask extends Shell { foreach ($this->__paths as $path) { $Folder = new Folder($path); $files = $Folder->findRecursive('.*\.(php|ctp|thtml|inc|tpl)', true); - $this->__files += $files; + $this->__files = array_merge($this->__files, $files); } } } diff --git a/cake/tests/cases/console/libs/tasks/extract.test.php b/cake/tests/cases/console/libs/tasks/extract.test.php index 29c4f2bd8..f93a9a6a7 100644 --- a/cake/tests/cases/console/libs/tasks/extract.test.php +++ b/cake/tests/cases/console/libs/tasks/extract.test.php @@ -155,4 +155,33 @@ class ExtractTaskTest extends CakeTestCase { $Folder = new Folder($path); $Folder->delete(); } + function getTests() { + return array('start', 'startCase', 'testExtractMultiplePaths', 'endCase', 'end'); + } + +/** + * test extract can read more than one path. + * + * @return void + */ + function testExtractMultiplePaths() { + $path = TMP . 'tests' . DS . 'extract_task_test'; + new Folder($path . DS . 'locale', true); + + $this->Task->interactive = false; + + $this->Task->params['paths'] = + TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages,' . + TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'posts'; + + $this->Task->params['output'] = $path . DS; + $this->Task->Dispatch->expectNever('stderr'); + $this->Task->Dispatch->expectNever('_stop'); + $this->Task->execute(); + + $result = file_get_contents($path . DS . 'default.pot'); + + $pattern = '/msgid "Add User"/'; + $this->assertPattern($pattern, $result); + } } From ccd036eed03af678ecf3f2ecff6d29e945f877dd Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 7 Jun 2010 23:10:53 -0400 Subject: [PATCH 077/100] Adding additional test cases for nld, dut, and nl. Closes #795 --- cake/tests/cases/libs/l10n.test.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php index 6efd3954e..4b8483d4b 100644 --- a/cake/tests/cases/libs/l10n.test.php +++ b/cake/tests/cases/libs/l10n.test.php @@ -194,6 +194,10 @@ class L10nTest extends CakeTestCase { $result = $l10n->map(array('nld', 'nl')); $expected = array('nld' => 'nl', 'nl' => 'dut'); $this->assertEqual($result, $expected); + + $result = $l10n->map(array('nld')); + $expected = array('nld' => 'nl'); + $this->assertEqual($result, $expected); $result = $l10n->map(array('eng', 'en')); $expected = array('eng' => 'en', 'en' => 'eng'); @@ -745,6 +749,18 @@ class L10nTest extends CakeTestCase { ); $this->assertEqual($result, $expected); + $result = $l10n->catalog('nl'); + $expected = array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'); + $this->assertEqual($result, $expected); + + $result = $l10n->catalog('nld'); + $expected = array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'); + $this->assertEqual($result, $expected); + + $result = $l10n->catalog('dut'); + $expected = array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'); + $this->assertEqual($result, $expected); + $result = $l10n->catalog(array('nb')); $expected = array( 'nb' => array('language' => 'Norwegian Bokmal', 'locale' => 'nob', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr') From a9fa7ac24027feeda38ca5aa2449da2bb2582dac Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Mon, 7 Jun 2010 17:08:04 -0700 Subject: [PATCH 078/100] Fix for auth component userModel with plugins. Fixes #799 --- cake/libs/controller/components/auth.php | 2 +- .../cases/libs/controller/components/auth.test.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php index 153172542..fb736e8e5 100644 --- a/cake/libs/controller/components/auth.php +++ b/cake/libs/controller/components/auth.php @@ -469,7 +469,7 @@ class AuthComponent extends Object { 'loginAction' => array( 'controller' => Inflector::underscore(Inflector::pluralize($model)), 'action' => 'login', - 'plugin' => $plugin, + 'plugin' => Inflector::underscore($plugin), ), 'sessionKey' => 'Auth.' . $model, 'logoutRedirect' => $this->loginAction, diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php index ba4fa181f..f077b20db 100644 --- a/cake/tests/cases/libs/controller/components/auth.test.php +++ b/cake/tests/cases/libs/controller/components/auth.test.php @@ -1431,6 +1431,16 @@ class AuthTest extends CakeTestCase { $this->assertEqual($user, $expected); $sessionKey = $this->Controller->Auth->sessionKey; $this->assertEqual('Auth.TestPluginAuthUser', $sessionKey); + + $this->Controller->Auth->loginAction = null; + $this->Controller->Auth->__setDefaults(); + $loginAction = $this->Controller->Auth->loginAction; + $expected = array( + 'controller' => 'test_plugin_auth_users', + 'action' => 'login', + 'plugin' => 'test_plugin' + ); + $this->assertEqual($loginAction, $expected); // Reverting changes Cache::delete('object_map', '_cake_core_'); From a88b8dd5b940abf8bc1aaa6a21b04171fc7b5296 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 7 Jun 2010 23:43:35 -0400 Subject: [PATCH 079/100] Making requestAction() calls that requesthandler creates not remove autoLayout. This fixes issues where ajax layout files would not be rendered. Tests added. Fixes #722 --- .../controller/components/request_handler.php | 2 +- .../components/request_handler.test.php | 42 ++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php index 1748c787d..dbbdfe2c9 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/cake/libs/controller/components/request_handler.php @@ -279,7 +279,7 @@ class RequestHandlerComponent extends Object { $msg = $statusCode[$code]; $controller->header("HTTP/1.1 {$code} {$msg}"); } - echo $this->requestAction($url, array('return')); + echo $this->requestAction($url, array('return', 'bare' => false)); $this->_stop(); } diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php index abeaa0531..420ecd405 100644 --- a/cake/tests/cases/libs/controller/components/request_handler.test.php +++ b/cake/tests/cases/libs/controller/components/request_handler.test.php @@ -79,6 +79,18 @@ class RequestHandlerTestController extends Controller { echo "one: $one two: $two"; $this->autoRender = false; } + +/** + * test method for testing layout rendering when isAjax() + * + * @return void + */ + function ajax2_layout() { + if ($this->autoLayout) { + $this->layout = 'ajax2'; + } + $this->destination(); + } } /** @@ -593,6 +605,34 @@ class RequestHandlerComponentTest extends CakeTestCase { App::build(); } +/** + * test that ajax requests involving redirects don't force no layout + * this would cause the ajax layout to not be rendered. + * + * @return void + */ + function testAjaxRedirectAsRequestActionStillRenderingLayout() { + $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; + $this->_init(); + App::build(array( + 'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS) + ), true); + + $this->Controller->RequestHandler = new NoStopRequestHandler($this); + $this->Controller->RequestHandler->expectOnce('_stop'); + + ob_start(); + $this->Controller->RequestHandler->beforeRedirect( + $this->Controller, array('controller' => 'request_handler_test', 'action' => 'ajax2_layout') + ); + $result = ob_get_clean(); + $this->assertPattern('/posts index/', $result, 'RequestAction redirect failed.'); + $this->assertPattern('/Ajax!/', $result, 'Layout was not rendered.'); + + unset($_SERVER['HTTP_X_REQUESTED_WITH']); + App::build(); + } + /** * test that the beforeRedirect callback properly converts * array urls into their correct string ones, and adds base => false so @@ -605,7 +645,7 @@ class RequestHandlerComponentTest extends CakeTestCase { $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; Router::setRequestInfo(array( - array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'named' => array(), 'form' => array(), 'url' => array('url' => 'accounts/'), 'bare' => 0), + array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'named' => array(), 'form' => array(), 'url' => array('url' => 'accounts/')), array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/') )); From 2f527cc5af6ef91a677d5255dfeb315dd726d688 Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 8 Jun 2010 23:29:40 -0400 Subject: [PATCH 080/100] Adding a few tests for DboSource::fullTableName(); --- .../libs/model/datasources/dbo_source.test.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php index 2ba412ab4..8dda31f00 100644 --- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php +++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php @@ -4426,4 +4426,19 @@ class DboSourceTest extends CakeTestCase { $expected = " GROUP BY (YEAR(`Article`.`created`))"; $this->assertEqual($expected, $result); } + +/** + * test the permutations of fullTableName() + * + * @return void + */ + function testFullTablePermutations() { + $Article =& ClassRegistry::init('Article'); + $result = $this->testDb->fullTableName($Article, false); + $this->assertEqual($result, 'articles'); + + $Article->tablePrefix = 'tbl_'; + $result = $this->testDb->fullTableName($Article, false); + $this->assertEqual($result, 'tbl_articles'); + } } From bca3c4ab38e0326dd4782b0536f9e3b8cd71f83e Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 8 Jun 2010 23:30:57 -0400 Subject: [PATCH 081/100] Moving init() tests into separate test methods. Adding tests for table prefixes on models being used as imports. Fixing issue where tablePrefix was not accurately used when importing model information. Fixes #765 --- .../cases/libs/cake_test_fixture.test.php | 39 +++++++++++++++++++ cake/tests/lib/cake_test_fixture.php | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php index 554e6119c..3b443a9c6 100644 --- a/cake/tests/cases/libs/cake_test_fixture.test.php +++ b/cake/tests/cases/libs/cake_test_fixture.test.php @@ -114,6 +114,14 @@ class FixtureImportTestModel extends Model { var $useTable = 'fixture_tests'; var $useDbConfig = 'test_suite'; } + +class FixturePrefixTest extends Model { + var $name = 'FixturePrefix'; + var $useTable = '_tests'; + var $tablePrefix = 'fixture'; + var $useDbConfig = 'test_suite'; +} + Mock::generate('DboSource', 'FixtureMockDboSource'); /** @@ -162,7 +170,14 @@ class CakeTestFixtureTest extends CakeTestCase { $Fixture->primaryKey = 'my_random_key'; $Fixture->init(); $this->assertEqual($Fixture->primaryKey, 'my_random_key'); + } +/** + * test that init() correctly sets the fixture table when the connection or model have prefixes defined. + * + * @return void + */ + function testInitDbPrefix() { $this->_initDb(); $Source =& new CakeTestFixtureTestFixture(); $Source->create($this->db); @@ -194,6 +209,30 @@ class CakeTestFixtureTest extends CakeTestCase { $Source->drop($this->db); } +/** + * test init with a model that has a tablePrefix declared. + * + * @return void + */ + function testInitModelTablePrefix() { + $this->_initDb(); + $Source =& new CakeTestFixtureTestFixture(); + $Source->create($this->db); + $Source->insert($this->db); + + $Fixture =& new CakeTestFixtureImportFixture(); + unset($Fixture->table); + $Fixture->fields = $Fixture->records = null; + $Fixture->import = array('model' => 'FixturePrefixTest', 'connection' => 'test_suite', 'records' => false); + $Fixture->init(); + $this->assertEqual($Fixture->table, 'fixture_tests'); + + $keys = array_flip(ClassRegistry::keys()); + $this->assertFalse(array_key_exists('fixtureimporttestmodel', $keys)); + + $Source->drop($this->db); + } + /** * testImport * diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php index efebbbe08..6c434bf8b 100644 --- a/cake/tests/lib/cake_test_fixture.php +++ b/cake/tests/lib/cake_test_fixture.php @@ -80,6 +80,7 @@ class CakeTestFixture extends Object { $db->cacheSources = false; $this->fields = $model->schema(true); $this->fields[$model->primaryKey]['key'] = 'primary'; + $this->table = $db->fullTableName($model, false); ClassRegistry::config(array('ds' => 'test_suite')); ClassRegistry::flush(); } elseif (isset($import['table'])) { @@ -97,7 +98,7 @@ class CakeTestFixture extends Object { $this->records = array(); $query = array( 'fields' => $db->fields($model, null, array_keys($this->fields)), - 'table' => $db->fullTableName($model->table), + 'table' => $db->fullTableName($model), 'alias' => $model->alias, 'conditions' => array(), 'order' => null, From ad8b70cec24164c967dc769bde1679c5822c7e8c Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 9 Jun 2010 13:48:54 -0400 Subject: [PATCH 082/100] Removing continue statement that did nothing. Adding a rollback for when validation fails and atomic has been set. Tests added. Fixes #797 --- cake/libs/model/model.php | 5 +++- .../cases/libs/model/model_write.test.php | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index 4efe17e11..8b2dcd650 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -1622,7 +1622,6 @@ class Model extends Overloadable { case ($options['validate'] === 'first'): $options['validate'] = true; $return = array(); - continue; break; default: if ($options['atomic']) { @@ -1636,6 +1635,10 @@ class Model extends Overloadable { break; } } + if ($options['atomic'] && !$validates) { + $db->rollback($this); + return false; + } return $return; } $associations = $this->getAssociated(); diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php index 3beb16d44..ba7b4383f 100644 --- a/cake/tests/cases/libs/model/model_write.test.php +++ b/cake/tests/cases/libs/model/model_write.test.php @@ -3034,6 +3034,34 @@ class ModelWriteTest extends BaseModelTest { ), array('validate' => 'only')); } +/** + * test saveAll with transactions and ensure there is no missing rollback. + * + * @return void + */ + function testSaveAllTransactionNoRollback() { + $this->loadFixtures('Post'); + + Mock::generate('DboSource', 'MockTransactionDboSource'); + $db = ConnectionManager::create('mock_transaction', array( + 'datasource' => 'MockTransactionDbo', + )); + $db->expectOnce('rollback'); + + $Post =& new Post(); + $Post->useDbConfig = 'mock_transaction'; + + $Post->validate = array( + 'title' => array('rule' => array('notEmpty')) + ); + + $data = array( + array('author_id' => 1, 'title' => 'New Fourth Post'), + array('author_id' => 1, 'title' => '') + ); + $Post->saveAll($data, array('atomic' => true)); + } + /** * testSaveAllTransaction method * From d5ddd8ee5f23109233387175f3c7dd6a0bd38631 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Wed, 9 Jun 2010 19:22:06 -0300 Subject: [PATCH 083/100] Fixing check of EHLO/HELO in EmailComponent. Fixes #794 --- cake/libs/controller/components/email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index dbd9ef233..4397a5f38 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -813,7 +813,7 @@ class EmailComponent extends Object{ $host = 'localhost'; } - if (!$this->_smtpSend("EHLO {$host}", '250') || !$this->_smtpSend("HELO {$host}", '250')) { + if (!$this->_smtpSend("EHLO {$host}", '250') && !$this->_smtpSend("HELO {$host}", '250')) { return false; } From 9ee4a12a9d8ba32da80d73aafc47659b8a3815fc Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 10 Jun 2010 12:48:55 -0400 Subject: [PATCH 084/100] Adding additional tests for FormHelper::input() and checkbox generation and checked attribute being set for truthy values. Close #806 --- .../cases/libs/view/helpers/form.test.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php index 892e2be8d..472376d71 100644 --- a/cake/tests/cases/libs/view/helpers/form.test.php +++ b/cake/tests/cases/libs/view/helpers/form.test.php @@ -313,6 +313,7 @@ class UserForm extends CakeTestModel { 'other' => array('type' => 'text', 'null' => true, 'default' => null, 'length' => null), 'stuff' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10), 'something' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 255), + 'active' => array('type' => 'boolean', 'null' => false, 'default' => false), 'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''), 'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null) ); @@ -1829,6 +1830,32 @@ class FormHelperTest extends CakeTestCase { ); $this->assertTags($result, $expected); } + +/** + * test input() with checkbox creation + * + * @return void + */ + function testInputCheckbox() { + $result = $this->Form->input('User.active', array('label' => false, 'checked' => true)); + $expected = array( + 'div' => array('class' => 'input checkbox'), + 'input' => array('type' => 'hidden', 'name' => 'data[User][active]', 'value' => '0', 'id' => 'UserActive_'), + array('input' => array('type' => 'checkbox', 'name' => 'data[User][active]', 'value' => '1', 'id' => 'UserActive', 'checked' => 'checked')), + '/div' + ); + $this->assertTags($result, $expected); + + $result = $this->Form->input('User.active', array('label' => false, 'checked' => 1)); + $expected = array( + 'div' => array('class' => 'input checkbox'), + 'input' => array('type' => 'hidden', 'name' => 'data[User][active]', 'value' => '0', 'id' => 'UserActive_'), + array('input' => array('type' => 'checkbox', 'name' => 'data[User][active]', 'value' => '1', 'id' => 'UserActive', 'checked' => 'checked')), + '/div' + ); + $this->assertTags($result, $expected); + } + /** * test form->input() with datetime, date and time types * @@ -1952,6 +1979,7 @@ class FormHelperTest extends CakeTestCase { )); $this->assertPattern('/for\="created-month"/', $result); } + /** * Test generating checkboxes in a loop. * @@ -1972,6 +2000,7 @@ class FormHelperTest extends CakeTestCase { $this->assertTags($result, $expected); } } + /** * test form->input() with select type inputs. * @@ -3545,6 +3574,20 @@ class FormHelperTest extends CakeTestCase { ); $this->assertTags($result, $expected); + $result = $this->Form->checkbox('Model.field', array('checked' => 1)); + $expected = array( + 'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'), + array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField', 'checked' => 'checked')) + ); + $this->assertTags($result, $expected); + + $result = $this->Form->checkbox('Model.field', array('checked' => true)); + $expected = array( + 'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'), + array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField', 'checked' => 'checked')) + ); + $this->assertTags($result, $expected); + $this->Form->validationErrors['Model']['field'] = 1; $this->Form->data['Contact']['published'] = 1; $result = $this->Form->checkbox('Contact.published', array('id' => 'theID')); From ec5ad93a68ae6064c68f4cdcb6de4ccf0fc2384f Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 10 Jun 2010 13:54:04 -0400 Subject: [PATCH 085/100] Updating doc blocks for ModelBehavior so they better reflect the actual behaviour of the methods. Removing unused variable assignment. Fixes #810 --- cake/libs/model/model_behavior.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php index 140a8831d..2606bb49a 100644 --- a/cake/libs/model/model_behavior.php +++ b/cake/libs/model/model_behavior.php @@ -81,7 +81,7 @@ class ModelBehavior extends Object { * * @param object $model Model using this behavior * @param array $queryData Data used to execute this query, i.e. conditions, order, etc. - * @return boolean True if the operation should continue, false if it should abort + * @return mixed False if the operation should abort. Any other result will continue. * @access public */ function beforeFind(&$model, $query) { } @@ -101,7 +101,7 @@ class ModelBehavior extends Object { * Before validate callback * * @param object $model Model using this behavior - * @return boolean True if validate operation should continue, false to abort + * @return mixed False if the operation should abort. Any other result will continue. * @access public */ function beforeValidate(&$model) { } @@ -110,7 +110,7 @@ class ModelBehavior extends Object { * Before save callback * * @param object $model Model using this behavior - * @return boolean True if the operation should continue, false if it should abort + * @return mixed False if the operation should abort. Any other result will continue. * @access public */ function beforeSave(&$model) { } @@ -129,7 +129,7 @@ class ModelBehavior extends Object { * * @param object $model Model using this behavior * @param boolean $cascade If true records that depend on this record will also be deleted - * @return boolean True if the operation should continue, false if it should abort + * @return mixed False if the operation should abort. Any other result will continue. * @access public */ function beforeDelete(&$model, $cascade = true) { } @@ -483,7 +483,6 @@ class BehaviorCollection extends Object { if (empty($this->_attached)) { return true; } - $_params = $params; $options = array_merge(array('break' => false, 'breakOn' => array(null, false), 'modParams' => false), $options); $count = count($this->_attached); From e5df32e9d9cc372c79b5db6adbba97d82d7adf1e Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 10 Jun 2010 14:23:49 -0400 Subject: [PATCH 086/100] Adding omitted documentation information. --- cake/libs/controller/scaffold.php | 8 +++++- cake/libs/model/behaviors/translate.php | 33 ++++++++++++++++++------- cake/libs/view/theme.php | 5 ++-- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index f75237e16..27a1cd531 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -544,11 +544,17 @@ if (!class_exists('ThemeView')) { App::import('View', 'Theme'); } +/** + * ScaffoldView provides specific view file loading features for scaffolded views. + * + * @package cake.libs.view + */ class ScaffoldView extends ThemeView { /** - * Override _getViewFileName + * Override _getViewFileName Appends special scaffolding views in. * + * @param string $name name of the view file to get. * @return string action * @access protected */ diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php index 39393015d..fb2d21709 100644 --- a/cake/libs/model/behaviors/translate.php +++ b/cake/libs/model/behaviors/translate.php @@ -29,6 +29,8 @@ class TranslateBehavior extends ModelBehavior { /** * Used for runtime configuration of model + * + * @var array */ var $runtime = array(); @@ -45,7 +47,8 @@ class TranslateBehavior extends ModelBehavior { * $config could be empty - and translations configured dynamically by * bindTranslation() method * - * @param array $config + * @param Model $model Model the behavior is being attached to. + * @param array $config Array of configuration information. * @return mixed * @access public */ @@ -66,8 +69,9 @@ class TranslateBehavior extends ModelBehavior { } /** - * Callback + * Cleanup Callback unbinds bound translations and deletes setting information. * + * @param Model $model Model being detached. * @return void * @access public */ @@ -80,7 +84,8 @@ class TranslateBehavior extends ModelBehavior { /** * beforeFind Callback * - * @param array $query + * @param Model $model Model find is being run on. + * @param array $query Array of Query parameters. * @return array Modified query * @access public */ @@ -205,8 +210,9 @@ class TranslateBehavior extends ModelBehavior { /** * afterFind Callback * - * @param array $results - * @param boolean $primary + * @param Model $model Model find was run on + * @param array $results Array of model results. + * @param boolean $primary Did the find originate on $model. * @return array Modified results * @access public */ @@ -250,6 +256,7 @@ class TranslateBehavior extends ModelBehavior { /** * beforeValidate Callback * + * @param Model $model Model invalidFields was called on. * @return boolean * @access public */ @@ -283,7 +290,8 @@ class TranslateBehavior extends ModelBehavior { /** * afterSave Callback * - * @param boolean $created + * @param Model $model Model the callback is called on + * @param boolean $created Whether or not the save created a record. * @return void * @access public */ @@ -327,6 +335,7 @@ class TranslateBehavior extends ModelBehavior { /** * afterDelete Callback * + * @param Model $model Model the callback was run on. * @return void * @access public */ @@ -339,6 +348,7 @@ class TranslateBehavior extends ModelBehavior { /** * Get selected locale for model * + * @param Model $model Model the locale needs to be set/get on. * @return mixed string or false * @access protected */ @@ -356,8 +366,12 @@ class TranslateBehavior extends ModelBehavior { } /** - * Get instance of model for translations + * Get instance of model for translations. * + * If the model has a translateModel property set, this will be used as the class + * name to find/use. If no translateModel property is found 'I18nModel' will be used. + * + * @param Model $model Model to get a translatemodel for. * @return object * @access public */ @@ -461,8 +475,9 @@ class TranslateBehavior extends ModelBehavior { * Unbind translation for fields, optionally unbinds hasMany association for * fake field * - * @param object instance of model - * @param mixed string with field, or array(field1, field2=>AssocName, field3), or null for unbind all original translations + * @param object $model instance of model + * @param mixed $fields string with field, or array(field1, field2=>AssocName, field3), or null for + * unbind all original translations * @return bool */ function unbindTranslation(&$model, $fields = null) { diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php index f161e2685..22a06f050 100644 --- a/cake/libs/view/theme.php +++ b/cake/libs/view/theme.php @@ -35,7 +35,8 @@ class ThemeView extends View { /** * Constructor for ThemeView sets $this->theme. * - * @param Controller $controller + * @param Controller $controller Controller object to be rendered. + * @param boolean $register Should the view be registered in the registry. */ function __construct(&$controller, $register = true) { parent::__construct($controller, $register); @@ -45,7 +46,7 @@ class ThemeView extends View { /** * Return all possible paths to find view files in order * - * @param string $plugin + * @param string $plugin The name of the plugin views are being found for. * @param boolean $cached Set to true to force dir scan. * @return array paths * @access protected From f0d755bd8e0ae65a75923aad490781902a9be0df Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 10 Jun 2010 19:11:26 -0400 Subject: [PATCH 087/100] Adding additional tests for Helper::_parseAttributes() and fixing issue where '1' would not be interpreted as a truthy value for compact attributes. Fixes #806 --- cake/libs/view/helper.php | 9 ++--- cake/tests/cases/libs/view/helper.test.php | 34 +++++++++++++++++++ .../cases/libs/view/helpers/form.test.php | 9 +++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index 376d47335..4a0f1e149 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -296,9 +296,10 @@ class Helper extends Overloadable { * * And its value is one of: * - * - 1 - * - true - * - 'true' + * - '1' (string) + * - 1 (integer) + * - true (boolean) + * - 'true' (string) * * Then the value will be reset to be identical with key's name. * If the value is not one of these 3, the parameter is not output. @@ -358,7 +359,7 @@ class Helper extends Overloadable { } if (in_array($key, $minimizedAttributes)) { - if ($value === 1 || $value === true || $value === 'true' || $value == $key) { + if ($value === 1 || $value === true || $value === 'true' || $value === '1' || $value == $key) { $attribute = sprintf($attributeFormat, $key, $key); } } else { diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php index db60c94cd..114864686 100644 --- a/cake/tests/cases/libs/view/helper.test.php +++ b/cake/tests/cases/libs/view/helper.test.php @@ -162,6 +162,21 @@ class HelperTestPostsTag extends Model { } } +class TestHelper extends Helper { +/** + * expose a method as public + * + * @param string $options + * @param string $exclude + * @param string $insertBefore + * @param string $insertAfter + * @return void + */ + function parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) { + return $this->_parseAttributes($options, $exclude, $insertBefore, $insertAfter); + } +} + /** * HelperTest class * @@ -720,4 +735,23 @@ class HelperTest extends CakeTestCase { Configure::write('App.www_root', $webRoot); } + +/** + * test parsing attributes. + * + * @return void + */ + function testParseAttributeCompact() { + $helper =& new TestHelper(); + $compact = array('compact', 'checked', 'declare', 'readonly', 'disabled', + 'selected', 'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize'); + + foreach ($compact as $attribute) { + foreach (array('true', true, 1, '1', $attribute) as $value) { + $attrs = array($attribute => $value); + $expected = ' ' . $attribute . '="' . $attribute . '"'; + $this->assertEqual($helper->parseAttributes($attrs), $expected, '%s Failed on ' . $value); + } + } + } } diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php index 472376d71..7678020db 100644 --- a/cake/tests/cases/libs/view/helpers/form.test.php +++ b/cake/tests/cases/libs/view/helpers/form.test.php @@ -1854,6 +1854,15 @@ class FormHelperTest extends CakeTestCase { '/div' ); $this->assertTags($result, $expected); + + $result = $this->Form->input('User.active', array('label' => false, 'checked' => '1')); + $expected = array( + 'div' => array('class' => 'input checkbox'), + 'input' => array('type' => 'hidden', 'name' => 'data[User][active]', 'value' => '0', 'id' => 'UserActive_'), + array('input' => array('type' => 'checkbox', 'name' => 'data[User][active]', 'value' => '1', 'id' => 'UserActive', 'checked' => 'checked')), + '/div' + ); + $this->assertTags($result, $expected); } /** From df3432aa86f4fbba34286e1eab5655c69f306cea Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 11 Jun 2010 09:55:39 -0400 Subject: [PATCH 088/100] Updating doc blocks in ModelBehavior. Refs #810 --- cake/libs/model/model_behavior.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php index 2606bb49a..000b3186d 100644 --- a/cake/libs/model/model_behavior.php +++ b/cake/libs/model/model_behavior.php @@ -81,7 +81,7 @@ class ModelBehavior extends Object { * * @param object $model Model using this behavior * @param array $queryData Data used to execute this query, i.e. conditions, order, etc. - * @return mixed False if the operation should abort. Any other result will continue. + * @return mixed False if the operation should abort. An array will replace the value of $query. * @access public */ function beforeFind(&$model, $query) { } @@ -92,7 +92,7 @@ class ModelBehavior extends Object { * @param object $model Model using this behavior * @param mixed $results The results of the find operation * @param boolean $primary Whether this model is being queried directly (vs. being queried as an association) - * @return mixed Result of the find operation + * @return mixed An array value will replace the value of $results - any other value will be ignored. * @access public */ function afterFind(&$model, $results, $primary) { } From d1651db9a81f97e2da376dd733bfd6202147b557 Mon Sep 17 00:00:00 2001 From: mark_story Date: Fri, 11 Jun 2010 10:01:02 -0400 Subject: [PATCH 089/100] Fixing typo in Scaffold that caused error messages to display incorrectly. Fixes #813 --- cake/libs/controller/scaffold.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index 27a1cd531..42dcfef6c 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -223,7 +223,7 @@ class Scaffold extends Object { function __scaffoldView($params) { if ($this->controller->_beforeScaffold('view')) { - $message = __(sprintf("No id set for %s::view()", Inflector::humanize($this->modelKey), true)); + $message = __(sprintf("No id set for %s::view()", Inflector::humanize($this->modelKey)), true); if (isset($params['pass'][0])) { $this->ScaffoldModel->id = $params['pass'][0]; } elseif ($this->_validSession) { From 50144d6b5b1db2d31e1be3019e47c66a58fc50f3 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 12 Jun 2010 22:50:09 -0400 Subject: [PATCH 090/100] Making FormHelper clear fields on create() as well as end() this ensures that GET forms don't leak fields. Fixes #571 --- cake/libs/view/helpers/form.php | 1 + cake/tests/cases/libs/view/helpers/form.test.php | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php index 3de99f084..4e1a209b3 100755 --- a/cake/libs/view/helpers/form.php +++ b/cake/libs/view/helpers/form.php @@ -306,6 +306,7 @@ class FormHelper extends AppHelper { unset($options['default']); $htmlAttributes = array_merge($options, $htmlAttributes); + $this->fields = array(); if (isset($this->params['_Token']) && !empty($this->params['_Token'])) { $append .= $this->hidden('_Token.key', array( 'value' => $this->params['_Token']['key'], 'id' => 'Token' . mt_rand()) diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php index 7678020db..c17c2c69a 100644 --- a/cake/tests/cases/libs/view/helpers/form.test.php +++ b/cake/tests/cases/libs/view/helpers/form.test.php @@ -751,6 +751,17 @@ class FormHelperTest extends CakeTestCase { $this->assertTags($result, $expected); } +/** + * test that create() clears the fields property so it starts fresh + * + * @return void + */ + function testCreateClearingFields() { + $this->Form->fields = array('model_id'); + $this->Form->create('Contact'); + $this->assertEqual($this->Form->fields, array()); + } + /** * Tests form hash generation with model-less data * From 2db510d1c15f2627332cd87fef0538aa61f2a67f Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 20 Jun 2010 21:47:34 -0400 Subject: [PATCH 091/100] Modifying Controller::validateErrors so it can accept and validate arbitrary model objects, not just those attached to the controller. Test cases updated, fixes #832 --- cake/libs/controller/controller.php | 7 +++++-- .../cases/libs/controller/controller.test.php | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index f3295f33a..7308418a0 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -843,8 +843,11 @@ class Controller extends Object { $errors = array(); foreach ($objects as $object) { - $this->{$object->alias}->set($object->data); - $errors = array_merge($errors, $this->{$object->alias}->invalidFields()); + if (isset($this->{$object->alias})) { + $object =& $this->{$object->alias}; + } + $object->set($object->data); + $errors = array_merge($errors, $object->invalidFields()); } return $this->validationErrors = (!empty($errors) ? $errors : false); diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php index 0219f2750..a517092ea 100644 --- a/cake/tests/cases/libs/controller/controller.test.php +++ b/cake/tests/cases/libs/controller/controller.test.php @@ -1228,7 +1228,7 @@ class ControllerTest extends CakeTestCase { $TestController->ControllerComment->invalidate('some_field', 'error_message'); $TestController->ControllerComment->invalidate('some_field2', 'error_message2'); - $comment = new ControllerComment; + $comment =& new ControllerComment(); $comment->set('someVar', 'data'); $result = $TestController->validateErrors($comment); $expected = array('some_field' => 'error_message', 'some_field2' => 'error_message2'); @@ -1236,6 +1236,23 @@ class ControllerTest extends CakeTestCase { $this->assertEqual($TestController->validate($comment), 2); } +/** + * test that validateErrors works with any old model. + * + * @return void + */ + function testValidateErrorsOnArbitraryModels() { + $TestController =& new TestController(); + + $Post = new ControllerPost(); + $Post->validate = array('title' => 'notEmpty'); + $Post->set('title', ''); + $result = $TestController->validateErrors($Post); + + $expected = array('title' => 'This field cannot be left blank'); + $this->assertEqual($result, $expected); + } + /** * testPostConditions method * From a1911b471475ff1107e5ffd1de09c0d4b1c092da Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 20 Jun 2010 22:05:56 -0400 Subject: [PATCH 092/100] Changing array_key_exists for the faster isset(). --- cake/dispatcher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/dispatcher.php b/cake/dispatcher.php index 7ff7f5459..e4ab3ffcf 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -162,7 +162,7 @@ class Dispatcher extends Object { } else { $controller->data = null; } - if (array_key_exists('return', $this->params) && $this->params['return'] == 1) { + if (isset($this->params['return']) && $this->params['return'] == 1) { $controller->autoRender = false; } if (!empty($this->params['bare'])) { From 0c8088c77d2cd9056804982a701854c1da3ff3ff Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 20 Jun 2010 22:17:47 -0400 Subject: [PATCH 093/100] Fixing parse error. --- cake/libs/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/validation.php b/cake/libs/validation.php index 94fdcf8da..acb2ea0ad 100644 --- a/cake/libs/validation.php +++ b/cake/libs/validation.php @@ -380,7 +380,7 @@ class Validation { return $return; } - if ($return === true && preg_match('/@(' . self::__pattern['hostname'] . ')$/i', $check, $regs)) { + if ($return === true && preg_match('/@(' . self::$__pattern['hostname'] . ')$/i', $check, $regs)) { if (function_exists('getmxrr') && getmxrr($regs[1], $mxhosts)) { return true; } From 2d20215e5339ea86ff9992ca77d910ca2ca51259 Mon Sep 17 00:00:00 2001 From: Thomas Ploch Date: Mon, 10 May 2010 13:31:51 +0200 Subject: [PATCH 094/100] Converted JsBaseEngineHelper to an abstract class. Fixes #703 . Signed-off-by: mark_story --- cake/libs/view/helpers/js.php | 50 +++++++++-------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php index a24fab21f..e4a994ef6 100644 --- a/cake/libs/view/helpers/js.php +++ b/cake/libs/view/helpers/js.php @@ -440,7 +440,7 @@ class JsHelper extends AppHelper { * * @package cake.view.helpers */ -class JsBaseEngineHelper extends AppHelper { +abstract class JsBaseEngineHelper extends AppHelper { /** * Determines whether native JSON extension is used for encoding. Set by object constructor. * @@ -766,10 +766,7 @@ class JsBaseEngineHelper extends AppHelper { * @param string $selector The selector that is targeted * @return object instance of $this. Allows chained methods. */ - public function get($selector) { - trigger_error(sprintf(__('%s does not have get() implemented'), get_class($this)), E_USER_WARNING); - return $this; - } + abstract public function get($selector); /** * Add an event to the script cache. Operates on the currently selected elements. @@ -784,9 +781,7 @@ class JsBaseEngineHelper extends AppHelper { * @param array $options Options for the event. * @return string completed event handler */ - public function event($type, $callback, $options = array()) { - trigger_error(sprintf(__('%s does not have event() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function event($type, $callback, $options = array()); /** * Create a domReady event. This is a special event in many libraries @@ -794,9 +789,7 @@ class JsBaseEngineHelper extends AppHelper { * @param string $functionBody The code to run on domReady * @return string completed domReady method */ - public function domReady($functionBody) { - trigger_error(sprintf(__('%s does not have domReady() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function domReady($functionBody); /** * Create an iteration over the current selection result. @@ -804,9 +797,7 @@ class JsBaseEngineHelper extends AppHelper { * @param string $callback The function body you wish to apply during the iteration. * @return string completed iteration */ - function each($callback) { - trigger_error(sprintf(__('%s does not have each() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function each($callback); /** * Trigger an Effect. @@ -831,9 +822,7 @@ class JsBaseEngineHelper extends AppHelper { * @param array $options Array of options for the effect. * @return string completed string with effect. */ - public function effect($name, $options) { - trigger_error(sprintf(__('%s does not have effect() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function effect($name, $options); /** * Make an XHR request @@ -860,9 +849,7 @@ class JsBaseEngineHelper extends AppHelper { * @param array $options Array of options. See above for cross library supported options * @return string XHR request. */ - public function request($url, $options = array()) { - trigger_error(sprintf(__('%s does not have request() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function request($url, $options = array()); /** * Create a draggable element. Works on the currently selected element. @@ -883,9 +870,7 @@ class JsBaseEngineHelper extends AppHelper { * @param array $options Options array see above. * @return string Completed drag script */ - public function drag($options = array()) { - trigger_error(sprintf(__('%s does not have drag() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function drag($options = array()); /** * Create a droppable element. Allows for draggable elements to be dropped on it. @@ -904,9 +889,7 @@ class JsBaseEngineHelper extends AppHelper { * * @return string Completed drop script */ - public function drop($options = array()) { - trigger_error(sprintf(__('%s does not have drop() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function drop($options = array()); /** * Create a sortable element. @@ -929,9 +912,7 @@ class JsBaseEngineHelper extends AppHelper { * @param array $options Array of options for the sortable. See above. * @return string Completed sortable script. */ - public function sortable() { - trigger_error(sprintf(__('%s does not have sortable() implemented'), get_class($this)), E_USER_WARNING); - } + abstract public function sortable(); /** * Create a slider UI widget. Comprised of a track and knob. @@ -953,10 +934,7 @@ class JsBaseEngineHelper extends AppHelper { * * @return string Completed slider script */ - public function slider() { - trigger_error(sprintf(__('%s does not have slider() implemented'), get_class($this)), E_USER_WARNING); - } - + abstract public function slider(); /** * Serialize the form attached to $selector. * Pass `true` for $isForm if the current selection is a form element. @@ -971,11 +949,7 @@ class JsBaseEngineHelper extends AppHelper { * @param array $options options for serialization generation. * @return string completed form serialization script */ - public function serializeForm() { - trigger_error( - sprintf(__('%s does not have serializeForm() implemented'), get_class($this)), E_USER_WARNING - ); - } + abstract public function serializeForm(); /** * Parse an options assoc array into an Javascript object literal. From e14d8e5280234afb372b4349ce1c259b7ab018cd Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 20 Jun 2010 22:31:24 -0400 Subject: [PATCH 095/100] Updating test cases to work with JsBaseEngineHelper being abstract. --- cake/tests/cases/libs/view/helpers/js.test.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php index 0d59366af..70c154411 100644 --- a/cake/tests/cases/libs/view/helpers/js.test.php +++ b/cake/tests/cases/libs/view/helpers/js.test.php @@ -50,6 +50,18 @@ class OptionEngineHelper extends JsBaseEngineHelper { function testParseOptions($options, $safe = array()) { return $this->_parseOptions($options, $safe); } + + function get($selector) {} + function event($type, $callback, $options = array()) {} + function domReady($functionBody) {} + function each($callback) {} + function effect($name, $options) {} + function request($url, $options = array()) {} + function drag($options = array()) {} + function drop($options = array()) {} + function sortable() {} + function slider() {} + function serializeForm() {} } /** @@ -83,11 +95,11 @@ class JsHelperTestCase extends CakeTestCase { $this->_asset = Configure::read('Asset.timestamp'); Configure::write('Asset.timestamp', false); - $this->Js = new JsHelper('JsBase'); + $this->Js = new JsHelper('Option'); $this->Js->Html = new HtmlHelper(); $this->Js->Form = new FormHelper(); $this->Js->Form->Html = new HtmlHelper(); - $this->Js->JsBaseEngine = new JsBaseEngineHelper(); + $this->Js->OptionEngine = new OptionEngineHelper(); $view = new JsHelperMockView(); ClassRegistry::addObject('view', $view); @@ -578,7 +590,7 @@ class JsBaseEngineTestCase extends CakeTestCase { * @return void */ function startTest() { - $this->JsEngine = new JsBaseEngineHelper(); + $this->JsEngine = new OptionEngineHelper(); } /** * endTest method From 2a4489cdf2b8c929cb79f9f4c63a8c85a370b8f8 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sun, 20 Jun 2010 23:53:54 -0300 Subject: [PATCH 096/100] Naming conventions to datasources with plugins. Fixes #819 --- cake/libs/model/connection_manager.php | 7 ++- .../libs/model/connection_manager.test.php | 61 +++++++++++++++++++ cake/tests/test_app/models/datasources/empty | 0 .../models/datasources/test2_other_source.php | 27 ++++++++ .../models/datasources/test2_source.php | 27 ++++++++ .../models/datasources/test_other_source.php | 27 ++++++++ 6 files changed, 147 insertions(+), 2 deletions(-) delete mode 100644 cake/tests/test_app/models/datasources/empty create mode 100644 cake/tests/test_app/models/datasources/test2_other_source.php create mode 100644 cake/tests/test_app/models/datasources/test2_source.php create mode 100644 cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php index af3365be3..723ad0994 100644 --- a/cake/libs/model/connection_manager.php +++ b/cake/libs/model/connection_manager.php @@ -272,9 +272,12 @@ class ConnectionManager extends Object { if ($plugin) { $filename = Inflector::underscore($classname); } else { - $filename = $config['datasource'] . '_source'; - $classname = Inflector::camelize(strtolower($filename)); + $filename = Inflector::underscore($config['datasource']); } + if (substr($filename, -7) != '_source') { + $filename .= '_source'; + } + $classname = Inflector::camelize(strtolower($filename)); } return compact('filename', 'classname', 'parent', 'plugin'); } diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php index 049ad5276..e100a7bf3 100644 --- a/cake/tests/cases/libs/model/connection_manager.test.php +++ b/cake/tests/cases/libs/model/connection_manager.test.php @@ -276,4 +276,65 @@ class ConnectionManagerTest extends CakeTestCase { $source = ConnectionManager::create(null, $config); $this->assertEqual($source, null); } + +/** + * testConnectionData method + * + * @access public + * @return void + */ + function testConnectionData() { + App::build(array( + 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), + 'datasources' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS) + )); + + $expected = array( + 'filename' => 'test2_source', + 'classname' => 'Test2Source', + 'parent' => '', + 'plugin' => '' + ); + + ConnectionManager::create('connection1', array('datasource' => 'Test2')); + $connections = ConnectionManager::enumConnectionObjects(); + $this->assertEqual($expected, $connections['connection1']); + + ConnectionManager::create('connection2', array('datasource' => 'Test2Source')); + $connections = ConnectionManager::enumConnectionObjects(); + $this->assertEqual($expected, $connections['connection2']); + + ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.Test')); + $connections = ConnectionManager::enumConnectionObjects(); + $expected['filename'] = 'test_source'; + $expected['classname'] = 'TestSource'; + $expected['plugin'] = 'TestPlugin'; + $this->assertEqual($expected, $connections['connection3']); + + ConnectionManager::create('connection4', array('datasource' => 'TestPlugin.TestSource')); + $connections = ConnectionManager::enumConnectionObjects(); + $this->assertEqual($expected, $connections['connection4']); + + ConnectionManager::create('connection5', array('datasource' => 'Test2Other')); + $connections = ConnectionManager::enumConnectionObjects(); + $expected['filename'] = 'test2_other_source'; + $expected['classname'] = 'Test2OtherSource'; + $expected['plugin'] = ''; + $this->assertEqual($expected, $connections['connection5']); + + ConnectionManager::create('connection6', array('datasource' => 'Test2OtherSource')); + $connections = ConnectionManager::enumConnectionObjects(); + $this->assertEqual($expected, $connections['connection6']); + + ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOther')); + $connections = ConnectionManager::enumConnectionObjects(); + $expected['filename'] = 'test_other_source'; + $expected['classname'] = 'TestOtherSource'; + $expected['plugin'] = 'TestPlugin'; + $this->assertEqual($expected, $connections['connection7']); + + ConnectionManager::create('connection8', array('datasource' => 'TestPlugin.TestOtherSource')); + $connections = ConnectionManager::enumConnectionObjects(); + $this->assertEqual($expected, $connections['connection8']); + } } diff --git a/cake/tests/test_app/models/datasources/empty b/cake/tests/test_app/models/datasources/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/cake/tests/test_app/models/datasources/test2_other_source.php b/cake/tests/test_app/models/datasources/test2_other_source.php new file mode 100644 index 000000000..d5743f606 --- /dev/null +++ b/cake/tests/test_app/models/datasources/test2_other_source.php @@ -0,0 +1,27 @@ + Date: Mon, 21 Jun 2010 00:37:25 -0300 Subject: [PATCH 097/100] Fixing wrap for html mode in e-mails. Fixes #663 --- cake/libs/controller/components/email.php | 17 ++++++-- .../libs/controller/components/email.test.php | 41 +++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index 4397a5f38..b341f3965 100755 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -356,7 +356,11 @@ class EmailComponent extends Object{ } } - $message = $this->_wrap($content); + if ($this->sendAs === 'text') { + $message = $this->_wrap($content); + } else { + $message = $this->_wrap($content, 998); + } if ($this->template === null) { $message = $this->_formatMessage($message); @@ -676,10 +680,11 @@ class EmailComponent extends Object{ * Wrap the message using EmailComponent::$lineLength * * @param string $message Message to wrap + * @param integer $lineLength Max length of line * @return array Wrapped message - * @access private + * @access protected */ - function _wrap($message) { + function _wrap($message, $lineLength = null) { $message = $this->_strip($message, true); $message = str_replace(array("\r\n","\r"), "\n", $message); $lines = explode("\n", $message); @@ -690,11 +695,15 @@ class EmailComponent extends Object{ $this->lineLength = $this->_lineLength; } + if (!$lineLength) { + $lineLength = $this->lineLength; + } + foreach ($lines as $line) { if (substr($line, 0, 1) == '.') { $line = '.' . $line; } - $formatted = array_merge($formatted, explode("\n", wordwrap($line, $this->lineLength, "\n", true))); + $formatted = array_merge($formatted, explode("\n", wordwrap($line, $lineLength, "\n", true))); } $formatted[] = ''; return $formatted; diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php index 512dfe97e..521a3fbb9 100755 --- a/cake/tests/cases/libs/controller/components/email.test.php +++ b/cake/tests/cases/libs/controller/components/email.test.php @@ -109,6 +109,16 @@ class EmailTestComponent extends EmailComponent { return $this->__message; } +/** + * Convenience getter for testing. + * + * @access protected + * @return string + */ + function _getMessage() { + return $this->__message; + } + /** * Convenience method for testing. * @@ -1078,4 +1088,35 @@ HTMLBLOC; $this->assertNoPattern('/Message-ID:/', $result); } +/** + * testSendMessage method + * + * @access public + * @return void + */ + function testSendMessage() { + $this->Controller->EmailTest->delivery = 'getMessage'; + $this->Controller->EmailTest->lineLength = 70; + + $text = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.'; + $this->Controller->EmailTest->sendAs = 'text'; + $result = $this->Controller->EmailTest->send($text); + $expected = array( + 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do', + 'eiusmod tempor incididunt ut labore et dolore magna aliqua.', + '', + '' + ); + $this->assertEqual($expected, $result); + + $text = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.'; + $this->Controller->EmailTest->sendAs = 'html'; + $result = $this->Controller->EmailTest->send($text); + $expected = array( + $text, + '', + '' + ); + $this->assertEqual($expected, $result); + } } From 5945edd983597dc0bf44f6162101e7b3c3a5353f Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 21 Jun 2010 21:17:37 -0400 Subject: [PATCH 098/100] Removing strtolower call that was breaking autolinks for URL shorteners. Tests added. Fixes #838 --- cake/libs/view/helpers/text.php | 2 +- cake/tests/cases/libs/view/helpers/text.test.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php index 046ce7080..04e80a812 100644 --- a/cake/libs/view/helpers/text.php +++ b/cake/libs/view/helpers/text.php @@ -123,7 +123,7 @@ class TextHelper extends AppHelper { '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], $matches[0],' . $options . ');'), $text); return preg_replace_callback('#(?)(?tags = $Html->loadConfig(); return $Html->link($matches[0], "http://" . strtolower($matches[0]),' . $options . ');'), $text); + create_function('$matches', '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], "http://" . $matches[0],' . $options . ');'), $text); } /** diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php index eb674d3e5..7a5470c01 100644 --- a/cake/tests/cases/libs/view/helpers/text.test.php +++ b/cake/tests/cases/libs/view/helpers/text.test.php @@ -267,15 +267,19 @@ class TextHelperTest extends CakeTestCase { $this->assertPattern('#^' . $expected . '$#', $result); $text = 'Text with a partial WWW.cakephp.org URL'; - $expected = 'Text with a partial WWW.cakephp.org URL'; + $expected = 'Text with a partial WWW.cakephp.org URL'; $result = $this->Text->autoLinkUrls($text); $this->assertPattern('#^' . $expected . '$#', $result); $text = 'Text with a partial WWW.cakephp.org © URL'; - $expected = 'Text with a partial WWW.cakephp.org © URL'; + $expected = 'Text with a partial WWW.cakephp.org © URL'; $result = $this->Text->autoLinkUrls($text, array('escape' => false)); $this->assertPattern('#^' . $expected . '$#', $result); + $text = 'Text with a url www.cot.ag/cuIb2Q and more'; + $expected = 'Text with a url www.cot.ag/cuIb2Q and more'; + $result = $this->Text->autoLinkUrls($text); + $this->assertEqual($expected, $result); } /** From 9bbaf153f77b15f190b027065e03b78e0dc1f00e Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Wed, 23 Jun 2010 00:10:21 -0300 Subject: [PATCH 099/100] Setting cookies in a single line. Fixes #48 --- cake/libs/http_socket.php | 2 +- cake/tests/cases/libs/http_socket.test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php index a5c24c9fc..6686ebbce 100644 --- a/cake/libs/http_socket.php +++ b/cake/libs/http_socket.php @@ -975,7 +975,7 @@ class HttpSocket extends CakeSocket { foreach ($cookies as $name => $cookie) { $header[] = $name.'='.$this->_escapeToken($cookie['value'], array(';')); } - $header = $this->_buildHeader(array('Cookie' => $header), 'pragmatic'); + $header = $this->_buildHeader(array('Cookie' => implode('; ', $header)), 'pragmatic'); return $header; } diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php index 1c3d04f6c..d61d654f5 100644 --- a/cake/tests/cases/libs/http_socket.test.php +++ b/cake/tests/cases/libs/http_socket.test.php @@ -1375,7 +1375,7 @@ class HttpSocketTest extends CakeTestCase { 'path' => '/accounts' ) ); - $expect = "Cookie: foo=bar\r\nCookie: people=jim,jack,johnny\";\"\r\n"; + $expect = "Cookie: foo=bar; people=jim,jack,johnny\";\"\r\n"; $result = $this->Socket->buildCookies($cookies); $this->assertEqual($result, $expect); } From 83651091cef8a677844dbb6d2d318677eaaead45 Mon Sep 17 00:00:00 2001 From: predominant Date: Thu, 24 Jun 2010 10:30:12 +1000 Subject: [PATCH 100/100] Refactor session timeouts. --- cake/libs/cake_session.php | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index ddefa4506..5c478d3ed 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -460,29 +460,13 @@ class CakeSession extends Object { */ function __initSession() { $iniSet = function_exists('ini_set'); - if ($iniSet && env('HTTPS')) { ini_set('session.cookie_secure', 1); } - - switch ($this->security) { - case 'high': - $this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins(); - if ($iniSet) { - ini_set('session.referer_check', $this->host); - } - break; - case 'medium': - $this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins(); - if ($iniSet) { - ini_set('session.referer_check', $this->host); - } - break; - case 'low': - default: - $this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins(); - break; + if ($iniSet && ($this->security === 'high' || $this->security === 'medium')) { + ini_set('session.referer_check', $this->host); } + $this->cookieLifeTime = Configure::read('Session.timeout') * Security::inactiveMins(); switch (Configure::read('Session.save')) { case 'cake':