Permalink
Browse files

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\
  • Loading branch information...
1 parent 431e610 commit 514d9675d8202e335a8318af951055c453376a41 @ravage84 ravage84 committed Feb 8, 2013
Showing with 118 additions and 113 deletions.
  1. +14 −2 .gitignore
  2. +2 −6 app/Config/Schema/i18n.php
  3. +1 −1 app/Config/core.php
  4. +0 −6 app/Config/database.php.default
  5. +0 −6 app/Config/email.php.default
  6. +1 −1 app/Console/cake
  7. +1 −1 app/Console/cake.bat
  8. +4 −1 app/Console/cake.php
  9. +2 −3 app/Controller/AppController.php
  10. +0 −1 app/Controller/PagesController.php
  11. +1 −1 app/View/Emails/html/default.ctp
  12. +1 −1 app/View/Emails/text/default.ctp
  13. +2 −2 app/View/Errors/error400.ctp
  14. +2 −2 app/View/Errors/error500.ctp
  15. +0 −1 app/View/Helper/AppHelper.php
  16. +3 −3 app/View/Layouts/Emails/html/default.ctp
  17. +2 −2 app/View/Layouts/Emails/text/default.ctp
  18. +1 −1 app/View/Layouts/ajax.ctp
  19. +1 −1 app/View/Layouts/default.ctp
  20. +1 −1 app/View/Layouts/error.ctp
  21. +1 −1 app/View/Layouts/flash.ctp
  22. +1 −1 app/View/Pages/home.ctp
  23. +13 −7 app/webroot/index.php
  24. +10 −5 app/webroot/test.php
  25. +2 −6 lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
  26. +1 −1 lib/Cake/Console/Templates/skel/Config/core.php
  27. +0 −6 lib/Cake/Console/Templates/skel/Config/database.php.default
  28. +0 −6 lib/Cake/Console/Templates/skel/Config/email.php.default
  29. +1 −1 lib/Cake/Console/Templates/skel/Console/cake
  30. +1 −1 lib/Cake/Console/Templates/skel/Console/cake.bat
  31. +4 −1 lib/Cake/Console/Templates/skel/Console/cake.php
  32. +2 −3 lib/Cake/Console/Templates/skel/Controller/AppController.php
  33. +12 −6 lib/Cake/Console/Templates/skel/Controller/PagesController.php
  34. +1 −1 lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
  35. +1 −1 lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
  36. +1 −1 lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
  37. +1 −3 lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
  38. +0 −1 lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp
  39. +5 −3 lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
  40. +5 −3 lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
  41. +2 −2 lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
  42. +4 −5 lib/Cake/Console/Templates/skel/View/Pages/home.ctp
  43. +5 −2 lib/Cake/Console/Templates/skel/webroot/index.php
  44. +6 −3 lib/Cake/Console/Templates/skel/webroot/test.php
