From 5a58d38a805dcd8a2c69c004757041d8c6fd96d3 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 2 Apr 2011 09:17:14 -0400
Subject: [PATCH] Removing the ?> from files generated by bake.  Fixes #1631

---
 cake/console/templates/default/classes/controller.ctp   | 1 -
 cake/console/templates/default/classes/fixture.ctp      | 1 -
 cake/console/templates/default/classes/model.ctp        | 1 -
 cake/console/templates/default/classes/test.ctp         | 1 -
 cake/tests/cases/console/libs/tasks/controller.test.php | 1 +
 5 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cake/console/templates/default/classes/controller.ctp b/cake/console/templates/default/classes/controller.ctp
index 0214d914a..af5d68498 100644
--- a/cake/console/templates/default/classes/controller.ctp
+++ b/cake/console/templates/default/classes/controller.ctp
@@ -58,4 +58,3 @@ echo $actions;
 endif; ?>
 
 }
-<?php echo "?>"; ?>
\ No newline at end of file
diff --git a/cake/console/templates/default/classes/fixture.ctp b/cake/console/templates/default/classes/fixture.ctp
index 6d158052c..2f16bb75c 100644
--- a/cake/console/templates/default/classes/fixture.ctp
+++ b/cake/console/templates/default/classes/fixture.ctp
@@ -39,4 +39,3 @@ class <?php echo $model; ?>Fixture extends CakeTestFixture {
 	var $records = <?php echo $records; ?>;
 <?php endif;?>
 }
-<?php echo '?>'; ?>
\ No newline at end of file
diff --git a/cake/console/templates/default/classes/model.ctp b/cake/console/templates/default/classes/model.ctp
index e3c303e1c..a5d2a9e49 100644
--- a/cake/console/templates/default/classes/model.ctp
+++ b/cake/console/templates/default/classes/model.ctp
@@ -139,4 +139,3 @@ if (!empty($associations['hasAndBelongsToMany'])):
 endif;
 ?>
 }
-<?php echo '?>'; ?>
\ No newline at end of file
diff --git a/cake/console/templates/default/classes/test.ctp b/cake/console/templates/default/classes/test.ctp
index 1207e468c..70f4d5a09 100644
--- a/cake/console/templates/default/classes/test.ctp
+++ b/cake/console/templates/default/classes/test.ctp
@@ -54,4 +54,3 @@ class <?php echo $fullClassName; ?>TestCase extends CakeTestCase {
 
 <?php endforeach;?>
 }
-<?php echo '?>'; ?>
\ 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 3dc758ac3..69ed7cf6e 100644
--- a/cake/tests/cases/console/libs/tasks/controller.test.php
+++ b/cake/tests/cases/console/libs/tasks/controller.test.php
@@ -31,6 +31,7 @@ if (!class_exists('ShellDispatcher')) {
 	require CAKE . 'console' .  DS . 'cake.php';
 	ob_end_clean();
 }
+null
 
 require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'project.php';
 require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'controller.php';