From 79700a5e94808563db5ae2daa1b76028ca5a982e Mon Sep 17 00:00:00 2001
From: AD7six <andydawson76@gmail.com>
Date: Sat, 7 May 2011 19:05:24 +0200
Subject: [PATCH] applying upgrade shell to test app files

---
 ...controller.php => TestsAppsController.php} |  0
 ...oller.php => TestsAppsPostsController.php} |  4 +-
 .../test_app/Lib/{library.php => Library.php} |  0
 ...r.php => PersisterOneBehaviorBehavior.php} |  0
 ...r.php => PersisterTwoBehaviorBehavior.php} |  0
 .../Model/{comment.php => Comment.php}        |  0
 ..._other_source.php => Test2OtherSource.php} |  0
 .../{test2_source.php => Test2Source.php}     |  0
 .../{persister_one.php => PersisterOne.php}   |  0
 .../{persister_two.php => PersisterTwo.php}   |  0
 .../test_app/Model/{post.php => Post.php}     |  0
 .../Helper/{banana.php => BananaHelper.php}   |  0
 .../tests/test_app/View/layouts/flash.ctp     |  2 +-
 lib/Cake/tests/test_app/View/pages/home.ctp   |  2 +-
 .../test_app/View/posts/test_nocache_tags.ctp | 71 +++++++++----------
 15 files changed, 39 insertions(+), 40 deletions(-)
 rename lib/Cake/tests/test_app/Controller/{tests_apps_controller.php => TestsAppsController.php} (100%)
 rename lib/Cake/tests/test_app/Controller/{tests_apps_posts_controller.php => TestsAppsPostsController.php} (93%)
 rename lib/Cake/tests/test_app/Lib/{library.php => Library.php} (100%)
 rename lib/Cake/tests/test_app/Model/Behavior/{persister_one_behavior.php => PersisterOneBehaviorBehavior.php} (100%)
 rename lib/Cake/tests/test_app/Model/Behavior/{persister_two_behavior.php => PersisterTwoBehaviorBehavior.php} (100%)
 rename lib/Cake/tests/test_app/Model/{comment.php => Comment.php} (100%)
 rename lib/Cake/tests/test_app/Model/Datasource/{test2_other_source.php => Test2OtherSource.php} (100%)
 rename lib/Cake/tests/test_app/Model/Datasource/{test2_source.php => Test2Source.php} (100%)
 rename lib/Cake/tests/test_app/Model/{persister_one.php => PersisterOne.php} (100%)
 rename lib/Cake/tests/test_app/Model/{persister_two.php => PersisterTwo.php} (100%)
 rename lib/Cake/tests/test_app/Model/{post.php => Post.php} (100%)
 rename lib/Cake/tests/test_app/View/Helper/{banana.php => BananaHelper.php} (100%)

