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

correct a few missing constant replacements

Browse source
This commit is contained in:
AD7six 2011-05-15 18:49:38 +02:00
parent ef684c3d94
commit 8e27cf992f
6 changed files with 8 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Core/App.php
View file

@ -411,7 +411,7 @@ class App {
* @return string full path to package * @return string full path to package
*/ */
public static function core($type) { public static function core($type) {
return array(LIBS . str_replace('/', DS, $type) . DS); return array(CAKE . str_replace('/', DS, $type) . DS);
} }
/** /**

2
lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
View file

@ -470,7 +470,7 @@ class SchemaShellTest extends CakeTestCase {
*/ */
public function testPluginDotSyntaxWithCreate() { public function testPluginDotSyntaxWithCreate() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->Shell->params = array( $this->Shell->params = array(

2
lib/Cake/Test/Case/Console/TaskCollectionTest.php
View file

@ -88,7 +88,7 @@ class TaskCollectionTest extends CakeTestCase {
$dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false); $dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false);
$shell = $this->getMock('Shell', array(), array(), '', false); $shell = $this->getMock('Shell', array(), array(), '', false);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->Tasks = new TaskCollection($shell, $dispatcher); $this->Tasks = new TaskCollection($shell, $dispatcher);

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

@ -530,7 +530,7 @@ class CakeSessionTest extends CakeTestCase {
'Model/Datasource/Session' => array( 'Model/Datasource/Session' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
), ),
'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
Configure::write('Session', array( Configure::write('Session', array(
'defaults' => 'cake', 'defaults' => 'cake',
@ -551,7 +551,7 @@ class CakeSessionTest extends CakeTestCase {
*/ */
function testUsingPluginHandler() { function testUsingPluginHandler() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
Configure::write('Session', array( Configure::write('Session', array(

6
lib/Cake/Test/Case/View/ViewTest.php
View file

@ -195,7 +195,7 @@ class ViewTest extends CakeTestCase {
$this->PostsController->index(); $this->PostsController->index();
$this->View = new View($this->PostsController); $this->View = new View($this->PostsController);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array( 'View' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS
) )
@ -283,8 +283,8 @@ class ViewTest extends CakeTestCase {
$View = new TestView($this->Controller); $View = new TestView($this->Controller);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS) 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
)); ));
$pluginPath = CakePlugin::path('TestPlugin'); $pluginPath = CakePlugin::path('TestPlugin');

142
lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
View file

@ -1,142 +0,0 @@
<?php
/**
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package cake.libs.view.templates.pages
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<p>
<!--nocache-->
<span class="notice">
<?php
echo __d('cake', 'Your tmp directory is ');
if (is_writable(TMP)):
echo __d('cake', 'writable.');
else:
echo __d('cake', 'NOT writable.');
endif;
?>
</span>
<!--/nocache-->
</p>
<p>
<span class="notice">
<?php
echo __d('cake', 'Your cache is ');
if (Cache::isInitialized('default')):
echo __d('cake', 'set up and initialized properly.');
$settings = Cache::settings();
echo '<p>' . $settings['engine'];
echo __d('cake', ' is being used to cache, to change this edit config/core.php ');
echo '</p>';
echo 'Settings: <ul>';
foreach ($settings as $name => $value):
echo '<li>' . $name . ': ' . $value . '</li>';
endforeach;
echo '</ul>';
else:
echo __d('cake', 'NOT working.');
echo '<br />';
if (is_writable(TMP)):
echo __d('cake', 'Edit: config/core.php to insure you have the newset version of this file and the variable $cakeCache set properly');
endif;
endif;
?>
</span>
</p>
<p>
<span class="notice">
<?php
echo __d('cake', 'Your database configuration file is ');
$filePresent = null;
if (file_exists(APP . 'Config' . DS.'database.php')):
echo __d('cake', 'present.');
$filePresent = true;
else:
echo __d('cake', 'NOT present.');
echo '<br/>';
echo __d('cake', 'Rename config/database.php.default to config/database.php');
endif;
?>
</span>
</p>
<?php
if (!empty($filePresent)):
if (!class_exists('ConnectionManager')) {
require LIBS . 'model' . DS . 'connection_manager.php';
}
$connected = ConnectionManager::getDataSource('default');
?>
<p>
<span class="notice">
<?php
__d('cake', 'Cake');
if ($connected->isConnected()):
__d('cake', ' is able to ');
else:
__d('cake', ' is NOT able to ');
endif;
__d('cake', 'connect to the database.');
?>
</span>
</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>
<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/.'); ?>
</p>
<h2><?php __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>
</p>
<h2><?php __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.'); ?>
</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.'); ?>
</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="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
<ul><li><?php __d('cake', 'Live chat about CakePHP'); ?></li></ul></li>
</ul>