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

Applying patch from 'ryandesign' fixing incorrect datetime formats. Fixes #1441

Browse source
This commit is contained in:
mark_story 2011-01-11 20:16:42 -05:00
parent 4f94b715ec
commit f893e3b63b
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/console/templates/default/classes/fixture.ctp
View file

@ -21,7 +21,7 @@
*/ */
?> ?>
<?php echo '<?php' . "\n"; ?> <?php echo '<?php' . "\n"; ?>
/* <?php echo $model; ?> Fixture generated on: <?php echo date('Y-m-d H:m:s') . " : ". time(); ?> */ /* <?php echo $model; ?> Fixture generated on: <?php echo date('Y-m-d H:i:s') . " : ". time(); ?> */
class <?php echo $model; ?>Fixture extends CakeTestFixture { class <?php echo $model; ?>Fixture extends CakeTestFixture {
var $name = '<?php echo $model; ?>'; var $name = '<?php echo $model; ?>';
<?php if ($table): ?> <?php if ($table): ?>

2
cake/console/templates/default/classes/test.ctp
View file

@ -19,7 +19,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
echo "<?php\n"; echo "<?php\n";
echo "/* ". $className ." Test cases generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n"; echo "/* ". $className ." Test cases generated on: " . date('Y-m-d H:i:s') . " : ". time() . "*/\n";
?> ?>
App::import('<?php echo $type; ?>', '<?php echo $plugin . $className;?>'); App::import('<?php echo $type; ?>', '<?php echo $plugin . $className;?>');

2
cake/libs/model/cake_schema.php
View file

@ -379,7 +379,7 @@ class CakeSchema extends Object {
$File =& new File($path . DS . $file, true); $File =& new File($path . DS . $file, true);
$header = '$Id'; $header = '$Id';
$content = "<?php \n/* SVN FILE: {$header}$ */\n/* {$name} schema generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>"; $content = "<?php \n/* {$name} schema generated on: " . date('Y-m-d H:i:s') . " : ". time() . "*/\n{$out}?>";
$content = $File->prepare($content); $content = $File->prepare($content);
if ($File->write($content)) { if ($File->write($content)) {
return $content; return $content;

1
cake/tests/cases/libs/model/model_write.test.php
View file

@ -1586,7 +1586,6 @@ class ModelWriteTest extends BaseModelTest {
); );
$TestModel->save($data); $TestModel->save($data);
$result = $TestModel->read(null, 1); $result = $TestModel->read(null, 1);
$time = date('Y-M-D H:i:s');
$expected = array(4, 5); $expected = array(4, 5);
$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected); $this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected);
$expected = array('new record', 'new record'); $expected = array('new record', 'new record');