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

Sync skel and app directories.

Browse source 
Closes #1698
This commit is contained in:
mark_story 2013-10-22 22:18:59 -04:00
parent 75624c0279
commit 328fcdc376
9 changed files with 42 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Config/database.php.default
View file

@ -1,9 +1,5 @@
<?php
/**
* This is core configuration file.
*
* Use it to configure core behaviour of CakePHP.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@ -18,8 +14,11 @@
* @package app.Config
* @since CakePHP(tm) v 0.2.9
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*
*/
/**
* Database configuration class.
*
* You can specify multiple configurations for production, development and testing.
*
* datasource => The name of a supported datasource; valid options are as follows:
@ -43,7 +42,8 @@
* on a per-table basis with the Model::$tablePrefix property.
*
* schema =>
* For Postgres/Sqlserver specifies which schema you would like to use the tables in. Postgres defaults to 'public'. For Sqlserver, it defaults to empty and use
* For Postgres/Sqlserver specifies which schema you would like to use the tables in.
* Postgres defaults to 'public'. For Sqlserver, it defaults to empty and use
* the connected user's default schema (typically 'dbo').
*
* encoding =>

10
app/Config/email.php.default
View file

@ -1,9 +1,5 @@
<?php
/**
* This is email configuration file.
*
* Use it to configure email transports of CakePHP.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@ -18,6 +14,12 @@
* @package app.Config
* @since CakePHP(tm) v 2.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
/**
* This is email configuration file.
*
* Use it to configure email transports of CakePHP.
*
* Email configuration class.
* You can specify multiple configurations for production, development and testing.

1
app/Console/cake.php
View file

@ -18,6 +18,7 @@
* @since CakePHP(tm) v 2.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
$ds = DIRECTORY_SEPARATOR;
$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';

2
app/webroot/index.php
View file

@ -78,7 +78,7 @@ if (!defined('WWW_ROOT')) {
}
// for built-in server
if (php_sapi_name() == 'cli-server') {
if (php_sapi_name() === 'cli-server') {
if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
return false;
}

6
lib/Cake/Console/Templates/skel/Config/bootstrap.php
View file

@ -45,7 +45,7 @@ Cache::config('default', array('engine' => 'File'));
*/
/**
* Custom Inflector rules, can be set to correctly pluralize or singularize table, model, controller names or whatever other
* Custom Inflector rules can be set to correctly pluralize or singularize table, model, controller names or whatever other
* string is passed to the inflection functions
*
* Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
@ -55,7 +55,7 @@ Cache::config('default', array('engine' => 'File'));
/**
* Plugins need to be loaded manually, you can either load them one by one or all of them in a single call
* Uncomment one of the lines below, as you need. make sure you read the documentation on CakePlugin to use more
* Uncomment one of the lines below, as you need. Make sure you read the documentation on CakePlugin to use more
* advanced ways of loading plugins
*
* CakePlugin::loadAll(); // Loads all plugins at once
@ -64,7 +64,7 @@ Cache::config('default', array('engine' => 'File'));
*/
/**
* You can attach event listeners to the request lifecycle as Dispatcher Filter . By Default CakePHP bundles two filters:
* You can attach event listeners to the request lifecycle as Dispatcher Filter . By default CakePHP bundles two filters:
*
* - AssetDispatcher filter will serve your asset files (css, images, js, etc) from your themes and plugins
* - CacheDispatcher filter will read the Cache.check configure variable and try to serve cached content generated from controllers

10
lib/Cake/Console/Templates/skel/Config/database.php.default
View file

@ -1,9 +1,5 @@
<?php
/**
* This is core configuration file.
*
* Use it to configure core behaviour of Cake.
*
* PHP 5
*
* @link http://cakephp.org CakePHP(tm) Project
@ -45,6 +41,12 @@
*
* unix_socket =>
* For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port`
* settings =>
* Array of key/value pairs, on connection it executes SET statements for each pair
* For MySQL : http://dev.mysql.com/doc/refman/5.6/en/set-statement.html
* For Postgres : http://www.postgresql.org/docs/9.2/static/sql-set.html
* For Sql Server : http://msdn.microsoft.com/en-us/library/ms190356.aspx
*/
class DATABASE_CONFIG {

4
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
View file

@ -14,9 +14,9 @@
<?php echo $this->Html->charset(); ?>
<title><?php echo $page_title; ?></title>
<?php if (Configure::read('debug') == 0) { ?>
<?php if (Configure::read('debug') == 0): ?>
<meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
<?php } ?>
<?php endif ?>
<style><!--
P { text-align:center; font:bold 1.1em sans-serif }
A { color:#444; text-decoration:none }

9
lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp
View file

@ -1,14 +1,13 @@
<?php
if (!isset($channel)) {
if (!isset($channel)):
$channel = array();
}
if (!isset($channel['title'])) {
endif;
if (!isset($channel['title'])):
$channel['title'] = $title_for_layout;
}
endif;
echo $this->Rss->document(
$this->Rss->channel(
array(), $channel, $this->fetch('content')
)
);
?>