View
@@ -1,9 +1,21 @@
-/app/Config
+# User specific & automatically generated files #
+#################################################
+/app/Config/database.php
/app/tmp
/lib/Cake/Console/Templates/skel/tmp/
/plugins
/vendors
/build
/dist
-.DS_Store
/tags
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
@@ -20,19 +20,15 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-// @codingStandardsIgnoreStart
-
-/*
+/**
*
* Using the Schema command line utility
*
* Use it to configure database for i18n
*
* cake schema run create i18n
*/
-class i18nSchema extends CakeSchema {
-
-// @codingStandardsIgnoreEnd
+class I18nSchema extends CakeSchema {
public $name = 'i18n';
View
@@ -95,7 +95,7 @@
*
* And uncomment the App.baseUrl below. But keep in mind
* that plugin assets such as images, CSS and Javascript files
- * will not work without url rewriting
+ * will not work without url rewriting!
* To work around this issue you should either symlink or copy
* the plugin assets into you app's webroot directory. This is
* recommended even when you are using mod_rewrite. Handling static
@@ -18,13 +18,7 @@
* @package app.Config
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your database connection details.
*
- * @package cake.config
- */
-/**
* Database configuration class.
* You can specify multiple configurations for production, development and testing.
*
@@ -18,13 +18,7 @@
* @package app.Config
* @since CakePHP(tm) v 2.0.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your send email details.
*
- * @package cake.config
- */
-/**
* Email configuration class.
* You can specify multiple configurations for production, development and testing.
*
View
@@ -13,7 +13,7 @@
#
# @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
# @link http://cakephp.org CakePHP(tm) Project
-# @package cake.Console
+# @package app.Console
# @since CakePHP(tm) v 1.2.0.5012
# @license MIT License (http://www.opensource.org/licenses/mit-license.php)
#
@@ -11,7 +11,7 @@
::
:: @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
:: @link http://cakephp.org CakePHP(tm) Project
-:: @package app.Console
+:: @package app.Console
:: @since CakePHP(tm) v 2.0
:: @license MIT License (http://www.opensource.org/licenses/mit-license.php)
::
@@ -23,10 +23,13 @@
if (function_exists('ini_set')) {
$root = dirname(dirname(dirname(__FILE__)));
+
+ // the following line differs from its sibling
+ // /lib/Cake/Console/Templates/skel/Console/cake.php
ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
}
-if (!include ($dispatcher)) {
+if (!include($dispatcher)) {
trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
}
unset($paths, $path, $dispatcher, $root, $ds);
@@ -20,7 +20,6 @@
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-
App::uses('Controller', 'Controller');
/**
@@ -29,8 +28,8 @@
* Add your application-wide methods in the class below, your controllers
* will inherit them.
*
- * @package app.Controller
- * @link http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
+ * @package app.Controller
+ * @link http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
*/
class AppController extends Controller {
}
@@ -19,7 +19,6 @@
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-
App::uses('AppController', 'Controller');
/**
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Emails.html
+ * @package app.View.Emails.html
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Emails.text
+ * @package app.View.Emails.text
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Errors
+ * @package app.View.Errors
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -26,7 +26,7 @@
); ?>
</p>
<?php
-if (Configure::read('debug') > 0 ):
+if (Configure::read('debug') > 0):
echo $this->element('exception_stack_trace');
endif;
?>
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Errors
+ * @package app.View.Errors
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -23,7 +23,7 @@
<?php echo __d('cake', 'An Internal Error Has Occurred.'); ?>
</p>
<?php
-if (Configure::read('debug') > 0 ):
+if (Configure::read('debug') > 0):
echo $this->element('exception_stack_trace');
endif;
?>
@@ -20,7 +20,6 @@
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-
App::uses('Helper', 'View');
/**
@@ -12,18 +12,18 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Layouts.Emails.html
+ * @package app.View.Layouts.Email.html
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
<head>
- <title><?php echo $title_for_layout;?></title>
+ <title><?php echo $title_for_layout; ?></title>
</head>
<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>
</body>
@@ -12,11 +12,11 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Layouts.Emails.text
+ * @package app.View.Layouts.Email.text
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
-<?php echo $this->fetch('content');?>
+<?php echo $this->fetch('content'); ?>
This email was sent using the CakePHP Framework, http://cakephp.org.
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Layouts
+ * @package app.View.Layouts
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Layouts
+ * @package app.View.Layouts
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Layouts
+ * @package app.View.Layouts
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Layouts
+ * @package app.View.Layouts
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
@@ -12,7 +12,7 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
- * @package Cake.View.Pages
+ * @package app.View.Pages
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
View
@@ -39,6 +39,7 @@
if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__))));
}
+
/**
* The actual directory name for the "app".
*
@@ -53,12 +54,15 @@
* Un-comment this line to specify a fixed path to CakePHP.
* This should point at the directory containing `Cake`.
*
- * For ease of development CakePHP uses PHP's include_path. If you
+ * For ease of development CakePHP uses PHP's include_path. If you
* cannot modify your include_path set this value.
*
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * /lib/Cake/Console/Templates/skel/webroot/index.php
*/
- //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
/**
* Editing below this line should NOT be necessary.
@@ -84,20 +88,22 @@
if (function_exists('ini_set')) {
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
}
- if (!include ('Cake' . DS . 'bootstrap.php')) {
+ if (!include('Cake' . DS . 'bootstrap.php')) {
$failed = true;
}
} else {
- if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+ if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
$failed = true;
}
}
if (!empty($failed)) {
- 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);
+ 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);
}
App::uses('Dispatcher', 'Routing');
-
$Dispatcher = new Dispatcher();
-$Dispatcher->dispatch(new CakeRequest(), new CakeResponse());
+$Dispatcher->dispatch(
+ new CakeRequest(),
+ new CakeResponse()
+);
View
@@ -25,6 +25,7 @@
if (!defined('DS')) {
define('DS', DIRECTORY_SEPARATOR);
}
+
/**
* These defines should only be edited if you have cake installed in
* a directory layout other than the way it is distributed.
@@ -38,6 +39,7 @@
if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__))));
}
+
/**
* The actual directory name for the "app".
*
@@ -49,12 +51,15 @@
/**
* The absolute path to the "Cake" directory, WITHOUT a trailing DS.
*
- * For ease of development CakePHP uses PHP's include_path. If you
+ * For ease of development CakePHP uses PHP's include_path. If you
* need to cannot modify your include_path, you can set this path.
*
* Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * /lib/Cake/Console/Templates/skel/webroot/test.php
*/
- //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
/**
* Editing below this line should not be necessary.
@@ -72,16 +77,16 @@
if (function_exists('ini_set')) {
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
}
- if (!include ('Cake' . DS . 'bootstrap.php')) {
+ if (!include('Cake' . DS . 'bootstrap.php')) {
$failed = true;
}
} else {
- if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+ if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
$failed = true;
}
}
if (!empty($failed)) {
- 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);
+ 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);
}
if (Configure::read('debug') < 1) {
Oops, something went wrong.

0 comments on commit 514d967

Please sign in to comment.