adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing coding conventions

Browse source
This commit is contained in:
Jelle Henkens 2012-05-19 15:48:15 +01:00
parent d5b5327f70
commit 97ebbc8e23
30 changed files with 83 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Console/Templates/default/classes/fixture.ctp
View file

@ -52,7 +52,7 @@ class <?php echo $model; ?>Fixture extends CakeTestFixture {
*/ */
public $fields = <?php echo $schema; ?>; public $fields = <?php echo $schema; ?>;
<?php endif;?> <?php endif; ?>
<?php if ($records): ?> <?php if ($records): ?>
/** /**
* Records * Records
@ -61,5 +61,5 @@ class <?php echo $model; ?>Fixture extends CakeTestFixture {
*/ */
public $records = <?php echo $records; ?>; public $records = <?php echo $records; ?>;
<?php endif;?> <?php endif; ?>
} }

4
lib/Cake/Console/Templates/default/classes/test.ctp
View file

@ -62,7 +62,7 @@ class <?php echo $fullClassName; ?>Test extends CakeTestCase {
* @return void * @return void
*/ */
public function tearDown() { public function tearDown() {
unset($this-><?php echo $className;?>); unset($this-><?php echo $className; ?>);
parent::tearDown(); parent::tearDown();
} }
@ -76,5 +76,5 @@ class <?php echo $fullClassName; ?>Test extends CakeTestCase {
public function test<?php echo Inflector::camelize($method); ?>() { public function test<?php echo Inflector::camelize($method); ?>() {
} }
<?php endforeach;?> <?php endforeach; ?>
} }

12
lib/Cake/Console/Templates/default/views/form.ctp
View file

