Skip to content
This repository

Increasing "sync" between app and skel directories. #247

Merged
merged 3 commits into from over 2 years ago

2 participants

sitedyno José Lorenzo Rodríguez
sitedyno

Additional differences between the 2 folders:

diff -r app/Console/cake.php lib/Cake/Console/Templates/skel/Console/cake.php
33c33
<       ini_set('include_path', $root . $ds. 'lib' . PATH_SEPARATOR . ini_get('include_path'));
---
>       ini_set('include_path', __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path'));
diff -r app/webroot/index.php lib/Cake/Console/Templates/skel/webroot/index.php
59c59
<       //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
---
>       //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
diff -r app/webroot/test.php lib/Cake/Console/Templates/skel/webroot/test.php
56c56
<       //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
---
>       //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
71,73d70
<       if (function_exists('ini_set')) {
<               ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
<       }

Only in lib/Cake/Console/Templates/skel/Config/Schema: db_acl.sql
Only in lib/Cake/Console/Templates/skel/Config/Schema: i18n.sql
Only in lib/Cake/Console/Templates/skel/Config/Schema: sessions.sql
Only in lib/Cake/Console/Templates/skel/Controller: AppController.php
Only in lib/Cake/Console/Templates/skel/Controller: PagesController.php
Only in lib/Cake/Console/Templates/skel/Model: AppModel.php
Only in lib/Cake/Console/Templates/skel/tmp/cache/persistent: cake_core_cake_console_
Only in lib/Cake/Console/Templates/skel/tmp/cache/persistent: cake_core_cake_dev_
Only in lib/Cake/Console/Templates/skel/View/Emails/html: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Emails/text: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Helper: AppHelper.php
Only in lib/Cake/Console/Templates/skel/View/Layouts: ajax.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/Emails/html: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/Emails/text: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts: flash.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/js: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/rss: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/xml: default.ctp

Only in app/Console/Command: empty
Only in app/Console: Templates
Only in app/View/Emails/html: empty
Only in app/View/Emails/text: empty
Only in app/View/Layouts/Emails/html: empty
Only in app/View/Layouts/Emails/text: empty
Only in app/View/Layouts/js: empty
Only in app/View/Layouts/rss: empty
Only in app/View/Layouts/xml: empty
Only in app/webroot: files
José Lorenzo Rodríguez
Owner

Thanks!!

José Lorenzo Rodríguez lorenzo merged commit 36c9315 into from October 14, 2011
José Lorenzo Rodríguez lorenzo closed this October 14, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
13  app/Config/Schema/db_acl.php
... ...
@@ -1,5 +1,6 @@
1 1
 <?php
2 2
 /*DbAcl schema generated on: 2007-11-24 15:11:13 : 1195945453*/
  3
+
3 4
 /**
4 5
  * This is Acl Schema file
5 6
  *
@@ -15,10 +16,11 @@
15 16
  *
16 17
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
17 18
  * @link          http://cakephp.org CakePHP(tm) Project
18  
- * @package       app.config.sql
  19
+ * @package       app.Config.Schema
19 20
  * @since         CakePHP(tm) v 0.2.9
20 21
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
21 22
  */
  23
+
22 24
 /*
23 25
  *
24 26
  * Using the Schema command line utility
@@ -27,6 +29,15 @@
27 29
  */
28 30
 class DbAclSchema extends CakeSchema {
29 31
 
  32
+	public $name = 'DbAcl';
  33
+
  34
+	public function before($event = array()) {
  35
+		return true;
  36
+	}
  37
+
  38
+	public function after($event = array()) {
  39
+	}
  40
+
30 41
 	public $acos = array(
31 42
 			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
32 43
 			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
13  app/Config/Schema/i18n.php
... ...
@@ -1,5 +1,6 @@
1 1
 <?php
2 2
 /*i18n schema generated on: 2007-11-25 07:11:25 : 1196004805*/
  3
+
3 4
 /**
4 5
  * This is i18n Schema file
5 6
  *
@@ -15,10 +16,11 @@
15 16
  *
16 17
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
17 18
  * @link          http://cakephp.org CakePHP(tm) Project
18  
- * @package       app.config.sql
  19
+ * @package       app.Config.Schema
19 20
  * @since         CakePHP(tm) v 0.2.9
20 21
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
21 22
  */
  23
+
22 24
 /*
23 25
  *
24 26
  * Using the Schema command line utility
@@ -27,6 +29,15 @@
27 29
  */
28 30
 class i18nSchema extends CakeSchema {
29 31
 
  32
+	public $name = 'i18n';
  33
+
  34
+	public function before($event = array()) {
  35
+		return true;
  36
+	}
  37
+
  38
+	public function after($event = array()) {
  39
+	}
  40
+
30 41
 	public $i18n = array(
31 42
 			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
32 43
 			'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
13  app/Config/Schema/sessions.php
... ...
@@ -1,5 +1,6 @@
1 1
 <?php
2 2
 /*Sessions schema generated on: 2007-11-25 07:11:54 : 1196004714*/
  3
+
3 4
 /**
4 5
  * This is Sessions Schema file
5 6
  *
@@ -15,10 +16,11 @@
15 16
  *
16 17
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
17 18
  * @link          http://cakephp.org CakePHP(tm) Project
18  
- * @package       app.config.sql
  19
+ * @package       app.Config.Schema
19 20
  * @since         CakePHP(tm) v 0.2.9
20 21
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
21 22
  */
  23
+
22 24
 /*
23 25
  *
24 26
  * Using the Schema command line utility
@@ -27,6 +29,15 @@
27 29
  */
28 30
 class SessionsSchema extends CakeSchema {
29 31
 
  32
+	public $name = 'Sessions';
  33
+
  34
+	public function before($event = array()) {
  35
+		return true;
  36
+	}
  37
+
  38
+	public function after($event = array()) {
  39
+	}
  40
+
30 41
 	public $cake_sessions = array(
31 42
 			'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
32 43
 			'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
4  app/Config/acl.ini.php
@@ -5,7 +5,7 @@
5 5
 ; *
6 6
 ; * PHP 5
7 7
 ; *
8  
-; * CakePHP(tm) :  Rapid Development Framework http://cakephp.org
  8
+; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
9 9
 ; * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
10 10
 ; *
11 11
 ; *  Licensed under The MIT License
@@ -13,7 +13,7 @@
13 13
 ; *
14 14
 ; * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
15 15
 ; * @link          http://cakephp.org CakePHP(tm) Project
16  
-; * @package       app.config
  16
+; * @package       app.Config
17 17
 ; * @since         CakePHP(tm) v 0.10.0.1076
18 18
 ; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
19 19
 ; */
2  app/Config/bootstrap.php
@@ -18,7 +18,7 @@
18 18
  *
19 19
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
20 20
  * @link          http://cakephp.org CakePHP(tm) Project
21  
- * @package       app.config
  21
+ * @package       app.Config
22 22
  * @since         CakePHP(tm) v 0.10.8.2117
23 23
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
24 24
  */
2  app/Config/core.php
@@ -14,7 +14,7 @@
14 14
  *
15 15
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
16 16
  * @link          http://cakephp.org CakePHP(tm) Project
17  
- * @package       app.config
  17
+ * @package       app.Config
18 18
  * @since         CakePHP(tm) v 0.2.9
19 19
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
20 20
  */
2  app/Config/database.php.default
@@ -14,7 +14,7 @@
14 14
  *
15 15
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
16 16
  * @link          http://cakephp.org CakePHP(tm) Project
17  
- * @package       app.config
  17
+ * @package       app.Config
18 18
  * @since         CakePHP(tm) v 0.2.9
19 19
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
20 20
  */
2  app/Config/email.php.default
@@ -14,7 +14,7 @@
14 14
  *
15 15
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
16 16
  * @link          http://cakephp.org CakePHP(tm) Project
17  
- * @package       app.config
  17
+ * @package       app.Config
18 18
  * @since         CakePHP(tm) v 2.0.0
19 19
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
20 20
  */
2  app/Config/routes.php
@@ -16,7 +16,7 @@
16 16
  *
17 17
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
18 18
  * @link          http://cakephp.org CakePHP(tm) Project
19  
- * @package       app.config
  19
+ * @package       app.Config
20 20
  * @since         CakePHP(tm) v 0.2.9
21 21
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
22 22
  */
10  app/Console/cake
@@ -11,10 +11,10 @@
11 11
 # Redistributions of files must retain the above copyright notice.
12 12
 #
13 13
 # @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
14  
-# @link				http://cakephp.org CakePHP(tm) Project
15  
-# @package   		app.console
16  
-# @since			CakePHP(tm) v 2.0
17  
-# @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
  14
+# @link			http://cakephp.org CakePHP(tm) Project
  15
+# @package   		app.Console
  16
+# @since		CakePHP(tm) v 2.0
  17
+# @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
18 18
 #
19 19
 ################################################################################
20 20
 LIB=${0/%cake/}
@@ -22,4 +22,4 @@ APP=`pwd`
22 22
 
23 23
 exec php -q ${LIB}cake.php -working "${APP}" "$@"
24 24
 
25  
-exit;
  25
+exit;
64  app/Console/cake.bat
... ...
@@ -1,32 +1,32 @@
1  
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2  
-::
3  
-:: Bake is a shell script for running CakePHP bake script
4  
-:: PHP 5
5  
-::
6  
-:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
7  
-:: Copyright 2005-2011, Cake Software Foundation, Inc.
8  
-::
9  
-:: Licensed under The MIT License
10  
-:: Redistributions of files must retain the above copyright notice.
11  
-::
12  
-:: @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
13  
-:: @link			http://cakephp.org CakePHP(tm) Project
14  
-:: @package   		app.console
15  
-:: @since			CakePHP(tm) v 2.0
16  
-:: @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
17  
-::
18  
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
19  
-
20  
-:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
21  
-
22  
-@echo.
23  
-@echo off
24  
-
25  
-SET app=%0
26  
-SET lib=%~dp0
27  
-
28  
-php -q "%lib%cake.php" -working "%CD% " %*
29  
-
30  
-echo.
31  
-
32  
-exit /B %ERRORLEVEL%
  1
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  2
+::
  3
+:: Bake is a shell script for running CakePHP bake script
  4
+:: PHP 5
  5
+::
  6
+:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  7
+:: Copyright 2005-2011, Cake Software Foundation, Inc.
  8
+::
  9
+:: Licensed under The MIT License
  10
+:: Redistributions of files must retain the above copyright notice.
  11
+::
  12
+:: @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
  13
+:: @link		http://cakephp.org CakePHP(tm) Project
  14
+:: @package   		app.Console
  15
+:: @since		CakePHP(tm) v 2.0
  16
+:: @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
  17
+::
  18
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  19
+
  20
+:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
  21
+
  22
+@echo.
  23
+@echo off
  24
+
  25
+SET app=%0
  26
+SET lib=%~dp0
  27
+
  28
+php -q "%lib%cake.php" -working "%CD% " %*
  29
+
  30
+echo.
  31
+
  32
+exit /B %ERRORLEVEL%
2  lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
@@ -16,7 +16,7 @@
16 16
  *
17 17
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
18 18
  * @link          http://cakephp.org CakePHP(tm) Project
19  
- * @package       app.Config
  19
+ * @package       app.Config.Schema
20 20
  * @since         CakePHP(tm) v 0.2.9
21 21
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
22 22
  */
2  lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
@@ -16,7 +16,7 @@
16 16
  *
17 17
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
18 18
  * @link          http://cakephp.org CakePHP(tm) Project
19  
- * @package       app.Config
  19
+ * @package       app.Config.Schema
20 20
  * @since         CakePHP(tm) v 0.2.9
21 21
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
22 22
  */
2  lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
@@ -16,7 +16,7 @@
16 16
  *
17 17
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
18 18
  * @link          http://cakephp.org CakePHP(tm) Project
19  
- * @package       app.Config
  19
+ * @package       app.Config.Schema
20 20
  * @since         CakePHP(tm) v 0.2.9
21 21
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
22 22
  */
4  lib/Cake/Console/Templates/skel/Config/acl.ini.php
@@ -5,7 +5,7 @@
5 5
 ; *
6 6
 ; * PHP 5
7 7
 ; *
8  
-; * CakePHP(tm) : Rapid Development Framework http://www.cakephp.org/
  8
+; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
9 9
 ; * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
10 10
 ; *
11 11
 ; *  Licensed under The MIT License
@@ -13,7 +13,7 @@
13 13
 ; *
14 14
 ; * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
15 15
 ; * @link          http://cakephp.org CakePHP(tm) Project
16  
-; * @package       Cake.Console.Templates.skel.Config
  16
+; * @package       app.Config
17 17
 ; * @since         CakePHP(tm) v 0.10.0.1076
18 18
 ; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
19 19
 ; */
2  lib/Cake/Console/Templates/skel/Config/bootstrap.php
@@ -62,4 +62,4 @@
62 62
  * CakePlugin::loadAll(); // Loads all plugins at once
63 63
  * CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
64 64
  *
65  
- */
  65
+ */
4  lib/Cake/Console/Templates/skel/Config/core.php
@@ -196,8 +196,8 @@
196 196
  * Will append a querystring parameter containing the time the file was modified. This is
197 197
  * useful for invalidating browser caches.
198 198
  *
199  
- * Set to `true` to apply timestamps, when debug > 0, or set to 'force' to always enable
200  
- * timestamping.
  199
+ * Set to `true` to apply timestamps when debug > 0. Set to 'force' to always enable
  200
+ * timestamping regardless of debug value.
201 201
  */
202 202
 	//Configure::write('Asset.timestamp', true);
203 203
 /**
8  lib/Cake/Console/Templates/skel/Console/cake
@@ -11,10 +11,10 @@
11 11
 # Redistributions of files must retain the above copyright notice.
12 12
 #
13 13
 # @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
14  
-# @link				http://cakephp.org CakePHP(tm) Project
  14
+# @link			http://cakephp.org CakePHP(tm) Project
15 15
 # @package   		app.Console
16  
-# @since			CakePHP(tm) v 2.0
17  
-# @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
  16
+# @since		CakePHP(tm) v 2.0
  17
+# @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
18 18
 #
19 19
 ################################################################################
20 20
 LIB=${0/%cake/}
@@ -22,4 +22,4 @@ APP=`pwd`
22 22
 
23 23
 exec php -q ${LIB}cake.php -working "${APP}" "$@"
24 24
 
25  
-exit;
  25
+exit;
64  lib/Cake/Console/Templates/skel/Console/cake.bat
... ...
@@ -1,32 +1,32 @@
1  
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2  
-::
3  
-:: Bake is a shell script for running CakePHP bake script
4  
-:: PHP 5
5  
-::
6  
-:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
7  
-:: Copyright 2005-2011, Cake Software Foundation, Inc.
8  
-::
9  
-:: Licensed under The MIT License
10  
-:: Redistributions of files must retain the above copyright notice.
11  
-::
12  
-:: @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
13  
-:: @link		http://cakephp.org CakePHP(tm) Project
14  
-:: @package   		app.Console
15  
-:: @since		CakePHP(tm) v 2.0
16  
-:: @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
17  
-::
18  
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
19  
-
20  
-:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
21  
-
22  
-@echo.
23  
-@echo off
24  
-
25  
-SET app=%0
26  
-SET lib=%~dp0
27  
-
28  
-php -q "%lib%cake.php" -working "%CD% " %*
29  
-
30  
-echo.
31  
-
32  
-exit /B %ERRORLEVEL%
  1
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  2
+::
  3
+:: Bake is a shell script for running CakePHP bake script
  4
+:: PHP 5
  5
+::
  6
+:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  7
+:: Copyright 2005-2011, Cake Software Foundation, Inc.
  8
+::
  9
+:: Licensed under The MIT License
  10
+:: Redistributions of files must retain the above copyright notice.
  11
+::
  12
+:: @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
  13
+:: @link		http://cakephp.org CakePHP(tm) Project
  14
+:: @package   		app.Console
  15
+:: @since		CakePHP(tm) v 2.0
  16
+:: @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
  17
+::
  18
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  19
+
  20
+:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
  21
+
  22
+@echo.
  23
+@echo off
  24
+
  25
+SET app=%0
  26
+SET lib=%~dp0
  27
+
  28
+php -q "%lib%cake.php" -working "%CD% " %*
  29
+
  30
+echo.
  31
+
  32
+exit /B %ERRORLEVEL%
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.