Browse Source

Merge pull request #4645 from tersmitten/cs-fixes

Cs fixes
Mark Story 11 years ago
parent
commit
12cf82ba19

+ 12 - 0
app/Config/Schema/i18n.php

@@ -29,10 +29,22 @@ class I18nSchema extends CakeSchema {
 
 	public $name = 'i18n';
 
+/**
+ * Before callback.
+ *
+ * @param array $event Schema object properties
+ * @return bool Should process continue
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After callback.
+ *
+ * @param array $event Schema object properties
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 

+ 12 - 0
app/Config/Schema/sessions.php

@@ -28,10 +28,22 @@ class SessionsSchema extends CakeSchema {
 
 	public $name = 'Sessions';
 
+/**
+ * Before callback.
+ *
+ * @param array $event Schema object properties
+ * @return bool Should process continue
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After callback.
+ *
+ * @param array $event Schema object properties
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 

+ 1 - 1
app/View/Emails/html/default.ctp

@@ -20,4 +20,4 @@ $content = explode("\n", $content);
 foreach ($content as $line):
 	echo '<p> ' . $line . "</p>\n";
 endforeach;
-?>
+?>

+ 1 - 1
app/View/Emails/text/default.ctp

@@ -14,4 +14,4 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 ?>
-<?php echo $content; ?>
+<?php echo $content; ?>

+ 1 - 1
app/View/Layouts/Emails/html/default.ctp

@@ -17,7 +17,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 <head>
-	<title><?php echo $title_for_layout; ?></title>
+	<title><?php echo $this->fetch('title'); ?></title>
 </head>
 <body>
 	<?php echo $this->fetch('content'); ?>

+ 1 - 1
app/View/Layouts/default.ctp

@@ -23,7 +23,7 @@ $cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
 	<?php echo $this->Html->charset(); ?>
 	<title>
 		<?php echo $cakeDescription ?>:
-		<?php echo $title_for_layout; ?>
+		<?php echo $this->fetch('title'); ?>
 	</title>
 	<?php
 		echo $this->Html->meta('icon');

+ 1 - 1
app/View/Layouts/error.ctp

@@ -22,7 +22,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 	<?php echo $this->Html->charset(); ?>
 	<title>
 		<?php echo $cakeDescription ?>:
-		<?php echo $title_for_layout; ?>
+		<?php echo $this->fetch('title'); ?>
 	</title>
 	<?php
 		echo $this->Html->meta('icon');

+ 9 - 5
app/View/Layouts/flash.ctp

@@ -18,11 +18,13 @@
 <html>
 <head>
 <?php echo $this->Html->charset(); ?>
-<title><?php echo $page_title; ?></title>
+<title><?php echo $pageTitle; ?></title>
 
-<?php if (Configure::read('debug') == 0): ?>
-<meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
-<?php endif; ?>
+<?php
+if (Configure::read('debug') == 0):
+	echo sprintf('<meta http-equiv="Refresh" content="%s;url=%s" />', $pause, $url);
+endif;
+?>
 <style><!--
 P { text-align:center; font:bold 1.1em sans-serif }
 A { color:#444; text-decoration:none }
@@ -30,6 +32,8 @@ A:HOVER { text-decoration: underline; color:#44E }
 --></style>
 </head>
 <body>
-<p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
+<p>
+	<?php echo $this->Html->link($message, $url); ?>
+</p>
 </body>
 </html>

+ 1 - 1
app/View/Layouts/js/default.ctp

@@ -1,2 +1,2 @@
-<?php echo $scripts_for_layout; ?>
+<?php echo $this->fetch('script'); ?>
 <script type="text/javascript"><?php echo $this->fetch('content'); ?></script>

+ 1 - 1
app/View/Layouts/rss/default.ctp

@@ -3,7 +3,7 @@ if (!isset($channel)):
 	$channel = array();
 endif;
 if (!isset($channel['title'])):
-	$channel['title'] = $title_for_layout;
+	$channel['title'] = $this->fetch('title');
 endif;
 
 echo $this->Rss->document(

+ 91 - 94
app/View/Pages/home.ctp

@@ -13,79 +13,75 @@ App::uses('Debugger', 'Utility');
 ?>
 <h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
 <p>
-	<a href="http://cakephp.org/changelogs/<?php echo Configure::version(); ?>"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
+	<?php echo $this->Html->link(__d('cake_dev', 'Read the changelog'), 'http://cakephp.org/changelogs/' . Configure::version()); ?>
 </p>
 <?php
 if (Configure::read('debug') > 0):
 	Debugger::checkSecurityKeys();
 endif;
 ?>
+<?php if (file_exists(WWW_ROOT . 'css' . DS . 'cake.generic.css')): ?>
+	<p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
+		<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
+		1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
+		2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
+	</p>
+<?php endif; ?>
+<p>
 <?php
-if (file_exists(WWW_ROOT . 'css' . DS . 'cake.generic.css')):
-?>
-<p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
-	<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
-	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
-	2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
-</p>
-<?php
+if (version_compare(PHP_VERSION, '5.2.8', '>=')):
+	echo '<span class="notice success">';
+		echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
+	echo '</span>';
+else:
+	echo '<span class="notice">';
+		echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
+	echo '</span>';
 endif;
 ?>
+</p>
 <p>
-<?php
-	if (version_compare(PHP_VERSION, '5.2.8', '>=')):
+	<?php
+	if (is_writable(TMP)):
 		echo '<span class="notice success">';
-			echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
+			echo __d('cake_dev', 'Your tmp directory is writable.');
 		echo '</span>';
 	else:
 		echo '<span class="notice">';
-			echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
+			echo __d('cake_dev', 'Your tmp directory is NOT writable.');
 		echo '</span>';
 	endif;
-?>
-</p>
-<p>
-	<?php
-		if (is_writable(TMP)):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'Your tmp directory is writable.');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your tmp directory is NOT writable.');
-			echo '</span>';
-		endif;
 	?>
 </p>
 <p>
 	<?php
-		$settings = Cache::settings();
-		if (!empty($settings)):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>'. $settings['engine'] . 'Engine</em>', 'APP/Config/core.php');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in %s', 'APP/Config/core.php');
-			echo '</span>';
-		endif;
+	$settings = Cache::settings();
+	if (!empty($settings)):
+		echo '<span class="notice success">';
+			echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>' . $settings['engine'] . 'Engine</em>', 'APP/Config/core.php');
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in %s', 'APP/Config/core.php');
+		echo '</span>';
+	endif;
 	?>
 </p>
 <p>
 	<?php
-		$filePresent = null;
-		if (file_exists(APP . 'Config' . DS . 'database.php')):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'Your database configuration file is present.');
-				$filePresent = true;
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your database configuration file is NOT present.');
-				echo '<br/>';
-				echo __d('cake_dev', 'Rename %s to %s', 'APP/Config/database.php.default', 'APP/Config/database.php');
-			echo '</span>';
-		endif;
+	$filePresent = null;
+	if (file_exists(APP . 'Config' . DS . 'database.php')):
+		echo '<span class="notice success">';
+			echo __d('cake_dev', 'Your database configuration file is present.');
+			$filePresent = true;
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			echo __d('cake_dev', 'Your database configuration file is NOT present.');
+			echo '<br/>';
+			echo __d('cake_dev', 'Rename %s to %s', 'APP/Config/database.php.default', 'APP/Config/database.php');
+		echo '</span>';
+	endif;
 	?>
 </p>
 <?php
@@ -103,47 +99,48 @@ if (isset($filePresent)):
 			endif;
 		endif;
 	}
-?>
-<p>
-	<?php
-		if ($connected && $connected->isConnected()):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'CakePHP is able to connect to the database.');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.');
-				echo '<br /><br />';
-				echo $errorMsg;
-			echo '</span>';
-		endif;
 	?>
-</p>
-<?php endif; ?>
+	<p>
+		<?php
+			if ($connected && $connected->isConnected()):
+				echo '<span class="notice success">';
+					echo __d('cake_dev', 'CakePHP is able to connect to the database.');
+				echo '</span>';
+			else:
+				echo '<span class="notice">';
+					echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.');
+					echo '<br /><br />';
+					echo $errorMsg;
+				echo '</span>';
+			endif;
+		?>
+	</p>
 <?php
-	App::uses('Validation', 'Utility');
-	if (!Validation::alphaNumeric('cakephp')):
-		echo '<p><span class="notice">';
-			echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
-			echo '<br/>';
-			echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
-		echo '</span></p>';
-	endif;
+endif;
+
+App::uses('Validation', 'Utility');
+if (!Validation::alphaNumeric('cakephp')):
+	echo '<p><span class="notice">';
+		echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
+		echo '<br/>';
+		echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
+	echo '</span></p>';
+endif;
 ?>
 
 <p>
 	<?php
-		if (CakePlugin::loaded('DebugKit')):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'DebugKit plugin is present');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.');
-				echo '<br/>';
-				echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit'));
-			echo '</span>';
-		endif;
+	if (CakePlugin::loaded('DebugKit')):
+		echo '<span class="notice success">';
+			echo __d('cake_dev', 'DebugKit plugin is present');
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.');
+			echo '<br/>';
+			echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit'));
+		echo '</span>';
+	endif;
 	?>
 </p>
 
@@ -160,20 +157,20 @@ You can also add some CSS styles for your pages at: %s.',
 <h3><?php echo __d('cake_dev', 'Getting Started'); ?></h3>
 <p>
 	<?php
-		echo $this->Html->link(
-			sprintf('<strong>%s</strong> %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 2.0 Docs')),
-			'http://book.cakephp.org/2.0/en/',
-			array('target' => '_blank', 'escape' => false)
-		);
+	echo $this->Html->link(
+		sprintf('<strong>%s</strong> %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 2.0 Docs')),
+		'http://book.cakephp.org/2.0/en/',
+		array('target' => '_blank', 'escape' => false)
+	);
 	?>
 </p>
 <p>
 	<?php
-		echo $this->Html->link(
-			__d('cake_dev', 'The 15 min Blog Tutorial'),
-			'http://book.cakephp.org/2.0/en/tutorials-and-examples/blog/blog.html',
-			array('target' => '_blank', 'escape' => false)
-		);
+	echo $this->Html->link(
+		__d('cake_dev', 'The 15 min Blog Tutorial'),
+		'http://book.cakephp.org/2.0/en/tutorials-and-examples/blog/blog.html',
+		array('target' => '_blank', 'escape' => false)
+	);
 	?>
 </p>
 

+ 1 - 1
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp

@@ -9,7 +9,7 @@
 <html>
 <head>
 <?php echo $this->Html->charset(); ?>
-<title><?php echo $page_title; ?></title>
+<title><?php echo $pageTitle; ?></title>
 
 <?php if (!Configure::read('debug')): ?>
 <meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>

+ 1 - 1
lib/Cake/Controller/Controller.php

@@ -1004,7 +1004,7 @@ class Controller extends Object implements CakeEventListener {
 		$this->set('url', Router::url($url));
 		$this->set('message', $message);
 		$this->set('pause', $pause);
-		$this->set('page_title', $message);
+		$this->set('pageTitle', $message);
 		$this->render(false, $layout);
 	}
 

+ 1 - 1
lib/Cake/Test/Case/View/ViewTest.php

@@ -1020,7 +1020,7 @@ class ViewTest extends CakeTestCase {
 		$this->PostsController->set('url', 'flash');
 		$this->PostsController->set('message', 'yo what up');
 		$this->PostsController->set('pause', 3);
-		$this->PostsController->set('page_title', 'yo what up');
+		$this->PostsController->set('pageTitle', 'yo what up');
 
 		$View = new TestView($this->PostsController);
 		$result = $View->render(false, 'flash');

+ 2 - 2
lib/Cake/Test/test_app/View/Layouts/flash.ctp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title><?php echo $page_title?></title>
+<title><?php echo $pageTitle?></title>
 <?php echo $this->Html->charset(); ?>
 
 <?php if (!Configure::read('debug')) { ?>
@@ -16,4 +16,4 @@ A:HOVER { text-decoration: underline; color:#44E }
 <body>
 <p><a href="<?php echo $url?>"><?php echo $message?></a></p>
 </body>
-</html>
+</html>