@ -16,8 +16,8 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
?> ?>
<div class="<?php echo $pluralVar;?> form"> <div class="<?php echo $pluralVar; ?> form">
<?php echo "<?php echo \$this->Form->create('{$modelClass}');?>\n";?> <?php echo "<?php echo \$this->Form->create('{$modelClass}'); ?>\n"; ?>
<fieldset> <fieldset>
<legend><?php printf("<?php echo __('%s %s'); ?>", Inflector::humanize($action), $singularHumanName); ?></legend> <legend><?php printf("<?php echo __('%s %s'); ?>", Inflector::humanize($action), $singularHumanName); ?></legend>
<?php <?php
@ -38,7 +38,7 @@
?> ?>
</fieldset> </fieldset>
<?php <?php
echo "<?php echo \$this->Form->end(__('Submit'));?>\n"; echo "<?php echo \$this->Form->end(__('Submit')); ?>\n";
?> ?>
</div> </div>
<div class="actions"> <div class="actions">
@ -46,9 +46,9 @@
<ul> <ul>
<?php if (strpos($action, 'add') === false): ?> <?php if (strpos($action, 'add') === false): ?>
<li><?php echo "<?php echo \$this->Form->postLink(__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?></li> <li><?php echo "<?php echo \$this->Form->postLink(__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>"; ?></li>
<?php endif;?> <?php endif; ?>
<li><?php echo "<?php echo \$this->Html->link(__('List " . $pluralHumanName . "'), array('action' => 'index'));?>";?></li> <li><?php echo "<?php echo \$this->Html->link(__('List " . $pluralHumanName . "'), array('action' => 'index')); ?>"; ?></li>
<?php <?php
$done = array(); $done = array();
foreach ($associations as $type => $data) { foreach ($associations as $type => $data) {

16
lib/Cake/Console/Templates/default/views/index.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
?> ?>
<div class="<?php echo $pluralVar;?> index"> <div class="<?php echo $pluralVar; ?> index">
<h2><?php echo "<?php echo __('{$pluralHumanName}');?>";?></h2> <h2><?php echo "<?php echo __('{$pluralHumanName}'); ?>"; ?></h2>
<table cellpadding="0" cellspacing="0"> <table cellpadding="0" cellspacing="0">
<tr> <tr>
<?php foreach ($fields as $field):?> <?php foreach ($fields as $field): ?>
<th><?php echo "<?php echo \$this->Paginator->sort('{$field}');?>";?></th> <th><?php echo "<?php echo \$this->Paginator->sort('{$field}'); ?>"; ?></th>
<?php endforeach;?> <?php endforeach; ?>
<th class="actions"><?php echo "<?php echo __('Actions');?>";?></th> <th class="actions"><?php echo "<?php echo __('Actions'); ?>"; ?></th>
</tr> </tr>
<?php <?php
echo "<?php echo "<?php
@ -60,7 +60,7 @@
echo \$this->Paginator->counter(array( echo \$this->Paginator->counter(array(
'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}') 'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}')
)); ));
?>";?> ?>"; ?>
</p> </p>
<div class="paging"> <div class="paging">
@ -76,7 +76,7 @@
<div class="actions"> <div class="actions">
<h3><?php echo "<?php echo __('Actions'); ?>"; ?></h3> <h3><?php echo "<?php echo __('Actions'); ?>"; ?></h3>
<ul> <ul>
<li><?php echo "<?php echo \$this->Html->link(__('New " . $singularHumanName . "'), array('action' => 'add')); ?>";?></li> <li><?php echo "<?php echo \$this->Html->link(__('New " . $singularHumanName . "'), array('action' => 'add')); ?>"; ?></li>
<?php <?php
$done = array(); $done = array();
foreach ($associations as $type => $data) { foreach ($associations as $type => $data) {

30
lib/Cake/Console/Templates/default/views/view.ctp
View file

@ -16,8 +16,8 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
?> ?>
<div class="<?php echo $pluralVar;?> view"> <div class="<?php echo $pluralVar; ?> view">
<h2><?php echo "<?php echo __('{$singularHumanName}');?>";?></h2> <h2><?php echo "<?php echo __('{$singularHumanName}'); ?>"; ?></h2>
<dl> <dl>
<?php <?php
foreach ($fields as $field) { foreach ($fields as $field) {
@ -66,20 +66,20 @@ foreach ($fields as $field) {
if (!empty($associations['hasOne'])) : if (!empty($associations['hasOne'])) :
foreach ($associations['hasOne'] as $alias => $details): ?> foreach ($associations['hasOne'] as $alias => $details): ?>
<div class="related"> <div class="related">
<h3><?php echo "<?php echo __('Related " . Inflector::humanize($details['controller']) . "');?>";?></h3> <h3><?php echo "<?php echo __('Related " . Inflector::humanize($details['controller']) . "'); ?>"; ?></h3>
<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?> <?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])): ?>\n"; ?>
<dl> <dl>
<?php <?php
foreach ($details['fields'] as $field) { foreach ($details['fields'] as $field) {
echo "\t\t<dt><?php echo __('" . Inflector::humanize($field) . "');?></dt>\n"; echo "\t\t<dt><?php echo __('" . Inflector::humanize($field) . "'); ?></dt>\n";
echo "\t\t<dd>\n\t<?php echo \${$singularVar}['{$alias}']['{$field}'];?>\n&nbsp;</dd>\n"; echo "\t\t<dd>\n\t<?php echo \${$singularVar}['{$alias}']['{$field}']; ?>\n&nbsp;</dd>\n";
} }
?> ?>
</dl> </dl>
<?php echo "<?php endif; ?>\n";?> <?php echo "<?php endif; ?>\n"; ?>
<div class="actions"> <div class="actions">
<ul> <ul>
<li><?php echo "<?php echo \$this->Html->link(__('Edit " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?></li>\n";?> <li><?php echo "<?php echo \$this->Html->link(__('Edit " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?></li>\n"; ?>
</ul> </ul>
</div> </div>
</div> </div>
@ -99,8 +99,8 @@ foreach ($relations as $alias => $details):
$otherPluralHumanName = Inflector::humanize($details['controller']); $otherPluralHumanName = Inflector::humanize($details['controller']);
?> ?>
<div class="related"> <div class="related">
<h3><?php echo "<?php echo __('Related " . $otherPluralHumanName . "');?>";?></h3> <h3><?php echo "<?php echo __('Related " . $otherPluralHumanName . "'); ?>"; ?></h3>
<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?> <?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])): ?>\n"; ?>
<table cellpadding = "0" cellspacing = "0"> <table cellpadding = "0" cellspacing = "0">
<tr> <tr>
<?php <?php
@ -108,7 +108,7 @@ foreach ($relations as $alias => $details):
echo "\t\t<th><?php echo __('" . Inflector::humanize($field) . "'); ?></th>\n"; echo "\t\t<th><?php echo __('" . Inflector::humanize($field) . "'); ?></th>\n";
} }
?> ?>
<th class="actions"><?php echo "<?php echo __('Actions');?>";?></th> <th class="actions"><?php echo "<?php echo __('Actions'); ?>"; ?></th>
</tr> </tr>
<?php <?php
echo "\t<?php echo "\t<?php
@ -116,7 +116,7 @@ echo "\t<?php
foreach (\${$singularVar}['{$alias}'] as \${$otherSingularVar}): ?>\n"; foreach (\${$singularVar}['{$alias}'] as \${$otherSingularVar}): ?>\n";
echo "\t\t<tr>\n"; echo "\t\t<tr>\n";
foreach ($details['fields'] as $field) { foreach ($details['fields'] as $field) {
echo "\t\t\t<td><?php echo \${$otherSingularVar}['{$field}'];?></td>\n"; echo "\t\t\t<td><?php echo \${$otherSingularVar}['{$field}']; ?></td>\n";
} }
echo "\t\t\t<td class=\"actions\">\n"; echo "\t\t\t<td class=\"actions\">\n";
@ -129,11 +129,11 @@ echo "\t<?php
echo "\t<?php endforeach; ?>\n"; echo "\t<?php endforeach; ?>\n";
?> ?>
</table> </table>
<?php echo "<?php endif; ?>\n\n";?> <?php echo "<?php endif; ?>\n\n"; ?>
<div class="actions"> <div class="actions">
<ul> <ul>
<li><?php echo "<?php echo \$this->Html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add'));?>";?> </li> <li><?php echo "<?php echo \$this->Html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>"; ?> </li>
</ul> </ul>
</div> </div>
</div> </div>
<?php endforeach;?> <?php endforeach; ?>

