Skip to content

Commit 514d967

Browse files
ravage84ravage84
committed
Updated .gitignore, synced app & skel
Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!) Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync Fixed various @Package annotations in \app\ Fixed various @Package annotations in \lib\Cake\Console\Templates\skel\
1 parent 431e610 commit 514d967

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+118
-113
lines changed

‎.gitignore

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1-
/app/Config
1+
# User specific & automatically generated files #
2+
#################################################
3+
/app/Config/database.php
24
/app/tmp
35
/lib/Cake/Console/Templates/skel/tmp/
46
/plugins
57
/vendors
68
/build
79
/dist
8-
.DS_Store
910
/tags
11+
12+
# OS generated files #
13+
######################
14+
.DS_Store
15+
.DS_Store?
16+
._*
17+
.Spotlight-V100
18+
.Trashes
19+
Icon?
20+
ehthumbs.db
21+
Thumbs.db

‎app/Config/Schema/i18n.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,15 @@
2020
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
2121
*/
2222

23-
// @codingStandardsIgnoreStart
24-
25-
/*
23+
/**
2624
*
2725
* Using the Schema command line utility
2826
*
2927
* Use it to configure database for i18n
3028
*
3129
* cake schema run create i18n
3230
*/
33-
class i18nSchema extends CakeSchema {
34-
35-
// @codingStandardsIgnoreEnd
31+
class I18nSchema extends CakeSchema {
3632

3733
public $name = 'i18n';
3834

‎app/Config/core.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
*
9696
* And uncomment the App.baseUrl below. But keep in mind
9797
* that plugin assets such as images, CSS and Javascript files
98-
* will not work without url rewriting
98+
* will not work without url rewriting!
9999
* To work around this issue you should either symlink or copy
100100
* the plugin assets into you app's webroot directory. This is
101101
* recommended even when you are using mod_rewrite. Handling static

‎app/Config/database.php.default

-6
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@
1818
* @package app.Config
1919
* @since CakePHP(tm) v 0.2.9
2020
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
21-
*/
22-
/**
23-
* In this file you set up your database connection details.
2421
*
25-
* @package cake.config
26-
*/
27-
/**
2822
* Database configuration class.
2923
* You can specify multiple configurations for production, development and testing.
3024
*

‎app/Config/email.php.default

-6
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@
1818
* @package app.Config
1919
* @since CakePHP(tm) v 2.0.0
2020
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
21-
*/
22-
/**
23-
* In this file you set up your send email details.
2421
*
25-
* @package cake.config
26-
*/
27-
/**
2822
* Email configuration class.
2923
* You can specify multiple configurations for production, development and testing.
3024
*

‎app/Console/cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1515
# @link http://cakephp.org CakePHP(tm) Project
16-
# @package cake.Console
16+
# @package app.Console
1717
# @since CakePHP(tm) v 1.2.0.5012
1818
# @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1919
#

‎app/Console/cake.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
::
1212
:: @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1313
:: @link http://cakephp.org CakePHP(tm) Project
14-
:: @package app.Console
14+
:: @package app.Console
1515
:: @since CakePHP(tm) v 2.0
1616
:: @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1717
::

‎app/Console/cake.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323

2424
if (function_exists('ini_set')) {
2525
$root = dirname(dirname(dirname(__FILE__)));
26+
27+
// the following line differs from its sibling
28+
// /lib/Cake/Console/Templates/skel/Console/cake.php
2629
ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
2730
}
2831

29-
if (!include ($dispatcher)) {
32+
if (!include($dispatcher)) {
3033
trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
3134
}
3235
unset($paths, $path, $dispatcher, $root, $ds);

‎app/Controller/AppController.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* @since CakePHP(tm) v 0.2.9
2121
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
2222
*/
23-
2423
App::uses('Controller', 'Controller');
2524

2625
/**
@@ -29,8 +28,8 @@
2928
* Add your application-wide methods in the class below, your controllers
3029
* will inherit them.
3130
*
32-
* @package app.Controller
33-
* @link http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
31+
* @package app.Controller
32+
* @link http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
3433
*/
3534
class AppController extends Controller {
3635
}

‎app/Controller/PagesController.php

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
* @since CakePHP(tm) v 0.2.9
2020
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
2121
*/
22-
2322
App::uses('AppController', 'Controller');
2423

2524
/**

‎app/View/Emails/html/default.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Emails.html
15+
* @package app.View.Emails.html
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/

‎app/View/Emails/text/default.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Emails.text
15+
* @package app.View.Emails.text
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/

‎app/View/Errors/error400.ctp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Errors
15+
* @package app.View.Errors
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/
@@ -26,7 +26,7 @@
2626
); ?>
2727
</p>
2828
<?php
29-
if (Configure::read('debug') > 0 ):
29+
if (Configure::read('debug') > 0):
3030
echo $this->element('exception_stack_trace');
3131
endif;
3232
?>

‎app/View/Errors/error500.ctp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Errors
15+
* @package app.View.Errors
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/
@@ -23,7 +23,7 @@
2323
<?php echo __d('cake', 'An Internal Error Has Occurred.'); ?>
2424
</p>
2525
<?php
26-
if (Configure::read('debug') > 0 ):
26+
if (Configure::read('debug') > 0):
2727
echo $this->element('exception_stack_trace');
2828
endif;
2929
?>

‎app/View/Helper/AppHelper.php

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* @since CakePHP(tm) v 0.2.9
2121
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
2222
*/
23-
2423
App::uses('Helper', 'View');
2524

2625
/**

‎app/View/Layouts/Emails/html/default.ctp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Layouts.Emails.html
15+
* @package app.View.Layouts.Email.html
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/
1919
?>
2020
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
2121
<html>
2222
<head>
23-
<title><?php echo $title_for_layout;?></title>
23+
<title><?php echo $title_for_layout; ?></title>
2424
</head>
2525
<body>
26-
<?php echo $this->fetch('content');?>
26+
<?php echo $this->fetch('content'); ?>
2727

2828
<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
2929
</body>

‎app/View/Layouts/Emails/text/default.ctp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Layouts.Emails.text
15+
* @package app.View.Layouts.Email.text
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/
1919
?>
20-
<?php echo $this->fetch('content');?>
20+
<?php echo $this->fetch('content'); ?>
2121

2222
This email was sent using the CakePHP Framework, http://cakephp.org.

‎app/View/Layouts/ajax.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Layouts
15+
* @package app.View.Layouts
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/

‎app/View/Layouts/default.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Layouts
15+
* @package app.View.Layouts
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/

‎app/View/Layouts/error.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Layouts
15+
* @package app.View.Layouts
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/

‎app/View/Layouts/flash.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Layouts
15+
* @package app.View.Layouts
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/

‎app/View/Pages/home.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1414
* @link http://cakephp.org CakePHP(tm) Project
15-
* @package Cake.View.Pages
15+
* @package app.View.Pages
1616
* @since CakePHP(tm) v 0.10.0.1076
1717
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
1818
*/

‎app/webroot/index.php

+13-7
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
if (!defined('ROOT')) {
4040
define('ROOT', dirname(dirname(dirname(__FILE__))));
4141
}
42+
4243
/**
4344
* The actual directory name for the "app".
4445
*
@@ -53,12 +54,15 @@
5354
* Un-comment this line to specify a fixed path to CakePHP.
5455
* This should point at the directory containing `Cake`.
5556
*
56-
* For ease of development CakePHP uses PHP's include_path. If you
57+
* For ease of development CakePHP uses PHP's include_path. If you
5758
* cannot modify your include_path set this value.
5859
*
5960
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
61+
*
62+
* The following line differs from its sibling
63+
* /lib/Cake/Console/Templates/skel/webroot/index.php
6064
*/
61-
//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
65+
//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
6266

6367
/**
6468
* Editing below this line should NOT be necessary.
@@ -84,20 +88,22 @@
8488
if (function_exists('ini_set')) {
8589
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
8690
}
87-
if (!include ('Cake' . DS . 'bootstrap.php')) {
91+
if (!include('Cake' . DS . 'bootstrap.php')) {
8892
$failed = true;
8993
}
9094
} else {
91-
if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
95+
if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
9296
$failed = true;
9397
}
9498
}
9599
if (!empty($failed)) {
96-
trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
100+
trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
97101
}
98102

99103
App::uses('Dispatcher', 'Routing');
100104

101-
102105
$Dispatcher = new Dispatcher();
103-
$Dispatcher->dispatch(new CakeRequest(), new CakeResponse());
106+
$Dispatcher->dispatch(
107+
new CakeRequest(),
108+
new CakeResponse()
109+
);

‎app/webroot/test.php

+10-5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
if (!defined('DS')) {
2626
define('DS', DIRECTORY_SEPARATOR);
2727
}
28+
2829
/**
2930
* These defines should only be edited if you have cake installed in
3031
* a directory layout other than the way it is distributed.
@@ -38,6 +39,7 @@
3839
if (!defined('ROOT')) {
3940
define('ROOT', dirname(dirname(dirname(__FILE__))));
4041
}
42+
4143
/**
4244
* The actual directory name for the "app".
4345
*
@@ -49,12 +51,15 @@
4951
/**
5052
* The absolute path to the "Cake" directory, WITHOUT a trailing DS.
5153
*
52-
* For ease of development CakePHP uses PHP's include_path. If you
54+
* For ease of development CakePHP uses PHP's include_path. If you
5355
* need to cannot modify your include_path, you can set this path.
5456
*
5557
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
58+
*
59+
* The following line differs from its sibling
60+
* /lib/Cake/Console/Templates/skel/webroot/test.php
5661
*/
57-
//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
62+
//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
5863

5964
/**
6065
* Editing below this line should not be necessary.
@@ -72,16 +77,16 @@
7277
if (function_exists('ini_set')) {
7378
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
7479
}
75-
if (!include ('Cake' . DS . 'bootstrap.php')) {
80+
if (!include('Cake' . DS . 'bootstrap.php')) {
7681
$failed = true;
7782
}
7883
} else {
79-
if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
84+
if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
8085
$failed = true;
8186
}
8287
}
8388
if (!empty($failed)) {
84-
trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
89+
trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
8590
}
8691

8792
if (Configure::read('debug') < 1) {

0 commit comments

Comments
 (0)