diff --git a/lib/Cake/tests/test_app/Controller/tests_apps_controller.php b/lib/Cake/tests/test_app/Controller/TestsAppsController.php
similarity index 100%
rename from lib/Cake/tests/test_app/Controller/tests_apps_controller.php
rename to lib/Cake/tests/test_app/Controller/TestsAppsController.php
diff --git a/lib/Cake/tests/test_app/Controller/tests_apps_posts_controller.php b/lib/Cake/tests/test_app/Controller/TestsAppsPostsController.php
similarity index 93%
rename from lib/Cake/tests/test_app/Controller/tests_apps_posts_controller.php
rename to lib/Cake/tests/test_app/Controller/TestsAppsPostsController.php
index af28f42c4..f5b6dc89e 100644
--- a/lib/Cake/tests/test_app/Controller/tests_apps_posts_controller.php
+++ b/lib/Cake/tests/test_app/Controller/TestsAppsPostsController.php
@@ -40,7 +40,7 @@ class TestsAppsPostsController extends AppController {
  *
  */
 	function url_var() {
-		$this->set('params', $this->params);
+		$this->set('params', $this->request->params);
 		$this->render('index');
 	}
 
@@ -49,7 +49,7 @@ class TestsAppsPostsController extends AppController {
  *
  */
 	function post_var() {
-		$this->set('data', $this->data);
+		$this->set('data', $this->request->data);
 		$this->render('index');
 	}
 
diff --git a/lib/Cake/tests/test_app/Lib/library.php b/lib/Cake/tests/test_app/Lib/Library.php
similarity index 100%
rename from lib/Cake/tests/test_app/Lib/library.php
rename to lib/Cake/tests/test_app/Lib/Library.php
diff --git a/lib/Cake/tests/test_app/Model/Behavior/persister_one_behavior.php b/lib/Cake/tests/test_app/Model/Behavior/PersisterOneBehaviorBehavior.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Behavior/persister_one_behavior.php
rename to lib/Cake/tests/test_app/Model/Behavior/PersisterOneBehaviorBehavior.php
diff --git a/lib/Cake/tests/test_app/Model/Behavior/persister_two_behavior.php b/lib/Cake/tests/test_app/Model/Behavior/PersisterTwoBehaviorBehavior.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Behavior/persister_two_behavior.php
rename to lib/Cake/tests/test_app/Model/Behavior/PersisterTwoBehaviorBehavior.php
diff --git a/lib/Cake/tests/test_app/Model/comment.php b/lib/Cake/tests/test_app/Model/Comment.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/comment.php
rename to lib/Cake/tests/test_app/Model/Comment.php
diff --git a/lib/Cake/tests/test_app/Model/Datasource/test2_other_source.php b/lib/Cake/tests/test_app/Model/Datasource/Test2OtherSource.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Datasource/test2_other_source.php
rename to lib/Cake/tests/test_app/Model/Datasource/Test2OtherSource.php
diff --git a/lib/Cake/tests/test_app/Model/Datasource/test2_source.php b/lib/Cake/tests/test_app/Model/Datasource/Test2Source.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Datasource/test2_source.php
rename to lib/Cake/tests/test_app/Model/Datasource/Test2Source.php
diff --git a/lib/Cake/tests/test_app/Model/persister_one.php b/lib/Cake/tests/test_app/Model/PersisterOne.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/persister_one.php
rename to lib/Cake/tests/test_app/Model/PersisterOne.php
diff --git a/lib/Cake/tests/test_app/Model/persister_two.php b/lib/Cake/tests/test_app/Model/PersisterTwo.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/persister_two.php
rename to lib/Cake/tests/test_app/Model/PersisterTwo.php
diff --git a/lib/Cake/tests/test_app/Model/post.php b/lib/Cake/tests/test_app/Model/Post.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/post.php
rename to lib/Cake/tests/test_app/Model/Post.php
diff --git a/lib/Cake/tests/test_app/View/Helper/banana.php b/lib/Cake/tests/test_app/View/Helper/BananaHelper.php
similarity index 100%
rename from lib/Cake/tests/test_app/View/Helper/banana.php
rename to lib/Cake/tests/test_app/View/Helper/BananaHelper.php
diff --git a/lib/Cake/tests/test_app/View/layouts/flash.ctp b/lib/Cake/tests/test_app/View/layouts/flash.ctp
index bed0624c4..1e9508609 100644
--- a/lib/Cake/tests/test_app/View/layouts/flash.ctp
+++ b/lib/Cake/tests/test_app/View/layouts/flash.ctp
@@ -22,7 +22,7 @@
 <title><?php echo $page_title?></title>
 <?php echo $this->Html->charset(); ?>
 
-<?php if (Configure::read() == 0) { ?>
+<?php if (Configure::read('debug') == 0) { ?>
 <meta http-equiv="Refresh" content="<?php echo $pause?>;url=<?php echo $url?>"/>
 <?php } ?>
 <style><!--
diff --git a/lib/Cake/tests/test_app/View/pages/home.ctp b/lib/Cake/tests/test_app/View/pages/home.ctp
index 1b2a2e492..a26cfdb0b 100644
--- a/lib/Cake/tests/test_app/View/pages/home.ctp
+++ b/lib/Cake/tests/test_app/View/pages/home.ctp
@@ -18,7 +18,7 @@
 App::uses('Debugger', 'Utility');
 ?>
 <h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
-<a href="http://cakephp.org/changelogs/1.3.6"><?php __d('cake_dev', 'Read the changelog'); ?> </a>
+<a href="http://cakephp.org/changelogs/1.3.6"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
 <p>
 	<?php
 		if (is_writable(TMP)):
diff --git a/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp b/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
index 20909edc5..3375d8fbf 100644
--- a/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
+++ b/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
@@ -82,8 +82,7 @@ if (!empty($filePresent)):
 ?>
 <p>
 	<span class="notice">
-		<?php
-			__d('cake', 'Cake');
+		<?php echo __d('cake', 'Cake');
 			if ($connected->isConnected()):
 		 		__d('cake', ' is able to ');
 			else:
@@ -95,48 +94,48 @@ if (!empty($filePresent)):
 </p>
 <?php endif; ?>
 <h2><?php echo __d('cake', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
-<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?php __d('cake', 'Read the release notes and get the latest version'); ?> </a>
-<h2><?php __d('cake', 'Editing this Page'); ?></h2>
+<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?php echo __d('cake', 'Read the release notes and get the latest version'); ?> </a>
+<h2><?php echo __d('cake', 'Editing this Page'); ?></h2>
 <p>
-<?php __d('cake', 'To change the content of this page, create: /app/views/pages/home.ctp.'); ?><br />
-<?php __d('cake', 'To change its layout, create: /app/views/layouts/default.ctp.'); ?><br />
-<a href="http://manual.cakephp.org/"><?php __d('cake', 'See the views section of the manual for more info.'); ?> </a><br />
-<?php __d('cake', 'You can also add some CSS styles for your pages at: app/webroot/css/.'); ?>
+<?php echo __d('cake', 'To change the content of this page, create: /app/views/pages/home.ctp.'); ?><br />
+<?php echo __d('cake', 'To change its layout, create: /app/views/layouts/default.ctp.'); ?><br />
+<a href="http://manual.cakephp.org/"><?php echo __d('cake', 'See the views section of the manual for more info.'); ?> </a><br />
+<?php echo __d('cake', 'You can also add some CSS styles for your pages at: app/webroot/css/.'); ?>
 </p>
-<h2><?php __d('cake', 'Getting Started'); ?></h2>
+<h2><?php echo __d('cake', 'Getting Started'); ?></h2>
 <p>
-<a href="http://manual.cakephp.org/appendix/blog_tutorial"><?php __d('cake', 'The 15 min Blog Tutorial'); ?></a><br />
-<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-cake1.html"><?php __d('cake', 'Cook up Web sites fast with CakePHP'); ?></a><br />
-<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-wiki1.html"><?php __d('cake', 'Create an interactive production wiki using PHP'); ?></a>
+<a href="http://manual.cakephp.org/appendix/blog_tutorial"><?php echo __d('cake', 'The 15 min Blog Tutorial'); ?></a><br />
+<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-cake1.html"><?php echo __d('cake', 'Cook up Web sites fast with CakePHP'); ?></a><br />
+<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-wiki1.html"><?php echo __d('cake', 'Create an interactive production wiki using PHP'); ?></a>
 </p>
-<h2><?php __d('cake', 'More about Cake'); ?></h2>
+<h2><?php echo __d('cake', 'More about Cake'); ?></h2>
 <p>
-<?php __d('cake', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
+<?php echo __d('cake', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
 </p>
 <p>
-<?php __d('cake', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
+<?php echo __d('cake', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
 </p>
 <ul>
-	<li><a href="http://cakefoundation.org/"><?php __d('cake', 'Cake Software Foundation'); ?> </a>
-	<ul><li><?php __d('cake', 'Promoting development related to CakePHP'); ?></li></ul></li>
-	<li><a href="http://bakery.cakephp.org"><?php __d('cake', 'The Bakery'); ?> </a>
-	<ul><li><?php __d('cake', 'Everything CakePHP'); ?></li></ul></li>
-	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php __d('cake', 'Book Store'); ?> </a>
-	<ul><li><?php __d('cake', 'Recommended Software Books'); ?></li></ul></li>
-	<li><a href="http://www.cafepress.com/cakefoundation"><?php __d('cake', 'CakeSchwag'); ?> </a>
-	<ul><li><?php __d('cake', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
-	<li><a href="http://www.cakephp.org"><?php __d('cake', 'CakePHP'); ?> </a>
-	<ul><li><?php __d('cake', 'The Rapid Development Framework'); ?></li></ul></li>
-	<li><a href="http://manual.cakephp.org"><?php __d('cake', 'CakePHP Manual'); ?> </a>
-	<ul><li><?php __d('cake', 'Your Rapid Development Cookbook'); ?></li></ul></li>
-	<li><a href="http://api.cakephp.org"><?php __d('cake', 'CakePHP API'); ?> </a>
-	<ul><li><?php __d('cake', 'Docblock Your Best Friend'); ?></li></ul></li>
-	<li><a href="http://www.cakeforge.org"><?php __d('cake', 'CakeForge'); ?> </a>
-	<ul><li><?php __d('cake', 'Open Development for CakePHP'); ?></li></ul></li>
-	<li><a href="https://trac.cakephp.org/"><?php __d('cake', 'CakePHP Trac'); ?> </a>
-	<ul><li><?php __d('cake', 'For the Development of CakePHP (Tickets, SVN browser, Roadmap, Changelogs)'); ?></li></ul></li>
-	<li><a href="http://groups-beta.google.com/group/cake-php"><?php __d('cake', 'CakePHP Google Group'); ?> </a>
-	<ul><li><?php __d('cake', 'Community mailing list'); ?></li></ul></li>
+	<li><a href="http://cakefoundation.org/"><?php echo __d('cake', 'Cake Software Foundation'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Promoting development related to CakePHP'); ?></li></ul></li>
+	<li><a href="http://bakery.cakephp.org"><?php echo __d('cake', 'The Bakery'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Everything CakePHP'); ?></li></ul></li>
+	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __d('cake', 'Book Store'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Recommended Software Books'); ?></li></ul></li>
+	<li><a href="http://www.cafepress.com/cakefoundation"><?php echo __d('cake', 'CakeSchwag'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
+	<li><a href="http://www.cakephp.org"><?php echo __d('cake', 'CakePHP'); ?> </a>
+	<ul><li><?php echo __d('cake', 'The Rapid Development Framework'); ?></li></ul></li>
+	<li><a href="http://manual.cakephp.org"><?php echo __d('cake', 'CakePHP Manual'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Your Rapid Development Cookbook'); ?></li></ul></li>
+	<li><a href="http://api.cakephp.org"><?php echo __d('cake', 'CakePHP API'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Docblock Your Best Friend'); ?></li></ul></li>
+	<li><a href="http://www.cakeforge.org"><?php echo __d('cake', 'CakeForge'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Open Development for CakePHP'); ?></li></ul></li>
+	<li><a href="https://trac.cakephp.org/"><?php echo __d('cake', 'CakePHP Trac'); ?> </a>
+	<ul><li><?php echo __d('cake', 'For the Development of CakePHP (Tickets, SVN browser, Roadmap, Changelogs)'); ?></li></ul></li>
+	<li><a href="http://groups-beta.google.com/group/cake-php"><?php echo __d('cake', 'CakePHP Google Group'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Community mailing list'); ?></li></ul></li>
 	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
-	<ul><li><?php __d('cake', 'Live chat about CakePHP'); ?></li></ul></li>
+	<ul><li><?php echo __d('cake', 'Live chat about CakePHP'); ?></li></ul></li>
 </ul>
\ No newline at end of file