4
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
View file

@ -20,11 +20,11 @@
<html> <html>
<head> <head>
<title><?php echo $title_for_layout;?></title> <title><?php echo $title_for_layout; ?></title>
</head> </head>
<body> <body>
<?php echo $this->fetch('content');?> <?php echo $this->fetch('content'); ?>
<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p> <p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
</body> </body>

2
lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp
View file

@ -17,6 +17,6 @@
*/ */
?> ?>
<?php echo $this->fetch('content');?> <?php echo $this->fetch('content'); ?>
This email was sent using the CakePHP Framework, http://cakephp.org. This email was sent using the CakePHP Framework, http://cakephp.org.

2
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
View file

@ -116,7 +116,7 @@ if (isset($filePresent)):
endif; endif;
?> ?>
</p> </p>
<?php endif;?> <?php endif; ?>
<?php <?php
App::uses('Validation', 'Utility'); App::uses('Validation', 'Utility');
if (!Validation::alphaNumeric('cakephp')) { if (!Validation::alphaNumeric('cakephp')) {

4
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
View file

@ -2371,10 +2371,10 @@ class MysqlTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testConditionsOptionalArguments() { public function testConditionsOptionalArguments() {
$result = $this->Dbo->conditions( array('Member.name' => 'Mariano'), true, false); $result = $this->Dbo->conditions(array('Member.name' => 'Mariano'), true, false);
$this->assertRegExp('/^\s*`Member`.`name`\s*=\s*\'Mariano\'\s*$/', $result); $this->assertRegExp('/^\s*`Member`.`name`\s*=\s*\'Mariano\'\s*$/', $result);
$result = $this->Dbo->conditions( array(), true, false); $result = $this->Dbo->conditions(array(), true, false);
$this->assertRegExp('/^\s*1\s*=\s*1\s*$/', $result); $this->assertRegExp('/^\s*1\s*=\s*1\s*$/', $result);
} }

2
lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
View file

@ -869,7 +869,7 @@ class CakeRouteTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testParseTrailingUTF8() { public function testParseTrailingUTF8() {
$route = new CakeRoute( '/category/**', array('controller' => 'categories','action' => 'index')); $route = new CakeRoute('/category/**', array('controller' => 'categories','action' => 'index'));
$result = $route->parse('/category/%D9%85%D9%88%D8%A8%D8%A7%DB%8C%D9%84'); $result = $route->parse('/category/%D9%85%D9%88%D8%A8%D8%A7%DB%8C%D9%84');
$expected = array( $expected = array(
'controller' => 'categories', 'controller' => 'categories',

2
lib/Cake/Test/Case/Utility/CakeNumberTest.php
View file

@ -228,7 +228,7 @@ class CakeNumberTest extends CakeTestCase {
$this->Number->addFormat('Other2', array('before' => '$ ', 'after' => false)); $this->Number->addFormat('Other2', array('before' => '$ ', 'after' => false));
$result = $this->Number->currency(0.22, 'Other2'); $result = $this->Number->currency(0.22, 'Other2');
$expected = '$ 0.22'; $expected = '$ 0.22';
$this->assertEquals($expected,$result); $this->assertEquals($expected, $result);
} }
/** /**

2
lib/Cake/Test/Case/Utility/CakeTimeTest.php
View file

@ -212,7 +212,7 @@ class CakeTimeTest extends CakeTestCase {
if ($time == time()) { if ($time == time()) {
$expected = 'just now'; $expected = 'just now';
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} else if (date("Y-m-d", $time) == date("Y-m-d")) { } elseif (date("Y-m-d", $time) == date("Y-m-d")) {
$expected = 'Today, ' . date("H:i", $time); $expected = 'Today, ' . date("H:i", $time);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }

2
lib/Cake/Test/Case/Utility/HashTest.php
View file

@ -1196,7 +1196,7 @@ class HashTest extends CakeTestCase {
$expected = array( $expected = array(
'Some' => array( 'Some' => array(
'string' => array( 'string' => array(
'value' => array( 'values') 'value' => array('values')
) )
) )
); );

2
lib/Cake/Test/Case/Utility/SetTest.php
View file

@ -1445,7 +1445,7 @@ class SetTest extends CakeTestCase {
); );
$result = Set::extract($a, '{n}.Article.id'); $result = Set::extract($a, '{n}.Article.id');
$expected = array( 1, 2, 3 ); $expected = array(1, 2, 3);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::extract($a, '{n}.Article.title'); $result = Set::extract($a, '{n}.Article.title');

2
lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
View file

@ -581,7 +581,7 @@ class PaginatorHelperTest extends CakeTestCase {
Router::parse('/'); Router::parse('/');
Router::setRequestInfo( array( Router::setRequestInfo(array(
array('controller' => 'posts', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null), array('controller' => 'posts', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
array('base' => '', 'here' => 'posts/index', 'webroot' => '/') array('base' => '', 'here' => 'posts/index', 'webroot' => '/')
)); ));

4
lib/Cake/Test/test_app/View/Layouts/Emails/html/default.ctp
View file

@ -20,11 +20,11 @@
<html> <html>
<head> <head>
<title><?php echo $title_for_layout;?></title> <title><?php echo $title_for_layout; ?></title>
</head> </head>
<body> <body>
<?php echo $content_for_layout;?> <?php echo $content_for_layout; ?>
<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p> <p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
</body> </body>

4
lib/Cake/Test/test_app/View/Layouts/Emails/html/japanese.ctp
View file

@ -20,11 +20,11 @@
<html> <html>
<head> <head>
<title><?php echo $title_for_layout;?></title> <title><?php echo $title_for_layout; ?></title>
</head> </head>
<body> <body>
<?php echo $content_for_layout;?> <?php echo $content_for_layout; ?>
<p>このメールは <a href="http://cakephp.org">CakePHP Framework</a> を利用して送信しました。</p> <p>このメールは <a href="http://cakephp.org">CakePHP Framework</a> を利用して送信しました。</p>
</body> </body>

4
lib/Cake/Test/test_app/View/Layouts/Emails/html/thin.ctp
View file

@ -20,11 +20,11 @@
<html> <html>
<head> <head>
<title><?php echo $title_for_layout;?></title> <title><?php echo $title_for_layout; ?></title>
</head> </head>
<body> <body>
<?php echo $content_for_layout;?> <?php echo $content_for_layout; ?>
<p>This email was sent using the CakePHP Framework</p> <p>This email was sent using the CakePHP Framework</p>
</body> </body>

2
lib/Cake/Test/test_app/View/Layouts/Emails/text/default.ctp
View file

@ -17,6 +17,6 @@
*/ */
?> ?>
<?php echo $content_for_layout;?> <?php echo $content_for_layout; ?>
This email was sent using the CakePHP Framework, http://cakephp.org. This email was sent using the CakePHP Framework, http://cakephp.org.

2
lib/Cake/Test/test_app/View/Layouts/Emails/text/japanese.ctp
View file

@ -17,6 +17,6 @@
*/ */
?> ?>
<?php echo $content_for_layout;?> <?php echo $content_for_layout; ?>
CakePHP Framework を使って送信したメールです。 http://cakephp.org. CakePHP Framework を使って送信したメールです。 http://cakephp.org.

2
lib/Cake/Test/test_app/View/Pages/home.ctp
View file

@ -85,7 +85,7 @@ if (isset($filePresent)):
endif; endif;
?> ?>
</p> </p>
<?php endif;?> <?php endif; ?>
<?php <?php
App::uses('Validation', 'Utility'); App::uses('Validation', 'Utility');
if (!Validation::alphaNumeric('cakephp')) { if (!Validation::alphaNumeric('cakephp')) {

6
lib/Cake/Test/test_app/View/Posts/cache_form.ctp
View file

@ -1,14 +1,14 @@
<div class="users form"> <div class="users form">
<!--nocache--> <!--nocache-->
<?php echo $this->Form->create('User');?> <?php echo $this->Form->create('User'); ?>
<fieldset> <fieldset>
<legend><?php echo __('Add User');?></legend> <legend><?php echo __('Add User'); ?></legend>
<?php <?php
echo $this->Form->input('username'); echo $this->Form->input('username');
echo $this->Form->input('email'); echo $this->Form->input('email');
echo $this->Form->input('password'); echo $this->Form->input('password');
?> ?>
</fieldset> </fieldset>
<?php echo $this->Form->end('Submit');?> <?php echo $this->Form->end('Submit'); ?>
<!--/nocache--> <!--/nocache-->
</div> </div>

10
lib/Cake/TestSuite/templates/menu.php
View file

@ -22,7 +22,7 @@
<li> <li>
<span style="font-size: 18px">App</span> <span style="font-size: 18px">App</span>
<ul> <ul>
<li><a href='<?php echo $cases;?>'>Tests</a></li> <li><a href='<?php echo $cases; ?>'>Tests</a></li>
</ul> </ul>
</li> </li>
<?php if (!empty($plugins)): ?> <?php if (!empty($plugins)): ?>
@ -31,19 +31,19 @@
<?php foreach ($plugins as $plugin): ?> <?php foreach ($plugins as $plugin): ?>
<ul> <ul>
<li style="padding-top: 10px"> <li style="padding-top: 10px">
<span style="font-size: 18px"><?php echo $plugin;?></span> <span style="font-size: 18px"><?php echo $plugin; ?></span>
<ul> <ul>
<li><a href='<?php echo $cases;?>&amp;plugin=<?php echo $plugin; ?>'>Tests</a></li> <li><a href='<?php echo $cases; ?>&amp;plugin=<?php echo $plugin; ?>'>Tests</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<?php endforeach; ?> <?php endforeach; ?>
</li> </li>
<?php endif;?> <?php endif; ?>
<li style="padding-top: 10px"> <li style="padding-top: 10px">
<span style="font-size: 18px">Core</span> <span style="font-size: 18px">Core</span>
<ul> <ul>
<li><a href='<?php echo $cases;?>&amp;core=true'>Tests</a></li> <li><a href='<?php echo $cases; ?>&amp;core=true'>Tests</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>

2
lib/Cake/Utility/File.php
View file

@ -366,7 +366,7 @@ class File {
if (!$ext) { if (!$ext) {
$ext = $this->ext(); $ext = $this->ext();
} }
return preg_replace( "/(?:[^\w\.-]+)/", "_", basename($name, $ext)); return preg_replace("/(?:[^\w\.-]+)/", "_", basename($name, $ext));
} }
/** /**

4
lib/Cake/Utility/Inflector.php
View file

@ -406,8 +406,8 @@ class Inflector {
} }
if (!isset(self::$_singular['cacheUninflected']) || !isset(self::$_singular['cacheIrregular'])) { if (!isset(self::$_singular['cacheUninflected']) || !isset(self::$_singular['cacheIrregular'])) {
self::$_singular['cacheUninflected'] = '(?:' . join( '|', self::$_singular['merged']['uninflected']) . ')'; self::$_singular['cacheUninflected'] = '(?:' . join('|', self::$_singular['merged']['uninflected']) . ')';
self::$_singular['cacheIrregular'] = '(?:' . join( '|', array_keys(self::$_singular['merged']['irregular'])) . ')'; self::$_singular['cacheIrregular'] = '(?:' . join('|', array_keys(self::$_singular['merged']['irregular'])) . ')';
} }
if (preg_match('/(.*)\\b(' . self::$_singular['cacheIrregular'] . ')$/i', $word, $regs)) { if (preg_match('/(.*)\\b(' . self::$_singular['cacheIrregular'] . ')$/i', $word, $regs)) {

4
lib/Cake/View/Errors/missing_action.ctp
View file

@ -26,10 +26,10 @@
</p> </p>
<pre> <pre>
&lt;?php &lt;?php
class <?php echo $controller;?> extends AppController { class <?php echo $controller; ?> extends AppController {
<strong> <strong>
public function <?php echo $action;?>() { public function <?php echo $action; ?>() {
} }
</strong> </strong>

2
lib/Cake/View/Helper/CacheHelper.php
View file

@ -313,7 +313,7 @@ class CacheHelper extends AppHelper {
$this->loadHelpers(); $this->loadHelpers();
extract($this->viewVars, EXTR_SKIP); extract($this->viewVars, EXTR_SKIP);
?>'; ?>';
$content = preg_replace("/(<\\?xml)/", "<?php echo '$1';?>", $content); $content = preg_replace("/(<\\?xml)/", "<?php echo '$1'; ?>", $content);
$file .= $content; $file .= $content;
return cache('views' . DS . $cache, $file, $timestamp); return cache('views' . DS . $cache, $file, $timestamp);
} }

6
lib/Cake/View/Scaffolds/form.ctp
View file

@ -16,7 +16,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
?> ?>
<div class="<?php echo $pluralVar;?> form"> <div class="<?php echo $pluralVar; ?> form">
<?php <?php
echo $this->Form->create(); echo $this->Form->create();
echo $this->Form->inputs($scaffoldFields, array('created', 'modified', 'updated')); echo $this->Form->inputs($scaffoldFields, array('created', 'modified', 'updated'));
@ -33,8 +33,8 @@
null, null,
__d('cake', 'Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey))); __d('cake', 'Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey)));
?></li> ?></li>
<?php endif;?> <?php endif; ?>
<li><?php echo $this->Html->link(__d('cake', 'List') . ' ' . $pluralHumanName, array('action' => 'index'));?></li> <li><?php echo $this->Html->link(__d('cake', 'List') . ' ' . $pluralHumanName, array('action' => 'index')); ?></li>
<?php <?php
$done = array(); $done = array();
foreach ($associations as $_type => $_data) { foreach ($associations as $_type => $_data) {

12
lib/Cake/View/Scaffolds/index.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
?> ?>
<div class="<?php echo $pluralVar;?> index"> <div class="<?php echo $pluralVar; ?> index">
<h2><?php echo $pluralHumanName;?></h2> <h2><?php echo $pluralHumanName; ?></h2>
<table cellpadding="0" cellspacing="0"> <table cellpadding="0" cellspacing="0">
<tr> <tr>
<?php foreach ($scaffoldFields as $_field):?> <?php foreach ($scaffoldFields as $_field): ?>
<th><?php echo $this->Paginator->sort($_field);?></th> <th><?php echo $this->Paginator->sort($_field); ?></th>
<?php endforeach;?> <?php endforeach; ?>
<th><?php echo __d('cake', 'Actions');?></th> <th><?php echo __d('cake', 'Actions'); ?></th>
</tr> </tr>
<?php <?php
$i = 0; $i = 0;

12
lib/Cake/View/Scaffolds/view.ctp
View file

@ -16,7 +16,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
?> ?>
<div class="<?php echo $pluralVar;?> view"> <div class="<?php echo $pluralVar; ?> view">
<h2><?php echo __d('cake', 'View %s', $singularHumanName); ?></h2> <h2><?php echo __d('cake', 'View %s', $singularHumanName); ?></h2>
<dl> <dl>
<?php <?php
@ -68,7 +68,7 @@ if (!empty($associations['hasOne'])) :
foreach ($associations['hasOne'] as $_alias => $_details): ?> foreach ($associations['hasOne'] as $_alias => $_details): ?>
<div class="related"> <div class="related">
<h3><?php echo __d('cake', "Related %s", Inflector::humanize($_details['controller'])); ?></h3> <h3><?php echo __d('cake', "Related %s", Inflector::humanize($_details['controller'])); ?></h3>
<?php if (!empty(${$singularVar}[$_alias])):?> <?php if (!empty(${$singularVar}[$_alias])): ?>
<dl> <dl>
<?php <?php
$i = 0; $i = 0;
@ -82,7 +82,7 @@ foreach ($associations['hasOne'] as $_alias => $_details): ?>
<?php endif; ?> <?php endif; ?>
<div class="actions"> <div class="actions">
<ul> <ul>
<li><?php echo $this->Html->link(__d('cake', 'Edit %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."</li>\n";?> <li><?php echo $this->Html->link(__d('cake', 'Edit %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."</li>\n"; ?>
</ul> </ul>
</div> </div>
</div> </div>
@ -103,7 +103,7 @@ $otherSingularVar = Inflector::variable($_alias);
?> ?>
<div class="related"> <div class="related">
<h3><?php echo __d('cake', "Related %s", Inflector::humanize($_details['controller'])); ?></h3> <h3><?php echo __d('cake', "Related %s", Inflector::humanize($_details['controller'])); ?></h3>
<?php if (!empty(${$singularVar}[$_alias])):?> <?php if (!empty(${$singularVar}[$_alias])): ?>
<table cellpadding="0" cellspacing="0"> <table cellpadding="0" cellspacing="0">
<tr> <tr>
<?php <?php
@ -139,8 +139,8 @@ $otherSingularVar = Inflector::variable($_alias);
<?php endif; ?> <?php endif; ?>
<div class="actions"> <div class="actions">
<ul> <ul>
<li><?php echo $this->Html->link(__d('cake', "New %s", Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'));?> </li> <li><?php echo $this->Html->link(__d('cake', "New %s", Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')); ?> </li>
</ul> </ul>
</div> </div>
</div> </div>
<?php endforeach;?> <?php endforeach; ?>