Merge branch 'master' into 2.5

2024-11-15 03:18:26 +00:00 · 2013-11-19 00:27:12 +05:30 · 2013-11-19 00:27:12 +05:30 · dda6080579
commit dda6080579
parent b6b8d83980 df52e85e0c
648 changed files with 136 additions and 1283 deletions
--- a/app/Config/Schema/db_acl.php
+++ b/app/Config/Schema/db_acl.php
@ -4,8 +4,6 @@
 *
 * Use it to configure database for ACL
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Config/Schema/i18n.php
+++ b/app/Config/Schema/i18n.php
@ -4,8 +4,6 @@
 *
 * Use it to configure database for i18n
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Config/Schema/sessions.php
+++ b/app/Config/Schema/sessions.php
@ -4,8 +4,6 @@
 *
 * Use it to configure database for Sessions
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Config/acl.ini.php
+++ b/app/Config/acl.ini.php
@ -2,9 +2,6 @@
 ;/**
 ; * ACL Configuration
 ; *
-; *
-; * PHP 5
-; *
 ; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 ; * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
--- a/app/Config/acl.php
+++ b/app/Config/acl.php
@ -4,8 +4,6 @@
 *
 * Use it to configure access control of your CakePHP application.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Config/bootstrap.php
+++ b/app/Config/bootstrap.php
@ -8,8 +8,6 @@
 * You should also use this file to include any files that provide global functions/constants
 * that your application uses.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Config/core.php
+++ b/app/Config/core.php
@ -4,8 +4,6 @@
 *
 * Use it to configure core behavior of Cake.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Config/database.php.default
+++ b/app/Config/database.php.default
@ -1,6 +1,6 @@
 <?php
 /**
- * PHP 5
+ *
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/Config/email.php.default
+++ b/app/Config/email.php.default
@ -1,6 +1,6 @@
 <?php
 /**
- * PHP 5
+ *
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/Config/routes.php
+++ b/app/Config/routes.php
@ -6,8 +6,6 @@
 * Routes are very important mechanism that allows you to freely connect
 * different URLs to chosen controllers and their actions (functions).
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Console/Command/AppShell.php
+++ b/app/Console/Command/AppShell.php
@ -2,8 +2,6 @@
 /**
 * AppShell file
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Console/cake
+++ b/app/Console/cake
@ -2,7 +2,6 @@
 ################################################################################
 #
 # Bake is a shell script for running CakePHP bake script
-# PHP 5
 #
 # CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
 # Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/Console/cake.bat
+++ b/app/Console/cake.bat
@ -1,7 +1,6 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
 :: Bake is a shell script for running CakePHP bake script
-:: PHP 5
 ::
 :: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 :: Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/Console/cake.php
+++ b/app/Console/cake.php
@ -3,8 +3,6 @@
 /**
 * Command-line code generation utility to automate programmer chores.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@ -5,8 +5,6 @@
 * This file is application-wide controller file. You can put all
 * application-wide controller-related methods here.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Controller/PagesController.php
+++ b/app/Controller/PagesController.php
@ -4,8 +4,6 @@
 *
 * This file will render views from views/pages/
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@ -5,8 +5,6 @@
 * This file is application-wide model file. You can put all
 * application-wide model-related methods here.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/View/Emails/html/default.ctp
+++ b/app/View/Emails/html/default.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Emails/text/default.ctp
+++ b/app/View/Emails/text/default.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Errors/error400.ctp
+++ b/app/View/Errors/error400.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Errors/error500.ctp
+++ b/app/View/Errors/error500.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Helper/AppHelper.php
+++ b/app/View/Helper/AppHelper.php
@ -5,8 +5,6 @@
 * This file is application-wide helper file. You can put all
 * application-wide helper-related methods here.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/View/Layouts/Emails/html/default.ctp
+++ b/app/View/Layouts/Emails/html/default.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Layouts/Emails/text/default.ctp
+++ b/app/View/Layouts/Emails/text/default.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Layouts/ajax.ctp
+++ b/app/View/Layouts/ajax.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Layouts/error.ctp
+++ b/app/View/Layouts/error.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Layouts/flash.ctp
+++ b/app/View/Layouts/flash.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/View/Pages/home.ctp
+++ b/app/View/Pages/home.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * @link          http://cakephp.org CakePHP(tm) Project
 * @package       app.View.Pages
--- a/app/index.php
+++ b/app/index.php
@ -1,6 +1,6 @@
 <?php
 /**
- * PHP 5
+ *
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@ -4,8 +4,6 @@
 *
 * The Front Controller for handling every request
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@ -2,8 +2,6 @@
 /**
 * Web Access Frontend for TestSuite
 *
- * PHP 5
- *
 * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/index.php
+++ b/index.php
@ -7,10 +7,8 @@
 *  - requires App.baseUrl to be uncommented in app/Config/core.php
 *	- app/webroot is not set as a document root.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c), Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
 * Licensed under The MIT License
 * For full copyright and license information, please see the LICENSE.txt
--- a/lib/Cake/Cache/Engine/ApcEngine.php
+++ b/lib/Cake/Cache/Engine/ApcEngine.php
@ -2,9 +2,6 @@
 /**
 * APC storage engine for cache.
 *
- *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Cache/Engine/FileEngine.php
+++ b/lib/Cake/Cache/Engine/FileEngine.php
@ -6,8 +6,6 @@
 *
 * You can configure a FileEngine cache, using Cache::config()
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Cache/Engine/MemcacheEngine.php
+++ b/lib/Cake/Cache/Engine/MemcacheEngine.php
@ -2,9 +2,6 @@
 /**
 * Memcache storage engine for cache
 *
- *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Cache/Engine/RedisEngine.php
+++ b/lib/Cake/Cache/Engine/RedisEngine.php
@ -2,9 +2,6 @@
 /**
 * Redis storage engine for cache
 *
- *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Cache/Engine/WincacheEngine.php
+++ b/lib/Cake/Cache/Engine/WincacheEngine.php
@ -4,8 +4,6 @@
 *
 * Supports wincache 1.1.0 and higher.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Cache/Engine/XcacheEngine.php
+++ b/lib/Cake/Cache/Engine/XcacheEngine.php
@ -2,8 +2,6 @@
 /**
 * Xcache storage engine for cache.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/config.php
+++ b/lib/Cake/Config/config.php
@ -2,8 +2,6 @@
 /**
 * Core Configurations.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/routes.php
+++ b/lib/Cake/Config/routes.php
@ -1,7 +1,5 @@
 <?php
 /**
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0080_00ff.php
+++ b/lib/Cake/Config/unicode/casefolding/0080_00ff.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0100_017f.php
+++ b/lib/Cake/Config/unicode/casefolding/0100_017f.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0180_024F.php
+++ b/lib/Cake/Config/unicode/casefolding/0180_024F.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0250_02af.php
+++ b/lib/Cake/Config/unicode/casefolding/0250_02af.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0370_03ff.php
+++ b/lib/Cake/Config/unicode/casefolding/0370_03ff.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0400_04ff.php
+++ b/lib/Cake/Config/unicode/casefolding/0400_04ff.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0500_052f.php
+++ b/lib/Cake/Config/unicode/casefolding/0500_052f.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/0530_058f.php
+++ b/lib/Cake/Config/unicode/casefolding/0530_058f.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/1e00_1eff.php
+++ b/lib/Cake/Config/unicode/casefolding/1e00_1eff.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/1f00_1fff.php
+++ b/lib/Cake/Config/unicode/casefolding/1f00_1fff.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/2100_214f.php
+++ b/lib/Cake/Config/unicode/casefolding/2100_214f.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/2150_218f.php
+++ b/lib/Cake/Config/unicode/casefolding/2150_218f.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/2460_24ff.php
+++ b/lib/Cake/Config/unicode/casefolding/2460_24ff.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/2c00_2c5f.php
+++ b/lib/Cake/Config/unicode/casefolding/2c00_2c5f.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/2c60_2c7f.php
+++ b/lib/Cake/Config/unicode/casefolding/2c60_2c7f.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/2c80_2cff.php
+++ b/lib/Cake/Config/unicode/casefolding/2c80_2cff.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Config/unicode/casefolding/ff00_ffef.php
+++ b/lib/Cake/Config/unicode/casefolding/ff00_ffef.php
@ -8,8 +8,6 @@
 * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 * @see http://www.unicode.org/reports/tr21/tr21-5.html
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Configure/IniReader.php
+++ b/lib/Cake/Configure/IniReader.php
@ -2,8 +2,6 @@
 /**
 * IniReader
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Configure/PhpReader.php
+++ b/lib/Cake/Configure/PhpReader.php
@ -2,8 +2,6 @@
 /**
 * PhpReader file
 *
- * PHP 5
- *
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
 * Licensed under The MIT License
--- a/lib/Cake/Console/Command/AclShell.php
+++ b/lib/Cake/Console/Command/AclShell.php
@ -2,8 +2,6 @@
 /**
 * Acl Shell provides Acl access in the CLI environment
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/ApiShell.php
+++ b/lib/Cake/Console/Command/ApiShell.php
@ -4,8 +4,6 @@
 *
 * Implementation of a Cake Shell to show CakePHP core method signatures.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/AppShell.php
+++ b/lib/Cake/Console/Command/AppShell.php
@ -2,8 +2,6 @@
 /**
 * AppShell file
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/BakeShell.php
+++ b/lib/Cake/Console/Command/BakeShell.php
@ -6,8 +6,6 @@
 * application development by writing fully functional skeleton controllers,
 * models, and views. Going further, Bake can also write Unit Tests for you.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/I18nShell.php
+++ b/lib/Cake/Console/Command/I18nShell.php
@ -2,8 +2,6 @@
 /**
 * Internationalization Management Shell
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/ServerShell.php
+++ b/lib/Cake/Console/Command/ServerShell.php
@ -2,8 +2,6 @@
 /**
 * built-in Server Shell
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/BakeTask.php
+++ b/lib/Cake/Console/Command/Task/BakeTask.php
@ -2,8 +2,6 @@
 /**
 * Base class for Bake Tasks.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/ControllerTask.php
+++ b/lib/Cake/Console/Command/Task/ControllerTask.php
@ -2,8 +2,6 @@
 /**
 * The ControllerTask handles creating and updating controller files.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ b/lib/Cake/Console/Command/Task/DbConfigTask.php
@ -2,8 +2,6 @@
 /**
 * The DbConfig Task handles creating and updating the database.php
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/ExtractTask.php
+++ b/lib/Cake/Console/Command/Task/ExtractTask.php
@ -2,8 +2,6 @@
 /**
 * Language string extractor
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/FixtureTask.php
+++ b/lib/Cake/Console/Command/Task/FixtureTask.php
@ -2,8 +2,6 @@
 /**
 * The FixtureTask handles creating and updating fixture files.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/ModelTask.php
+++ b/lib/Cake/Console/Command/Task/ModelTask.php
@ -2,8 +2,6 @@
 /**
 * The ModelTask handles creating and updating models files.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/lib/Cake/Console/Command/Task/PluginTask.php
@ -2,8 +2,6 @@
 /**
 * The Plugin Task handles creating an empty plugin, ready to be used
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/ProjectTask.php
+++ b/lib/Cake/Console/Command/Task/ProjectTask.php
@ -2,9 +2,6 @@
 /**
 * The Project Task handles creating the base application
 *
- *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/TemplateTask.php
+++ b/lib/Cake/Console/Command/Task/TemplateTask.php
@ -2,8 +2,6 @@
 /**
 * Template Task can generate templated output Used in other Tasks
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/TestTask.php
+++ b/lib/Cake/Console/Command/Task/TestTask.php
@ -2,8 +2,6 @@
 /**
 * The TestTask handles creating and updating test files.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/Task/ViewTask.php
+++ b/lib/Cake/Console/Command/Task/ViewTask.php
@ -2,8 +2,6 @@
 /**
 * The View Tasks handles creating and updating view files.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/TestShell.php
+++ b/lib/Cake/Console/Command/TestShell.php
@ -4,8 +4,6 @@
 *
 * This Shell allows the running of test suites via the cake command line
 *
- * PHP 5
- *
 * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/TestsuiteShell.php
+++ b/lib/Cake/Console/Command/TestsuiteShell.php
@ -4,8 +4,6 @@
 *
 * This is a bc wrapper for the newer Test shell
 *
- * PHP 5
- *
 * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Command/UpgradeShell.php
+++ b/lib/Cake/Console/Command/UpgradeShell.php
@ -2,8 +2,6 @@
 /**
 * Upgrade Shell
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ConsoleErrorHandler.php
+++ b/lib/Cake/Console/ConsoleErrorHandler.php
@ -2,8 +2,6 @@
 /**
 * ErrorHandler for Console Shells
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ConsoleInput.php
+++ b/lib/Cake/Console/ConsoleInput.php
@ -2,8 +2,6 @@
 /**
 * ConsoleInput file.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ConsoleInputArgument.php
+++ b/lib/Cake/Console/ConsoleInputArgument.php
@ -2,8 +2,6 @@
 /**
 * ConsoleArgumentOption file
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ConsoleInputOption.php
+++ b/lib/Cake/Console/ConsoleInputOption.php
@ -2,8 +2,6 @@
 /**
 * ConsoleInputOption file
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ConsoleInputSubcommand.php
+++ b/lib/Cake/Console/ConsoleInputSubcommand.php
@ -2,8 +2,6 @@
 /**
 * ConsoleInputSubcommand file
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ConsoleOptionParser.php
+++ b/lib/Cake/Console/ConsoleOptionParser.php
@ -2,8 +2,6 @@
 /**
 * ConsoleOptionParser file
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ConsoleOutput.php
+++ b/lib/Cake/Console/ConsoleOutput.php
@ -2,8 +2,6 @@
 /**
 * ConsoleOutput file.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
@ -286,8 +284,7 @@ class ConsoleOutput {
 	}

 /**
- * clean up and close handles
- *
+ * Clean up and close handles
 */
 	public function __destruct() {
 		fclose($this->_output);
--- a/lib/Cake/Console/HelpFormatter.php
+++ b/lib/Cake/Console/HelpFormatter.php
@ -2,8 +2,6 @@
 /**
 * HelpFormatter
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Shell.php
+++ b/lib/Cake/Console/Shell.php
@ -2,8 +2,6 @@
 /**
 * Base class for Shells
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/ShellDispatcher.php
+++ b/lib/Cake/Console/ShellDispatcher.php
@ -2,8 +2,6 @@
 /**
 * ShellDispatcher file
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
+++ b/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
@ -2,8 +2,6 @@
 /**
 * Bake Template for Controller action generation.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Templates/default/classes/controller.ctp
+++ b/lib/Cake/Console/Templates/default/classes/controller.ctp
@ -4,8 +4,6 @@
 *
 * Allows templating of Controllers generated from bake.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Templates/default/classes/fixture.ctp
+++ b/lib/Cake/Console/Templates/default/classes/fixture.ctp
@ -4,8 +4,6 @@
 *
 * Fixture Template used when baking fixtures with bake
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Templates/default/classes/model.ctp
+++ b/lib/Cake/Console/Templates/default/classes/model.ctp
@ -4,8 +4,6 @@
 *
 * Used by bake to create new Model files.
 *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Templates/default/classes/test.ctp
+++ b/lib/Cake/Console/Templates/default/classes/test.ctp
@ -2,9 +2,6 @@
 /**
 * Test Case bake template
 *
- *
- * PHP 5
- *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 *
--- a/lib/Cake/Console/Templates/default/views/form.ctp
+++ b/lib/Cake/Console/Templates/default/views/form.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/lib/Cake/Console/Templates/default/views/index.ctp
+++ b/lib/Cake/Console/Templates/default/views/index.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/lib/Cake/Console/Templates/default/views/view.ctp
+++ b/lib/Cake/Console/Templates/default/views/view.ctp
@ -1,7 +1,6 @@
 <?php
 /**
 *
- * PHP 5
 *
 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
--- a/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
+++ b/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
@ -4,8 +4,6 @@
 *
 * Use it to configure database for ACL
 *
- * PHP 5
- *
 * @link          http://cakephp.org CakePHP(tm) Project
 * @package       app.Config.Schema
 * @since         CakePHP(tm) v 0.2.9
--- a/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
+++ b/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
@ -4,8 +4,6 @@
 *
 * Use it to configure database for i18n
 *
- * PHP 5
- *
 * @link          http://cakephp.org CakePHP(tm) Project
 * @package       app.Config.Schema
 * @since         CakePHP(tm) v 0.2.9
--- a/Show more
+++ b/Show more