- *
- * To use database sessions, run the app/Config/Schema/sessions.php schema using
- * the cake shell command: cake schema create Sessions
- *
- */
- Configure::write('Session', array(
- 'defaults' => 'php'
- ));
-
-/**
- * The level of CakePHP security.
- */
- Configure::write('Security.level', 'medium');
-
-/**
- * A random string used in security hashing methods.
- */
- Configure::write('Security.salt', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
-
-/**
- * A random numeric string (digits only) used to encrypt/decrypt strings.
- */
- Configure::write('Security.cipherSeed', '76859309657453542496749683645');
-
-/**
- * Apply timestamps with the last modified time to static assets (js, css, images).
- * Will append a querystring parameter containing the time the file was modified. This is
- * useful for invalidating browser caches.
- *
- * Set to `true` to apply timestamps when debug > 0. Set to 'force' to always enable
- * timestamping regardless of debug value.
- */
- //Configure::write('Asset.timestamp', true);
-
-/**
- * Compress CSS output by removing comments, whitespace, repeating tags, etc.
- * This requires a/var/cache directory to be writable by the web server for caching.
- * and /vendors/csspp/csspp.php
- *
- * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use HtmlHelper::css().
- */
- //Configure::write('Asset.filter.css', 'css.php');
-
-/**
- * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the
- * output, and setting the config below to the name of the script.
- *
- * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link().
- */
- //Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
-
-/**
- * The classname and database used in CakePHP's
- * access control lists.
- */
- Configure::write('Acl.classname', 'DbAcl');
- Configure::write('Acl.database', 'default');
-
-/**
- * Uncomment this line and correct your server timezone to fix
- * any date & time related errors.
- */
- //date_default_timezone_set('UTC');
-
-/**
- * Pick the caching engine to use. If APC is enabled use it.
- * If running via cli - apc is disabled by default. ensure it's available and enabled in this case
- *
- * Note: 'default' and other application caches should be configured in app/Config/bootstrap.php.
- * Please check the comments in boostrap.php for more info on the cache engines available
- * and their setttings.
- */
-$engine = 'File';
-if (extension_loaded('apc') && function_exists('apc_dec') && (php_sapi_name() !== 'cli' || ini_get('apc.enable_cli'))) {
- $engine = 'Apc';
-}
-
-// In development mode, caches should expire quickly.
-$duration = '+999 days';
-if (Configure::read('debug') >= 1) {
- $duration = '+10 seconds';
-}
-
-// Prefix each application on the same server with a different string, to avoid Memcache and APC conflicts.
-$prefix = 'myapp_';
-
-/**
- * Configure the cache used for general framework caching. Path information,
- * object listings, and translation cache files are stored with this configuration.
- */
-Cache::config('_cake_core_', array(
- 'engine' => $engine,
- 'prefix' => $prefix . 'cake_core_',
- 'path' => CACHE . 'persistent' . DS,
- 'serialize' => ($engine === 'File'),
- 'duration' => $duration
-));
-
-/**
- * Configure the cache for model and datasource caches. This cache configuration
- * is used to store schema descriptions, and table listings in connections.
- */
-Cache::config('_cake_model_', array(
- 'engine' => $engine,
- 'prefix' => $prefix . 'cake_model_',
- 'path' => CACHE . 'models' . DS,
- 'serialize' => ($engine === 'File'),
- 'duration' => $duration
-));
diff --git a/app/Config/database.php.default b/app/Config/database.php.default
deleted file mode 100644
index d0aeb1f1399..00000000000
--- a/app/Config/database.php.default
+++ /dev/null
@@ -1,83 +0,0 @@
- The name of a supported datasource; valid options are as follows:
- * Database/Mysql - MySQL 4 & 5,
- * Database/Sqlite - SQLite (PHP5 only),
- * Database/Postgres - PostgreSQL 7 and higher,
- * Database/Sqlserver - Microsoft SQL Server 2005 and higher
- *
- * You can add custom database datasources (or override existing datasources) by adding the
- * appropriate file to app/Model/Datasource/Database. Datasources should be named 'MyDatasource.php',
- *
- *
- * persistent => true / false
- * Determines whether or not the database should use a persistent connection
- *
- * host =>
- * the host you connect to the database. To add a socket or port number, use 'port' => #
- *
- * prefix =>
- * Uses the given prefix for all the tables in this database. This setting can be overridden
- * on a per-table basis with the Model::$tablePrefix property.
- *
- * schema =>
- * For Postgres specifies which schema you would like to use the tables in. Postgres defaults to 'public'.
- *
- * encoding =>
- * For MySQL, Postgres specifies the character encoding to use when connecting to the
- * database. Uses database default not specified.
- *
- * unix_socket =>
- * For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port`
- */
-class DATABASE_CONFIG {
-
- public $default = array(
- 'datasource' => 'Database/Mysql',
- 'persistent' => false,
- 'host' => 'localhost',
- 'login' => 'user',
- 'password' => 'password',
- 'database' => 'database_name',
- 'prefix' => '',
- //'encoding' => 'utf8',
- );
-
- public $test = array(
- 'datasource' => 'Database/Mysql',
- 'persistent' => false,
- 'host' => 'localhost',
- 'login' => 'user',
- 'password' => 'password',
- 'database' => 'test_database_name',
- 'prefix' => '',
- //'encoding' => 'utf8',
- );
-}
diff --git a/app/Config/email.php.default b/app/Config/email.php.default
deleted file mode 100644
index c423f782f29..00000000000
--- a/app/Config/email.php.default
+++ /dev/null
@@ -1,97 +0,0 @@
- The name of a supported transport; valid options are as follows:
- * Mail - Send using PHP mail function
- * Smtp - Send using SMTP
- * Debug - Do not send the email, just return the result
- *
- * You can add custom transports (or override existing transports) by adding the
- * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php',
- * where 'Your' is the name of the transport.
- *
- * from =>
- * The origin email. See CakeEmail::from() about the valid values
- *
- */
-class EmailConfig {
-
- public $default = array(
- 'transport' => 'Mail',
- 'from' => 'you@localhost',
- //'charset' => 'utf-8',
- //'headerCharset' => 'utf-8',
- );
-
- public $smtp = array(
- 'transport' => 'Smtp',
- 'from' => array('site@localhost' => 'My Site'),
- 'host' => 'localhost',
- 'port' => 25,
- 'timeout' => 30,
- 'username' => 'user',
- 'password' => 'secret',
- 'client' => null,
- 'log' => false
- //'charset' => 'utf-8',
- //'headerCharset' => 'utf-8',
- );
-
- public $fast = array(
- 'from' => 'you@localhost',
- 'sender' => null,
- 'to' => null,
- 'cc' => null,
- 'bcc' => null,
- 'replyTo' => null,
- 'readReceipt' => null,
- 'returnPath' => null,
- 'messageId' => true,
- 'subject' => null,
- 'message' => null,
- 'headers' => null,
- 'viewRender' => null,
- 'template' => false,
- 'layout' => false,
- 'viewVars' => null,
- 'attachments' => null,
- 'emailFormat' => null,
- 'transport' => 'Smtp',
- 'host' => 'localhost',
- 'port' => 25,
- 'timeout' => 30,
- 'username' => 'user',
- 'password' => 'secret',
- 'client' => null,
- 'log' => true,
- //'charset' => 'utf-8',
- //'headerCharset' => 'utf-8',
- );
-
-}
diff --git a/app/Config/routes.php b/app/Config/routes.php
deleted file mode 100644
index b3823779e11..00000000000
--- a/app/Config/routes.php
+++ /dev/null
@@ -1,44 +0,0 @@
- 'pages', 'action' => 'display', 'home'));
-/**
- * ...and connect the rest of 'Pages' controller's urls.
- */
- Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
-
-/**
- * Load all plugin routes. See the CakePlugin documentation on
- * how to customize the loading of plugin routes.
- */
- CakePlugin::routes();
-
-/**
- * Load the CakePHP default routes. Remove this if you do not want to use
- * the built-in default routes.
- */
- require CAKE . 'Config' . DS . 'routes.php';
diff --git a/app/Console/Command/AppShell.php b/app/Console/Command/AppShell.php
deleted file mode 100644
index 5cc915f6bfe..00000000000
--- a/app/Console/Command/AppShell.php
+++ /dev/null
@@ -1,31 +0,0 @@
-redirect('/');
- }
- $page = $subpage = $title_for_layout = null;
-
- if (!empty($path[0])) {
- $page = $path[0];
- }
- if (!empty($path[1])) {
- $subpage = $path[1];
- }
- if (!empty($path[$count - 1])) {
- $title_for_layout = Inflector::humanize($path[$count - 1]);
- }
- $this->set(compact('page', 'subpage', 'title_for_layout'));
- $this->render(implode('/', $path));
- }
-}
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
deleted file mode 100644
index 94e5e5f39d1..00000000000
--- a/app/Model/AppModel.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- ' . $line . "\n";
-endforeach;
-?>
\ No newline at end of file
diff --git a/app/View/Emails/text/default.ctp b/app/View/Emails/text/default.ctp
deleted file mode 100644
index 56be8c13a1e..00000000000
--- a/app/View/Emails/text/default.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/View/Errors/error400.ctp b/app/View/Errors/error400.ctp
deleted file mode 100644
index 6d508604c7c..00000000000
--- a/app/View/Errors/error400.ctp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- :
- '{$url}'"
- ); ?>
-
- 0 ):
- echo $this->element('exception_stack_trace');
-endif;
-?>
diff --git a/app/View/Errors/error500.ctp b/app/View/Errors/error500.ctp
deleted file mode 100644
index 4e1f36ece56..00000000000
--- a/app/View/Errors/error500.ctp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- :
-
-
- 0 ):
- echo $this->element('exception_stack_trace');
-endif;
-?>
diff --git a/app/View/Helper/AppHelper.php b/app/View/Helper/AppHelper.php
deleted file mode 100644
index 0fddaea2016..00000000000
--- a/app/View/Helper/AppHelper.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- <?php echo $title_for_layout;?>
-
-
-
-
- This email was sent using the CakePHP Framework
-
-
\ No newline at end of file
diff --git a/app/View/Layouts/Emails/text/default.ctp b/app/View/Layouts/Emails/text/default.ctp
deleted file mode 100644
index 94ed2224956..00000000000
--- a/app/View/Layouts/Emails/text/default.ctp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-This email was sent using the CakePHP Framework, http://cakephp.org.
diff --git a/app/View/Layouts/ajax.ctp b/app/View/Layouts/ajax.ctp
deleted file mode 100644
index c0ca27058ff..00000000000
--- a/app/View/Layouts/ajax.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
deleted file mode 100644
index 39704bf4411..00000000000
--- a/app/View/Layouts/default.ctp
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
- Html->charset(); ?>
-
- <?php echo $cakeDescription ?>:
- <?php echo $title_for_layout; ?>
-
- Html->meta('icon');
-
- echo $this->Html->css('cake.generic');
-
- echo $this->fetch('meta');
- echo $this->fetch('css');
- echo $this->fetch('script');
- ?>
-
-
-
-
-
-
- Session->flash(); ?>
-
- fetch('content'); ?>
-
-
-
<?php echo $page_title; ?>
-
-
-
-
-
\ No newline at end of file
diff --git a/app/View/Layouts/js/default.ctp b/app/View/Layouts/js/default.ctp
deleted file mode 100644
index d94dc903a57..00000000000
--- a/app/View/Layouts/js/default.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/View/Layouts/rss/default.ctp b/app/View/Layouts/rss/default.ctp
deleted file mode 100644
index d57624e1a90..00000000000
--- a/app/View/Layouts/rss/default.ctp
+++ /dev/null
@@ -1,14 +0,0 @@
-Rss->document(
- $this->Rss->channel(
- array(), $channel, $content_for_layout
- )
-);
-?>
diff --git a/app/View/Layouts/xml/default.ctp b/app/View/Layouts/xml/default.ctp
deleted file mode 100644
index 27f20316b37..00000000000
--- a/app/View/Layouts/xml/default.ctp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/View/Pages/home.ctp b/app/View/Pages/home.ctp
deleted file mode 100644
index 6661e9a6240..00000000000
--- a/app/View/Pages/home.ctp
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
- 0):
- Debugger::checkSecurityKeys();
-endif;
-?>
-
-
- 1) Help me configure it
- 2) I don't / can't use URL rewriting
-
-
-=')):
- echo '';
- echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
- echo ' ';
- else:
- echo '';
- echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
- echo ' ';
- endif;
-?>
-
-
- ';
- echo __d('cake_dev', 'Your tmp directory is writable.');
- echo '';
- else:
- echo '';
- echo __d('cake_dev', 'Your tmp directory is NOT writable.');
- echo ' ';
- endif;
- ?>
-
-
- ';
- echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit APP/Config/core.php ', ''. $settings['engine'] . 'Engine ');
- echo '';
- else:
- echo '';
- echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in APP/Config/core.php');
- echo ' ';
- endif;
- ?>
-
-
- ';
- echo __d('cake_dev', 'Your database configuration file is present.');
- $filePresent = true;
- echo '';
- else:
- echo '';
- echo __d('cake_dev', 'Your database configuration file is NOT present.');
- echo ' ';
- endif;
- ?>
-
-
-
- isConnected()):
- echo '';
- echo __d('cake_dev', 'Cake is able to connect to the database.');
- echo ' ';
- else:
- echo '';
- echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
- echo ' ';
- endif;
- ?>
-
-
-';
- echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
- echo '--enable-unicode-properties when configuring');
- echo ' ';
- }
-?>
-
-
-To change its layout, create: APP/View/Layouts/default.ctp.
-
-
- Html->link(
- sprintf('%s %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 2.0 Docs')),
- 'http://book.cakephp.org/2.0/en/',
- array('target' => '_blank', 'escape' => false)
- );
- ?>
-
-
- Html->link(
- __d('cake_dev', 'The 15 min Blog Tutorial'),
- 'http://book.cakephp.org/2.0/en/tutorials-and-examples/blog/blog.html',
- array('target' => '_blank', 'escape' => false)
- );
- ?>
-
-
-
-
-
-
-
-
-
-
diff --git a/app/View/Scaffolds/empty b/app/View/Scaffolds/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/index.php b/app/index.php
deleted file mode 100644
index 29f2c572852..00000000000
--- a/app/index.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteRule ^(.*)$ index.php [QSA,L]
-
diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
deleted file mode 100644
index 2244ad2f868..00000000000
--- a/app/webroot/css/cake.generic.css
+++ /dev/null
@@ -1,739 +0,0 @@
-@charset "utf-8";
-/**
- *
- * Generic CSS for CakePHP
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://cakephp.org CakePHP(tm) Project
- * @package app.webroot.css
- * @since CakePHP(tm)
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-
-* {
- margin:0;
- padding:0;
-}
-
-/** General Style Info **/
-body {
- background: #003d4c;
- color: #fff;
- font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
- font-size:90%;
- margin: 0;
-}
-a {
- color: #003d4c;
- text-decoration: underline;
- font-weight: bold;
-}
-a:hover {
- color: #367889;
- text-decoration:none;
-}
-a img {
- border:none;
-}
-h1, h2, h3, h4 {
- font-weight: normal;
- margin-bottom:0.5em;
-}
-h1 {
- background:#fff;
- color: #003d4c;
- font-size: 100%;
-}
-h2 {
- background:#fff;
- color: #e32;
- font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
- font-size: 190%;
-}
-h3 {
- color: #2c6877;
- font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
- font-size: 165%;
-}
-h4 {
- color: #993;
- font-weight: normal;
-}
-ul, li {
- margin: 0 12px;
-}
-p {
- margin: 0 0 1em 0;
-}
-
-/** Layout **/
-#container {
- text-align: left;
-}
-
-#header{
- padding: 10px 20px;
-}
-#header h1 {
- line-height:20px;
- background: #003d4c url('../img/cake.icon.png') no-repeat left;
- color: #fff;
- padding: 0px 30px;
-}
-#header h1 a {
- color: #fff;
- background: #003d4c;
- font-weight: normal;
- text-decoration: none;
-}
-#header h1 a:hover {
- color: #fff;
- background: #003d4c;
- text-decoration: underline;
-}
-#content{
- background: #fff;
- clear: both;
- color: #333;
- padding: 10px 20px 40px 20px;
- overflow: auto;
-}
-#footer {
- clear: both;
- padding: 6px 10px;
- text-align: right;
-}
-
-/** containers **/
-div.form,
-div.index,
-div.view {
- float:right;
- width:76%;
- border-left:1px solid #666;
- padding:10px 2%;
-}
-div.actions {
- float:left;
- width:16%;
- padding:10px 1.5%;
-}
-div.actions h3 {
- padding-top:0;
- color:#777;
-}
-
-
-/** Tables **/
-table {
- border-right:0;
- clear: both;
- color: #333;
- margin-bottom: 10px;
- width: 100%;
-}
-th {
- border:0;
- border-bottom:2px solid #555;
- text-align: left;
- padding:4px;
-}
-th a {
- display: block;
- padding: 2px 4px;
- text-decoration: none;
-}
-th a.asc:after {
- content: ' ⇣';
-}
-th a.desc:after {
- content: ' ⇡';
-}
-table tr td {
- padding: 6px;
- text-align: left;
- vertical-align: top;
- border-bottom:1px solid #ddd;
-}
-table tr:nth-child(even) {
- background: #f9f9f9;
-}
-td.actions {
- text-align: center;
- white-space: nowrap;
-}
-table td.actions a {
- margin: 0px 6px;
- padding:2px 5px;
-}
-
-/* SQL log */
-.cake-sql-log {
- background: #fff;
-}
-.cake-sql-log td {
- padding: 4px 8px;
- text-align: left;
- font-family: Monaco, Consolas, "Courier New", monospaced;
-}
-.cake-sql-log caption {
- color:#fff;
-}
-
-/** Paging **/
-.paging {
- background:#fff;
- color: #ccc;
- margin-top: 1em;
- clear:both;
-}
-.paging .current,
-.paging .disabled,
-.paging a {
- text-decoration: none;
- padding: 5px 8px;
- display: inline-block
-}
-.paging > span {
- display: inline-block;
- border: 1px solid #ccc;
- border-left: 0;
-}
-.paging > span:hover {
- background: #efefef;
-}
-.paging .prev {
- border-left: 1px solid #ccc;
- -moz-border-radius: 4px 0 0 4px;
- -webkit-border-radius: 4px 0 0 4px;
- border-radius: 4px 0 0 4px;
-}
-.paging .next {
- -moz-border-radius: 0 4px 4px 0;
- -webkit-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
-}
-.paging .disabled {
- color: #ddd;
-}
-.paging .disabled:hover {
- background: transparent;
-}
-.paging .current {
- background: #efefef;
- color: #c73e14;
-}
-
-/** Scaffold View **/
-dl {
- line-height: 2em;
- margin: 0em 0em;
- width: 60%;
-}
-dl dd:nth-child(4n+2),
-dl dt:nth-child(4n+1) {
- background: #f4f4f4;
-}
-
-dt {
- font-weight: bold;
- padding-left: 4px;
- vertical-align: top;
- width: 10em;
-}
-dd {
- margin-left: 10em;
- margin-top: -2em;
- vertical-align: top;
-}
-
-/** Forms **/
-form {
- clear: both;
- margin-right: 20px;
- padding: 0;
- width: 95%;
-}
-fieldset {
- border: none;
- margin-bottom: 1em;
- padding: 16px 10px;
-}
-fieldset legend {
- color: #e32;
- font-size: 160%;
- font-weight: bold;
-}
-fieldset fieldset {
- margin-top: 0;
- padding: 10px 0 0;
-}
-fieldset fieldset legend {
- font-size: 120%;
- font-weight: normal;
-}
-fieldset fieldset div {
- clear: left;
- margin: 0 20px;
-}
-form div {
- clear: both;
- margin-bottom: 1em;
- padding: .5em;
- vertical-align: text-top;
-}
-form .input {
- color: #444;
-}
-form .required {
- font-weight: bold;
-}
-form .required label:after {
- color: #e32;
- content: '*';
- display:inline;
-}
-form div.submit {
- border: 0;
- clear: both;
- margin-top: 10px;
-}
-label {
- display: block;
- font-size: 110%;
- margin-bottom:3px;
-}
-input, textarea {
- clear: both;
- font-size: 140%;
- font-family: "frutiger linotype", "lucida grande", "verdana", sans-serif;
- padding: 1%;
- width:98%;
-}
-select {
- clear: both;
- font-size: 120%;
- vertical-align: text-bottom;
-}
-select[multiple=multiple] {
- width: 100%;
-}
-option {
- font-size: 120%;
- padding: 0 3px;
-}
-input[type=checkbox] {
- clear: left;
- float: left;
- margin: 0px 6px 7px 2px;
- width: auto;
-}
-div.checkbox label {
- display: inline;
-}
-input[type=radio] {
- float:left;
- width:auto;
- margin: 6px 0;
- padding: 0;
- line-height: 26px;
-}
-.radio label {
- margin: 0 0 6px 20px;
- line-height: 26px;
-}
-input[type=submit] {
- display: inline;
- font-size: 110%;
- width: auto;
-}
-form .submit input[type=submit] {
- background:#62af56;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#76BF6B), to(#3B8230));
- background-image: -webkit-linear-gradient(top, #76BF6B, #3B8230);
- background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
- border-color: #2d6324;
- color: #fff;
- text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px;
- padding: 8px 10px;
-}
-form .submit input[type=submit]:hover {
- background: #5BA150;
-}
-/* Form errors */
-form .error {
- background: #FFDACC;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- font-weight: normal;
-}
-form .error-message {
- -moz-border-radius: none;
- -webkit-border-radius: none;
- border-radius: none;
- border: none;
- background: none;
- margin: 0;
- padding-left: 4px;
- padding-right: 0;
-}
-form .error,
-form .error-message {
- color: #9E2424;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- -ms-box-shadow: none;
- -o-box-shadow: none;
- box-shadow: none;
- text-shadow: none;
-}
-
-/** Notices and Errors **/
-.message {
- clear: both;
- color: #fff;
- font-size: 140%;
- font-weight: bold;
- margin: 0 0 1em 0;
- padding: 5px;
-}
-
-.success,
-.message,
-.cake-error,
-.cake-debug,
-.notice,
-p.error,
-.error-message {
- background: #ffcc00;
- background-repeat: repeat-x;
- background-image: -moz-linear-gradient(top, #ffcc00, #E6B800);
- background-image: -ms-linear-gradient(top, #ffcc00, #E6B800);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#ffcc00), to(#E6B800));
- background-image: -webkit-linear-gradient(top, #ffcc00, #E6B800);
- background-image: -o-linear-gradient(top, #ffcc00, #E6B800);
- background-image: linear-gradient(top, #ffcc00, #E6B800);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border: 1px solid rgba(0, 0, 0, 0.2);
- margin-bottom: 18px;
- padding: 7px 14px;
- color: #404040;
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-}
-.success,
-.message,
-.cake-error,
-p.error,
-.error-message {
- clear: both;
- color: #fff;
- background: #c43c35;
- border: 1px solid rgba(0, 0, 0, 0.5);
- background-repeat: repeat-x;
- background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
- background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: linear-gradient(top, #ee5f5b, #c43c35);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-}
-.success {
- clear: both;
- color: #fff;
- border: 1px solid rgba(0, 0, 0, 0.5);
- background: #3B8230;
- background-repeat: repeat-x;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#76BF6B), to(#3B8230));
- background-image: -webkit-linear-gradient(top, #76BF6B, #3B8230);
- background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
- background-image: -ms-linear-gradient(top, #76BF6B, #3B8230);
- background-image: -o-linear-gradient(top, #76BF6B, #3B8230);
- background-image: linear-gradient(top, #76BF6B, #3B8230);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-}
-p.error {
- font-family: Monaco, Consolas, Courier, monospace;
- font-size: 120%;
- padding: 0.8em;
- margin: 1em 0;
-}
-p.error em {
- font-weight: normal;
- line-height: 140%;
-}
-.notice {
- color: #000;
- display: block;
- font-size: 120%;
- padding: 0.8em;
- margin: 1em 0;
-}
-.success {
- color: #fff;
-}
-
-/** Actions **/
-.actions ul {
- margin: 0;
- padding: 0;
-}
-.actions li {
- margin:0 0 0.5em 0;
- list-style-type: none;
- white-space: nowrap;
- padding: 0;
-}
-.actions ul li a {
- font-weight: normal;
- display: block;
- clear: both;
-}
-
-/* Buttons and button links */
-input[type=submit],
-.actions ul li a,
-.actions a {
- font-weight:normal;
- padding: 4px 8px;
- background: #dcdcdc;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#fefefe), to(#dcdcdc));
- background-image: -webkit-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: -moz-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: -ms-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: -o-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: linear-gradient(top, #fefefe, #dcdcdc);
- color:#333;
- border:1px solid #bbb;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- text-decoration: none;
- text-shadow: #fff 0px 1px 0px;
- min-width: 0;
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
- -webkit-user-select: none;
- user-select: none;
-}
-.actions ul li a:hover,
-.actions a:hover {
- background: #ededed;
- border-color: #acacac;
- text-decoration: none;
-}
-input[type=submit]:active,
-.actions ul li a:active,
-.actions a:active {
- background: #eee;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#dfdfdf), to(#eee));
- background-image: -webkit-linear-gradient(top, #dfdfdf, #eee);
- background-image: -moz-linear-gradient(top, #dfdfdf, #eee);
- background-image: -ms-linear-gradient(top, #dfdfdf, #eee);
- background-image: -o-linear-gradient(top, #dfdfdf, #eee);
- background-image: linear-gradient(top, #dfdfdf, #eee);
- text-shadow: #eee 0px 1px 0px;
- -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
- -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
- box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
- border-color: #aaa;
- text-decoration: none;
-}
-
-/** Related **/
-.related {
- clear: both;
- display: block;
-}
-
-/** Debugging **/
-pre {
- color: #000;
- background: #f0f0f0;
- padding: 15px;
- -moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
- -webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
- box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
-}
-.cake-debug-output {
- padding: 0;
- position: relative;
-}
-.cake-debug-output > span {
- position: absolute;
- top: 5px;
- right: 5px;
- background: rgba(255, 255, 255, 0.3);
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- padding: 5px 6px;
- color: #000;
- display: block;
- float: left;
- -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(255, 255, 255, 0.5);
- -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(255, 255, 255, 0.5);
- box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(255, 255, 255, 0.5);
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);
-}
-.cake-debug,
-.cake-error {
- font-size: 16px;
- line-height: 20px;
- clear: both;
-}
-.cake-error > a {
- text-shadow: none;
-}
-.cake-error {
- white-space: normal;
-}
-.cake-stack-trace {
- background: rgba(255, 255, 255, 0.7);
- color: #333;
- margin: 10px 0 5px 0;
- padding: 10px 10px 0 10px;
- font-size: 120%;
- line-height: 140%;
- overflow: auto;
- position: relative;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
-}
-.cake-stack-trace a {
- text-shadow: none;
- background: rgba(255, 255, 255, 0.7);
- padding: 5px;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- border-radius: 10px;
- margin: 0px 4px 10px 2px;
- font-family: sans-serif;
- font-size: 14px;
- line-height: 14px;
- display: inline-block;
- text-decoration: none;
- -moz-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
- -webkit-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
- box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
-}
-.cake-code-dump pre {
- position: relative;
- overflow: auto;
-}
-.cake-context {
- margin-bottom: 10px;
-}
-.cake-stack-trace pre {
- color: #000;
- background-color: #F0F0F0;
- margin: 0px 0 10px 0;
- padding: 1em;
- overflow: auto;
- text-shadow: none;
-}
-.cake-stack-trace li {
- padding: 10px 5px 0px;
- margin: 0 0 4px 0;
- font-family: monospace;
- border: 1px solid #bbb;
- -moz-border-radius: 4px;
- -wekbkit-border-radius: 4px;
- border-radius: 4px;
- background: #dcdcdc;
- background-image: -webkit-gradient(linear, left top, left bottom, from(#fefefe), to(#dcdcdc));
- background-image: -webkit-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: -moz-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: -ms-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: -o-linear-gradient(top, #fefefe, #dcdcdc);
- background-image: linear-gradient(top, #fefefe, #dcdcdc);
-}
-/* excerpt */
-.cake-code-dump pre,
-.cake-code-dump pre code {
- clear: both;
- font-size: 12px;
- line-height: 15px;
- margin: 4px 2px;
- padding: 4px;
- overflow: auto;
-}
-.cake-code-dump .code-highlight {
- display: block;
- background-color: rgba(255, 255, 0, 0.5);
-}
-.code-coverage-results div.code-line {
- padding-left:5px;
- display:block;
- margin-left:10px;
-}
-.code-coverage-results div.uncovered span.content {
- background:#ecc;
-}
-.code-coverage-results div.covered span.content {
- background:#cec;
-}
-.code-coverage-results div.ignored span.content {
- color:#aaa;
-}
-.code-coverage-results span.line-num {
- color:#666;
- display:block;
- float:left;
- width:20px;
- text-align:right;
- margin-right:5px;
-}
-.code-coverage-results span.line-num strong {
- color:#666;
-}
-.code-coverage-results div.start {
- border:1px solid #aaa;
- border-width:1px 1px 0px 1px;
- margin-top:30px;
- padding-top:5px;
-}
-.code-coverage-results div.end {
- border:1px solid #aaa;
- border-width:0px 1px 1px 1px;
- margin-bottom:30px;
- padding-bottom:5px;
-}
-.code-coverage-results div.realstart {
- margin-top:0px;
-}
-.code-coverage-results p.note {
- color:#bbb;
- padding:5px;
- margin:5px 0 10px;
- font-size:10px;
-}
-.code-coverage-results span.result-bad {
- color: #a00;
-}
-.code-coverage-results span.result-ok {
- color: #fa0;
-}
-.code-coverage-results span.result-good {
- color: #0a0;
-}
-
-/** Elements **/
-#url-rewriting-warning {
- display:none;
-}
diff --git a/app/webroot/favicon.ico b/app/webroot/favicon.ico
deleted file mode 100644
index b36e81f2f35..00000000000
Binary files a/app/webroot/favicon.ico and /dev/null differ
diff --git a/app/webroot/files/empty b/app/webroot/files/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/webroot/img/test-error-icon.png b/app/webroot/img/test-error-icon.png
deleted file mode 100644
index 07bb1241143..00000000000
Binary files a/app/webroot/img/test-error-icon.png and /dev/null differ
diff --git a/app/webroot/img/test-fail-icon.png b/app/webroot/img/test-fail-icon.png
deleted file mode 100644
index f9d2f147ec4..00000000000
Binary files a/app/webroot/img/test-fail-icon.png and /dev/null differ
diff --git a/app/webroot/img/test-pass-icon.png b/app/webroot/img/test-pass-icon.png
deleted file mode 100644
index 99c5eb05ad2..00000000000
Binary files a/app/webroot/img/test-pass-icon.png and /dev/null differ
diff --git a/app/webroot/img/test-skip-icon.png b/app/webroot/img/test-skip-icon.png
deleted file mode 100644
index 749771c9895..00000000000
Binary files a/app/webroot/img/test-skip-icon.png and /dev/null differ
diff --git a/app/webroot/index.php b/app/webroot/index.php
deleted file mode 100644
index 14ba634724f..00000000000
--- a/app/webroot/index.php
+++ /dev/null
@@ -1,96 +0,0 @@
-dispatch(new CakeRequest(), new CakeResponse(array('charset' => Configure::read('App.encoding'))));
diff --git a/app/webroot/js/empty b/app/webroot/js/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/webroot/test.php b/app/webroot/test.php
deleted file mode 100644
index 9a3a072add3..00000000000
--- a/app/webroot/test.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
- * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice
- *
- * @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://book.cakephp.org/view/1196/Testing
- * @package app.webroot
- * @since CakePHP(tm) v 1.2.0.4433
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-set_time_limit(0);
-ini_set('display_errors', 1);
-/**
- * Use the DS to separate the directories in other defines
- */
- 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.
- * When using custom settings be sure to use the DS and do not add a trailing DS.
- */
-
-/**
- * The full path to the directory which holds "app", WITHOUT a trailing DS.
- *
- */
- if (!defined('ROOT')) {
- define('ROOT', dirname(dirname(dirname(__FILE__))));
- }
-/**
- * The actual directory name for the "app".
- *
- */
- if (!defined('APP_DIR')) {
- define('APP_DIR', basename(dirname(dirname(__FILE__))));
- }
-
-/**
- * The absolute path to the "Cake" directory, WITHOUT a trailing DS.
- *
- * 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
- */
- //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
-
-/**
- * Editing below this line should not be necessary.
- * Change at your own risk.
- *
- */
-if (!defined('WEBROOT_DIR')) {
- define('WEBROOT_DIR', basename(dirname(__FILE__)));
-}
-if (!defined('WWW_ROOT')) {
- define('WWW_ROOT', dirname(__FILE__) . DS);
-}
-
-if (!defined('CAKE_CORE_INCLUDE_PATH')) {
- if (function_exists('ini_set')) {
- ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
- }
- if (!include('Cake' . DS . 'bootstrap.php')) {
- $failed = true;
- }
-} else {
- 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);
-}
-
-if (Configure::read('debug') < 1) {
- die(__d('cake_dev', 'Debug setting does not allow access to this url.'));
-}
-
-require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php';
-
-CakeTestSuiteDispatcher::run();
diff --git a/build.properties b/build.properties
deleted file mode 100644
index e3c99ca9177..00000000000
--- a/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# Name
-project.name = CakePHP
-
-# Git stuff
-git.remote = changeme!
-
-# Directories
-build.dir = build
-dist.dir = dist
-
-# Server
-pirum.dir = /home/cakephp/www-live/pear.cakephp.org
diff --git a/build.xml b/build.xml
deleted file mode 100644
index c6542643826..00000000000
--- a/build.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CakePHP
- CakePHP Rapid Development Framework
- pear.cakephp.org
- CakePHP is an application development framework for PHP 5.2+
-
- MIT License
- http://github.com/cakephp/cakephp/blob/master/README
-
-
- script
- php
- php
- php
- php
-
-
- php
- php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000000..e64e685c727
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,153 @@
+{
+ "name": "cakephp/cakephp",
+ "type": "library",
+ "description": "The CakePHP framework",
+ "keywords": [
+ "framework",
+ "mvc",
+ "rapid-development",
+ "conventions over configuration",
+ "dry",
+ "orm",
+ "form",
+ "validation",
+ "psr-7"
+ ],
+ "homepage": "https://cakephp.org",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "CakePHP Community",
+ "homepage": "https://github.com/cakephp/cakephp/graphs/contributors"
+ }
+ ],
+ "require": {
+ "php": ">=8.2",
+ "ext-intl": "*",
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "cakephp/chronos": "^3.3",
+ "composer/ca-bundle": "^1.5",
+ "laminas/laminas-diactoros": "^3.8",
+ "laminas/laminas-httphandlerrunner": "^2.6",
+ "league/container": "^5.1",
+ "psr/container": "^1.1 || ^2.0",
+ "psr/http-client": "^1.0.2",
+ "psr/http-factory": "^1.1",
+ "psr/http-message": "^1.1 || ^2.0",
+ "psr/http-server-handler": "^1.0.2",
+ "psr/http-server-middleware": "^1.0.2",
+ "psr/log": "^3.0",
+ "psr/simple-cache": "^2.0 || ^3.0"
+ },
+ "replace": {
+ "cakephp/cache": "self.version",
+ "cakephp/collection": "self.version",
+ "cakephp/console": "self.version",
+ "cakephp/core": "self.version",
+ "cakephp/database": "self.version",
+ "cakephp/datasource": "self.version",
+ "cakephp/event": "self.version",
+ "cakephp/form": "self.version",
+ "cakephp/http": "self.version",
+ "cakephp/i18n": "self.version",
+ "cakephp/log": "self.version",
+ "cakephp/orm": "self.version",
+ "cakephp/utility": "self.version",
+ "cakephp/validation": "self.version"
+ },
+ "require-dev": {
+ "cakephp/cakephp-codesniffer": "^5.3",
+ "http-interop/http-factory-tests": "^2.0",
+ "mikey179/vfsstream": "^1.6.12",
+ "mockery/mockery": "^1.6",
+ "paragonie/csp-builder": "^2.3 || ^3.0",
+ "phpunit/phpunit": "^11.5.3 || ^12.1.3 || ^13.0"
+ },
+ "suggest": {
+ "ext-curl": "To enable more efficient network calls in Http\\Client.",
+ "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
+ "paragonie/csp-builder": "CSP builder, to use the CSP Middleware"
+ },
+ "provide": {
+ "psr/container-implementation": "^2.0",
+ "psr/http-client-implementation": "^1.0",
+ "psr/http-factory-implementation": "^1.0",
+ "psr/http-server-handler-implementation": "^1.0",
+ "psr/http-server-middleware-implementation": "^1.0",
+ "psr/log-implementation": "^3.0",
+ "psr/simple-cache-implementation": "^3.0"
+ },
+ "config": {
+ "lock": false,
+ "process-timeout": 900,
+ "sort-packages": true,
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true,
+ "phpstan/extension-installer": true
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Cake\\": "src/"
+ },
+ "files": [
+ "src/Core/functions.php",
+ "src/Error/functions.php",
+ "src/Collection/functions.php",
+ "src/I18n/functions.php",
+ "src/ORM/bootstrap.php",
+ "src/Routing/functions.php",
+ "src/Utility/bootstrap.php"
+ ]
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "Cake\\PHPStan\\": "tests/PHPStan/",
+ "Cake\\Test\\": "tests/",
+ "TestApp\\": "tests/test_app/TestApp/",
+ "TestApp\\Test\\": "tests/test_app/TestApp/tests/",
+ "TestPlugin\\": "tests/test_app/Plugin/TestPlugin/src/",
+ "TestPlugin\\Test\\": "tests/test_app/Plugin/TestPlugin/tests/",
+ "TestPluginTwo\\": "tests/test_app/Plugin/TestPluginTwo/src/",
+ "Company\\TestPluginThree\\": "tests/test_app/Plugin/Company/TestPluginThree/src/",
+ "Company\\TestPluginThree\\Test\\": "tests/test_app/Plugin/Company/TestPluginThree/tests/",
+ "Named\\": "tests/test_app/Plugin/Named/src/",
+ "TestTheme\\": "tests/test_app/Plugin/TestTheme/src/",
+ "PluginJs\\": "tests/test_app/Plugin/PluginJs/src/"
+ }
+ },
+ "scripts": {
+ "check": [
+ "@cs-check",
+ "@test"
+ ],
+ "cs-check": "phpcs",
+ "cs-fix": "phpcbf",
+ "stan": [
+ "tools/phpstan analyse",
+ "tools/psalm"
+ ],
+ "stan-tests": "tools/phpstan analyze -c tests/phpstan.neon",
+ "stan-baseline": "tools/phpstan --generate-baseline",
+ "stan-setup": "phive install",
+ "psalm-baseline": "tools/psalm --set-baseline=psalm-baseline.xml",
+ "lowest": "validate-prefer-lowest",
+ "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
+ "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:\"~2.4.0\" && mv composer.backup composer.json",
+ "rector-check": "vendor/bin/rector process --dry-run",
+ "rector-fix": "vendor/bin/rector process",
+ "test": "phpunit",
+ "test-coverage": "phpunit --coverage-clover=clover.xml"
+ },
+ "support": {
+ "issues": "https://github.com/cakephp/cakephp/issues",
+ "forum": "https://discourse.cakephp.org/",
+ "source": "https://github.com/cakephp/cakephp"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-5.next": "5.4.x-dev"
+ }
+ }
+}
diff --git a/config/bootstrap.php b/config/bootstrap.php
new file mode 100644
index 00000000000..4e95849bc2c
--- /dev/null
+++ b/config/bootstrap.php
@@ -0,0 +1,21 @@
+ trim(array_pop($versionFile)),
+];
diff --git a/contrib/git-filter-repo b/contrib/git-filter-repo
new file mode 100644
index 00000000000..fb3de42e428
--- /dev/null
+++ b/contrib/git-filter-repo
@@ -0,0 +1,4989 @@
+#!/usr/bin/env python3
+
+"""
+git-filter-repo filters git repositories, similar to git filter-branch, BFG
+repo cleaner, and others. The basic idea is that it works by running
+ git fast-export | filter | git fast-import
+where this program not only launches the whole pipeline but also serves as
+the 'filter' in the middle. It does a few additional things on top as well
+in order to make it into a well-rounded filtering tool.
+
+git-filter-repo can also be used as a library for more involved filtering
+operations; however:
+ ***** API BACKWARD COMPATIBILITY CAVEAT *****
+ Programs using git-filter-repo as a library can reach pretty far into its
+ internals, but I am not prepared to guarantee backward compatibility of
+ all APIs. I suspect changes will be rare, but I reserve the right to
+ change any API. Since it is assumed that repository filtering is
+ something one would do very rarely, and in particular that it's a
+ one-shot operation, this should not be a problem in practice for anyone.
+ However, if you want to re-use a program you have written that uses
+ git-filter-repo as a library (or makes use of one of its --*-callback
+ arguments), you should either make sure you are using the same version of
+ git and git-filter-repo, or make sure to re-test it.
+
+ If there are particular pieces of the API you are concerned about, and
+ there is not already a testcase for it in t9391-lib-usage.sh or
+ t9392-python-callback.sh, please contribute a testcase. That will not
+ prevent me from changing the API, but it will allow you to look at the
+ history of a testcase to see whether and how the API changed.
+ ***** END API BACKWARD COMPATIBILITY CAVEAT *****
+"""
+
+import argparse
+import collections
+import fnmatch
+import gettext
+import io
+import os
+import platform
+import re
+import shutil
+import subprocess
+import sys
+import time
+import textwrap
+
+from datetime import tzinfo, timedelta, datetime
+
+__all__ = ["Blob", "Reset", "FileChange", "Commit", "Tag", "Progress",
+ "Checkpoint", "FastExportParser", "ProgressWriter",
+ "string_to_date", "date_to_string",
+ "record_id_rename", "GitUtils", "FilteringOptions", "RepoFilter"]
+
+# The globals to make visible to callbacks. They will see all our imports for
+# free, as well as our public API.
+public_globals = ["__builtins__", "argparse", "collections", "fnmatch",
+ "gettext", "io", "os", "platform", "re", "shutil",
+ "subprocess", "sys", "time", "textwrap", "tzinfo",
+ "timedelta", "datetime"] + __all__
+
+deleted_hash = b'0'*40
+write_marks = True
+date_format_permissive = True
+
+def gettext_poison(msg):
+ if "GIT_TEST_GETTEXT_POISON" in os.environ: # pragma: no cover
+ return "# GETTEXT POISON #"
+ return gettext.gettext(msg)
+
+_ = gettext_poison
+
+def setup_gettext():
+ TEXTDOMAIN="git-filter-repo"
+ podir = os.environ.get("GIT_TEXTDOMAINDIR") or "@@LOCALEDIR@@"
+ if not os.path.isdir(podir): # pragma: no cover
+ podir = None # Python has its own fallback; use that
+
+ ## This looks like the most straightforward translation of the relevant
+ ## code in git.git:gettext.c and git.git:perl/Git/I18n.pm:
+ #import locale
+ #locale.setlocale(locale.LC_MESSAGES, "");
+ #locale.setlocale(locale.LC_TIME, "");
+ #locale.textdomain(TEXTDOMAIN);
+ #locale.bindtextdomain(TEXTDOMAIN, podir);
+ ## but the python docs suggest using the gettext module (which doesn't
+ ## have setlocale()) instead, so:
+ gettext.textdomain(TEXTDOMAIN);
+ gettext.bindtextdomain(TEXTDOMAIN, podir);
+
+def _timedelta_to_seconds(delta):
+ """
+ Converts timedelta to seconds
+ """
+ offset = delta.days*86400 + delta.seconds + (delta.microseconds+0.0)/1000000
+ return round(offset)
+
+class FixedTimeZone(tzinfo):
+ """
+ Fixed offset in minutes east from UTC.
+ """
+
+ tz_re = re.compile(br'^([-+]?)(\d\d)(\d\d)$')
+
+ def __init__(self, offset_string):
+ tzinfo.__init__(self)
+ sign, hh, mm = FixedTimeZone.tz_re.match(offset_string).groups()
+ factor = -1 if (sign and sign == b'-') else 1
+ self._offset = timedelta(minutes = factor*(60*int(hh) + int(mm)))
+ self._offset_string = offset_string
+
+ def utcoffset(self, dt):
+ return self._offset
+
+ def tzname(self, dt):
+ return self._offset_string
+
+ def dst(self, dt):
+ return timedelta(0)
+
+def string_to_date(datestring):
+ (unix_timestamp, tz_offset) = datestring.split()
+ return datetime.fromtimestamp(int(unix_timestamp),
+ FixedTimeZone(tz_offset))
+
+def date_to_string(dateobj):
+ epoch = datetime.fromtimestamp(0, dateobj.tzinfo)
+ return(b'%d %s' % (int(_timedelta_to_seconds(dateobj - epoch)),
+ dateobj.tzinfo.tzname(0)))
+
+def decode(bytestr):
+ 'Try to convert bytestr to utf-8 for outputting as an error message.'
+ return bytestr.decode('utf-8', 'backslashreplace')
+
+def glob_to_regex(glob_bytestr):
+ 'Translate glob_bytestr into a regex on bytestrings'
+
+ # fnmatch.translate is idiotic and won't accept bytestrings
+ if (decode(glob_bytestr).encode() != glob_bytestr): # pragma: no cover
+ raise SystemExit(_("Error: Cannot handle glob %s").format(glob_bytestr))
+
+ # Create regex operating on string
+ regex = fnmatch.translate(decode(glob_bytestr))
+
+ # FIXME: This is an ugly hack...
+ # fnmatch.translate tries to do multi-line matching and wants the glob to
+ # match up to the end of the input, which isn't relevant for us, so we
+ # have to modify the regex. fnmatch.translate has used different regex
+ # constructs to achieve this with different python versions, so we have
+ # to check for each of them and then fix it up. It would be much better
+ # if fnmatch.translate could just take some flags to allow us to specify
+ # what we want rather than employing this hackery, but since it
+ # doesn't...
+ if regex.endswith(r'\Z(?ms)'): # pragma: no cover
+ regex = regex[0:-7]
+ elif regex.startswith(r'(?s:') and regex.endswith(r')\Z'): # pragma: no cover
+ regex = regex[4:-3]
+ elif regex.startswith(r'(?s:') and regex.endswith(r')\z'): # pragma: no cover
+ # Yaay, python3.14 for senselessly duplicating \Z as \z...
+ regex = regex[4:-3]
+
+ # Finally, convert back to regex operating on bytestr
+ return regex.encode()
+
+class PathQuoting:
+ _unescape = {b'a': b'\a',
+ b'b': b'\b',
+ b'f': b'\f',
+ b'n': b'\n',
+ b'r': b'\r',
+ b't': b'\t',
+ b'v': b'\v',
+ b'"': b'"',
+ b'\\':b'\\'}
+ _unescape_re = re.compile(br'\\([a-z"\\]|[0-9]{3})')
+ _escape = [bytes([x]) for x in range(127)]+[
+ b'\\'+bytes(ord(c) for c in oct(x)[2:]) for x in range(127,256)]
+ _reverse = dict(map(reversed, _unescape.items()))
+ for x in _reverse:
+ _escape[ord(x)] = b'\\'+_reverse[x]
+ _special_chars = [len(x) > 1 for x in _escape]
+
+ @staticmethod
+ def unescape_sequence(orig):
+ seq = orig.group(1)
+ return PathQuoting._unescape[seq] if len(seq) == 1 else bytes([int(seq, 8)])
+
+ @staticmethod
+ def dequote(quoted_string):
+ if quoted_string.startswith(b'"'):
+ assert quoted_string.endswith(b'"')
+ return PathQuoting._unescape_re.sub(PathQuoting.unescape_sequence,
+ quoted_string[1:-1])
+ return quoted_string
+
+ @staticmethod
+ def enquote(unquoted_string):
+ # Option 1: Quoting when fast-export would:
+ # pqsc = PathQuoting._special_chars
+ # if any(pqsc[x] for x in set(unquoted_string)):
+ # Option 2, perf hack: do minimal amount of quoting required by fast-import
+ if unquoted_string.startswith(b'"') or b'\n' in unquoted_string:
+ pqe = PathQuoting._escape
+ return b'"' + b''.join(pqe[x] for x in unquoted_string) + b'"'
+ return unquoted_string
+
+class AncestryGraph(object):
+ """
+ A class that maintains a direct acycle graph of commits for the purpose of
+ determining if one commit is the ancestor of another.
+
+ A note about identifiers in Commit objects:
+ * Commit objects have 2 identifiers: commit.old_id and commit.id, because:
+ * The original fast-export stream identified commits by an identifier.
+ This is often an integer, but is sometimes a hash (particularly when
+ --reference-excluded-parents is provided)
+ * The new fast-import stream we use may not use the same identifiers.
+ If new blobs or commits are inserted (such as lint-history does), then
+ the integer (or hash) are no longer valid.
+
+ A note about identifiers in AncestryGraph objects, of which there are three:
+ * A given AncestryGraph is based on either commit.old_id or commit.id, but
+ not both. These are the keys for self.value.
+ * Using full hashes (occasionally) for children in self.graph felt
+ wasteful, so we use our own internal integer within self.graph.
+ self.value maps from commit {old_}id to our internal integer id.
+ * When working with commit.old_id, it is also sometimes useful to be able
+ to map these to the original hash, i.e. commit.original_id. So, we
+ also have self.git_hash for mapping from commit.old_id to git's commit
+ hash.
+ """
+
+ def __init__(self):
+ # The next internal identifier we will use; increments with every commit
+ # added to the AncestryGraph
+ self.cur_value = 0
+
+ # A mapping from the external identifers given to us to the simple integers
+ # we use in self.graph
+ self.value = {}
+
+ # A tuple of (depth, list-of-ancestors). Values and keys in this graph are
+ # all integers from the (values of the) self.value dict. The depth of a
+ # commit is one more than the max depth of any of its ancestors.
+ self.graph = {}
+
+ # A mapping from external identifier (i.e. from the keys of self.value) to
+ # the hash of the given commit. Only populated for graphs based on
+ # commit.old_id, since we won't know until later what the git_hash for
+ # graphs based on commit.id (since we have to wait for fast-import to
+ # create the commit and notify us of its hash; see _pending_renames).
+ # elsewhere
+ self.git_hash = {}
+
+ # Reverse maps; only populated if needed. Caller responsible to check
+ # and ensure they are populated
+ self._reverse_value = {}
+ self._hash_to_id = {}
+
+ # Cached results from previous calls to is_ancestor().
+ self._cached_is_ancestor = {}
+
+ def record_external_commits(self, external_commits):
+ """
+ Record in graph that each commit in external_commits exists, and is
+ treated as a root commit with no parents.
+ """
+ for c in external_commits:
+ if c not in self.value:
+ self.cur_value += 1
+ self.value[c] = self.cur_value
+ self.graph[self.cur_value] = (1, [])
+ self.git_hash[c] = c
+
+ def add_commit_and_parents(self, commit, parents, githash = None):
+ """
+ Record in graph that commit has the given parents (all identified by
+ fast export stream identifiers, usually integers but sometimes hashes).
+ parents _MUST_ have been first recorded. commit _MUST_ not have been
+ recorded yet. Also, record the mapping between commit and githash, if
+ githash is given.
+ """
+ assert all(p in self.value for p in parents)
+ assert commit not in self.value
+
+ # Get values for commit and parents
+ self.cur_value += 1
+ self.value[commit] = self.cur_value
+ if githash:
+ self.git_hash[commit] = githash
+ graph_parents = [self.value[x] for x in parents]
+
+ # Determine depth for commit, then insert the info into the graph
+ depth = 1
+ if parents:
+ depth += max(self.graph[p][0] for p in graph_parents)
+ self.graph[self.cur_value] = (depth, graph_parents)
+
+ def record_hash(self, commit_id, githash):
+ '''
+ If a githash was not recorded for commit_id, when add_commit_and_parents
+ was called, add it now.
+ '''
+ assert commit_id in self.value
+ assert commit_id not in self.git_hash
+ self.git_hash[commit_id] = githash
+
+ def _ensure_reverse_maps_populated(self):
+ if not self._hash_to_id:
+ assert not self._reverse_value
+ self._hash_to_id = {v: k for k, v in self.git_hash.items()}
+ self._reverse_value = {v: k for k, v in self.value.items()}
+
+ def get_parent_hashes(self, commit_hash):
+ '''
+ Given a commit_hash, return its parents hashes
+ '''
+ #
+ # We have to map:
+ # commit hash -> fast export stream id -> graph id
+ # then lookup
+ # parent graph ids for given graph id
+ # then we need to map
+ # parent graph ids -> parent fast export ids -> parent commit hashes
+ #
+ self._ensure_reverse_maps_populated()
+ commit_fast_export_id = self._hash_to_id[commit_hash]
+ commit_graph_id = self.value[commit_fast_export_id]
+ parent_graph_ids = self.graph[commit_graph_id][1]
+ parent_fast_export_ids = [self._reverse_value[x] for x in parent_graph_ids]
+ parent_hashes = [self.git_hash[x] for x in parent_fast_export_ids]
+ return parent_hashes
+
+ def map_to_hash(self, commit_id):
+ '''
+ Given a commit (by fast export stream id), return its hash
+ '''
+ return self.git_hash.get(commit_id, None)
+
+ def is_ancestor(self, possible_ancestor, check):
+ """
+ Return whether possible_ancestor is an ancestor of check
+ """
+ a, b = self.value[possible_ancestor], self.value[check]
+ original_pair = (a,b)
+ a_depth = self.graph[a][0]
+ ancestors = [b]
+ visited = set()
+ while ancestors:
+ ancestor = ancestors.pop()
+ prev_pair = (a, ancestor)
+ if prev_pair in self._cached_is_ancestor:
+ if not self._cached_is_ancestor[prev_pair]:
+ continue
+ self._cached_is_ancestor[original_pair] = True
+ return True
+ if ancestor in visited:
+ continue
+ visited.add(ancestor)
+ depth, more_ancestors = self.graph[ancestor]
+ if ancestor == a:
+ self._cached_is_ancestor[original_pair] = True
+ return True
+ elif depth <= a_depth:
+ continue
+ ancestors.extend(more_ancestors)
+ self._cached_is_ancestor[original_pair] = False
+ return False
+
+class MailmapInfo(object):
+ def __init__(self, filename):
+ self.changes = {}
+ self._parse_file(filename)
+
+ def _parse_file(self, filename):
+ name_and_email_re = re.compile(br'(.*?)\s*<([^>]*)>\s*')
+ comment_re = re.compile(br'\s*#.*')
+ if not os.access(filename, os.R_OK):
+ raise SystemExit(_("Cannot read %s") % decode(filename))
+ with open(filename, 'br') as f:
+ count = 0
+ for line in f:
+ count += 1
+ err = "Unparseable mailmap file: line #{} is bad: {}".format(count, line)
+ # Remove comments
+ line = comment_re.sub(b'', line)
+ # Remove leading and trailing whitespace
+ line = line.strip()
+ if not line:
+ continue
+
+ m = name_and_email_re.match(line)
+ if not m:
+ raise SystemExit(err)
+ proper_name, proper_email = m.groups()
+ if len(line) == m.end():
+ self.changes[(None, proper_email)] = (proper_name, proper_email)
+ continue
+ rest = line[m.end():]
+ m = name_and_email_re.match(rest)
+ if m:
+ commit_name, commit_email = m.groups()
+ if len(rest) != m.end():
+ raise SystemExit(err)
+ else:
+ commit_name, commit_email = rest, None
+ self.changes[(commit_name, commit_email)] = (proper_name, proper_email)
+
+ def translate(self, name, email):
+ ''' Given a name and email, return the expected new name and email from the
+ mailmap if there is a translation rule for it, otherwise just return
+ the given name and email.'''
+ for old, new in self.changes.items():
+ old_name, old_email = old
+ new_name, new_email = new
+ if (old_email is None or email.lower() == old_email.lower()) and (
+ name == old_name or not old_name):
+ return (new_name or name, new_email or email)
+ return (name, email)
+
+class ProgressWriter(object):
+ def __init__(self):
+ self._last_progress_update = time.time()
+ self._last_message = None
+
+ def show(self, msg):
+ self._last_message = msg
+ now = time.time()
+ if now - self._last_progress_update > .1:
+ self._last_progress_update = now
+ sys.stdout.write("\r{}".format(msg))
+ sys.stdout.flush()
+
+ def finish(self):
+ self._last_progress_update = 0
+ if self._last_message:
+ self.show(self._last_message)
+ sys.stdout.write("\n")
+
+class _IDs(object):
+ """
+ A class that maintains the 'name domain' of all the 'marks' (short int
+ id for a blob/commit git object). There are two reasons this mechanism
+ is necessary:
+ (1) the output text of fast-export may refer to an object using a different
+ mark than the mark that was assigned to that object using IDS.new().
+ (This class allows you to translate the fast-export marks, "old" to
+ the marks assigned from IDS.new(), "new").
+ (2) when we prune a commit, its "old" id becomes invalid. Any commits
+ which had that commit as a parent needs to use the nearest unpruned
+ ancestor as its parent instead.
+
+ Note that for purpose (1) above, this typically comes about because the user
+ manually creates Blob or Commit objects (for insertion into the stream).
+ It could also come about if we attempt to read the data from two different
+ repositories and trying to combine the data (git fast-export will number ids
+ from 1...n, and having two 1's, two 2's, two 3's, causes issues; granted, we
+ this scheme doesn't handle the two streams perfectly either, but if the first
+ fast export stream is entirely processed and handled before the second stream
+ is started, this mechanism may be sufficient to handle it).
+ """
+
+ def __init__(self):
+ """
+ Init
+ """
+ # The id for the next created blob/commit object
+ self._next_id = 1
+
+ # A map of old-ids to new-ids (1:1 map)
+ self._translation = {}
+
+ # A map of new-ids to every old-id that points to the new-id (1:N map)
+ self._reverse_translation = {}
+
+ def has_renames(self):
+ """
+ Return whether there have been ids remapped to new values
+ """
+ return bool(self._translation)
+
+ def new(self):
+ """
+ Should be called whenever a new blob or commit object is created. The
+ returned value should be used as the id/mark for that object.
+ """
+ rv = self._next_id
+ self._next_id += 1
+ return rv
+
+ def record_rename(self, old_id, new_id, handle_transitivity = False):
+ """
+ Record that old_id is being renamed to new_id.
+ """
+ if old_id != new_id or old_id in self._translation:
+ # old_id -> new_id
+ self._translation[old_id] = new_id
+
+ # Transitivity will be needed if new commits are being inserted mid-way
+ # through a branch.
+ if handle_transitivity:
+ # Anything that points to old_id should point to new_id
+ if old_id in self._reverse_translation:
+ for id_ in self._reverse_translation[old_id]:
+ self._translation[id_] = new_id
+
+ # Record that new_id is pointed to by old_id
+ if new_id not in self._reverse_translation:
+ self._reverse_translation[new_id] = []
+ self._reverse_translation[new_id].append(old_id)
+
+ def translate(self, old_id):
+ """
+ If old_id has been mapped to an alternate id, return the alternate id.
+ """
+ if old_id in self._translation:
+ return self._translation[old_id]
+ else:
+ return old_id
+
+ def __str__(self):
+ """
+ Convert IDs to string; used for debugging
+ """
+ rv = "Current count: %d\nTranslation:\n" % self._next_id
+ for k in sorted(self._translation):
+ rv += " %d -> %s\n" % (k, self._translation[k])
+
+ rv += "Reverse translation:\n"
+ reverse_keys = list(self._reverse_translation.keys())
+ if None in reverse_keys: # pragma: no cover
+ reverse_keys.remove(None)
+ reverse_keys = sorted(reverse_keys)
+ reverse_keys.append(None)
+ for k in reverse_keys:
+ rv += " " + str(k) + " -> " + str(self._reverse_translation[k]) + "\n"
+
+ return rv
+
+class _GitElement(object):
+ """
+ The base class for all git elements that we create.
+ """
+
+ def __init__(self):
+ # A string that describes what type of Git element this is
+ self.type = None
+
+ # A flag telling us if this Git element has been dumped
+ # (i.e. printed) or skipped. Typically elements that have been
+ # dumped or skipped will not be dumped again.
+ self.dumped = 0
+
+ def dump(self, file_):
+ """
+ This version should never be called. Derived classes need to
+ override! We should note that subclasses should implement this
+ method such that the output would match the format produced by
+ fast-export.
+ """
+ raise SystemExit(_("Unimplemented function: %s") % type(self).__name__
+ +".dump()") # pragma: no cover
+
+ def __bytes__(self):
+ """
+ Convert GitElement to bytestring; used for debugging
+ """
+ old_dumped = self.dumped
+ writeme = io.BytesIO()
+ self.dump(writeme)
+ output_lines = writeme.getvalue().splitlines()
+ writeme.close()
+ self.dumped = old_dumped
+ return b"%s:\n %s" % (type(self).__name__.encode(),
+ b"\n ".join(output_lines))
+
+ def skip(self, new_id=None):
+ """
+ Ensures this element will not be written to output
+ """
+ self.dumped = 2
+
+class _GitElementWithId(_GitElement):
+ """
+ The base class for Git elements that have IDs (commits and blobs)
+ """
+
+ def __init__(self):
+ _GitElement.__init__(self)
+
+ # The mark (short, portable id) for this element
+ self.id = _IDS.new()
+
+ # The previous mark for this element
+ self.old_id = None
+
+ def skip(self, new_id=None):
+ """
+ This element will no longer be automatically written to output. When a
+ commit gets skipped, it's ID will need to be translated to that of its
+ parent.
+ """
+ self.dumped = 2
+
+ _IDS.record_rename(self.old_id or self.id, new_id)
+
+class Blob(_GitElementWithId):
+ """
+ This class defines our representation of git blob elements (i.e. our
+ way of representing file contents).
+ """
+
+ def __init__(self, data, original_id = None):
+ _GitElementWithId.__init__(self)
+
+ # Denote that this is a blob
+ self.type = 'blob'
+
+ # Record original id
+ self.original_id = original_id
+
+ # Stores the blob's data
+ assert(type(data) == bytes)
+ self.data = data
+
+ def dump(self, file_):
+ """
+ Write this blob element to a file.
+ """
+ self.dumped = 1
+ BLOB_HASH_TO_NEW_ID[self.original_id] = self.id
+ BLOB_NEW_ID_TO_HASH[self.id] = self.original_id
+
+ file_.write(b'blob\n')
+ file_.write(b'mark :%d\n' % self.id)
+ file_.write(b'data %d\n%s' % (len(self.data), self.data))
+ file_.write(b'\n')
+
+
+class Reset(_GitElement):
+ """
+ This class defines our representation of git reset elements. A reset
+ event is the creation (or recreation) of a named branch, optionally
+ starting from a specific revision).
+ """
+
+ def __init__(self, ref, from_ref = None):
+ _GitElement.__init__(self)
+
+ # Denote that this is a reset
+ self.type = 'reset'
+
+ # The name of the branch being (re)created
+ self.ref = ref
+
+ # Some reference to the branch/commit we are resetting from
+ self.from_ref = from_ref
+
+ def dump(self, file_):
+ """
+ Write this reset element to a file
+ """
+ self.dumped = 1
+
+ file_.write(b'reset %s\n' % self.ref)
+ if self.from_ref:
+ if isinstance(self.from_ref, int):
+ file_.write(b'from :%d\n' % self.from_ref)
+ else:
+ file_.write(b'from %s\n' % self.from_ref)
+ file_.write(b'\n')
+
+class FileChange(_GitElement):
+ """
+ This class defines our representation of file change elements. File change
+ elements are components within a Commit element.
+ """
+
+ def __init__(self, type_, filename = None, id_ = None, mode = None):
+ _GitElement.__init__(self)
+
+ # Denote the type of file-change (b'M' for modify, b'D' for delete, etc)
+ # We could
+ # assert(type(type_) == bytes)
+ # here but I don't just due to worries about performance overhead...
+ self.type = type_
+
+ # Record the name of the file being changed
+ self.filename = filename
+
+ # Record the mode (mode describes type of file entry (non-executable,
+ # executable, or symlink)).
+ self.mode = mode
+
+ # blob_id is the id (mark) of the affected blob
+ self.blob_id = id_
+
+ if type_ == b'DELETEALL':
+ assert filename is None and id_ is None and mode is None
+ self.filename = b'' # Just so PathQuoting.enquote doesn't die
+ else:
+ assert filename is not None
+
+ if type_ == b'M':
+ assert id_ is not None and mode is not None
+ elif type_ == b'D':
+ assert id_ is None and mode is None
+ elif type_ == b'R': # pragma: no cover (now avoid fast-export renames)
+ assert mode is None
+ if id_ is None:
+ raise SystemExit(_("new name needed for rename of %s") % filename)
+ self.filename = (self.filename, id_)
+ self.blob_id = None
+
+ def dump(self, file_):
+ """
+ Write this file-change element to a file
+ """
+ skipped_blob = (self.type == b'M' and self.blob_id is None)
+ if skipped_blob: return
+ self.dumped = 1
+
+ quoted_filename = PathQuoting.enquote(self.filename)
+ if self.type == b'M' and isinstance(self.blob_id, int):
+ file_.write(b'M %s :%d %s\n' % (self.mode, self.blob_id, quoted_filename))
+ elif self.type == b'M':
+ file_.write(b'M %s %s %s\n' % (self.mode, self.blob_id, quoted_filename))
+ elif self.type == b'D':
+ file_.write(b'D %s\n' % quoted_filename)
+ elif self.type == b'DELETEALL':
+ file_.write(b'deleteall\n')
+ else:
+ raise SystemExit(_("Unhandled filechange type: %s") % self.type) # pragma: no cover
+
+class Commit(_GitElementWithId):
+ """
+ This class defines our representation of commit elements. Commit elements
+ contain all the information associated with a commit.
+ """
+
+ def __init__(self, branch,
+ author_name, author_email, author_date,
+ committer_name, committer_email, committer_date,
+ message,
+ file_changes,
+ parents,
+ original_id = None,
+ encoding = None, # encoding for message; None implies UTF-8
+ **kwargs):
+ _GitElementWithId.__init__(self)
+ self.old_id = self.id
+
+ # Denote that this is a commit element
+ self.type = 'commit'
+
+ # Record the affected branch
+ self.branch = branch
+
+ # Record original id
+ self.original_id = original_id
+
+ # Record author's name
+ self.author_name = author_name
+
+ # Record author's email
+ self.author_email = author_email
+
+ # Record date of authoring
+ self.author_date = author_date
+
+ # Record committer's name
+ self.committer_name = committer_name
+
+ # Record committer's email
+ self.committer_email = committer_email
+
+ # Record date the commit was made
+ self.committer_date = committer_date
+
+ # Record commit message and its encoding
+ self.encoding = encoding
+ self.message = message
+
+ # List of file-changes associated with this commit. Note that file-changes
+ # are also represented as git elements
+ self.file_changes = file_changes
+
+ self.parents = parents
+
+ def dump(self, file_):
+ """
+ Write this commit element to a file.
+ """
+ self.dumped = 1
+
+ # Make output to fast-import slightly easier for humans to read if the
+ # message has no trailing newline of its own; cosmetic, but a nice touch...
+ extra_newline = b'\n'
+ if self.message.endswith(b'\n') or not (self.parents or self.file_changes):
+ extra_newline = b''
+
+ if not self.parents:
+ file_.write(b'reset %s\n' % self.branch)
+ file_.write((b'commit %s\n'
+ b'mark :%d\n'
+ b'author %s <%s> %s\n'
+ b'committer %s <%s> %s\n'
+ ) % (
+ self.branch, self.id,
+ self.author_name, self.author_email, self.author_date,
+ self.committer_name, self.committer_email, self.committer_date
+ ))
+ if self.encoding:
+ file_.write(b'encoding %s\n' % self.encoding)
+ file_.write(b'data %d\n%s%s' %
+ (len(self.message), self.message, extra_newline))
+ for i, parent in enumerate(self.parents):
+ file_.write(b'from ' if i==0 else b'merge ')
+ if isinstance(parent, int):
+ file_.write(b':%d\n' % parent)
+ else:
+ file_.write(b'%s\n' % parent)
+ for change in self.file_changes:
+ change.dump(file_)
+ if not self.parents and not self.file_changes:
+ # Workaround a bug in pre-git-2.22 versions of fast-import with
+ # the get-mark directive.
+ file_.write(b'\n')
+ file_.write(b'\n')
+
+ def first_parent(self):
+ """
+ Return first parent commit
+ """
+ if self.parents:
+ return self.parents[0]
+ return None
+
+ def skip(self, new_id=None):
+ _SKIPPED_COMMITS.add(self.old_id or self.id)
+ _GitElementWithId.skip(self, new_id)
+
+class Tag(_GitElementWithId):
+ """
+ This class defines our representation of annotated tag elements.
+ """
+
+ def __init__(self, ref, from_ref,
+ tagger_name, tagger_email, tagger_date, tag_msg,
+ original_id = None):
+ _GitElementWithId.__init__(self)
+ self.old_id = self.id
+
+ # Denote that this is a tag element
+ self.type = 'tag'
+
+ # Store the name of the tag
+ self.ref = ref
+
+ # Store the entity being tagged (this should be a commit)
+ self.from_ref = from_ref
+
+ # Record original id
+ self.original_id = original_id
+
+ # Store the name of the tagger
+ self.tagger_name = tagger_name
+
+ # Store the email of the tagger
+ self.tagger_email = tagger_email
+
+ # Store the date
+ self.tagger_date = tagger_date
+
+ # Store the tag message
+ self.message = tag_msg
+
+ def dump(self, file_):
+ """
+ Write this tag element to a file
+ """
+
+ self.dumped = 1
+
+ file_.write(b'tag %s\n' % self.ref)
+ if (write_marks and self.id):
+ file_.write(b'mark :%d\n' % self.id)
+ markfmt = b'from :%d\n' if isinstance(self.from_ref, int) else b'from %s\n'
+ file_.write(markfmt % self.from_ref)
+ if self.tagger_name:
+ file_.write(b'tagger %s <%s> ' % (self.tagger_name, self.tagger_email))
+ file_.write(self.tagger_date)
+ file_.write(b'\n')
+ file_.write(b'data %d\n%s' % (len(self.message), self.message))
+ file_.write(b'\n')
+
+class Progress(_GitElement):
+ """
+ This class defines our representation of progress elements. The progress
+ element only contains a progress message, which is printed by fast-import
+ when it processes the progress output.
+ """
+
+ def __init__(self, message):
+ _GitElement.__init__(self)
+
+ # Denote that this is a progress element
+ self.type = 'progress'
+
+ # Store the progress message
+ self.message = message
+
+ def dump(self, file_):
+ """
+ Write this progress element to a file
+ """
+ self.dumped = 1
+
+ file_.write(b'progress %s\n' % self.message)
+ file_.write(b'\n')
+
+class Checkpoint(_GitElement):
+ """
+ This class defines our representation of checkpoint elements. These
+ elements represent events which force fast-import to close the current
+ packfile, start a new one, and to save out all current branch refs, tags
+ and marks.
+ """
+
+ def __init__(self):
+ _GitElement.__init__(self)
+
+ # Denote that this is a checkpoint element
+ self.type = 'checkpoint'
+
+ def dump(self, file_):
+ """
+ Write this checkpoint element to a file
+ """
+ self.dumped = 1
+
+ file_.write(b'checkpoint\n')
+ file_.write(b'\n')
+
+class LiteralCommand(_GitElement):
+ """
+ This class defines our representation of commands. The literal command
+ includes only a single line, and is not processed in any special way.
+ """
+
+ def __init__(self, line):
+ _GitElement.__init__(self)
+
+ # Denote that this is a literal element
+ self.type = 'literal'
+
+ # Store the command
+ self.line = line
+
+ def dump(self, file_):
+ """
+ Write this progress element to a file
+ """
+ self.dumped = 1
+
+ file_.write(self.line)
+
+class Alias(_GitElement):
+ """
+ This class defines our representation of fast-import alias elements. An
+ alias element is the setting of one mark to the same sha1sum as another,
+ usually because the newer mark corresponded to a pruned commit.
+ """
+
+ def __init__(self, ref, to_ref):
+ _GitElement.__init__(self)
+ # Denote that this is a reset
+ self.type = 'alias'
+
+ self.ref = ref
+ self.to_ref = to_ref
+
+ def dump(self, file_):
+ """
+ Write this reset element to a file
+ """
+ self.dumped = 1
+
+ file_.write(b'alias\nmark :%d\nto :%d\n\n' % (self.ref, self.to_ref))
+
+class FastExportParser(object):
+ """
+ A class for parsing and handling the output from fast-export. This
+ class allows the user to register callbacks when various types of
+ data are encountered in the fast-export output. The basic idea is that,
+ FastExportParser takes fast-export output, creates the various objects
+ as it encounters them, the user gets to use/modify these objects via
+ callbacks, and finally FastExportParser outputs the modified objects
+ in fast-import format (presumably so they can be used to create a new
+ repo).
+ """
+
+ def __init__(self,
+ tag_callback = None, commit_callback = None,
+ blob_callback = None, progress_callback = None,
+ reset_callback = None, checkpoint_callback = None,
+ done_callback = None):
+ # Members below simply store callback functions for the various git
+ # elements
+ self._tag_callback = tag_callback
+ self._blob_callback = blob_callback
+ self._reset_callback = reset_callback
+ self._commit_callback = commit_callback
+ self._progress_callback = progress_callback
+ self._checkpoint_callback = checkpoint_callback
+ self._done_callback = done_callback
+
+ # Keep track of which refs appear from the export, and which make it to
+ # the import (pruning of empty commits, renaming of refs, and creating
+ # new manual objects and inserting them can cause these to differ).
+ self._exported_refs = set()
+ self._imported_refs = set()
+
+ # A list of the branches we've seen, plus the last known commit they
+ # pointed to. An entry in latest_*commit will be deleted if we get a
+ # reset for that branch. These are used because of fast-import's weird
+ # decision to allow having an implicit parent via naming the branch
+ # instead of requiring branches to be specified via 'from' directives.
+ self._latest_commit = {}
+ self._latest_orig_commit = {}
+
+ # A handle to the input source for the fast-export data
+ self._input = None
+
+ # A handle to the output file for the output we generate (we call dump
+ # on many of the git elements we create).
+ self._output = None
+
+ # Stores the contents of the current line of input being parsed
+ self._currentline = ''
+
+ # Tracks LFS objects we have found
+ self._lfs_object_tracker = None
+
+ # Compile some regexes and cache those
+ self._mark_re = re.compile(br'mark :(\d+)\n$')
+ self._parent_regexes = {}
+ parent_regex_rules = (br' :(\d+)\n$', br' ([0-9a-f]{40})\n')
+ for parent_refname in (b'from', b'merge'):
+ ans = [re.compile(parent_refname+x) for x in parent_regex_rules]
+ self._parent_regexes[parent_refname] = ans
+ self._quoted_string_re = re.compile(br'"(?:[^"\\]|\\.)*"')
+ self._refline_regexes = {}
+ for refline_name in (b'reset', b'commit', b'tag', b'progress'):
+ self._refline_regexes[refline_name] = re.compile(refline_name+b' (.*)\n$')
+ self._user_regexes = {}
+ for user in (b'author', b'committer', b'tagger'):
+ self._user_regexes[user] = re.compile(user + b' (.*?) <(.*?)> (.*)\n$')
+
+ def _advance_currentline(self):
+ """
+ Grab the next line of input
+ """
+ self._currentline = self._input.readline()
+
+ def _parse_optional_mark(self):
+ """
+ If the current line contains a mark, parse it and advance to the
+ next line; return None otherwise
+ """
+ mark = None
+ matches = self._mark_re.match(self._currentline)
+ if matches:
+ mark = int(matches.group(1))
+ self._advance_currentline()
+ return mark
+
+ def _parse_optional_parent_ref(self, refname):
+ """
+ If the current line contains a reference to a parent commit, then
+ parse it and advance the current line; otherwise return None. Note
+ that the name of the reference ('from', 'merge') must match the
+ refname arg.
+ """
+ orig_baseref, baseref = None, None
+ rule, altrule = self._parent_regexes[refname]
+ matches = rule.match(self._currentline)
+ if matches:
+ orig_baseref = int(matches.group(1))
+ # We translate the parent commit mark to what it needs to be in
+ # our mark namespace
+ baseref = _IDS.translate(orig_baseref)
+ self._advance_currentline()
+ else:
+ matches = altrule.match(self._currentline)
+ if matches:
+ orig_baseref = matches.group(1)
+ baseref = orig_baseref
+ self._advance_currentline()
+ return orig_baseref, baseref
+
+ def _parse_optional_filechange(self):
+ """
+ If the current line contains a file-change object, then parse it
+ and advance the current line; otherwise return None. We only care
+ about file changes of type b'M' and b'D' (these are the only types
+ of file-changes that fast-export will provide).
+ """
+ filechange = None
+ changetype = self._currentline[0:1]
+ if changetype == b'M':
+ (changetype, mode, idnum, path) = self._currentline.split(None, 3)
+ if idnum[0:1] == b':':
+ idnum = idnum[1:]
+ path = path.rstrip(b'\n')
+ # Check for LFS objects from sources before we might toss this filechange
+ if mode != b'160000' and self._lfs_object_tracker:
+ value = int(idnum) if len(idnum) != 40 else idnum
+ self._lfs_object_tracker.check_file_change_data(value, True)
+ # We translate the idnum to our id system
+ if len(idnum) != 40:
+ idnum = _IDS.translate( int(idnum) )
+ if idnum is not None:
+ if path.startswith(b'"'):
+ path = PathQuoting.dequote(path)
+ filechange = FileChange(b'M', path, idnum, mode)
+ else:
+ filechange = b'skipped'
+ self._advance_currentline()
+ elif changetype == b'D':
+ (changetype, path) = self._currentline.split(None, 1)
+ path = path.rstrip(b'\n')
+ if path.startswith(b'"'):
+ path = PathQuoting.dequote(path)
+ filechange = FileChange(b'D', path)
+ self._advance_currentline()
+ elif changetype == b'R': # pragma: no cover (now avoid fast-export renames)
+ rest = self._currentline[2:-1]
+ if rest.startswith(b'"'):
+ m = self._quoted_string_re.match(rest)
+ if not m:
+ raise SystemExit(_("Couldn't parse rename source"))
+ orig = PathQuoting.dequote(m.group(0))
+ new = rest[m.end()+1:]
+ else:
+ orig, new = rest.split(b' ', 1)
+ if new.startswith(b'"'):
+ new = PathQuoting.dequote(new)
+ filechange = FileChange(b'R', orig, new)
+ self._advance_currentline()
+ return filechange
+
+ def _parse_original_id(self):
+ original_id = self._currentline[len(b'original-oid '):].rstrip()
+ self._advance_currentline()
+ return original_id
+
+ def _parse_encoding(self):
+ encoding = self._currentline[len(b'encoding '):].rstrip()
+ self._advance_currentline()
+ return encoding
+
+ def _parse_ref_line(self, refname):
+ """
+ Parses string data (often a branch name) from current-line. The name of
+ the string data must match the refname arg. The program will crash if
+ current-line does not match, so current-line will always be advanced if
+ this method returns.
+ """
+ matches = self._refline_regexes[refname].match(self._currentline)
+ if not matches:
+ raise SystemExit(_("Malformed %(refname)s line: '%(line)s'") %
+ ({'refname': refname, 'line':self._currentline})
+ ) # pragma: no cover
+ ref = matches.group(1)
+ self._advance_currentline()
+ return ref
+
+ def _parse_user(self, usertype):
+ """
+ Get user name, email, datestamp from current-line. Current-line will
+ be advanced.
+ """
+ user_regex = self._user_regexes[usertype]
+ (name, email, when) = user_regex.match(self._currentline).groups()
+
+ self._advance_currentline()
+ return (name, email, when)
+
+ def _parse_data(self):
+ """
+ Reads data from _input. Current-line will be advanced until it is beyond
+ the data.
+ """
+ fields = self._currentline.split()
+ assert fields[0] == b'data'
+ size = int(fields[1])
+ data = self._input.read(size)
+ self._advance_currentline()
+ if self._currentline == b'\n':
+ self._advance_currentline()
+ return data
+
+ def _parse_blob(self):
+ """
+ Parse input data into a Blob object. Once the Blob has been created, it
+ will be handed off to the appropriate callbacks. Current-line will be
+ advanced until it is beyond this blob's data. The Blob will be dumped
+ to _output once everything else is done (unless it has been skipped by
+ the callback).
+ """
+ # Parse the Blob
+ self._advance_currentline()
+ id_ = self._parse_optional_mark()
+
+ original_id = None
+ if self._currentline.startswith(b'original-oid'):
+ original_id = self._parse_original_id();
+
+ data = self._parse_data()
+ if self._currentline == b'\n':
+ self._advance_currentline()
+
+ # Create the blob
+ blob = Blob(data, original_id)
+
+ # If fast-export text had a mark for this blob, need to make sure this
+ # mark translates to the blob's true id.
+ if id_:
+ blob.old_id = id_
+ _IDS.record_rename(id_, blob.id)
+
+ # Check for LFS objects
+ if self._lfs_object_tracker:
+ self._lfs_object_tracker.check_blob_data(data, blob.old_id, True)
+
+ # Call any user callback to allow them to use/modify the blob
+ if self._blob_callback:
+ self._blob_callback(blob)
+
+ # Now print the resulting blob
+ if not blob.dumped:
+ blob.dump(self._output)
+
+ def _parse_reset(self):
+ """
+ Parse input data into a Reset object. Once the Reset has been created,
+ it will be handed off to the appropriate callbacks. Current-line will
+ be advanced until it is beyond the reset data. The Reset will be dumped
+ to _output once everything else is done (unless it has been skipped by
+ the callback).
+ """
+ # Parse the Reset
+ ref = self._parse_ref_line(b'reset')
+ self._exported_refs.add(ref)
+ ignoreme, from_ref = self._parse_optional_parent_ref(b'from')
+ if self._currentline == b'\n':
+ self._advance_currentline()
+
+ # fast-export likes to print extraneous resets that serve no purpose.
+ # While we could continue processing such resets, that is a waste of
+ # resources. Also, we want to avoid recording that this ref was
+ # seen in such cases, since this ref could be rewritten to nothing.
+ if not from_ref:
+ self._latest_commit.pop(ref, None)
+ self._latest_orig_commit.pop(ref, None)
+ return
+
+ # Create the reset
+ reset = Reset(ref, from_ref)
+
+ # Call any user callback to allow them to modify the reset
+ if self._reset_callback:
+ self._reset_callback(reset)
+
+ # Update metadata
+ self._latest_commit[reset.ref] = reset.from_ref
+ self._latest_orig_commit[reset.ref] = reset.from_ref
+
+ # Now print the resulting reset
+ if not reset.dumped:
+ self._imported_refs.add(reset.ref)
+ reset.dump(self._output)
+
+ def _parse_commit(self):
+ """
+ Parse input data into a Commit object. Once the Commit has been created,
+ it will be handed off to the appropriate callbacks. Current-line will
+ be advanced until it is beyond the commit data. The Commit will be dumped
+ to _output once everything else is done (unless it has been skipped by
+ the callback OR the callback has removed all file-changes from the commit).
+ """
+ # Parse the Commit. This may look involved, but it's pretty simple; it only
+ # looks bad because a commit object contains many pieces of data.
+ branch = self._parse_ref_line(b'commit')
+ self._exported_refs.add(branch)
+ id_ = self._parse_optional_mark()
+
+ original_id = None
+ if self._currentline.startswith(b'original-oid'):
+ original_id = self._parse_original_id();
+
+ author_name = None
+ author_email = None
+ if self._currentline.startswith(b'author'):
+ (author_name, author_email, author_date) = self._parse_user(b'author')
+
+ (committer_name, committer_email, committer_date) = \
+ self._parse_user(b'committer')
+
+ if not author_name and not author_email:
+ (author_name, author_email, author_date) = \
+ (committer_name, committer_email, committer_date)
+
+ encoding = None
+ if self._currentline.startswith(b'encoding '):
+ encoding = self._parse_encoding()
+
+ commit_msg = self._parse_data()
+
+ pinfo = [self._parse_optional_parent_ref(b'from')]
+ # Due to empty pruning, we can have real 'from' and 'merge' lines that
+ # due to commit rewriting map to a parent of None. We need to record
+ # 'from' if its non-None, and we need to parse all 'merge' lines.
+ while self._currentline.startswith(b'merge '):
+ pinfo.append(self._parse_optional_parent_ref(b'merge'))
+ orig_parents, parents = [list(tmp) for tmp in zip(*pinfo)]
+
+ # No parents is oddly represented as [None] instead of [], due to the
+ # special 'from' handling. Convert it here to a more canonical form.
+ if parents == [None]:
+ parents = []
+ if orig_parents == [None]:
+ orig_parents = []
+
+ # fast-import format is kinda stupid in that it allows implicit parents
+ # based on the branch name instead of requiring them to be specified by
+ # 'from' directives. The only way to get no parent is by using a reset
+ # directive first, which clears the latest_commit_for_this_branch tracking.
+ if not orig_parents and self._latest_commit.get(branch):
+ parents = [self._latest_commit[branch]]
+ if not orig_parents and self._latest_orig_commit.get(branch):
+ orig_parents = [self._latest_orig_commit[branch]]
+
+ # Get the list of file changes
+ file_changes = []
+ file_change = self._parse_optional_filechange()
+ had_file_changes = file_change is not None
+ while file_change:
+ if not (type(file_change) == bytes and file_change == b'skipped'):
+ file_changes.append(file_change)
+ file_change = self._parse_optional_filechange()
+ if self._currentline == b'\n':
+ self._advance_currentline()
+
+ # Okay, now we can finally create the Commit object
+ commit = Commit(branch,
+ author_name, author_email, author_date,
+ committer_name, committer_email, committer_date,
+ commit_msg, file_changes, parents, original_id, encoding)
+
+ # If fast-export text had a mark for this commit, need to make sure this
+ # mark translates to the commit's true id.
+ if id_:
+ commit.old_id = id_
+ _IDS.record_rename(id_, commit.id)
+
+ # refs/notes/ put commit-message-related material in blobs, and name their
+ # files according to the hash of other commits. That totally messes with
+ # all normal callbacks; fast-export should really export these as different
+ # kinds of objects. Until then, let's just pass these commits through as-is
+ # and hope the blob callbacks don't mess things up.
+ if commit.branch.startswith(b'refs/notes/'):
+ self._imported_refs.add(commit.branch)
+ commit.dump(self._output)
+ return
+
+ # Call any user callback to allow them to modify the commit
+ aux_info = {'orig_parents': orig_parents,
+ 'had_file_changes': had_file_changes}
+ if self._commit_callback:
+ self._commit_callback(commit, aux_info)
+
+ # Now print the resulting commit, or if prunable skip it
+ self._latest_orig_commit[branch] = commit.id
+ if not (commit.old_id or commit.id) in _SKIPPED_COMMITS:
+ self._latest_commit[branch] = commit.id
+ if not commit.dumped:
+ self._imported_refs.add(commit.branch)
+ commit.dump(self._output)
+
+ def _parse_tag(self):
+ """
+ Parse input data into a Tag object. Once the Tag has been created,
+ it will be handed off to the appropriate callbacks. Current-line will
+ be advanced until it is beyond the tag data. The Tag will be dumped
+ to _output once everything else is done (unless it has been skipped by
+ the callback).
+ """
+ # Parse the Tag
+ tag = self._parse_ref_line(b'tag')
+ self._exported_refs.add(b'refs/tags/'+tag)
+ id_ = self._parse_optional_mark()
+ ignoreme, from_ref = self._parse_optional_parent_ref(b'from')
+
+ original_id = None
+ if self._currentline.startswith(b'original-oid'):
+ original_id = self._parse_original_id();
+
+ tagger_name, tagger_email, tagger_date = None, None, None
+ if self._currentline.startswith(b'tagger'):
+ (tagger_name, tagger_email, tagger_date) = self._parse_user(b'tagger')
+ tag_msg = self._parse_data()
+ if self._currentline == b'\n':
+ self._advance_currentline()
+
+ # Create the tag
+ tag = Tag(tag, from_ref,
+ tagger_name, tagger_email, tagger_date, tag_msg,
+ original_id)
+
+ # If fast-export text had a mark for this tag, need to make sure this
+ # mark translates to the tag's true id.
+ if id_:
+ tag.old_id = id_
+ _IDS.record_rename(id_, tag.id)
+
+ # Call any user callback to allow them to modify the tag
+ if self._tag_callback:
+ self._tag_callback(tag)
+
+ # The tag might not point at anything that still exists (self.from_ref
+ # will be None if the commit it pointed to and all its ancestors were
+ # pruned due to being empty)
+ if tag.from_ref:
+ # Print out this tag's information
+ if not tag.dumped:
+ self._imported_refs.add(b'refs/tags/'+tag.ref)
+ tag.dump(self._output)
+ else:
+ tag.skip()
+
+ def _parse_progress(self):
+ """
+ Parse input data into a Progress object. Once the Progress has
+ been created, it will be handed off to the appropriate
+ callbacks. Current-line will be advanced until it is beyond the
+ progress data. The Progress will be dumped to _output once
+ everything else is done (unless it has been skipped by the callback).
+ """
+ # Parse the Progress
+ message = self._parse_ref_line(b'progress')
+ if self._currentline == b'\n':
+ self._advance_currentline()
+
+ # Create the progress message
+ progress = Progress(message)
+
+ # Call any user callback to allow them to modify the progress messsage
+ if self._progress_callback:
+ self._progress_callback(progress)
+
+ # NOTE: By default, we do NOT print the progress message; git
+ # fast-import would write it to fast_import_pipes which could mess with
+ # our parsing of output from the 'ls' and 'get-mark' directives we send
+ # to fast-import. If users want these messages, they need to process
+ # and handle them in the appropriate callback above.
+
+ def _parse_checkpoint(self):
+ """
+ Parse input data into a Checkpoint object. Once the Checkpoint has
+ been created, it will be handed off to the appropriate
+ callbacks. Current-line will be advanced until it is beyond the
+ checkpoint data. The Checkpoint will be dumped to _output once
+ everything else is done (unless it has been skipped by the callback).
+ """
+ # Parse the Checkpoint
+ self._advance_currentline()
+ if self._currentline == b'\n':
+ self._advance_currentline()
+
+ # Create the checkpoint
+ checkpoint = Checkpoint()
+
+ # Call any user callback to allow them to drop the checkpoint
+ if self._checkpoint_callback:
+ self._checkpoint_callback(checkpoint)
+
+ # NOTE: By default, we do NOT print the checkpoint message; although it
+ # we would only realistically get them with --stdin, the fact that we
+ # are filtering makes me think the checkpointing is less likely to be
+ # reasonable. In fact, I don't think it's necessary in general. If
+ # users do want it, they should process it in the checkpoint_callback.
+
+ def _parse_literal_command(self):
+ """
+ Parse literal command. Then just dump the line as is.
+ """
+ # Create the literal command object
+ command = LiteralCommand(self._currentline)
+ self._advance_currentline()
+
+ # Now print the resulting literal command
+ if not command.dumped:
+ command.dump(self._output)
+
+ def insert(self, obj):
+ assert not obj.dumped
+ obj.dump(self._output)
+ if type(obj) == Commit:
+ self._imported_refs.add(obj.branch)
+ elif type(obj) in (Reset, Tag):
+ self._imported_refs.add(obj.ref)
+
+ def run(self, input, output):
+ """
+ This method filters fast export output.
+ """
+ # Set input. If no args provided, use stdin.
+ self._input = input
+ self._output = output
+
+ # Run over the input and do the filtering
+ self._advance_currentline()
+ while self._currentline:
+ if self._currentline.startswith(b'blob'):
+ self._parse_blob()
+ elif self._currentline.startswith(b'reset'):
+ self._parse_reset()
+ elif self._currentline.startswith(b'commit'):
+ self._parse_commit()
+ elif self._currentline.startswith(b'tag'):
+ self._parse_tag()
+ elif self._currentline.startswith(b'progress'):
+ self._parse_progress()
+ elif self._currentline.startswith(b'checkpoint'):
+ self._parse_checkpoint()
+ elif self._currentline.startswith(b'feature'):
+ self._parse_literal_command()
+ elif self._currentline.startswith(b'option'):
+ self._parse_literal_command()
+ elif self._currentline.startswith(b'done'):
+ if self._done_callback:
+ self._done_callback()
+ self._parse_literal_command()
+ # Prevent confusion from others writing additional stuff that'll just
+ # be ignored
+ self._output.close()
+ elif self._currentline.startswith(b'#'):
+ self._parse_literal_command()
+ elif self._currentline.startswith(b'get-mark') or \
+ self._currentline.startswith(b'cat-blob') or \
+ self._currentline.startswith(b'ls'):
+ raise SystemExit(_("Unsupported command: '%s'") % self._currentline)
+ else:
+ raise SystemExit(_("Could not parse line: '%s'") % self._currentline)
+
+ def get_exported_and_imported_refs(self):
+ return self._exported_refs, self._imported_refs
+
+def record_id_rename(old_id, new_id):
+ """
+ Register a new translation
+ """
+ handle_transitivity = True
+ _IDS.record_rename(old_id, new_id, handle_transitivity)
+
+# Internal globals
+_IDS = _IDs()
+_SKIPPED_COMMITS = set()
+BLOB_HASH_TO_NEW_ID = {}
+BLOB_NEW_ID_TO_HASH = {}
+sdr_next_steps = _("""
+NEXT STEPS FOR YOUR SENSITIVE DATA REMOVAL:
+ * If you are doing your rewrite in multiple steps, ignore these next steps
+ until you have completed all your invocations of git-filter-repo.
+ * See the "Sensitive Data Removal" subsection of the "DISCUSSION" section
+ of the manual for more details about any of the steps below.
+ * Inspect this repository and verify that the sensitive data is indeed
+ completely removed from all commits.
+ * Force push the rewritten history to the server:
+ %s
+ * Contact the server admins for additional steps they need to take; the
+ First Changed Commit(s)%s may come in handy here.
+ * Have other colleagues with a clone either discard their clone and reclone
+ OR follow the detailed steps in the manual to repeatedly rebase and
+ purge the sensitive data from their copy. Again, the First Changed
+ Commit(s)%s may come in handy.
+ * See the "Prevent repeats and avoid future sensitive data spills" section
+ of the manual.
+"""[1:])
+
+class SubprocessWrapper(object):
+ @staticmethod
+ def decodify(args):
+ if type(args) == str:
+ return args
+ else:
+ assert type(args) == list
+ return [decode(x) if type(x)==bytes else x for x in args]
+
+ @staticmethod
+ def call(*args, **kwargs):
+ if 'cwd' in kwargs:
+ kwargs['cwd'] = decode(kwargs['cwd'])
+ return subprocess.call(SubprocessWrapper.decodify(*args), **kwargs)
+
+ @staticmethod
+ def check_output(*args, **kwargs):
+ if 'cwd' in kwargs:
+ kwargs['cwd'] = decode(kwargs['cwd'])
+ return subprocess.check_output(SubprocessWrapper.decodify(*args), **kwargs)
+
+ @staticmethod
+ def check_call(*args, **kwargs): # pragma: no cover # used by filter-lamely
+ if 'cwd' in kwargs:
+ kwargs['cwd'] = decode(kwargs['cwd'])
+ return subprocess.check_call(SubprocessWrapper.decodify(*args), **kwargs)
+
+ @staticmethod
+ def Popen(*args, **kwargs):
+ if 'cwd' in kwargs:
+ kwargs['cwd'] = decode(kwargs['cwd'])
+ return subprocess.Popen(SubprocessWrapper.decodify(*args), **kwargs)
+
+subproc = subprocess
+if platform.system() == 'Windows' or 'PRETEND_UNICODE_ARGS' in os.environ:
+ subproc = SubprocessWrapper
+
+class GitUtils(object):
+ @staticmethod
+ def get_commit_count(repo, *args):
+ """
+ Return the number of commits that have been made on repo.
+ """
+ if not args:
+ args = ['--all']
+ if len(args) == 1 and isinstance(args[0], list):
+ args = args[0]
+ p = subproc.Popen(["git", "rev-list", "--count"] + args,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+ cwd=repo)
+ if p.wait() != 0:
+ raise SystemExit(_("%s does not appear to be a valid git repository")
+ % decode(repo))
+ return int(p.stdout.read())
+
+ @staticmethod
+ def get_total_objects(repo):
+ """
+ Return the number of objects (both packed and unpacked)
+ """
+ p1 = subproc.Popen(["git", "count-objects", "-v"],
+ stdout=subprocess.PIPE, cwd=repo)
+ lines = p1.stdout.read().splitlines()
+ # Return unpacked objects + packed-objects
+ return int(lines[0].split()[1]) + int(lines[2].split()[1])
+
+ @staticmethod
+ def is_repository_bare(repo_working_dir):
+ out = subproc.check_output('git rev-parse --is-bare-repository'.split(),
+ cwd=repo_working_dir)
+ return (out.strip() == b'true')
+
+ @staticmethod
+ def determine_git_dir(repo_working_dir):
+ d = subproc.check_output('git rev-parse --git-dir'.split(),
+ cwd=repo_working_dir).strip()
+ if repo_working_dir==b'.' or d.startswith(b'/'):
+ return d
+ return os.path.join(repo_working_dir, d)
+
+ @staticmethod
+ def get_refs(repo_working_dir):
+ try:
+ output = subproc.check_output('git show-ref'.split(),
+ cwd=repo_working_dir)
+ except subprocess.CalledProcessError as e:
+ # If error code is 1, there just aren't any refs; i.e. new repo.
+ # If error code is other than 1, some other error (e.g. not a git repo)
+ if e.returncode != 1:
+ raise SystemExit('fatal: {}'.format(e))
+ output = ''
+ return dict(reversed(x.split()) for x in output.splitlines())
+
+ @staticmethod
+ def get_config_settings(repo_working_dir):
+ output = ''
+ try:
+ output = subproc.check_output('git config --list --null'.split(),
+ cwd=repo_working_dir)
+ except subprocess.CalledProcessError as e: # pragma: no cover
+ raise SystemExit('fatal: {}'.format(e))
+
+ # FIXME: Ignores multi-valued keys, just let them overwrite for now
+ return dict(item.split(b'\n', maxsplit=1)
+ for item in output.strip().split(b"\0") if item)
+
+ @staticmethod
+ def get_blob_sizes(quiet = False):
+ blob_size_progress = ProgressWriter()
+ num_blobs = 0
+ processed_blobs_msg = _("Processed %d blob sizes")
+
+ # Get sizes of blobs by sha1
+ cmd = '--batch-check=%(objectname) %(objecttype) ' + \
+ '%(objectsize) %(objectsize:disk)'
+ cf = subproc.Popen(['git', 'cat-file', '--batch-all-objects', cmd],
+ bufsize = -1,
+ stdout = subprocess.PIPE)
+ unpacked_size = {}
+ packed_size = {}
+ for line in cf.stdout:
+ try:
+ sha, objtype, objsize, objdisksize = line.split()
+ objsize, objdisksize = int(objsize), int(objdisksize)
+ if objtype == b'blob':
+ unpacked_size[sha] = objsize
+ packed_size[sha] = objdisksize
+ num_blobs += 1
+ except ValueError: # pragma: no cover
+ sys.stderr.write(_("Error: unexpected `git cat-file` output: \"%s\"\n") % line)
+ if not quiet:
+ blob_size_progress.show(processed_blobs_msg % num_blobs)
+ cf.wait()
+ if not quiet:
+ blob_size_progress.finish()
+ return unpacked_size, packed_size
+
+ @staticmethod
+ def get_file_changes(repo, parent_hash, commit_hash):
+ """
+ Return a FileChanges list with the differences between parent_hash
+ and commit_hash
+ """
+ file_changes = []
+
+ cmd = ["git", "diff-tree", "-r", parent_hash, commit_hash]
+ output = subproc.check_output(cmd, cwd=repo)
+ for line in output.splitlines():
+ fileinfo, path = line.split(b'\t', 1)
+ if path.startswith(b'"'):
+ path = PathQuoting.dequote(path)
+ oldmode, mode, oldhash, newhash, changetype = fileinfo.split()
+ if changetype == b'D':
+ file_changes.append(FileChange(b'D', path))
+ elif changetype in (b'A', b'M', b'T'):
+ identifier = BLOB_HASH_TO_NEW_ID.get(newhash, newhash)
+ file_changes.append(FileChange(b'M', path, identifier, mode))
+ else: # pragma: no cover
+ raise SystemExit("Unknown change type for line {}".format(line))
+
+ return file_changes
+
+ @staticmethod
+ def print_my_version():
+ with open(__file__, 'br') as f:
+ contents = f.read()
+ # If people replaced @@LOCALEDIR@@ string to point at their local
+ # directory, undo it so we can get original source version.
+ contents = re.sub(br'\A#\!.*',
+ br'#!/usr/bin/env python3', contents)
+ contents = re.sub(br'(\("GIT_TEXTDOMAINDIR"\) or ").*"',
+ br'\1@@LOCALEDIR@@"', contents)
+
+ cmd = 'git hash-object --stdin'.split()
+ version = subproc.check_output(cmd, input=contents).strip()
+ print(decode(version[0:12]))
+
+class FilteringOptions(object):
+ default_replace_text = b'***REMOVED***'
+ class AppendFilter(argparse.Action):
+ def __call__(self, parser, namespace, values, option_string=None):
+ user_path = values
+ suffix = option_string[len('--path-'):] or 'match'
+ if suffix.startswith('rename'):
+ mod_type = 'rename'
+ match_type = option_string[len('--path-rename-'):] or 'match'
+ values = values.split(b':')
+ if len(values) != 2:
+ raise SystemExit(_("Error: --path-rename expects one colon in its"
+ " argument: ."))
+ if values[0] and values[1] and not (
+ values[0].endswith(b'/') == values[1].endswith(b'/')):
+ raise SystemExit(_("Error: With --path-rename, if OLD_NAME and "
+ "NEW_NAME are both non-empty and either ends "
+ "with a slash then both must."))
+ if any(v.startswith(b'/') for v in values):
+ raise SystemExit(_("Error: Pathnames cannot begin with a '/'"))
+ components = values[0].split(b'/') + values[1].split(b'/')
+ else:
+ mod_type = 'filter'
+ match_type = suffix
+ components = values.split(b'/')
+ if values.startswith(b'/'):
+ raise SystemExit(_("Error: Pathnames cannot begin with a '/'"))
+ for illegal_path in [b'.', b'..']:
+ if illegal_path in components:
+ raise SystemExit(_("Error: Invalid path component '%s' found in '%s'")
+ % (decode(illegal_path), decode(user_path)))
+ if match_type == 'regex':
+ values = re.compile(values)
+ items = getattr(namespace, self.dest, []) or []
+ items.append((mod_type, match_type, values))
+ if (match_type, mod_type) == ('glob', 'filter'):
+ if not values.endswith(b'*'):
+ extension = b'*' if values.endswith(b'/') else b'/*'
+ items.append((mod_type, match_type, values+extension))
+ setattr(namespace, self.dest, items)
+
+ class HelperFilter(argparse.Action):
+ def __call__(self, parser, namespace, values, option_string=None):
+ af = FilteringOptions.AppendFilter(dest='path_changes',
+ option_strings=None)
+ dirname = values if values[-1:] == b'/' else values+b'/'
+ if option_string == '--subdirectory-filter':
+ af(parser, namespace, dirname, '--path-match')
+ af(parser, namespace, dirname+b':', '--path-rename')
+ elif option_string == '--to-subdirectory-filter':
+ af(parser, namespace, b':'+dirname, '--path-rename')
+ else:
+ raise SystemExit(_("Error: HelperFilter given invalid option_string: %s")
+ % option_string) # pragma: no cover
+
+ class FileWithPathsFilter(argparse.Action):
+ def __call__(self, parser, namespace, values, option_string=None):
+ if not namespace.path_changes:
+ namespace.path_changes = []
+ namespace.path_changes += FilteringOptions.get_paths_from_file(values)
+
+ @staticmethod
+ def create_arg_parser():
+ # Include usage in the summary, so we can put the description first
+ summary = _('''Rewrite (or analyze) repository history
+
+ git-filter-repo destructively rewrites history (unless --analyze or
+ --dry-run are given) according to specified rules. It refuses to do any
+ rewriting unless either run from a clean fresh clone, or --force was
+ given.
+
+ Basic Usage:
+ git-filter-repo --analyze
+ git-filter-repo [FILTER/RENAME/CONTROL OPTIONS]
+
+ See EXAMPLES section for details.
+ ''').rstrip()
+
+ # Provide a long helpful examples section
+ example_text = _('''CALLBACKS
+
+ Most callback functions are of the same general format. For a command line
+ argument like
+ --foo-callback 'BODY'
+
+ the following code will be compiled and called:
+ def foo_callback(foo):
+ BODY
+
+ The exception on callbacks is the --file-info-callback, which will be
+ discussed further below.
+
+ Given the callback style, we can thus make a simple callback to replace
+ 'Jon' with 'John' in author/committer/tagger names:
+ git filter-repo --name-callback 'return name.replace(b"Jon", b"John")'
+
+ To remove all 'Tested-by' tags in commit (or tag) messages:
+ git filter-repo --message-callback 'return re.sub(br"\\nTested-by:.*", "", message)'
+
+ To remove all .DS_Store files:
+ git filter-repo --filename-callback 'return None if os.path.basename(filename) == b".DS_Store" else filename'
+
+ Note that if BODY resolves to a filename, then the contents of that file
+ will be used as the BODY in the callback function.
+
+ The --file-info-callback has a more involved function callback; for it the
+ following code will be compiled and called:
+ def file_info_callback(filename, mode, blob_id, value):
+ BODY
+
+ It is designed to be used in cases where filtering depends on both
+ filename and contents (and maybe mode). It is called for file changes
+ other than deletions (since deletions have no file contents to operate
+ on). This callback is expected to return a tuple of (filename, mode,
+ blob_id). It can make use of the following functions from the value
+ instance:
+ value.get_contents_by_identifier(blob_id) -> contents (bytestring)
+ value.get_size_by_identifier(blob_id) -> size_of_blob (int)
+ value.insert_file_with_contents(contents) -> blob_id
+ value.is_binary(contents) -> bool
+ value.apply_replace_text(contents) -> new_contents (bytestring)
+ and can read/write the following data member from the value instance:
+ value.data (dict)
+
+ The filename can be used for renaming the file similar to
+ --filename-callback (or None to drop the change), and mode is one
+ of b'100644', b'100755', b'120000', or b'160000'.
+
+ For more detailed examples and explanations AND caveats, see
+ https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html#CALLBACKS
+
+EXAMPLES
+
+ To get a bunch of reports mentioning renames that have occurred in
+ your repo and listing sizes of objects aggregated by any of path,
+ directory, extension, or blob-id:
+ git filter-repo --analyze
+
+ (These reports can help you choose how to filter your repo; it can
+ be useful to re-run this command after filtering to regenerate the
+ report and verify the changes look correct.)
+
+ To extract the history that touched just 'guides' and 'tools/releases':
+ git filter-repo --path guides/ --path tools/releases
+
+ To remove foo.zip and bar/baz/zips from every revision in history:
+ git filter-repo --path foo.zip --path bar/baz/zips/ --invert-paths
+
+ To replace the text 'password' with 'p455w0rd':
+ git filter-repo --replace-text <(echo "password==>p455w0rd")
+
+ To use the current version of the .mailmap file to update authors,
+ committers, and taggers throughout history and make it permanent:
+ git filter-repo --use-mailmap
+
+ To extract the history of 'src/', rename all files to have a new leading
+ directory 'my-module' (e.g. src/foo.java -> my-module/src/foo.java), and
+ add a 'my-module-' prefix to all tags:
+ git filter-repo --path src/ --to-subdirectory-filter my-module --tag-rename '':'my-module-'
+
+ For more detailed examples and explanations, see
+ https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html#EXAMPLES''')
+
+ # Create the basic parser
+ parser = argparse.ArgumentParser(description=summary,
+ usage = argparse.SUPPRESS,
+ add_help = False,
+ epilog = example_text,
+ formatter_class=argparse.RawDescriptionHelpFormatter)
+
+ analyze = parser.add_argument_group(title=_("Analysis"))
+ analyze.add_argument('--analyze', action='store_true',
+ help=_("Analyze repository history and create a report that may be "
+ "useful in determining what to filter in a subsequent run. "
+ "Will not modify your repo."))
+ analyze.add_argument('--report-dir',
+ metavar='DIR_OR_FILE',
+ type=os.fsencode,
+ dest='report_dir',
+ help=_("Directory to write report, defaults to GIT_DIR/filter_repo/analysis,"
+ "refuses to run if exists, --force delete existing dir first."))
+
+ path = parser.add_argument_group(title=_("Filtering based on paths "
+ "(see also --filename-callback)"),
+ description=textwrap.dedent(_("""
+ These options specify the paths to select. Note that much like git
+ itself, renames are NOT followed so you may need to specify multiple
+ paths, e.g. `--path olddir/ --path newdir/`
+ """[1:])))
+
+ path.add_argument('--invert-paths', action='store_false', dest='inclusive',
+ help=_("Invert the selection of files from the specified "
+ "--path-{match,glob,regex} options below, i.e. only select "
+ "files matching none of those options."))
+
+ path.add_argument('--path-match', '--path', metavar='DIR_OR_FILE',
+ type=os.fsencode,
+ action=FilteringOptions.AppendFilter, dest='path_changes',
+ help=_("Exact paths (files or directories) to include in filtered "
+ "history. Multiple --path options can be specified to get "
+ "a union of paths."))
+ path.add_argument('--path-glob', metavar='GLOB', type=os.fsencode,
+ action=FilteringOptions.AppendFilter, dest='path_changes',
+ help=_("Glob of paths to include in filtered history. Multiple "
+ "--path-glob options can be specified to get a union of "
+ "paths."))
+ path.add_argument('--path-regex', metavar='REGEX', type=os.fsencode,
+ action=FilteringOptions.AppendFilter, dest='path_changes',
+ help=_("Regex of paths to include in filtered history. Multiple "
+ "--path-regex options can be specified to get a union of "
+ "paths"))
+ path.add_argument('--use-base-name', action='store_true',
+ help=_("Match on file base name instead of full path from the top "
+ "of the repo. Incompatible with --path-rename, and "
+ "incompatible with matching against directory names."))
+
+ rename = parser.add_argument_group(title=_("Renaming based on paths "
+ "(see also --filename-callback)"))
+ rename.add_argument('--path-rename', '--path-rename-match',
+ metavar='OLD_NAME:NEW_NAME', dest='path_changes', type=os.fsencode,
+ action=FilteringOptions.AppendFilter,
+ help=_("Path to rename; if filename or directory matches OLD_NAME "
+ "rename to NEW_NAME. Multiple --path-rename options can be "
+ "specified. NOTE: If you combine filtering options with "
+ "renaming ones, do not rely on a rename argument to select "
+ "paths; you also need a filter to select them."))
+
+ helpers = parser.add_argument_group(title=_("Path shortcuts"))
+ helpers.add_argument('--paths', help=argparse.SUPPRESS, metavar='IGNORE')
+ helpers.add_argument('--paths-from-file', metavar='FILENAME',
+ type=os.fsencode,
+ action=FilteringOptions.FileWithPathsFilter, dest='path_changes',
+ help=_("Specify several path filtering and renaming directives, one "
+ "per line. Lines with '==>' in them specify path renames, "
+ "and lines can begin with 'literal:' (the default), 'glob:', "
+ "or 'regex:' to specify different matching styles. Blank "
+ "lines and lines starting with a '#' are ignored."))
+ helpers.add_argument('--subdirectory-filter', metavar='DIRECTORY',
+ action=FilteringOptions.HelperFilter, type=os.fsencode,
+ help=_("Only look at history that touches the given subdirectory "
+ "and treat that directory as the project root. Equivalent "
+ "to using '--path DIRECTORY/ --path-rename DIRECTORY/:'"))
+ helpers.add_argument('--to-subdirectory-filter', metavar='DIRECTORY',
+ action=FilteringOptions.HelperFilter, type=os.fsencode,
+ help=_("Treat the project root as if it were under DIRECTORY. "
+ "Equivalent to using '--path-rename :DIRECTORY/'"))
+
+ contents = parser.add_argument_group(title=_("Content editing filters "
+ "(see also --blob-callback)"))
+ contents.add_argument('--replace-text', metavar='EXPRESSIONS_FILE',
+ help=_("A file with expressions that, if found, will be replaced. "
+ "By default, each expression is treated as literal text, "
+ "but 'regex:' and 'glob:' prefixes are supported. You can "
+ "end the line with '==>' and some replacement text to "
+ "choose a replacement choice other than the default of '{}'."
+ .format(decode(FilteringOptions.default_replace_text))))
+ contents.add_argument('--strip-blobs-bigger-than', metavar='SIZE',
+ dest='max_blob_size', default=0,
+ help=_("Strip blobs (files) bigger than specified size (e.g. '5M', "
+ "'2G', etc)"))
+ contents.add_argument('--strip-blobs-with-ids', metavar='BLOB-ID-FILENAME',
+ help=_("Read git object ids from each line of the given file, and "
+ "strip all of them from history"))
+
+ refrename = parser.add_argument_group(title=_("Renaming of refs "
+ "(see also --refname-callback)"))
+ refrename.add_argument('--tag-rename', metavar='OLD:NEW', type=os.fsencode,
+ help=_("Rename tags starting with OLD to start with NEW. For "
+ "example, --tag-rename foo:bar will rename tag foo-1.2.3 "
+ "to bar-1.2.3; either OLD or NEW can be empty."))
+
+ messages = parser.add_argument_group(title=_("Filtering of commit messages "
+ "(see also --message-callback)"))
+ messages.add_argument('--replace-message', metavar='EXPRESSIONS_FILE',
+ help=_("A file with expressions that, if found in commit or tag "
+ "messages, will be replaced. This file uses the same syntax "
+ "as --replace-text."))
+ messages.add_argument('--preserve-commit-hashes', action='store_true',
+ help=_("By default, since commits are rewritten and thus gain new "
+ "hashes, references to old commit hashes in commit messages "
+ "are replaced with new commit hashes (abbreviated to the same "
+ "length as the old reference). Use this flag to turn off "
+ "updating commit hashes in commit messages."))
+ messages.add_argument('--preserve-commit-encoding', action='store_true',
+ help=_("Do not reencode commit messages into UTF-8. By default, if "
+ "the commit object specifies an encoding for the commit "
+ "message, the message is re-encoded into UTF-8."))
+
+ people = parser.add_argument_group(title=_("Filtering of names & emails "
+ "(see also --name-callback "
+ "and --email-callback)"))
+ people.add_argument('--mailmap', dest='mailmap', metavar='FILENAME',
+ type=os.fsencode,
+ help=_("Use specified mailmap file (see git-shortlog(1) for "
+ "details on the format) when rewriting author, committer, "
+ "and tagger names and emails. If the specified file is "
+ "part of git history, historical versions of the file will "
+ "be ignored; only the current contents are consulted."))
+ people.add_argument('--use-mailmap', dest='mailmap',
+ action='store_const', const=b'.mailmap',
+ help=_("Same as: '--mailmap .mailmap' "))
+
+ parents = parser.add_argument_group(title=_("Parent rewriting"))
+ parents.add_argument('--replace-refs', default=None,
+ choices=['delete-no-add', 'delete-and-add',
+ 'update-no-add', 'update-or-add',
+ 'update-and-add', 'old-default'],
+ help=_("How to handle replace refs (see git-replace(1)). Replace "
+ "refs can be added during the history rewrite as a way to "
+ "allow users to pass old commit IDs (from before "
+ "git-filter-repo was run) to git commands and have git know "
+ "how to translate those old commit IDs to the new "
+ "(post-rewrite) commit IDs. Also, replace refs that existed "
+ "before the rewrite can either be deleted or updated. The "
+ "choices to pass to --replace-refs thus need to specify both "
+ "what to do with existing refs and what to do with commit "
+ "rewrites. Thus 'update-and-add' means to update existing "
+ "replace refs, and for any commit rewrite (even if already "
+ "pointed at by a replace ref) add a new refs/replace/ reference "
+ "to map from the old commit ID to the new commit ID. The "
+ "default is update-no-add, meaning update existing replace refs "
+ "but do not add any new ones. There is also a special "
+ "'old-default' option for picking the default used in versions "
+ "prior to git-filter-repo-2.45, namely 'update-and-add' upon "
+ "the first run of git-filter-repo in a repository and "
+ "'update-or-add' if running git-filter-repo again on a "
+ "repository."))
+ parents.add_argument('--prune-empty', default='auto',
+ choices=['always', 'auto', 'never'],
+ help=_("Whether to prune empty commits. 'auto' (the default) means "
+ "only prune commits which become empty (not commits which were "
+ "empty in the original repo, unless their parent was pruned). "
+ "When the parent of a commit is pruned, the first non-pruned "
+ "ancestor becomes the new parent."))
+ parents.add_argument('--prune-degenerate', default='auto',
+ choices=['always', 'auto', 'never'],
+ help=_("Since merge commits are needed for history topology, they "
+ "are typically exempt from pruning. However, they can become "
+ "degenerate with the pruning of other commits (having fewer "
+ "than two parents, having one commit serve as both parents, or "
+ "having one parent as the ancestor of the other.) If such "
+ "merge commits have no file changes, they can be pruned. The "
+ "default ('auto') is to only prune empty merge commits which "
+ "become degenerate (not which started as such)."))
+ parents.add_argument('--no-ff', action='store_true',
+ help=_("Even if the first parent is or becomes an ancestor of another "
+ "parent, do not prune it. This modifies how "
+ "--prune-degenerate behaves, and may be useful in projects who "
+ "always use merge --no-ff."))
+
+ callback = parser.add_argument_group(title=_("Generic callback code snippets"))
+ callback.add_argument('--filename-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing filenames; see CALLBACKS "
+ "sections below."))
+ callback.add_argument('--file-info-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing file and metadata; see "
+ "CALLBACKS sections below."))
+ callback.add_argument('--message-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing messages (both commit "
+ "messages and tag messages); see CALLBACKS section below."))
+ callback.add_argument('--name-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing names of people; see "
+ "CALLBACKS section below."))
+ callback.add_argument('--email-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing emails addresses; see "
+ "CALLBACKS section below."))
+ callback.add_argument('--refname-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing refnames; see CALLBACKS "
+ "section below."))
+
+ callback.add_argument('--blob-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing blob objects; see "
+ "CALLBACKS section below."))
+ callback.add_argument('--commit-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing commit objects; see "
+ "CALLBACKS section below."))
+ callback.add_argument('--tag-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing tag objects. Note that "
+ "lightweight tags have no tag object and are thus not "
+ "handled by this callback. See CALLBACKS section below."))
+ callback.add_argument('--reset-callback', metavar="FUNCTION_BODY_OR_FILE",
+ help=_("Python code body for processing reset objects; see "
+ "CALLBACKS section below."))
+
+ sdr = parser.add_argument_group(title=_("Sensitive Data Removal Handling"))
+ sdr.add_argument('--sensitive-data-removal', '--sdr', action='store_true',
+ help=_("This rewrite is intended to remove sensitive data from a "
+ "repository. Gather extra information from the rewrite needed "
+ "to provide additional instructions on how to clean up other "
+ "copies."))
+ sdr.add_argument('--no-fetch', action='store_true',
+ help=_("By default, --sensitive-data-removal will trigger a "
+ "mirror-like fetch of all refs from origin, discarding local "
+ "changes, but ensuring that _all_ fetchable refs that hold on "
+ "to the sensitve data are rewritten. This flag removes that "
+ "fetch, risking that other refs continue holding on to the "
+ "sensitive data. This option is implied by --partial or any "
+ "flag that implies --partial."))
+
+ desc = _(
+ "Specifying alternate source or target locations implies --partial,\n"
+ "except that the normal default for --replace-refs is used. However,\n"
+ "unlike normal uses of --partial, this doesn't risk mixing old and new\n"
+ "history since the old and new histories are in different repositories.")
+ location = parser.add_argument_group(title=_("Location to filter from/to"),
+ description=desc)
+ location.add_argument('--source', type=os.fsencode,
+ help=_("Git repository to read from"))
+ location.add_argument('--target', type=os.fsencode,
+ help=_("Git repository to overwrite with filtered history"))
+
+ order = parser.add_argument_group(title=_("Ordering of commits"))
+ order.add_argument('--date-order', action='store_true',
+ help=_("Processes commits in commit timestamp order."))
+
+ misc = parser.add_argument_group(title=_("Miscellaneous options"))
+ misc.add_argument('--help', '-h', action='store_true',
+ help=_("Show this help message and exit."))
+ misc.add_argument('--version', action='store_true',
+ help=_("Display filter-repo's version and exit."))
+ misc.add_argument('--proceed', action='store_true',
+ help=_("Avoid triggering the no-arguments-specified check."))
+ misc.add_argument('--force', '-f', action='store_true',
+ help=_("Rewrite repository history even if the current repo does not "
+ "look like a fresh clone. History rewriting is irreversible "
+ "(and includes immediate pruning of reflogs and old objects), "
+ "so be cautious about using this flag."))
+ misc.add_argument('--partial', action='store_true',
+ help=_("Do a partial history rewrite, resulting in the mixture of "
+ "old and new history. This disables rewriting "
+ "refs/remotes/origin/* to refs/heads/*, disables removing "
+ "of the 'origin' remote, disables removing unexported refs, "
+ "disables expiring the reflog, and disables the automatic "
+ "post-filter gc. Also, this modifies --tag-rename and "
+ "--refname-callback options such that instead of replacing "
+ "old refs with new refnames, it will instead create new "
+ "refs and keep the old ones around. Use with caution."))
+ misc.add_argument('--no-gc', action='store_true',
+ help=_("Do not run 'git gc' after filtering."))
+ # WARNING: --refs presents a problem with become-degenerate pruning:
+ # * Excluding a commit also excludes its ancestors so when some other
+ # commit has an excluded ancestor as a parent we have no way of
+ # knowing what it is an ancestor of without doing a special
+ # full-graph walk.
+ misc.add_argument('--refs', nargs='+',
+ help=_("Limit history rewriting to the specified refs. Implies "
+ "--partial. In addition to the normal caveats of --partial "
+ "(mixing old and new history, no automatic remapping of "
+ "refs/remotes/origin/* to refs/heads/*, etc.), this also may "
+ "cause problems for pruning of degenerate empty merge "
+ "commits when negative revisions are specified."))
+
+ misc.add_argument('--dry-run', action='store_true',
+ help=_("Do not change the repository. Run `git fast-export` and "
+ "filter its output, and save both the original and the "
+ "filtered version for comparison. This also disables "
+ "rewriting commit messages due to not knowing new commit "
+ "IDs and disables filtering of some empty commits due to "
+ "inability to query the fast-import backend." ))
+ misc.add_argument('--debug', action='store_true',
+ help=_("Print additional information about operations being "
+ "performed and commands being run. When used together "
+ "with --dry-run, also show extra information about what "
+ "would be run."))
+ # WARNING: --state-branch has some problems:
+ # * It does not work well with manually inserted objects (user creating
+ # Blob() or Commit() or Tag() objects and calling
+ # RepoFilter.insert(obj) on them).
+ # * It does not work well with multiple source or multiple target repos
+ # * It doesn't work so well with pruning become-empty commits (though
+ # --refs doesn't work so well with it either)
+ # These are probably fixable, given some work (e.g. re-importing the
+ # graph at the beginning to get the AncestryGraph right, doing our own
+ # export of marks instead of using fast-export --export-marks, etc.), but
+ # for now just hide the option.
+ misc.add_argument('--state-branch',
+ #help=_("Enable incremental filtering by saving the mapping of old "
+ # "to new objects to the specified branch upon exit, and"
+ # "loading that mapping from that branch (if it exists) "
+ # "upon startup."))
+ help=argparse.SUPPRESS)
+ misc.add_argument('--stdin', action='store_true',
+ help=_("Instead of running `git fast-export` and filtering its "
+ "output, filter the fast-export stream from stdin. The "
+ "stdin must be in the expected input format (e.g. it needs "
+ "to include original-oid directives)."))
+ misc.add_argument('--quiet', action='store_true',
+ help=_("Pass --quiet to other git commands called"))
+ return parser
+
+ @staticmethod
+ def sanity_check_args(args):
+ if args.analyze and args.path_changes:
+ raise SystemExit(_("Error: --analyze is incompatible with --path* flags; "
+ "it's a read-only operation."))
+ if args.analyze and args.stdin:
+ raise SystemExit(_("Error: --analyze is incompatible with --stdin."))
+ # If no path_changes are found, initialize with empty list but mark as
+ # not inclusive so that all files match
+ if args.path_changes == None:
+ args.path_changes = []
+ args.inclusive = False
+ else:
+ # Similarly, if we have no filtering paths, then no path should be
+ # filtered out. Based on how newname() works, the easiest way to
+ # achieve that is setting args.inclusive to False.
+ if not any(x[0] == 'filter' for x in args.path_changes):
+ args.inclusive = False
+ # Also check for incompatible --use-base-name and --path-rename flags.
+ if args.use_base_name:
+ if any(x[0] == 'rename' for x in args.path_changes):
+ raise SystemExit(_("Error: --use-base-name and --path-rename are "
+ "incompatible."))
+ # Also throw some sanity checks on git version here;
+ # PERF: remove these checks once new enough git versions are common
+ p = subproc.Popen('git fast-export -h'.split(),
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ output = p.stdout.read()
+ if b'--anonymize-map' not in output: # pragma: no cover
+ global date_format_permissive
+ date_format_permissive = False
+ if not any(x in output for x in [b'--mark-tags',b'--[no-]mark-tags']): # pragma: no cover
+ global write_marks
+ write_marks = False
+ if args.state_branch:
+ # We need a version of git-fast-export with --mark-tags
+ raise SystemExit(_("Error: need git >= 2.24.0"))
+ if not any(x in output for x in [b'--reencode', b'--[no-]reencode']): # pragma: no cover
+ if args.preserve_commit_encoding:
+ # We need a version of git-fast-export with --reencode
+ raise SystemExit(_("Error: need git >= 2.23.0"))
+ else:
+ # Set args.preserve_commit_encoding to None which we'll check for later
+ # to avoid passing --reencode=yes to fast-export (that option was the
+ # default prior to git-2.23)
+ args.preserve_commit_encoding = None
+ # If we don't have fast-exoprt --reencode, we may also be missing
+ # diff-tree --combined-all-paths, which is even more important...
+ p = subproc.Popen('git diff-tree -h'.split(),
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ output = p.stdout.read()
+ if b'--combined-all-paths' not in output:
+ # We need a version of git-diff-tree with --combined-all-paths
+ raise SystemExit(_("Error: need git >= 2.22.0"))
+ if args.sensitive_data_removal:
+ p = subproc.Popen('git cat-file -h'.split(),
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ output = p.stdout.read()
+ if b"--batch-command" not in output: # pragma: no cover
+ raise SystemExit(_("Error: need git >= 2.36.0"))
+ # End of sanity checks on git version
+ if args.max_blob_size:
+ suffix = args.max_blob_size[-1]
+ if suffix not in '1234567890':
+ mult = {'K': 1024, 'M': 1024**2, 'G': 1024**3}
+ if suffix not in mult:
+ raise SystemExit(_("Error: could not parse --strip-blobs-bigger-than"
+ " argument %s")
+ % args.max_blob_size)
+ args.max_blob_size = int(args.max_blob_size[0:-1]) * mult[suffix]
+ else:
+ args.max_blob_size = int(args.max_blob_size)
+ if args.file_info_callback and (
+ args.stdin or args.blob_callback or args.filename_callback):
+ raise SystemExit(_("Error: --file-info-callback is incompatible with "
+ "--stdin, --blob-callback,\nand --filename-callback."))
+
+ @staticmethod
+ def get_replace_text(filename):
+ replace_literals = []
+ replace_regexes = []
+ with open(filename, 'br') as f:
+ for line in f:
+ line = line.rstrip(b'\r\n')
+
+ # Determine the replacement
+ replacement = FilteringOptions.default_replace_text
+ if b'==>' in line:
+ line, replacement = line.rsplit(b'==>', 1)
+
+ # See if we need to match via regex
+ regex = None
+ if line.startswith(b'regex:'):
+ regex = line[6:]
+ elif line.startswith(b'glob:'):
+ regex = glob_to_regex(line[5:])
+ if regex:
+ replace_regexes.append((re.compile(regex), replacement))
+ else:
+ # Otherwise, find the literal we need to replace
+ if line.startswith(b'literal:'):
+ line = line[8:]
+ if not line:
+ continue
+ replace_literals.append((line, replacement))
+ return {'literals': replace_literals, 'regexes': replace_regexes}
+
+ @staticmethod
+ def get_paths_from_file(filename):
+ new_path_changes = []
+ with open(filename, 'br') as f:
+ for line in f:
+ line = line.rstrip(b'\r\n')
+
+ # Skip blank lines
+ if not line:
+ continue
+ # Skip comment lines
+ if line.startswith(b'#'):
+ continue
+
+ # Determine the replacement
+ match_type, repl = 'literal', None
+ if b'==>' in line:
+ line, repl = line.rsplit(b'==>', 1)
+
+ # See if we need to match via regex
+ match_type = 'match' # a.k.a. 'literal'
+ if line.startswith(b'regex:'):
+ match_type = 'regex'
+ match = re.compile(line[6:])
+ elif line.startswith(b'glob:'):
+ match_type = 'glob'
+ match = line[5:]
+ if repl:
+ raise SystemExit(_("Error: In %s, 'glob:' and '==>' are incompatible (renaming globs makes no sense)" % decode(filename)))
+ else:
+ if line.startswith(b'literal:'):
+ match = line[8:]
+ else:
+ match = line
+ if repl is not None:
+ if match and repl and match.endswith(b'/') != repl.endswith(b'/'):
+ raise SystemExit(_("Error: When rename directories, if OLDNAME "
+ "and NEW_NAME are both non-empty and either "
+ "ends with a slash then both must."))
+
+ # Record the filter or rename
+ if repl is not None:
+ new_path_changes.append(['rename', match_type, (match, repl)])
+ else:
+ new_path_changes.append(['filter', match_type, match])
+ if match_type == 'glob' and not match.endswith(b'*'):
+ extension = b'*' if match.endswith(b'/') else b'/*'
+ new_path_changes.append(['filter', match_type, match+extension])
+ return new_path_changes
+
+ @staticmethod
+ def default_options():
+ return FilteringOptions.parse_args([], error_on_empty = False)
+
+ @staticmethod
+ def parse_args(input_args, error_on_empty = True):
+ parser = FilteringOptions.create_arg_parser()
+ if not input_args and error_on_empty:
+ parser.print_usage()
+ raise SystemExit(_("No arguments specified."))
+ args = parser.parse_args(input_args)
+ if args.help:
+ parser.print_help()
+ raise SystemExit()
+ if args.paths:
+ raise SystemExit("Error: Option `--paths` unrecognized; did you mean --path or --paths-from-file?")
+ if args.version:
+ GitUtils.print_my_version()
+ raise SystemExit()
+ FilteringOptions.sanity_check_args(args)
+ if args.mailmap:
+ args.mailmap = MailmapInfo(args.mailmap)
+ if args.replace_text:
+ args.replace_text = FilteringOptions.get_replace_text(args.replace_text)
+ if args.replace_message:
+ args.replace_message = FilteringOptions.get_replace_text(args.replace_message)
+ if args.strip_blobs_with_ids:
+ with open(args.strip_blobs_with_ids, 'br') as f:
+ args.strip_blobs_with_ids = set(f.read().split())
+ else:
+ args.strip_blobs_with_ids = set()
+ if (args.partial or args.refs) and not args.replace_refs:
+ args.replace_refs = 'update-no-add'
+ args.repack = not (args.partial or args.refs or args.no_gc)
+ if args.refs or args.source or args.target:
+ args.partial = True
+ if args.partial:
+ args.no_fetch = True
+ if not args.refs:
+ args.refs = ['--all']
+ return args
+
+class RepoAnalyze(object):
+
+ # First, several helper functions for analyze_commit()
+
+ @staticmethod
+ def equiv_class(stats, filename):
+ return stats['equivalence'].get(filename, (filename,))
+
+ @staticmethod
+ def setup_equivalence_for_rename(stats, oldname, newname):
+ # if A is renamed to B and B is renamed to C, then the user thinks of
+ # A, B, and C as all being different names for the same 'file'. We record
+ # this as an equivalence class:
+ # stats['equivalence'][name] = (A,B,C)
+ # for name being each of A, B, and C.
+ old_tuple = stats['equivalence'].get(oldname, ())
+ if newname in old_tuple:
+ return
+ elif old_tuple:
+ new_tuple = tuple(list(old_tuple)+[newname])
+ else:
+ new_tuple = (oldname, newname)
+ for f in new_tuple:
+ stats['equivalence'][f] = new_tuple
+
+ @staticmethod
+ def setup_or_update_rename_history(stats, commit, oldname, newname):
+ rename_commits = stats['rename_history'].get(oldname, set())
+ rename_commits.add(commit)
+ stats['rename_history'][oldname] = rename_commits
+
+ @staticmethod
+ def handle_renames(stats, commit, change_types, filenames):
+ for index, change_type in enumerate(change_types):
+ if change_type == ord(b'R'):
+ oldname, newname = filenames[index], filenames[-1]
+ RepoAnalyze.setup_equivalence_for_rename(stats, oldname, newname)
+ RepoAnalyze.setup_or_update_rename_history(stats, commit,
+ oldname, newname)
+
+ @staticmethod
+ def handle_file(stats, graph, commit, modes, shas, filenames):
+ mode, sha, filename = modes[-1], shas[-1], filenames[-1]
+
+ # Figure out kind of deletions to undo for this file, and update lists
+ # of all-names-by-sha and all-filenames
+ delmode = 'tree_deletions'
+ if mode != b'040000':
+ delmode = 'file_deletions'
+ stats['names'][sha].add(filename)
+ stats['allnames'].add(filename)
+
+ # If the file (or equivalence class of files) was recorded as deleted,
+ # clearly it isn't anymore
+ equiv = RepoAnalyze.equiv_class(stats, filename)
+ for f in equiv:
+ stats[delmode].pop(f, None)
+
+ # If we get a modify/add for a path that was renamed, we may need to break
+ # the equivalence class. However, if the modify/add was on a branch that
+ # doesn't have the rename in its history, we are still okay.
+ need_to_break_equivalence = False
+ if equiv[-1] != filename:
+ for rename_commit in stats['rename_history'][filename]:
+ if graph.is_ancestor(rename_commit, commit):
+ need_to_break_equivalence = True
+
+ if need_to_break_equivalence:
+ for f in equiv:
+ if f in stats['equivalence']:
+ del stats['equivalence'][f]
+
+ @staticmethod
+ def analyze_commit(stats, graph, commit, parents, date, file_changes):
+ graph.add_commit_and_parents(commit, parents)
+ for change in file_changes:
+ modes, shas, change_types, filenames = change
+ if len(parents) == 1 and change_types.startswith(b'R'):
+ change_types = b'R' # remove the rename score; we don't care
+ if modes[-1] == b'160000':
+ continue
+ elif modes[-1] == b'000000':
+ # Track when files/directories are deleted
+ for f in RepoAnalyze.equiv_class(stats, filenames[-1]):
+ if any(x == b'040000' for x in modes[0:-1]):
+ stats['tree_deletions'][f] = date
+ else:
+ stats['file_deletions'][f] = date
+ elif change_types.strip(b'AMT') == b'':
+ RepoAnalyze.handle_file(stats, graph, commit, modes, shas, filenames)
+ elif modes[-1] == b'040000' and change_types.strip(b'RAM') == b'':
+ RepoAnalyze.handle_file(stats, graph, commit, modes, shas, filenames)
+ elif change_types.strip(b'RAMT') == b'':
+ RepoAnalyze.handle_file(stats, graph, commit, modes, shas, filenames)
+ RepoAnalyze.handle_renames(stats, commit, change_types, filenames)
+ else:
+ raise SystemExit(_("Unhandled change type(s): %(change_type)s "
+ "(in commit %(commit)s)")
+ % ({'change_type': change_types, 'commit': commit})
+ ) # pragma: no cover
+
+ @staticmethod
+ def gather_data(args):
+ unpacked_size, packed_size = GitUtils.get_blob_sizes()
+ stats = {'names': collections.defaultdict(set),
+ 'allnames' : set(),
+ 'file_deletions': {},
+ 'tree_deletions': {},
+ 'equivalence': {},
+ 'rename_history': collections.defaultdict(set),
+ 'unpacked_size': unpacked_size,
+ 'packed_size': packed_size,
+ 'num_commits': 0}
+
+ # Setup the rev-list/diff-tree process
+ processed_commits_msg = _("Processed %d commits")
+ commit_parse_progress = ProgressWriter()
+ num_commits = 0
+ cmd = ('git rev-list --topo-order --reverse {}'.format(' '.join(args.refs)) +
+ ' | git diff-tree --stdin --always --root --format=%H%n%P%n%cd' +
+ ' --date=short -M -t -c --raw --combined-all-paths')
+ dtp = subproc.Popen(cmd, shell=True, bufsize=-1, stdout=subprocess.PIPE)
+ f = dtp.stdout
+ line = f.readline()
+ if not line:
+ raise SystemExit(_("Nothing to analyze; repository is empty."))
+ cont = bool(line)
+ graph = AncestryGraph()
+ while cont:
+ commit = line.rstrip()
+ parents = f.readline().split()
+ date = f.readline().rstrip()
+
+ # We expect a blank line next; if we get a non-blank line then
+ # this commit modified no files and we need to move on to the next.
+ # If there is no line, we've reached end-of-input.
+ line = f.readline()
+ if not line:
+ cont = False
+ line = line.rstrip()
+
+ # If we haven't reached end of input, and we got a blank line meaning
+ # a commit that has modified files, then get the file changes associated
+ # with this commit.
+ file_changes = []
+ if cont and not line:
+ cont = False
+ for line in f:
+ if not line.startswith(b':'):
+ cont = True
+ break
+ n = 1+max(1, len(parents))
+ assert line.startswith(b':'*(n-1))
+ relevant = line[n-1:-1]
+ splits = relevant.split(None, n)
+ modes = splits[0:n]
+ splits = splits[n].split(None, n)
+ shas = splits[0:n]
+ splits = splits[n].split(b'\t')
+ change_types = splits[0]
+ filenames = [PathQuoting.dequote(x) for x in splits[1:]]
+ file_changes.append([modes, shas, change_types, filenames])
+
+ # If someone is trying to analyze a subset of the history, make sure
+ # to avoid dying on commits with parents that we haven't seen before
+ if args.refs:
+ graph.record_external_commits([p for p in parents
+ if not p in graph.value])
+
+ # Analyze this commit and update progress
+ RepoAnalyze.analyze_commit(stats, graph, commit, parents, date,
+ file_changes)
+ num_commits += 1
+ commit_parse_progress.show(processed_commits_msg % num_commits)
+
+ # Show the final commits processed message and record the number of commits
+ commit_parse_progress.finish()
+ stats['num_commits'] = num_commits
+
+ # Close the output, ensure rev-list|diff-tree pipeline completed successfully
+ dtp.stdout.close()
+ if dtp.wait():
+ raise SystemExit(_("Error: rev-list|diff-tree pipeline failed; see above.")) # pragma: no cover
+
+ return stats
+
+ @staticmethod
+ def write_report(reportdir, stats):
+ def datestr(datetimestr):
+ return datetimestr if datetimestr else _('').encode()
+
+ def dirnames(path):
+ while True:
+ path = os.path.dirname(path)
+ yield path
+ if path == b'':
+ break
+
+ # Compute aggregate size information for paths, extensions, and dirs
+ total_size = {'packed': 0, 'unpacked': 0}
+ path_size = {'packed': collections.defaultdict(int),
+ 'unpacked': collections.defaultdict(int)}
+ ext_size = {'packed': collections.defaultdict(int),
+ 'unpacked': collections.defaultdict(int)}
+ dir_size = {'packed': collections.defaultdict(int),
+ 'unpacked': collections.defaultdict(int)}
+ for sha in stats['names']:
+ size = {'packed': stats['packed_size'][sha],
+ 'unpacked': stats['unpacked_size'][sha]}
+ for which in ('packed', 'unpacked'):
+ for name in stats['names'][sha]:
+ total_size[which] += size[which]
+ path_size[which][name] += size[which]
+ basename, ext = os.path.splitext(name)
+ ext_size[which][ext] += size[which]
+ for dirname in dirnames(name):
+ dir_size[which][dirname] += size[which]
+
+ # Determine if and when extensions and directories were deleted
+ ext_deleted_data = {}
+ for name in stats['allnames']:
+ when = stats['file_deletions'].get(name, None)
+
+ # Update the extension
+ basename, ext = os.path.splitext(name)
+ if when is None:
+ ext_deleted_data[ext] = None
+ elif ext in ext_deleted_data:
+ if ext_deleted_data[ext] is not None:
+ ext_deleted_data[ext] = max(ext_deleted_data[ext], when)
+ else:
+ ext_deleted_data[ext] = when
+
+ dir_deleted_data = {}
+ for name in dir_size['packed']:
+ dir_deleted_data[name] = stats['tree_deletions'].get(name, None)
+
+ with open(os.path.join(reportdir, b"README"), 'bw') as f:
+ # Give a basic overview of this file
+ f.write(b"== %s ==\n" % _("Overall Statistics").encode())
+ f.write((" %s: %d\n" % (_("Number of commits"),
+ stats['num_commits'])).encode())
+ f.write((" %s: %d\n" % (_("Number of filenames"),
+ len(path_size['packed']))).encode())
+ f.write((" %s: %d\n" % (_("Number of directories"),
+ len(dir_size['packed']))).encode())
+ f.write((" %s: %d\n" % (_("Number of file extensions"),
+ len(ext_size['packed']))).encode())
+ f.write(b"\n")
+ f.write((" %s: %d\n" % (_("Total unpacked size (bytes)"),
+ total_size['unpacked'])).encode())
+ f.write((" %s: %d\n" % (_("Total packed size (bytes)"),
+ total_size['packed'])).encode())
+ f.write(b"\n")
+
+ # Mention issues with the report
+ f.write(("== %s ==\n" % _("Caveats")).encode())
+ f.write(("=== %s ===\n" % _("Sizes")).encode())
+ f.write(textwrap.dedent(_("""
+ Packed size represents what size your repository would be if no
+ trees, commits, tags, or other metadata were included (though it may
+ fail to represent de-duplication; see below). It also represents the
+ current packing, which may be suboptimal if you haven't gc'ed for a
+ while.
+
+ Unpacked size represents what size your repository would be if no
+ trees, commits, tags, or other metadata were included AND if no
+ files were packed; i.e., without delta-ing or compression.
+
+ Both unpacked and packed sizes can be slightly misleading. Deleting
+ a blob from history not save as much space as the unpacked size,
+ because it is obviously normally stored in packed form. Also,
+ deleting a blob from history may not save as much space as its packed
+ size either, because another blob could be stored as a delta against
+ that blob, so when you remove one blob another blob's packed size may
+ grow.
+
+ Also, the sum of the packed sizes can add up to more than the
+ repository size; if the same contents appeared in the repository in
+ multiple places, git will automatically de-dupe and store only one
+ copy, while the way sizes are added in this analysis adds the size
+ for each file path that has those contents. Further, if a file is
+ ever reverted to a previous version's contents, the previous
+ version's size will be counted multiple times in this analysis, even
+ though git will only store it once.
+ """)[1:]).encode())
+ f.write(b"\n")
+ f.write(("=== %s ===\n" % _("Deletions")).encode())
+ f.write(textwrap.dedent(_("""
+ Whether a file is deleted is not a binary quality, since it can be
+ deleted on some branches but still exist in others. Also, it might
+ exist in an old tag, but have been deleted in versions newer than
+ that. More thorough tracking could be done, including looking at
+ merge commits where one side of history deleted and the other modified,
+ in order to give a more holistic picture of deletions. However, that
+ algorithm would not only be more complex to implement, it'd also be
+ quite difficult to present and interpret by users. Since --analyze
+ is just about getting a high-level rough picture of history, it instead
+ implements the simplistic rule that is good enough for 98% of cases:
+ A file is marked as deleted if the last commit in the fast-export
+ stream that mentions the file lists it as deleted.
+ This makes it dependent on topological ordering, but generally gives
+ the "right" answer.
+ """)[1:]).encode())
+ f.write(b"\n")
+ f.write(("=== %s ===\n" % _("Renames")).encode())
+ f.write(textwrap.dedent(_("""
+ Renames share the same non-binary nature that deletions do, plus
+ additional challenges:
+ * If the renamed file is renamed again, instead of just two names for
+ a path you can have three or more.
+ * Rename pairs of the form (oldname, newname) that we consider to be
+ different names of the "same file" might only be valid over certain
+ commit ranges. For example, if a new commit reintroduces a file
+ named oldname, then new versions of oldname aren't the "same file"
+ anymore. We could try to portray this to the user, but it's easier
+ for the user to just break the pairing and only report unbroken
+ rename pairings to the user.
+ * The ability for users to rename files differently in different
+ branches means that our chains of renames will not necessarily be
+ linear but may branch out.
+ """)[1:]).encode())
+ f.write(b"\n")
+
+ # Equivalence classes for names, so if folks only want to keep a
+ # certain set of paths, they know the old names they want to include
+ # too.
+ with open(os.path.join(reportdir, b"renames.txt"), 'bw') as f:
+ seen = set()
+ for pathname,equiv_group in sorted(stats['equivalence'].items(),
+ key=lambda x:(x[1], x[0])):
+ if equiv_group in seen:
+ continue
+ seen.add(equiv_group)
+ f.write(("{} ->\n ".format(decode(equiv_group[0])) +
+ "\n ".join(decode(x) for x in equiv_group[1:]) +
+ "\n").encode())
+
+ # List directories in reverse sorted order of unpacked size
+ with open(os.path.join(reportdir, b"directories-deleted-sizes.txt"), 'bw') as f:
+ msg = "=== %s ===\n" % _("Deleted directories by reverse size")
+ f.write(msg.encode())
+ msg = _("Format: unpacked size, packed size, date deleted, directory name\n")
+ f.write(msg.encode())
+ for dirname, size in sorted(dir_size['packed'].items(),
+ key=lambda x:(x[1],x[0]), reverse=True):
+ if (dir_deleted_data[dirname]):
+ f.write(b" %10d %10d %-10s %s\n" % (dir_size['unpacked'][dirname],
+ size,
+ datestr(dir_deleted_data[dirname]),
+ dirname or _('').encode()))
+
+ with open(os.path.join(reportdir, b"directories-all-sizes.txt"), 'bw') as f:
+ f.write(("=== %s ===\n" % _("All directories by reverse size")).encode())
+ msg = _("Format: unpacked size, packed size, date deleted, directory name\n")
+ f.write(msg.encode())
+ for dirname, size in sorted(dir_size['packed'].items(),
+ key=lambda x:(x[1],x[0]), reverse=True):
+ f.write(b" %10d %10d %-10s %s\n" % (dir_size['unpacked'][dirname],
+ size,
+ datestr(dir_deleted_data[dirname]),
+ dirname or _("").encode()))
+
+ # List extensions in reverse sorted order of unpacked size
+ with open(os.path.join(reportdir, b"extensions-deleted-sizes.txt"), 'bw') as f:
+ msg = "=== %s ===\n" % _("Deleted extensions by reverse size")
+ f.write(msg.encode())
+ msg = _("Format: unpacked size, packed size, date deleted, extension name\n")
+ f.write(msg.encode())
+ for extname, size in sorted(ext_size['packed'].items(),
+ key=lambda x:(x[1],x[0]), reverse=True):
+ if (ext_deleted_data[extname]):
+ f.write(b" %10d %10d %-10s %s\n" % (ext_size['unpacked'][extname],
+ size,
+ datestr(ext_deleted_data[extname]),
+ extname or _('').encode()))
+
+ with open(os.path.join(reportdir, b"extensions-all-sizes.txt"), 'bw') as f:
+ f.write(("=== %s ===\n" % _("All extensions by reverse size")).encode())
+ msg = _("Format: unpacked size, packed size, date deleted, extension name\n")
+ f.write(msg.encode())
+ for extname, size in sorted(ext_size['packed'].items(),
+ key=lambda x:(x[1],x[0]), reverse=True):
+ f.write(b" %10d %10d %-10s %s\n" % (ext_size['unpacked'][extname],
+ size,
+ datestr(ext_deleted_data[extname]),
+ extname or _('').encode()))
+
+ # List files in reverse sorted order of unpacked size
+ with open(os.path.join(reportdir, b"path-deleted-sizes.txt"), 'bw') as f:
+ msg = "=== %s ===\n" % _("Deleted paths by reverse accumulated size")
+ f.write(msg.encode())
+ msg = _("Format: unpacked size, packed size, date deleted, path name(s)\n")
+ f.write(msg.encode())
+ for pathname, size in sorted(path_size['packed'].items(),
+ key=lambda x:(x[1],x[0]), reverse=True):
+ when = stats['file_deletions'].get(pathname, None)
+ if when:
+ f.write(b" %10d %10d %-10s %s\n" % (path_size['unpacked'][pathname],
+ size,
+ datestr(when),
+ pathname))
+
+ with open(os.path.join(reportdir, b"path-all-sizes.txt"), 'bw') as f:
+ msg = "=== %s ===\n" % _("All paths by reverse accumulated size")
+ f.write(msg.encode())
+ msg = _("Format: unpacked size, packed size, date deleted, path name\n")
+ f.write(msg.encode())
+ for pathname, size in sorted(path_size['packed'].items(),
+ key=lambda x:(x[1],x[0]), reverse=True):
+ when = stats['file_deletions'].get(pathname, None)
+ f.write(b" %10d %10d %-10s %s\n" % (path_size['unpacked'][pathname],
+ size,
+ datestr(when),
+ pathname))
+
+ # List of filenames and sizes in descending order
+ with open(os.path.join(reportdir, b"blob-shas-and-paths.txt"), 'bw') as f:
+ f.write(("=== %s ===\n" % _("Files by sha and associated pathnames in reverse size")).encode())
+ f.write(_("Format: sha, unpacked size, packed size, filename(s) object stored as\n").encode())
+ for sha, size in sorted(stats['packed_size'].items(),
+ key=lambda x:(x[1],x[0]), reverse=True):
+ if sha not in stats['names']:
+ # Some objects in the repository might not be referenced, or not
+ # referenced by the branches/tags the user cares about; skip them.
+ continue
+ names_with_sha = stats['names'][sha]
+ if len(names_with_sha) == 1:
+ names_with_sha = names_with_sha.pop()
+ else:
+ names_with_sha = b'[' + b', '.join(sorted(names_with_sha)) + b']'
+ f.write(b" %s %10d %10d %s\n" % (sha,
+ stats['unpacked_size'][sha],
+ size,
+ names_with_sha))
+
+ @staticmethod
+ def run(args):
+ if args.report_dir:
+ reportdir = args.report_dir
+ else:
+ git_dir = GitUtils.determine_git_dir(b'.')
+
+ # Create the report directory as necessary
+ results_tmp_dir = os.path.join(git_dir, b'filter-repo')
+ if not os.path.isdir(results_tmp_dir):
+ os.mkdir(results_tmp_dir)
+ reportdir = os.path.join(results_tmp_dir, b"analysis")
+
+ if os.path.isdir(reportdir):
+ if args.force:
+ sys.stdout.write(_("Warning: Removing recursively: \"%s\"\n") % decode(reportdir))
+ shutil.rmtree(reportdir)
+ else:
+ sys.stdout.write(_("Error: dir already exists (use --force to delete): \"%s\"\n") % decode(reportdir))
+ sys.exit(1)
+
+ os.mkdir(reportdir)
+
+ # Gather the data we need
+ stats = RepoAnalyze.gather_data(args)
+
+ # Write the reports
+ sys.stdout.write(_("Writing reports to \"%s\"...") % decode(reportdir))
+ sys.stdout.flush()
+ RepoAnalyze.write_report(reportdir, stats)
+ sys.stdout.write(_("done.\n"))
+ sys.stdout.write(_("README: \"%s\"\n") % decode( os.path.join(reportdir, b"README") ))
+
+class FileInfoValueHelper:
+ def __init__(self, replace_text, insert_blob_func, source_working_dir):
+ self.data = {}
+ self._replace_text = replace_text
+ self._insert_blob_func = insert_blob_func
+ cmd = ['git', 'cat-file', '--batch-command']
+ self._cat_file_process = subproc.Popen(cmd,
+ stdin = subprocess.PIPE,
+ stdout = subprocess.PIPE,
+ cwd = source_working_dir)
+
+ def finalize(self):
+ self._cat_file_process.stdin.close()
+ self._cat_file_process.wait()
+
+ def get_contents_by_identifier(self, blobhash):
+ self._cat_file_process.stdin.write(b'contents '+blobhash+b'\n')
+ self._cat_file_process.stdin.flush()
+ line = self._cat_file_process.stdout.readline()
+ try:
+ (oid, oidtype, size) = line.split()
+ except ValueError:
+ assert(line == blobhash+b" missing\n")
+ return None
+ size = int(size) # Convert e.g. b'6283' to 6283
+ assert(oidtype == b'blob')
+ contents_plus_newline = self._cat_file_process.stdout.read(size+1)
+ return contents_plus_newline[:-1] # return all but the newline
+
+ def get_size_by_identifier(self, blobhash):
+ self._cat_file_process.stdin.write(b'info '+blobhash+b'\n')
+ self._cat_file_process.stdin.flush()
+ line = self._cat_file_process.stdout.readline()
+ (oid, oidtype, size) = line.split()
+ size = int(size) # Convert e.g. b'6283' to 6283
+ assert(oidtype == b'blob')
+ return size
+
+ def insert_file_with_contents(self, contents):
+ blob = Blob(contents)
+ self._insert_blob_func(blob)
+ return blob.id
+
+ def is_binary(self, contents):
+ return b"\0" in contents[0:8192]
+
+ def apply_replace_text(self, contents):
+ new_contents = contents
+ for literal, replacement in self._replace_text['literals']:
+ new_contents = new_contents.replace(literal, replacement)
+ for regex, replacement in self._replace_text['regexes']:
+ new_contents = regex.sub(replacement, new_contents)
+ return new_contents
+
+class LFSObjectTracker:
+ class LFSObjs:
+ def __init__(self):
+ self.id_to_object_map = {}
+ self.objects = set()
+
+ def __init__(self, file_info, check_sources, check_targets):
+ self.source_objects = LFSObjectTracker.LFSObjs()
+ self.target_objects = LFSObjectTracker.LFSObjs()
+ self.hash_to_object_map = {}
+ self.file_info = file_info
+ self.check_sources = check_sources
+ self.check_targets = check_targets
+ self.objects_orphaned = False
+
+ def _get_lfs_values(self, contents):
+ values = {}
+ if len(contents) > 1024:
+ return {}
+ for line in contents.splitlines():
+ try:
+ (key, value) = line.split(b' ', 1)
+ except ValueError:
+ return {}
+ if not values and key != b'version':
+ return values
+ values[key] = value
+ return values
+
+ def check_blob_data(self, contents, fast_export_id, source):
+ if source and not self.check_sources:
+ return
+ mymap = self.source_objects if source else self.target_objects
+ lfs_object_id = self._get_lfs_values(contents).get(b'oid')
+ if lfs_object_id:
+ mymap.id_to_object_map[fast_export_id] = lfs_object_id
+
+ def check_file_change_data(self, git_id, source):
+ if source and not self.check_sources:
+ return
+ mymap = self.source_objects if source else self.target_objects
+ if isinstance(git_id, int):
+ lfs_object_id = mymap.id_to_object_map.get(git_id)
+ if lfs_object_id:
+ mymap.objects.add(lfs_object_id)
+ else:
+ if git_id in self.hash_to_object_map:
+ mymap.objects.add(self.hash_to_object_map[git_id])
+ return
+ size = self.file_info.get_size_by_identifier(git_id)
+ if size >= 1024:
+ return
+ contents = self.file_info.get_contents_by_identifier(git_id)
+ lfs_object_id = self._get_lfs_values(contents).get(b'oid')
+ if lfs_object_id:
+ self.hash_to_object_map[git_id] = lfs_object_id
+ mymap.objects.add(lfs_object_id)
+
+ def check_output_object(self, obj):
+ if not self.check_targets:
+ return
+ if type(obj) == Blob:
+ self.check_blob_data(obj.data, obj.id, False)
+ elif type(obj) == Commit:
+ for change in obj.file_changes:
+ sys.stdout.flush()
+ if change.type != b'M' or change.mode == b'160000':
+ continue
+ self.check_file_change_data(change.blob_id, False)
+
+ def find_all_lfs_objects_in_repo(self, repo, source):
+ if not source:
+ self.file_info = FileInfoValueHelper(None, None, repo)
+ p = subproc.Popen(["git", "rev-list", "--objects", "--all"],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+ cwd=repo)
+ for line in p.stdout.readlines():
+ try:
+ (git_oid, filename) = line.split()
+ except ValueError:
+ # Commit and tree objects only have oid
+ continue
+
+ mymap = self.source_objects if source else self.target_objects
+ size = self.file_info.get_size_by_identifier(git_oid)
+ if size >= 1024:
+ continue
+ contents = self.file_info.get_contents_by_identifier(git_oid)
+ lfs_object_id = self._get_lfs_values(contents).get(b'oid')
+ if lfs_object_id:
+ mymap.objects.add(lfs_object_id)
+ if not source:
+ self.file_info.finalize()
+
+class InputFileBackup:
+ def __init__(self, input_file, output_file):
+ self.input_file = input_file
+ self.output_file = output_file
+
+ def close(self):
+ self.input_file.close()
+ self.output_file.close()
+
+ def read(self, size):
+ output = self.input_file.read(size)
+ self.output_file.write(output)
+ return output
+
+ def readline(self):
+ line = self.input_file.readline()
+ self.output_file.write(line)
+ return line
+
+class DualFileWriter:
+ def __init__(self, file1, file2):
+ self.file1 = file1
+ self.file2 = file2
+
+ def write(self, *args):
+ self.file1.write(*args)
+ self.file2.write(*args)
+
+ def flush(self):
+ self.file1.flush()
+ self.file2.flush()
+
+ def close(self):
+ self.file1.close()
+ self.file2.close()
+
+class RepoFilter(object):
+ def __init__(self,
+ args,
+ filename_callback = None,
+ message_callback = None,
+ name_callback = None,
+ email_callback = None,
+ refname_callback = None,
+ blob_callback = None,
+ commit_callback = None,
+ tag_callback = None,
+ reset_callback = None,
+ done_callback = None,
+ file_info_callback = None):
+
+ self._args = args
+
+ # Repo we are exporting
+ self._repo_working_dir = None
+
+ # Store callbacks for acting on objects printed by FastExport
+ self._blob_callback = blob_callback
+ self._commit_callback = commit_callback
+ self._tag_callback = tag_callback
+ self._reset_callback = reset_callback
+ self._done_callback = done_callback
+
+ # Store callbacks for acting on slices of FastExport objects
+ self._filename_callback = filename_callback # filenames from commits
+ self._message_callback = message_callback # commit OR tag message
+ self._name_callback = name_callback # author, committer, tagger
+ self._email_callback = email_callback # author, committer, tagger
+ self._refname_callback = refname_callback # from commit/tag/reset
+ self._file_info_callback = file_info_callback # various file info
+ self._handle_arg_callbacks()
+
+ # Helpers for callbacks
+ self._file_info_value = None
+
+ # Defaults for input
+ self._input = None
+ self._fep = None # Fast Export Process
+ self._fe_orig = None # Path to where original fast-export output stored
+ self._fe_filt = None # Path to where filtered fast-export output stored
+ self._parser = None # FastExportParser object we are working with
+
+ # Defaults for output
+ self._output = None
+ self._fip = None # Fast Import Process
+ self._import_pipes = None
+ self._managed_output = True
+
+ # A tuple of (depth, list-of-ancestors). Commits and ancestors are
+ # identified by their id (their 'mark' in fast-export or fast-import
+ # speak). The depth of a commit is one more than the max depth of any
+ # of its ancestors.
+ self._graph = AncestryGraph()
+ # Another one, for ancestry of commits in the original repo
+ self._orig_graph = AncestryGraph()
+
+ # Names of files that were tweaked in any commit; such paths could lead
+ # to subsequent commits being empty
+ self._files_tweaked = set()
+
+ # A set of commit hash pairs (oldhash, newhash) which used to be merge
+ # commits but due to filtering were turned into non-merge commits.
+ # The commits probably have suboptimal commit messages (e.g. "Merge branch
+ # next into master").
+ self._commits_no_longer_merges = []
+
+ # A dict of original_ids to new_ids; filtering commits means getting
+ # new commit hash (sha1sums), and we record the mapping both for
+ # diagnostic purposes and so we can rewrite commit messages. Note that
+ # the new_id can be None rather than a commit hash if the original
+ # commit became empty and was pruned or was otherwise dropped.
+ self._commit_renames = {}
+
+ # A set of original_ids (i.e. original hashes) for which we have not yet
+ # gotten the new hashses; the value is always the corresponding fast-export
+ # id (i.e. commit.id)
+ self._pending_renames = collections.OrderedDict()
+
+ # A dict of commit_hash[0:7] -> set(commit_hashes with that prefix).
+ #
+ # It's common for commit messages to refer to commits by abbreviated
+ # commit hashes, as short as 7 characters. To facilitate translating
+ # such short hashes, we have a mapping of prefixes to full old hashes.
+ self._commit_short_old_hashes = collections.defaultdict(set)
+
+ # A set of commit hash references appearing in commit messages which
+ # mapped to a valid commit that was removed entirely in the filtering
+ # process. The commit message will continue to reference the
+ # now-missing commit hash, since there was nothing to map it to.
+ self._commits_referenced_but_removed = set()
+
+ # Other vars related to metadata tracking
+ self._already_ran = False
+ self._changed_refs = set()
+ self._lfs_object_tracker = None
+
+ # Progress handling (number of commits parsed, etc.)
+ self._progress_writer = ProgressWriter()
+ self._num_commits = 0
+
+ # Size of blobs in the repo
+ self._unpacked_size = {}
+
+ # Other vars
+ self._sanity_checks_handled = False
+ self._finalize_handled = False
+ self._orig_refs = None
+ self._config_settings = {}
+ self._newnames = {}
+ self._stash = None
+
+ # Cache a few message translations for performance reasons
+ self._parsed_message = _("Parsed %d commits")
+
+ # Compile some regexes and cache those
+ self._hash_re = re.compile(br'(\b[0-9a-f]{7,40}\b)')
+
+ def _handle_arg_callbacks(self):
+ def make_callback(args, bdy):
+ callback_globals = {g: globals()[g] for g in public_globals}
+ callback_locals = {}
+ if type(args) == str:
+ args = (args, '_do_not_use_this_var = None')
+ exec('def callback({}):\n'.format(', '.join(args))+
+ ' '+'\n '.join(bdy.splitlines()), callback_globals, callback_locals)
+ return callback_locals['callback']
+ def handle(which, args=None):
+ which_under = which.replace('-','_')
+ if not args:
+ args = which
+ callback_field = '_{}_callback'.format(which_under)
+ code_string = getattr(self._args, which_under+'_callback')
+ if code_string:
+ if os.path.exists(code_string):
+ with open(code_string, 'r', encoding='utf-8') as f:
+ code_string = f.read()
+ if getattr(self, callback_field):
+ raise SystemExit(_("Error: Cannot pass a %s_callback to RepoFilter "
+ "AND pass --%s-callback"
+ % (which_under, which)))
+ if 'return ' not in code_string and \
+ which not in ('blob', 'commit', 'tag', 'reset'):
+ raise SystemExit(_("Error: --%s-callback should have a return statement")
+ % which)
+ setattr(self, callback_field, make_callback(args, code_string))
+ handle('filename')
+ handle('message')
+ handle('name')
+ handle('email')
+ handle('refname')
+ handle('blob')
+ handle('commit')
+ handle('tag')
+ handle('reset')
+ handle('file-info', ('filename', 'mode', 'blob_id', 'value'))
+
+ def _run_sanity_checks(self):
+ self._sanity_checks_handled = True
+ if not self._managed_output:
+ if not self._args.replace_refs:
+ # If not _managed_output we don't want to make extra changes to the
+ # repo, so set default to no-op 'update-no-add'
+ self._args.replace_refs = 'update-no-add'
+ return
+
+ if self._args.debug:
+ print("[DEBUG] Passed arguments:\n{}".format(self._args))
+
+ # Determine basic repository information
+ target_working_dir = self._args.target or b'.'
+ self._orig_refs = GitUtils.get_refs(target_working_dir)
+ is_bare = GitUtils.is_repository_bare(target_working_dir)
+ self._config_settings = GitUtils.get_config_settings(target_working_dir)
+
+ # Determine if this is second or later run of filter-repo
+ tmp_dir = self.results_tmp_dir(create_if_missing=False)
+ ran_path = os.path.join(tmp_dir, b'already_ran')
+ self._already_ran = os.path.isfile(ran_path)
+ if self._already_ran:
+ current_time = time.time()
+ file_mod_time = os.path.getmtime(ran_path)
+ file_age = current_time - file_mod_time
+ if file_age > 86400: # file older than a day
+ msg = (f"The previous run is older than a day ({decode(ran_path)} already exists).\n"
+ f"See \"Already Ran\" section in the manual for more information.\n"
+ f"Treat this run as a continuation of filtering in the previous run (Y/N)? ")
+ response = input(msg)
+
+ if response.lower() != 'y':
+ os.remove(ran_path)
+ self._already_ran = False
+
+ # Interaction between --already-ran and --sensitive_data_removal
+ msg = textwrap.dedent(_("""\
+ Error: Cannot specify --sensitive-data-removal on a follow-up invocation
+ of git-filter-repo unless it was specified in previously runs."""))
+ if self._already_ran:
+ sdr_path = os.path.join(tmp_dir, b'sensitive_data_removal')
+ sdr_previously = os.path.isfile(sdr_path)
+ if not sdr_previously and self._args.sensitive_data_removal:
+ raise SystemExit(msg)
+ # Treat this as a --sensitive-data-removal run if a previous run was,
+ # even if it wasn't specified this time
+ self._args.sensitive_data_removal = sdr_previously
+
+ # Have to check sensitive_data_removal interactions here instead of
+ # sanity_check_args because of the above interaction with already_ran stuff
+ if self._args.sensitive_data_removal:
+ if self._args.stdin:
+ msg = _("Error: sensitive data removal is incompatible with --stdin")
+ raise SystemExit(msg)
+ if self._args.source or self._args.target:
+ msg = _("Error: sensitive data removal is incompatible with --source and --target")
+ raise SystemExit(msg)
+
+ # Default for --replace-refs
+ if not self._args.replace_refs:
+ self._args.replace_refs = 'delete-no-add'
+ if self._args.replace_refs == 'old-default':
+ self._args.replace_refs = ('update-or-add' if self._already_ran
+ else 'update-and-add')
+
+ # Do sanity checks from the correct directory
+ if not self._args.force and not self._already_ran:
+ cwd = os.getcwd()
+ os.chdir(target_working_dir)
+ RepoFilter.sanity_check(self._orig_refs, is_bare, self._config_settings)
+ os.chdir(cwd)
+
+ def _setup_lfs_orphaning_checks(self):
+ # Do a couple checks to see if we want to do lfs orphaning checks
+ if not self._args.sensitive_data_removal:
+ return
+ metadata_dir = self.results_tmp_dir()
+ lfs_objects_file = os.path.join(metadata_dir, b'original_lfs_objects')
+ if self._already_ran:
+ # Check if we did lfs filtering in the previous run
+ if not os.path.isfile(lfs_objects_file):
+ return
+
+ # Set up self._file_info_value so we can query git for stuff
+ source_working_dir = self._args.source or b'.'
+ self._file_info_value = FileInfoValueHelper(self._args.replace_text,
+ self.insert,
+ source_working_dir)
+
+ # One more check to see if we want to do lfs orphaning checks
+ if not self._already_ran:
+ # Check if lfs filtering is active in HEAD's .gitattributes file
+ a = self._file_info_value.get_contents_by_identifier(b"HEAD:.gitattributes")
+ if not a or not re.search(rb'\bfilter=lfs\b', a):
+ return
+
+ # Set up the object tracker
+ check_sources = not self._already_ran and not self._args.partial
+ check_targets = not self._args.partial
+ self._lfs_object_tracker = LFSObjectTracker(self._file_info_value,
+ check_sources,
+ check_targets)
+ self._parser._lfs_object_tracker = self._lfs_object_tracker # kinda gross
+
+ # Get initial objects
+ if self._already_ran:
+ with open(lfs_objects_file, 'br') as f:
+ for line in f:
+ self._lfs_object_tracker.source_objects.objects.add(line.strip())
+ elif self._args.partial:
+ source = True
+ self._lfs_object_tracker.find_all_lfs_objects_in_repo(source_working_dir,
+ source)
+
+ @staticmethod
+ def loose_objects_are_replace_refs(git_dir, refs, num_loose_objects):
+ replace_objects = set()
+ for refname, rev in refs.items():
+ if not refname.startswith(b'refs/replace/'):
+ continue
+ replace_objects.add(rev)
+
+ validobj_re = re.compile(rb'^[0-9a-f]{40}$')
+ object_dir=os.path.join(git_dir, b'objects')
+ for root, dirs, files in os.walk(object_dir):
+ for filename in files:
+ objname = os.path.basename(root)+filename
+ if objname not in replace_objects and validobj_re.match(objname):
+ return False
+
+ return True
+
+ @staticmethod
+ def sanity_check(refs, is_bare, config_settings):
+ def abort(reason):
+ dirname = config_settings.get(b'remote.origin.url', b'')
+ msg = ""
+ if dirname and os.path.isdir(dirname):
+ msg = _("Note: when cloning local repositories, you need to pass\n"
+ " --no-local to git clone to avoid this issue.\n")
+ raise SystemExit(
+ _("Aborting: Refusing to destructively overwrite repo history since\n"
+ "this does not look like a fresh clone.\n"
+ " (%s)\n%s"
+ "Please operate on a fresh clone instead. If you want to proceed\n"
+ "anyway, use --force.") % (reason, msg))
+
+ # Avoid letting people running with weird setups and overwriting GIT_DIR
+ # elsewhere
+ git_dir = GitUtils.determine_git_dir(b'.')
+ if is_bare and git_dir != b'.':
+ abort(_("GIT_DIR must be ."))
+ elif not is_bare and git_dir != b'.git':
+ abort(_("GIT_DIR must be .git"))
+
+ # Check for refname collisions
+ if config_settings.get(b'core.ignorecase', b'false') == b'true':
+ collisions = collections.defaultdict(list)
+ for ref in refs:
+ collisions[ref.lower()].append(ref)
+ msg = ""
+ for ref in collisions:
+ if len(collisions[ref]) >= 2:
+ msg += " " + decode(b", ".join(collisions[ref])) + "\n"
+ if msg:
+ raise SystemExit(
+ _("Aborting: Cannot rewrite history on a case insensitive\n"
+ "filesystem since you have refs that differ in case only:\n"
+ "%s") % msg)
+ if config_settings.get(b'core.precomposeunicode', b'false') == b'true':
+ import unicodedata # Mac users need to have python-3.8
+ collisions = collections.defaultdict(list)
+ for ref in refs:
+ strref = decode(ref)
+ collisions[unicodedata.normalize('NFC', strref)].append(strref)
+ msg = ""
+ for ref in collisions:
+ if len(collisions[ref]) >= 2:
+ msg += " " + ", ".join(collisions[ref]) + "\n"
+ if msg:
+ raise SystemExit(
+ _("Aborting: Cannot rewrite history on a character normalizing\n"
+ "filesystem since you have refs that differ in normalization:\n"
+ "%s") % msg)
+
+ # Make sure repo is fully packed, just like a fresh clone would be.
+ # Note that transfer.unpackLimit defaults to 100, meaning that a
+ # repository with no packs and less than 100 objects should be considered
+ # fully packed.
+ output = subproc.check_output('git count-objects -v'.split())
+ stats = dict(x.split(b': ') for x in output.splitlines())
+ num_packs = int(stats[b'packs'])
+ num_loose_objects = int(stats[b'count'])
+ if num_packs > 1 or \
+ num_loose_objects >= 100 or \
+ (num_packs == 1 and num_loose_objects > 0 and
+ not RepoFilter.loose_objects_are_replace_refs(git_dir, refs,
+ num_loose_objects)):
+ abort(_("expected freshly packed repo"))
+
+ # Make sure there is precisely one remote, named "origin"...or that this
+ # is a new bare repo with no packs and no remotes
+ output = subproc.check_output('git remote'.split()).strip()
+ if not (output == b"origin" or (num_packs == 0 and not output)):
+ abort(_("expected one remote, origin"))
+
+ # Make sure that all reflogs have precisely one entry
+ reflog_dir=os.path.join(git_dir, b'logs')
+ for root, dirs, files in os.walk(reflog_dir):
+ for filename in files:
+ pathname = os.path.join(root, filename)
+ with open(pathname, 'br') as f:
+ if len(f.read().splitlines()) > 1:
+ shortpath = pathname[len(reflog_dir)+1:]
+ abort(_("expected at most one entry in the reflog for %s") %
+ decode(shortpath))
+
+ # Make sure there are no stashed changes
+ if b'refs/stash' in refs:
+ abort(_("has stashed changes"))
+
+ # Do extra checks in non-bare repos
+ if not is_bare:
+ # Avoid uncommitted, unstaged, or untracked changes
+ if subproc.call('git diff --staged --quiet'.split()):
+ abort(_("you have uncommitted changes"))
+ if subproc.call('git diff --quiet'.split()):
+ abort(_("you have unstaged changes"))
+ untracked_output = subproc.check_output('git ls-files -o'.split())
+ if len(untracked_output) > 0:
+ uf = untracked_output.rstrip(b'\n').split(b'\n')
+ # Since running git-filter-repo can result in files being written to
+ # __pycache__ (depending on python version, env vars, etc.), let's
+ # ignore those as far as "clean clone" is concerned.
+ relevant_uf = [x for x in uf
+ if not x.startswith(b'__pycache__/git_filter_repo.')]
+ if len(relevant_uf) > 0:
+ abort(_("you have untracked changes"))
+
+ # Avoid unpushed changes
+ for refname, rev in refs.items():
+ if not refname.startswith(b'refs/heads/'):
+ continue
+ origin_ref = refname.replace(b'refs/heads/', b'refs/remotes/origin/')
+ if origin_ref not in refs:
+ abort(_('%s exists, but %s not found') % (decode(refname),
+ decode(origin_ref)))
+ if rev != refs[origin_ref]:
+ abort(_('%s does not match %s') % (decode(refname),
+ decode(origin_ref)))
+
+ # Make sure there is only one worktree
+ output = subproc.check_output('git worktree list'.split())
+ if len(output.splitlines()) > 1:
+ abort(_('you have multiple worktrees'))
+
+ def cleanup(self, repo, repack, reset,
+ run_quietly=False, show_debuginfo=False):
+ ''' cleanup repo; if repack then expire reflogs and do a gc --prune=now.
+ if reset then do a reset --hard. Optionally also curb output if
+ run_quietly is True, or go the opposite direction and show extra
+ output if show_debuginfo is True. '''
+ assert not (run_quietly and show_debuginfo)
+
+ if (repack and not run_quietly and not show_debuginfo):
+ print(_("Repacking your repo and cleaning out old unneeded objects"))
+ quiet_flags = '--quiet' if run_quietly else ''
+ cleanup_cmds = []
+ if repack:
+ cleanup_cmds = ['git reflog expire --expire=now --all'.split(),
+ 'git gc {} --prune=now'.format(quiet_flags).split()]
+ if reset:
+ cleanup_cmds.insert(0, 'git reset {} --hard'.format(quiet_flags).split())
+ location_info = ' (in {})'.format(decode(repo)) if repo != b'.' else ''
+ for cmd in cleanup_cmds:
+ if show_debuginfo:
+ print("[DEBUG] Running{}: {}".format(location_info, ' '.join(cmd)))
+ ret = subproc.call(cmd, cwd=repo)
+ if ret != 0:
+ raise SystemExit("fatal: running '%s' failed!" % ' '.join(cmd))
+ if cmd[0:3] == 'git reflog expire'.split():
+ self._write_stash()
+
+ def _get_rename(self, old_hash):
+ # If we already know the rename, just return it
+ new_hash = self._commit_renames.get(old_hash, None)
+ if new_hash:
+ return new_hash
+
+ # If it's not in the remaining pending renames, we don't know it
+ if old_hash is not None and old_hash not in self._pending_renames:
+ return None
+
+ # Read through the pending renames until we find it or we've read them all,
+ # and return whatever we might find
+ self._flush_renames(old_hash)
+ return self._commit_renames.get(old_hash, None)
+
+ def _flush_renames(self, old_hash=None, limit=0):
+ # Parse through self._pending_renames until we have read enough. We have
+ # read enough if:
+ # self._pending_renames is empty
+ # old_hash != None and we found a rename for old_hash
+ # limit > 0 and len(self._pending_renames) started less than 2*limit
+ # limit > 0 and len(self._pending_renames) < limit
+ if limit and len(self._pending_renames) < 2 * limit:
+ return
+ fi_input, fi_output = self._import_pipes
+ while self._pending_renames:
+ orig_hash, new_fast_export_id = self._pending_renames.popitem(last=False)
+ new_hash = fi_output.readline().rstrip()
+ self._commit_renames[orig_hash] = new_hash
+ self._graph.record_hash(new_fast_export_id, new_hash)
+ if old_hash == orig_hash:
+ return
+ if limit and len(self._pending_renames) < limit:
+ return
+
+ def _translate_commit_hash(self, matchobj_or_oldhash):
+ old_hash = matchobj_or_oldhash
+ if not isinstance(matchobj_or_oldhash, bytes):
+ old_hash = matchobj_or_oldhash.group(1)
+ orig_len = len(old_hash)
+ new_hash = self._get_rename(old_hash)
+ if new_hash is None:
+ if old_hash[0:7] not in self._commit_short_old_hashes:
+ self._commits_referenced_but_removed.add(old_hash)
+ return old_hash
+ possibilities = self._commit_short_old_hashes[old_hash[0:7]]
+ matches = [x for x in possibilities
+ if x[0:orig_len] == old_hash]
+ if len(matches) != 1:
+ self._commits_referenced_but_removed.add(old_hash)
+ return old_hash
+ old_hash = matches[0]
+ new_hash = self._get_rename(old_hash)
+
+ assert new_hash is not None
+ return new_hash[0:orig_len]
+
+ def _maybe_trim_extra_parents(self, orig_parents, parents):
+ '''Due to pruning of empty commits, some parents could be non-existent
+ (None) or otherwise redundant. Remove the non-existent parents, and
+ remove redundant parents ***SO LONG AS*** that doesn't transform a
+ merge commit into a non-merge commit.
+
+ Returns a tuple:
+ (parents, new_first_parent_if_would_become_non_merge)'''
+
+ always_prune = (self._args.prune_degenerate == 'always')
+
+ # Pruning of empty commits means multiple things:
+ # * An original parent of this commit may have been pruned causing the
+ # need to rewrite the reported parent to the nearest ancestor. We
+ # want to know when we're dealing with such a parent.
+ # * Further, there may be no "nearest ancestor" if the entire history
+ # of that parent was also pruned. (Detectable by the parent being
+ # 'None')
+ # Remove all parents rewritten to None, and keep track of which parents
+ # were rewritten to an ancestor.
+ tmp = zip(parents,
+ orig_parents,
+ [(x in _SKIPPED_COMMITS or always_prune) for x in orig_parents])
+ tmp2 = [x for x in tmp if x[0] is not None]
+ if not tmp2:
+ # All ancestors have been pruned; we have no parents.
+ return [], None
+ parents, orig_parents, is_rewritten = [list(x) for x in zip(*tmp2)]
+
+ # We can't have redundant parents if we don't have at least 2 parents
+ if len(parents) < 2:
+ return parents, None
+
+ # Don't remove redundant parents if user doesn't want us to
+ if self._args.prune_degenerate == 'never':
+ return parents, None
+
+ # Remove duplicate parents (if both sides of history have lots of commits
+ # which become empty due to pruning, the most recent ancestor on both
+ # sides may be the same commit), except only remove parents that have
+ # been rewritten due to previous empty pruning.
+ seen = set()
+ seen_add = seen.add
+ # Deleting duplicate rewritten parents means keeping parents if either
+ # they have not been seen or they are ones that have not been rewritten.
+ parents_copy = parents
+ uniq = [[p, orig_parents[i], is_rewritten[i]] for i, p in enumerate(parents)
+ if not (p in seen or seen_add(p)) or not is_rewritten[i]]
+ parents, orig_parents, is_rewritten = [list(x) for x in zip(*uniq)]
+ if len(parents) < 2:
+ return parents_copy, parents[0]
+
+ # Flatten unnecessary merges. (If one side of history is entirely
+ # empty commits that were pruned, we may end up attempting to
+ # merge a commit with its ancestor. Remove parents that are an
+ # ancestor of another parent.)
+ num_parents = len(parents)
+ to_remove = []
+ for cur in range(num_parents):
+ if not is_rewritten[cur]:
+ continue
+ for other in range(num_parents):
+ if cur == other:
+ continue
+ if not self._graph.is_ancestor(parents[cur], parents[other]):
+ continue
+ # parents[cur] is an ancestor of parents[other], so parents[cur]
+ # seems redundant. However, if it was intentionally redundant
+ # (e.g. a no-ff merge) in the original, then we want to keep it.
+ if not always_prune and \
+ self._orig_graph.is_ancestor(orig_parents[cur],
+ orig_parents[other]):
+ continue
+ # Some folks want their history to have all first parents be merge
+ # commits (except for any root commits), and always do a merge --no-ff.
+ # For such folks, don't remove the first parent even if it's an
+ # ancestor of other commits.
+ if self._args.no_ff and cur == 0:
+ continue
+ # Okay so the cur-th parent is an ancestor of the other-th parent,
+ # and it wasn't that way in the original repository; mark the
+ # cur-th parent as removable.
+ to_remove.append(cur)
+ break # cur removed, so skip rest of others -- i.e. check cur+=1
+ for x in reversed(to_remove):
+ parents.pop(x)
+ if len(parents) < 2:
+ return parents_copy, parents[0]
+
+ return parents, None
+
+ def _prunable(self, commit, new_1st_parent, had_file_changes, orig_parents):
+ parents = commit.parents
+
+ if self._args.prune_empty == 'never':
+ return False
+ always_prune = (self._args.prune_empty == 'always')
+
+ # For merge commits, unless there are prunable (redundant) parents, we
+ # do not want to prune
+ if len(parents) >= 2 and not new_1st_parent:
+ return False
+
+ if len(parents) < 2:
+ # Special logic for commits that started empty...
+ if not had_file_changes and not always_prune:
+ had_parents_pruned = (len(parents) < len(orig_parents) or
+ (len(orig_parents) == 1 and
+ orig_parents[0] in _SKIPPED_COMMITS))
+ # If the commit remains empty and had parents which were pruned,
+ # then prune this commit; otherwise, retain it
+ return (not commit.file_changes and had_parents_pruned)
+
+ # We can only get here if the commit didn't start empty, so if it's
+ # empty now, it obviously became empty
+ if not commit.file_changes:
+ return True
+
+ # If there are no parents of this commit and we didn't match the case
+ # above, then this commit cannot be pruned. Since we have no parent(s)
+ # to compare to, abort now to prevent future checks from failing.
+ if not parents:
+ return False
+
+ # Similarly, we cannot handle the hard cases if we don't have a pipe
+ # to communicate with fast-import
+ if not self._import_pipes:
+ return False
+
+ # If there have not been renames/remappings of IDs (due to insertion of
+ # new blobs), then we can sometimes know things aren't prunable with a
+ # simple check
+ if not _IDS.has_renames():
+ # non-merge commits can only be empty if blob/file-change editing caused
+ # all file changes in the commit to have the same file contents as
+ # the parent.
+ changed_files = set(change.filename for change in commit.file_changes)
+ if len(orig_parents) < 2 and changed_files - self._files_tweaked:
+ return False
+
+ # Finally, the hard case: due to either blob rewriting, or due to pruning
+ # of empty commits wiping out the first parent history back to the merge
+ # base, the list of file_changes we have may not actually differ from our
+ # (new) first parent's version of the files, i.e. this would actually be
+ # an empty commit. Check by comparing the contents of this commit to its
+ # (remaining) parent.
+ #
+ # NOTE on why this works, for the case of original first parent history
+ # having been pruned away due to being empty:
+ # The first parent history having been pruned away due to being
+ # empty implies the original first parent would have a tree (after
+ # filtering) that matched the merge base's tree. Since
+ # file_changes has the changes needed to go from what would have
+ # been the first parent to our new commit, and what would have been
+ # our first parent has a tree that matches the merge base, then if
+ # the new first parent has a tree matching the versions of files in
+ # file_changes, then this new commit is empty and thus prunable.
+ fi_input, fi_output = self._import_pipes
+ self._flush_renames() # Avoid fi_output having other stuff present
+ # Optimization note: we could have two loops over file_changes, the
+ # first doing all the self._output.write() calls, and the second doing
+ # the rest. But I'm worried about fast-import blocking on fi_output
+ # buffers filling up so I instead read from it as I go.
+ for change in commit.file_changes:
+ parent = new_1st_parent or commit.parents[0] # exists due to above checks
+ quoted_filename = PathQuoting.enquote(change.filename)
+ if isinstance(parent, int):
+ self._output.write(b"ls :%d %s\n" % (parent, quoted_filename))
+ else:
+ self._output.write(b"ls %s %s\n" % (parent, quoted_filename))
+ self._output.flush()
+ parent_version = fi_output.readline().split()
+ if change.type == b'D':
+ if parent_version != [b'missing', quoted_filename]:
+ return False
+ else:
+ blob_sha = change.blob_id
+ if isinstance(change.blob_id, int):
+ self._output.write(b"get-mark :%d\n" % change.blob_id)
+ self._output.flush()
+ blob_sha = fi_output.readline().rstrip()
+ if parent_version != [change.mode, b'blob', blob_sha, quoted_filename]:
+ return False
+
+ return True
+
+ def _record_remapping(self, commit, orig_parents):
+ new_id = None
+ # Record the mapping of old commit hash to new one
+ if commit.original_id and self._import_pipes:
+ fi_input, fi_output = self._import_pipes
+ self._output.write(b"get-mark :%d\n" % commit.id)
+ self._output.flush()
+ orig_id = commit.original_id
+ self._commit_short_old_hashes[orig_id[0:7]].add(orig_id)
+ # Note that we have queued up an id for later reading; flush a
+ # few of the older ones if we have too many queued up
+ self._pending_renames[orig_id] = commit.id
+ self._flush_renames(None, limit=40)
+ # Also, record if this was a merge commit that turned into a non-merge
+ # commit.
+ if len(orig_parents) >= 2 and len(commit.parents) < 2:
+ self._commits_no_longer_merges.append((commit.original_id, new_id))
+
+ def callback_metadata(self, extra_items = dict()):
+ return {'commit_rename_func': self._translate_commit_hash,
+ 'ancestry_graph': self._graph,
+ 'original_ancestry_graph': self._orig_graph,
+ **extra_items}
+
+ def _tweak_blob(self, blob):
+ if self._args.max_blob_size and len(blob.data) > self._args.max_blob_size:
+ blob.skip()
+
+ if blob.original_id in self._args.strip_blobs_with_ids:
+ blob.skip()
+
+ if ( self._args.replace_text
+ and not self._file_info_callback
+ # not (if blob contains zero byte in the first 8Kb, that is, if blob is binary data)
+ and not b"\0" in blob.data[0:8192]
+ ):
+ for literal, replacement in self._args.replace_text['literals']:
+ blob.data = blob.data.replace(literal, replacement)
+ for regex, replacement in self._args.replace_text['regexes']:
+ blob.data = regex.sub(replacement, blob.data)
+
+ if self._blob_callback:
+ self._blob_callback(blob, self.callback_metadata())
+
+ self._insert_into_stream(blob)
+
+ def _filter_files(self, commit):
+ def filename_matches(path_expression, pathname):
+ ''' Returns whether path_expression matches pathname or a leading
+ directory thereof, allowing path_expression to not have a trailing
+ slash even if it is meant to match a leading directory. '''
+ if path_expression == b'':
+ return True
+ n = len(path_expression)
+ if (pathname.startswith(path_expression) and
+ (path_expression[n-1:n] == b'/' or
+ len(pathname) == n or
+ pathname[n:n+1] == b'/')):
+ return True
+ return False
+
+ def newname(path_changes, pathname, use_base_name, filtering_is_inclusive):
+ ''' Applies filtering and rename changes from path_changes to pathname,
+ returning any of None (file isn't wanted), original filename (file
+ is wanted with original name), or new filename. '''
+ wanted = False
+ full_pathname = pathname
+ if use_base_name:
+ pathname = os.path.basename(pathname)
+ for (mod_type, match_type, path_exp) in path_changes:
+ if mod_type == 'filter' and not wanted:
+ assert match_type in ('match', 'glob', 'regex')
+ if match_type == 'match' and filename_matches(path_exp, pathname):
+ wanted = True
+ if match_type == 'glob' and fnmatch.fnmatch(pathname, path_exp):
+ wanted = True
+ if match_type == 'regex' and path_exp.search(pathname):
+ wanted = True
+ elif mod_type == 'rename':
+ match, repl = path_exp
+ assert match_type in ('match','regex') # glob was translated to regex
+ if match_type == 'match' and filename_matches(match, full_pathname):
+ full_pathname = full_pathname.replace(match, repl, 1)
+ pathname = full_pathname # rename incompatible with use_base_name
+ if match_type == 'regex':
+ full_pathname = match.sub(repl, full_pathname)
+ pathname = full_pathname # rename incompatible with use_base_name
+ return full_pathname if (wanted == filtering_is_inclusive) else None
+
+ args = self._args
+ new_file_changes = {} # Assumes no renames or copies, otherwise collisions
+ for change in commit.file_changes:
+ # NEEDSWORK: _If_ we ever want to pass `--full-tree` to fast-export and
+ # parse that output, we'll need to modify this block; `--full-tree`
+ # issues a deleteall directive which has no filename, and thus this
+ # block would normally strip it. Of course, FileChange() and
+ # _parse_optional_filechange() would need updates too.
+ if change.type == b'DELETEALL':
+ new_file_changes[b''] = change
+ continue
+ if change.filename in self._newnames:
+ change.filename = self._newnames[change.filename]
+ else:
+ original_filename = change.filename
+ change.filename = newname(args.path_changes, change.filename,
+ args.use_base_name, args.inclusive)
+ if self._filename_callback:
+ change.filename = self._filename_callback(change.filename)
+ self._newnames[original_filename] = change.filename
+ if not change.filename:
+ continue # Filtering criteria excluded this file; move on to next one
+ if change.filename in new_file_changes:
+ # Getting here means that path renaming is in effect, and caused one
+ # path to collide with another. That's usually bad, but can be okay
+ # under two circumstances:
+ # 1) Sometimes people have a file named OLDFILE in old revisions of
+ # history, and they rename to NEWFILE, and would like to rewrite
+ # history so that all revisions refer to it as NEWFILE. As such,
+ # we can allow a collision when (at least) one of the two paths
+ # is a deletion. Note that if OLDFILE and NEWFILE are unrelated
+ # this also allows the rewrite to continue, which makes sense
+ # since OLDFILE is no longer in the way.
+ # 2) If OLDFILE and NEWFILE are exactly equal, then writing them
+ # both to the same location poses no problem; we only need one
+ # file. (This could come up if someone copied a file in some
+ # commit, then later either deleted the file or kept it exactly
+ # in sync with the original with any changes, and then decides
+ # they want to rewrite history to only have one of the two files)
+ colliding_change = new_file_changes[change.filename]
+ if change.type == b'D':
+ # We can just throw this one away and keep the other
+ continue
+ elif change.type == b'M' and (
+ change.mode == colliding_change.mode and
+ change.blob_id == colliding_change.blob_id):
+ # The two are identical, so we can throw this one away and keep other
+ continue
+ elif new_file_changes[change.filename].type != b'D':
+ raise SystemExit(_("File renaming caused colliding pathnames!\n") +
+ _(" Commit: {}\n").format(commit.original_id) +
+ _(" Filename: {}").format(change.filename))
+ # Strip files that are too large
+ if self._args.max_blob_size and \
+ self._unpacked_size.get(change.blob_id, 0) > self._args.max_blob_size:
+ continue
+ if self._args.strip_blobs_with_ids and \
+ change.blob_id in self._args.strip_blobs_with_ids:
+ continue
+ # Otherwise, record the change
+ new_file_changes[change.filename] = change
+ commit.file_changes = [v for k,v in sorted(new_file_changes.items())]
+
+ def _tweak_commit(self, commit, aux_info):
+ if self._args.replace_message:
+ for literal, replacement in self._args.replace_message['literals']:
+ commit.message = commit.message.replace(literal, replacement)
+ for regex, replacement in self._args.replace_message['regexes']:
+ commit.message = regex.sub(replacement, commit.message)
+ if self._message_callback:
+ commit.message = self._message_callback(commit.message)
+
+ # Change the commit message according to callback
+ if not self._args.preserve_commit_hashes:
+ commit.message = self._hash_re.sub(self._translate_commit_hash,
+ commit.message)
+
+ # Change the author & committer according to mailmap rules
+ args = self._args
+ if args.mailmap:
+ commit.author_name, commit.author_email = \
+ args.mailmap.translate(commit.author_name, commit.author_email)
+ commit.committer_name, commit.committer_email = \
+ args.mailmap.translate(commit.committer_name, commit.committer_email)
+ # Change author & committer according to callbacks
+ if self._name_callback:
+ commit.author_name = self._name_callback(commit.author_name)
+ commit.committer_name = self._name_callback(commit.committer_name)
+ if self._email_callback:
+ commit.author_email = self._email_callback(commit.author_email)
+ commit.committer_email = self._email_callback(commit.committer_email)
+
+ # Sometimes the 'branch' given is a tag; if so, rename it as requested so
+ # we don't get any old tagnames
+ if self._args.tag_rename:
+ commit.branch = RepoFilter._do_tag_rename(args.tag_rename, commit.branch)
+ if self._refname_callback:
+ commit.branch = self._refname_callback(commit.branch)
+
+ # Filter or rename the list of file changes
+ orig_file_changes = set(commit.file_changes)
+ self._filter_files(commit)
+
+ # Record ancestry graph
+ parents, orig_parents = commit.parents, aux_info['orig_parents']
+ if self._args.state_branch:
+ external_parents = parents
+ else:
+ external_parents = [p for p in parents if not isinstance(p, int)]
+ # The use of 'reversed' is intentional here; there is a risk that we have
+ # duplicates in parents, and we want to map from parents to the first
+ # entry we find in orig_parents in such cases.
+ parent_reverse_dict = dict(zip(reversed(parents), reversed(orig_parents)))
+
+ self._graph.record_external_commits(external_parents)
+ self._orig_graph.record_external_commits(external_parents)
+ self._graph.add_commit_and_parents(commit.id, parents) # new githash unknown
+ self._orig_graph.add_commit_and_parents(commit.old_id, orig_parents,
+ commit.original_id)
+
+ # Prune parents (due to pruning of empty commits) if relevant, note that
+ # new_1st_parent is None unless this was a merge commit that is becoming
+ # a non-merge
+ prev_1st_parent = parents[0] if parents else None
+ parents, new_1st_parent = self._maybe_trim_extra_parents(orig_parents,
+ parents)
+ commit.parents = parents
+
+ # If parents were pruned, then we need our file changes to be relative
+ # to the new first parent
+ #
+ # Notes:
+ # * new_1st_parent and new_1st_parent != parents[0] uniquely happens for example when:
+ # working on merge, selecting subset of files and merge base still
+ # valid while first parent history doesn't touch any of those paths,
+ # but second parent history does. prev_1st_parent had already been
+ # rewritten to the non-None first ancestor and it remains valid.
+ # self._maybe_trim_extra_parents() avoids removing this first parent
+ # because it'd make the commit a non-merge. However, if there are
+ # no file_changes of note, we'll drop this commit and mark
+ # new_1st_parent as the new replacement. To correctly determine if
+ # there are no file_changes of note, we need to have the list of
+ # file_changes relative to new_1st_parent.
+ # (See t9390#3, "basic -> basic-ten using '--path ten'")
+ # * prev_1st_parent != parents[0] happens for example when:
+ # similar to above, but the merge base is no longer valid and was
+ # pruned away as well. Then parents started as e.g. [None, $num],
+ # and both prev_1st_parent and new_1st_parent are None, while parents
+ # after self._maybe_trim_extra_parents() becomes just [$num].
+ # (See t9390#67, "degenerate merge with non-matching filename".)
+ # Since $num was originally a second parent, we need to rewrite
+ # file changes to be relative to parents[0].
+ # * TODO: We should be getting the changes relative to the new first
+ # parent even if self._fep is None, BUT we can't. Our method of
+ # getting the changes right now is an external git diff invocation,
+ # which we can't do if we just have a fast export stream. We can't
+ # really work around it by querying the fast-import stream either,
+ # because the 'ls' directive only allows us to list info about
+ # specific paths, but we need to find out which paths exist in two
+ # commits and then query them. We could maybe force checkpointing in
+ # fast-import, then doing a diff from what'll be the new first parent
+ # back to prev_1st_parent (which may be None, i.e. empty tree), using
+ # the fact that in A->{B,C}->D, where D is merge of B & C, the diff
+ # from C->D == C->A + A->B + B->D, and in these cases A==B, so it
+ # simplifies to C->D == C->A + B->D, and C is our new 1st parent
+ # commit, A is prev_1st_commit, and B->D is commit.file_changes that
+ # we already have. However, checkpointing the fast-import process
+ # and figuring out how long to wait before we can run our diff just
+ # seems excessive. For now, just punt and assume the merge wasn't
+ # "evil" (i.e. that it's remerge-diff is empty, as is true for most
+ # merges). If the merge isn't evil, no further steps are necessary.
+ if parents and self._fep and (
+ prev_1st_parent != parents[0] or
+ new_1st_parent and new_1st_parent != parents[0]):
+ # Get the id from the original fast export stream corresponding to the
+ # new 1st parent. As noted above, that new 1st parent might be
+ # new_1st_parent, or if that is None, it'll be parents[0].
+ will_be_1st = new_1st_parent or parents[0]
+ old_id = parent_reverse_dict[will_be_1st]
+ # Now, translate that to a hash
+ will_be_1st_commit_hash = self._orig_graph.map_to_hash(old_id)
+ # Get the changes from what is going to be the new 1st parent to this
+ # merge commit. Note that since we are going from the new 1st parent
+ # to the merge commit, we can just replace the existing
+ # commit.file_changes rather than getting something we need to combine
+ # with the existing commit.file_changes. Also, we can just replace
+ # because prev_1st_parent is an ancestor of will_be_1st_commit_hash
+ # (or prev_1st_parent is None and first parent history is gone), so
+ # even if we retain prev_1st_parent and do not prune it, the changes
+ # will still work given the snapshot-based way fast-export/fast-import
+ # work.
+ commit.file_changes = GitUtils.get_file_changes(self._repo_working_dir,
+ will_be_1st_commit_hash,
+ commit.original_id)
+
+ # Save these and filter them
+ orig_file_changes = set(commit.file_changes)
+ self._filter_files(commit)
+
+ # Process the --file-info-callback
+ if self._file_info_callback:
+ if self._file_info_value is None:
+ source_working_dir = self._args.source or b'.'
+ self._file_info_value = FileInfoValueHelper(self._args.replace_text,
+ self.insert,
+ source_working_dir)
+ new_file_changes = []
+ for change in commit.file_changes:
+ if change.type != b'D':
+ assert(change.type == b'M')
+ (filename, mode, blob_id) = \
+ self._file_info_callback(change.filename,
+ change.mode,
+ change.blob_id,
+ self._file_info_value)
+ if mode is None:
+ # TODO: Should deletion of the file even be a feature? Might
+ # want to remove this branch of the if-elif-else.
+ assert(filename is not None)
+ assert(blob_id is not None)
+ new_change = FileChange(b'D', filename)
+ elif filename is None:
+ continue # Drop the FileChange from this commit
+ else:
+ new_change = FileChange(b'M', filename, blob_id, mode)
+ else:
+ new_change = change # use change as-is for deletions
+ new_file_changes.append(new_change)
+ commit.file_changes = new_file_changes
+
+ # Call the user-defined callback, if any
+ if self._commit_callback:
+ self._commit_callback(commit, self.callback_metadata(aux_info))
+
+ # Find out which files were modified by the callbacks. Such paths could
+ # lead to subsequent commits being empty (e.g. if removing a line containing
+ # a password from every version of a file that had the password, and some
+ # later commit did nothing more than remove that line)
+ final_file_changes = set(commit.file_changes)
+ if self._args.replace_text or self._blob_callback:
+ differences = orig_file_changes.union(final_file_changes)
+ else:
+ differences = orig_file_changes.symmetric_difference(final_file_changes)
+ self._files_tweaked.update(x.filename for x in differences)
+
+ # Now print the resulting commit, or if prunable skip it
+ if not commit.dumped:
+ if not self._prunable(commit, new_1st_parent,
+ aux_info['had_file_changes'], orig_parents):
+ self._insert_into_stream(commit)
+ self._record_remapping(commit, orig_parents)
+ else:
+ rewrite_to = new_1st_parent or commit.first_parent()
+ commit.skip(new_id = rewrite_to)
+ if self._args.state_branch:
+ alias = Alias(commit.old_id or commit.id, rewrite_to or deleted_hash)
+ self._insert_into_stream(alias)
+ if commit.branch.startswith(b'refs/') or commit.branch == b'HEAD':
+ # The special check above is because when direct revisions are passed
+ # along to fast-export (such as with stashes), there is a chance the
+ # revision is rewritten to nothing. In such cases, we don't want to
+ # point an invalid ref that just names a revision to some other point.
+ reset = Reset(commit.branch, rewrite_to or deleted_hash)
+ self._insert_into_stream(reset)
+ self._commit_renames[commit.original_id] = None
+
+ # Show progress
+ self._num_commits += 1
+ if not self._args.quiet:
+ self._progress_writer.show(self._parsed_message % self._num_commits)
+
+ @staticmethod
+ def _do_tag_rename(rename_pair, tagname):
+ old, new = rename_pair.split(b':', 1)
+ old, new = b'refs/tags/'+old, b'refs/tags/'+new
+ if tagname.startswith(old):
+ return tagname.replace(old, new, 1)
+ return tagname
+
+ def _tweak_tag(self, tag):
+ # Tweak the tag message according to callbacks
+ if self._args.replace_message:
+ for literal, replacement in self._args.replace_message['literals']:
+ tag.message = tag.message.replace(literal, replacement)
+ for regex, replacement in self._args.replace_message['regexes']:
+ tag.message = regex.sub(replacement, tag.message)
+ if self._message_callback:
+ tag.message = self._message_callback(tag.message)
+
+ # Tweak the tag name according to tag-name-related callbacks
+ tag_prefix = b'refs/tags/'
+ fullref = tag_prefix+tag.ref
+ if self._args.tag_rename:
+ fullref = RepoFilter._do_tag_rename(self._args.tag_rename, fullref)
+ if self._refname_callback:
+ fullref = self._refname_callback(fullref)
+ if not fullref.startswith(tag_prefix):
+ msg = "Error: fast-import requires tags to be in refs/tags/ namespace."
+ msg += "\n {} renamed to {}".format(tag_prefix+tag.ref, fullref)
+ raise SystemExit(msg)
+ tag.ref = fullref[len(tag_prefix):]
+
+ # Tweak the tagger according to callbacks
+ if self._args.mailmap:
+ tag.tagger_name, tag.tagger_email = \
+ self._args.mailmap.translate(tag.tagger_name, tag.tagger_email)
+ if self._name_callback:
+ tag.tagger_name = self._name_callback(tag.tagger_name)
+ if self._email_callback:
+ tag.tagger_email = self._email_callback(tag.tagger_email)
+
+ # Call general purpose tag callback
+ if self._tag_callback:
+ self._tag_callback(tag, self.callback_metadata())
+
+ def _tweak_reset(self, reset):
+ if self._args.tag_rename:
+ reset.ref = RepoFilter._do_tag_rename(self._args.tag_rename, reset.ref)
+ if self._refname_callback:
+ reset.ref = self._refname_callback(reset.ref)
+ if self._reset_callback:
+ self._reset_callback(reset, self.callback_metadata())
+
+ def results_tmp_dir(self, create_if_missing=True):
+ target_working_dir = self._args.target or b'.'
+ git_dir = GitUtils.determine_git_dir(target_working_dir)
+ d = os.path.join(git_dir, b'filter-repo')
+ if create_if_missing and not os.path.isdir(d):
+ os.mkdir(d)
+ return d
+
+ def _load_marks_file(self, marks_basename):
+ full_branch = 'refs/heads/{}'.format(self._args.state_branch)
+ marks_file = os.path.join(self.results_tmp_dir(), marks_basename)
+ working_dir = self._args.target or b'.'
+ cmd = ['git', '-C', working_dir, 'show-ref', full_branch]
+ contents = b''
+ if subproc.call(cmd, stdout=subprocess.DEVNULL) == 0:
+ cmd = ['git', '-C', working_dir, 'show',
+ '%s:%s' % (full_branch, decode(marks_basename))]
+ try:
+ contents = subproc.check_output(cmd)
+ except subprocess.CalledProcessError as e: # pragma: no cover
+ raise SystemExit(_("Failed loading %s from %s") %
+ (decode(marks_basename), full_branch))
+ if contents:
+ biggest_id = max(int(x.split()[0][1:]) for x in contents.splitlines())
+ _IDS._next_id = max(_IDS._next_id, biggest_id+1)
+ with open(marks_file, 'bw') as f:
+ f.write(contents)
+ return marks_file
+
+ def _save_marks_files(self):
+ basenames = [b'source-marks', b'target-marks']
+ working_dir = self._args.target or b'.'
+
+ # Check whether the branch exists
+ parent = []
+ full_branch = 'refs/heads/{}'.format(self._args.state_branch)
+ cmd = ['git', '-C', working_dir, 'show-ref', full_branch]
+ if subproc.call(cmd, stdout=subprocess.DEVNULL) == 0:
+ parent = ['-p', full_branch]
+
+ # Run 'git hash-object $MARKS_FILE' for each marks file, save result
+ blob_hashes = {}
+ for marks_basename in basenames:
+ marks_file = os.path.join(self.results_tmp_dir(), marks_basename)
+ if not os.path.isfile(marks_file): # pragma: no cover
+ raise SystemExit(_("Failed to find %s to save to %s")
+ % (marks_file, self._args.state_branch))
+ cmd = ['git', '-C', working_dir, 'hash-object', '-w', marks_file]
+ blob_hashes[marks_basename] = subproc.check_output(cmd).strip()
+
+ # Run 'git mktree' to create a tree out of it
+ p = subproc.Popen(['git', '-C', working_dir, 'mktree'],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ for b in basenames:
+ p.stdin.write(b'100644 blob %s\t%s\n' % (blob_hashes[b], b))
+ p.stdin.close()
+ p.wait()
+ tree = p.stdout.read().strip()
+
+ # Create the new commit
+ cmd = (['git', '-C', working_dir, 'commit-tree', '-m', 'New mark files',
+ tree] + parent)
+ commit = subproc.check_output(cmd).strip()
+ subproc.call(['git', '-C', working_dir, 'update-ref', full_branch, commit])
+
+ def importer_only(self):
+ self._run_sanity_checks()
+ self._setup_output()
+
+ def set_output(self, outputRepoFilter):
+ assert outputRepoFilter._output
+
+ # set_output implies this RepoFilter is doing exporting, though may not
+ # be the only one.
+ self._setup_input(use_done_feature = False)
+
+ # Set our output management up to pipe to outputRepoFilter's locations
+ self._managed_output = False
+ self._output = outputRepoFilter._output
+ self._import_pipes = outputRepoFilter._import_pipes
+
+ # Handle sanity checks, though currently none needed for export-only cases
+ self._run_sanity_checks()
+
+ def _read_stash(self):
+ if self._stash:
+ return
+ if self._orig_refs and b'refs/stash' in self._orig_refs and \
+ self._args.refs == ['--all']:
+ repo_working_dir = self._args.source or b'.'
+ git_dir = GitUtils.determine_git_dir(repo_working_dir)
+ stash = os.path.join(git_dir, b'logs', b'refs', b'stash')
+ if os.path.exists(stash):
+ self._stash = []
+ with open(stash, 'br') as f:
+ for line in f:
+ (oldhash, newhash, rest) = line.split(None, 2)
+ self._stash.append((newhash, rest))
+ self._args.refs.extend([x[0] for x in self._stash])
+
+ def _write_stash(self):
+ last = deleted_hash
+ if self._stash:
+ target_working_dir = self._args.target or b'.'
+ git_dir = GitUtils.determine_git_dir(target_working_dir)
+ stash = os.path.join(git_dir, b'logs', b'refs', b'stash')
+ with open(stash, 'bw') as f:
+ for (hash, rest) in self._stash:
+ new_hash = self._get_rename(hash)
+ if new_hash is None:
+ continue
+ f.write(b' '.join([last, new_hash, rest]) + b'\n')
+ last = new_hash
+ print(_("Rewrote the stash."))
+
+ def _setup_input(self, use_done_feature):
+ if self._args.stdin:
+ self._input = sys.stdin.detach()
+ sys.stdin = None # Make sure no one tries to accidentally use it
+ self._fe_orig = None
+ else:
+ self._read_stash()
+ skip_blobs = (self._blob_callback is None and
+ (self._args.replace_text is None or
+ self._file_info_callback is not None) and
+ self._args.source == self._args.target)
+ extra_flags = []
+ if skip_blobs:
+ extra_flags.append('--no-data')
+ if self._args.max_blob_size:
+ self._unpacked_size, packed_size = GitUtils.get_blob_sizes()
+ if use_done_feature:
+ extra_flags.append('--use-done-feature')
+ if write_marks:
+ extra_flags.append(b'--mark-tags')
+ if self._args.state_branch:
+ assert(write_marks)
+ source_marks_file = self._load_marks_file(b'source-marks')
+ extra_flags.extend([b'--export-marks='+source_marks_file,
+ b'--import-marks='+source_marks_file])
+ if self._args.preserve_commit_encoding is not None: # pragma: no cover
+ reencode = 'no' if self._args.preserve_commit_encoding else 'yes'
+ extra_flags.append('--reencode='+reencode)
+ if self._args.date_order:
+ extra_flags.append('--date-order')
+ location = ['-C', self._args.source] if self._args.source else []
+ fep_cmd = ['git'] + location + ['fast-export', '--show-original-ids',
+ '--signed-tags=strip', '--tag-of-filtered-object=rewrite',
+ '--fake-missing-tagger', '--reference-excluded-parents'
+ ] + extra_flags + self._args.refs
+ self._fep = subproc.Popen(fep_cmd, bufsize=-1, stdout=subprocess.PIPE)
+ self._input = self._fep.stdout
+ if self._args.dry_run or self._args.debug:
+ self._fe_orig = os.path.join(self.results_tmp_dir(),
+ b'fast-export.original')
+ output = open(self._fe_orig, 'bw')
+ self._input = InputFileBackup(self._input, output)
+ if self._args.debug:
+ tmp = [decode(x) if isinstance(x, bytes) else x for x in fep_cmd]
+ print("[DEBUG] Running: {}".format(' '.join(tmp)))
+ print(" (saving a copy of the output at {})"
+ .format(decode(self._fe_orig)))
+
+ def _setup_output(self):
+ if not self._args.dry_run:
+ location = ['-C', self._args.target] if self._args.target else []
+ fip_cmd = ['git'] + location + ['-c', 'core.ignorecase=false',
+ 'fast-import', '--force', '--quiet']
+ if date_format_permissive:
+ fip_cmd.append('--date-format=raw-permissive')
+ if self._args.state_branch:
+ target_marks_file = self._load_marks_file(b'target-marks')
+ fip_cmd.extend([b'--export-marks='+target_marks_file,
+ b'--import-marks='+target_marks_file])
+ self._fip = subproc.Popen(fip_cmd, bufsize=-1,
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ self._import_pipes = (self._fip.stdin, self._fip.stdout)
+ if self._args.dry_run or self._args.debug:
+ self._fe_filt = os.path.join(self.results_tmp_dir(),
+ b'fast-export.filtered')
+ self._output = open(self._fe_filt, 'bw')
+ else:
+ self._output = self._fip.stdin
+ if self._args.debug and not self._args.dry_run:
+ self._output = DualFileWriter(self._fip.stdin, self._output)
+ tmp = [decode(x) if isinstance(x, bytes) else x for x in fip_cmd]
+ print("[DEBUG] Running: {}".format(' '.join(tmp)))
+ print(" (using the following file as input: {})"
+ .format(decode(self._fe_filt)))
+
+ def _migrate_origin_to_heads(self):
+ source_working_dir = self._args.source or b'.'
+ target_working_dir = self._args.target or b'.'
+ refs_to_migrate = set(x for x in self._orig_refs
+ if x.startswith(b'refs/remotes/origin/'))
+ refs_to_warn_about = set()
+ if refs_to_migrate:
+ if self._args.debug:
+ print("[DEBUG] Migrating refs/remotes/origin/* -> refs/heads/*")
+ p = subproc.Popen('git update-ref --no-deref --stdin'.split(),
+ stdin=subprocess.PIPE, cwd=source_working_dir)
+ for ref in refs_to_migrate:
+ if ref == b'refs/remotes/origin/HEAD':
+ p.stdin.write(b'delete %s %s\n' % (ref, self._orig_refs[ref]))
+ del self._orig_refs[ref]
+ continue
+ newref = ref.replace(b'refs/remotes/origin/', b'refs/heads/')
+ if newref not in self._orig_refs:
+ p.stdin.write(b'create %s %s\n' % (newref, self._orig_refs[ref]))
+ self._orig_refs[newref] = self._orig_refs[ref]
+ elif self._orig_refs[ref] != self._orig_refs[newref]:
+ refs_to_warn_about.add(newref)
+ p.stdin.write(b'delete %s %s\n' % (ref, self._orig_refs[ref]))
+ del self._orig_refs[ref]
+ p.stdin.close()
+ if p.wait(): # pragma: no cover
+ msg = _("git update-ref failed; see above")
+ raise SystemExit(msg)
+
+ if b'remote.origin.url' not in self._config_settings:
+ return
+
+ # For sensitive data removals, fetch ALL refs. Non-mirror clones normally
+ # only grab branches and tags, but other refs may hold on to the sensitive
+ # data as well.
+ if self._args.sensitive_data_removal and \
+ not self._args.no_fetch and \
+ not self._already_ran and \
+ self._config_settings.get(b'remote.origin.mirror', b'false') != b'true':
+
+ if refs_to_warn_about:
+ msg = ("Warning: You have refs modified from upstream:\n " +
+ "\n ".join([decode(x) for x in refs_to_warn_about]) +
+ "\n" +
+ " We want to forcibly fetch from upstream to ensure\n" +
+ " that all relevent refs are rewritten, but this will\n" +
+ " discard your local changes before starting the\n" +
+ " rewrite. Proceed with fetch (Y/N)?")
+ response = input(msg)
+
+ if response.lower() != 'y':
+ self._args.no_fetch = True
+ # Don't do the fetch, and don't remove the origin remote
+ return
+
+ cmd = 'git fetch -q --prune --update-head-ok --refmap "" origin +refs/*:refs/*'
+ m = _("NOTICE: Fetching all refs from origin to make sure we rewrite\n"
+ " all history that may reference the sensitive data, via\n"
+ " "+cmd)
+ print(m)
+ ret = subproc.call([arg if arg != '""' else '' for arg in cmd.split()],
+ cwd=source_working_dir)
+ if ret != 0: # pragma: no cover
+ m = _("Warning: Fetching all refs from origin failed")
+ print(m)
+ if self._args.sensitive_data_removal:
+ return
+
+ # Now remove the origin remote
+ url = self._config_settings[b'remote.origin.url'].decode(errors='replace')
+ m = _("NOTICE: Removing 'origin' remote; see 'Why is my origin removed?'\n"
+ " in the manual if you want to push back there.\n"
+ " (was %s)") % url
+ print(m)
+ subproc.call('git remote rm origin'.split(), cwd=target_working_dir)
+
+ def _final_commands(self):
+ self._finalize_handled = True
+ self._done_callback and self._done_callback()
+
+ if self._file_info_value:
+ self._file_info_value.finalize()
+ if not self._args.quiet:
+ self._progress_writer.finish()
+
+ def _ref_update(self, target_working_dir):
+ # Start the update-ref process
+ p = subproc.Popen('git update-ref --no-deref --stdin'.split(),
+ stdin=subprocess.PIPE,
+ cwd=target_working_dir)
+
+ # Remove replace_refs from _orig_refs
+ replace_refs = {k:v for k, v in self._orig_refs.items()
+ if k.startswith(b'refs/replace/')}
+ reverse_replace_refs = collections.defaultdict(list)
+ for k,v in replace_refs.items():
+ reverse_replace_refs[v].append(k)
+ all(map(self._orig_refs.pop, replace_refs))
+
+ # Remove unused refs
+ exported_refs, imported_refs = self.get_exported_and_imported_refs()
+ refs_to_nuke = exported_refs - imported_refs
+ # Because revisions can be passed to fast-export which handles them as
+ # though they were refs, we might have bad "refs" to nuke; strip them out.
+ refs_to_nuke = [x for x in refs_to_nuke
+ if x.startswith(b'refs/') or x == b'HEAD']
+ if self._args.partial:
+ refs_to_nuke = set()
+ if refs_to_nuke and self._args.debug:
+ print("[DEBUG] Deleting the following refs:\n "+
+ decode(b"\n ".join(sorted(refs_to_nuke))))
+ p.stdin.write(b''.join([b"delete %s\n" % x
+ for x in refs_to_nuke]))
+
+ # Delete or update and add replace_refs; note that fast-export automatically
+ # handles 'update-no-add', we only need to take action for the other four
+ # choices for replace_refs.
+ self._flush_renames()
+ actual_renames = {k:v for k,v in self._commit_renames.items() if k != v}
+ if self._args.replace_refs in ['delete-no-add', 'delete-and-add']:
+ # Delete old replace refs, if unwanted
+ replace_refs_to_nuke = set(replace_refs)
+ if self._args.replace_refs == 'delete-and-add':
+ # git-update-ref won't allow us to update a ref twice, so be careful
+ # to avoid deleting refs we'll later update
+ replace_refs_to_nuke = replace_refs_to_nuke.difference(
+ [b'refs/replace/'+x for x in actual_renames])
+ p.stdin.write(b''.join([b"delete %s\n" % x
+ for x in replace_refs_to_nuke]))
+ if self._args.replace_refs in ['delete-and-add', 'update-or-add',
+ 'update-and-add']:
+ # Add new replace refs
+ update_only = (self._args.replace_refs == 'update-or-add')
+ p.stdin.write(b''.join([b"update refs/replace/%s %s\n" % (old, new)
+ for old,new in actual_renames.items()
+ if new and not (update_only and
+ old in reverse_replace_refs)]))
+
+ # Complete the update-ref process
+ p.stdin.close()
+ if p.wait():
+ raise SystemExit(_("git update-ref failed; see above")) # pragma: no cover
+
+ def _remap_to(self, oldish_hash):
+ '''
+ Given an oldish_hash (from the beginning of the current run), return:
+ IF oldish_hash is NOT pruned:
+ the hash of the rewrite of oldish_hash
+ otherwise:
+ the hash of the rewrite of the first unpruned ancestor of oldish_hash
+ '''
+ old_id = self._orig_graph._hash_to_id[oldish_hash]
+ new_id = _IDS.translate(old_id)
+ new_hash = self._graph.git_hash[new_id] if new_id else deleted_hash
+ return new_hash
+
+ def _compute_metadata(self, metadata_dir, orig_refs):
+ #
+ # First, handle commit_renames
+ #
+ old_commit_renames = dict()
+ if not self._already_ran:
+ commit_renames = {old: new
+ for old, new in self._commit_renames.items()
+ }
+ else:
+ # Read commit-map into old_commit_renames
+ with open(os.path.join(metadata_dir, b'commit-map'), 'br') as f:
+ f.readline() # Skip the header line
+ for line in f:
+ (old,new) = line.split()
+ old_commit_renames[old] = new
+ # Use A->B mappings in old_commit_renames, and B->C mappings in
+ # self._commit_renames to yield A->C mappings in commit_renames
+ commit_renames = {old: self._commit_renames.get(newish, newish)
+ for old, newish in old_commit_renames.items()}
+ # If there are any B->C mappings in self._commit_renames for which
+ # there was no A->B mapping in old_commit_renames, then add the
+ # B->C mapping to commit_renames too.
+ seen = set(old_commit_renames.values())
+ commit_renames.update({old: new
+ for old, new in self._commit_renames.items()
+ if old not in seen})
+
+ #
+ # Second, handle ref_maps
+ #
+ exported_refs, imported_refs = self.get_exported_and_imported_refs()
+
+ old_commit_unrenames = dict()
+ if not self._already_ran:
+ old_ref_map = dict((refname, (old_hash, deleted_hash))
+ for refname, old_hash in orig_refs.items()
+ if refname in exported_refs)
+ else:
+ # old_commit_renames talk about how commits were renamed in the original
+ # run. Let's reverse it to find out how to get from the intermediate
+ # commit name, back to the original. Because everything in orig_refs
+ # right now refers to the intermediate commits after the first run(s),
+ # and we need to map them back to what they were before any changes.
+ old_commit_unrenames = dict((v,k) for (k,v) in old_commit_renames.items())
+
+ old_ref_map = {}
+ # Populate old_ref_map from the 'ref-map' file
+ with open(os.path.join(metadata_dir, b'ref-map'), 'br') as f:
+ f.readline() # Skip the header line
+ for line in f:
+ (old,intermediate,ref) = line.split()
+ old_ref_map[ref] = (old, intermediate)
+ # Append to old_ref_map items from orig_refs that were exported, but
+ # get the actual original commit name
+ for refname, old_hash in orig_refs.items():
+ if refname in old_ref_map:
+ continue
+ if refname not in exported_refs:
+ continue
+ # Compute older_hash
+ original_hash = old_commit_unrenames.get(old_hash, old_hash)
+ old_ref_map[refname] = (original_hash, deleted_hash)
+
+ new_refs = {}
+ new_refs_initialized = False
+ ref_maps = {}
+ self._orig_graph._ensure_reverse_maps_populated()
+ for refname, pair in old_ref_map.items():
+ old_hash, hash_ref_becomes_if_not_imported_in_this_run = pair
+ if refname not in imported_refs:
+ new_hash = hash_ref_becomes_if_not_imported_in_this_run
+ elif old_hash in commit_renames:
+ intermediate = old_commit_renames.get(old_hash,old_hash)
+ if intermediate in self._commit_renames:
+ new_hash = self._remap_to(intermediate)
+ else:
+ new_hash = intermediate
+ else: # Must be either an annotated tag, or a ref whose tip was pruned
+ if not new_refs_initialized:
+ target_working_dir = self._args.target or b'.'
+ new_refs = GitUtils.get_refs(target_working_dir)
+ new_refs_initialized = True
+ if refname in new_refs:
+ new_hash = new_refs[refname]
+ else:
+ new_hash = deleted_hash
+ ref_maps[refname] = (old_hash, new_hash)
+ if self._args.source or self._args.target:
+ if not new_refs_initialized:
+ target_working_dir = self._args.target or b'.'
+ new_refs = GitUtils.get_refs(target_working_dir)
+ new_refs_initialized = True
+ for ref, new_hash in new_refs.items():
+ if ref not in orig_refs and not ref.startswith(b'refs/replace/'):
+ old_hash = b'0'*len(new_hash)
+ ref_maps[ref] = (old_hash, new_hash)
+
+ #
+ # Third, handle first_changes
+ #
+
+ old_first_changes = dict()
+ if self._already_ran:
+ # Read first_changes into old_first_changes
+ with open(os.path.join(metadata_dir, b'first-changed-commits'), 'br') as f:
+ for line in f:
+ changed_commit, undeleted_self_or_ancestor = line.strip().split()
+ old_first_changes[changed_commit] = undeleted_self_or_ancestor
+ # We need to find the commits that were modified whose parents were not.
+ # To be able to find parents, we need the commit names as of the beginning
+ # of this run, and then when we are done, we need to map them back to the
+ # name of the commits from before any git-filter-repo runs.
+ #
+ # We are excluding here any commits deleted in previous git-filter-repo
+ # runs
+ undo_old_commit_renames = dict((v,k) for (k,v) in old_commit_renames.items()
+ if v != deleted_hash)
+ # Get a list of all commits that were changed, as of the beginning of
+ # this latest run.
+ changed_commits = {new
+ for (old,new) in old_commit_renames.items()
+ if old != new and new != deleted_hash} | \
+ {old
+ for (old,new) in self._commit_renames.items()
+ if old != new}
+ special_changed_commits = {old
+ for (old,new) in old_commit_renames.items()
+ if new == deleted_hash}
+ first_changes = dict()
+ for (old,new) in self._commit_renames.items():
+ if old == new:
+ # old wasn't modified, can't be first change if not even a change
+ continue
+ if old_commit_unrenames.get(old,old) != old:
+ # old was already modified in previous run; while it might represent
+ # something that is still a first change, we'll handle that as we
+ # loop over old_first_changes below
+ continue
+ if any(parent in changed_commits
+ for parent in self._orig_graph.get_parent_hashes(old)):
+ # a parent of old was modified, so old is not a first change
+ continue
+ # At this point, old IS a first change. We need to find out what new
+ # commit it maps to, or if it doesn't map to one, what new commit was
+ # its most recent ancestor that wasn't pruned.
+ if new is None:
+ new = self._remap_to(old)
+ first_changes[old] = (new if new is not None else deleted_hash)
+ for (old,undeleted_self_or_ancestor) in old_first_changes.items():
+ if undeleted_self_or_ancestor == deleted_hash:
+ # old represents a commit that was pruned and whose entire ancestry
+ # was pruned. So, old is still a first change
+ first_changes[old] = undeleted_self_or_ancestor
+ continue
+ intermediate = old_commit_renames.get(old, old)
+ usoa = undeleted_self_or_ancestor
+ new_ancestor = self._commit_renames.get(usoa, usoa)
+ if intermediate == deleted_hash:
+ # old was pruned in previous rewrite
+ if usoa != new_ancestor:
+ # old's ancestor got rewritten in this filtering run; we can drop
+ # this one from first_changes.
+ continue
+ # Getting here means old was a first change and old was pruned in a
+ # previous run, and its ancestors that survived were non rewritten in
+ # this run, so old remains a first change
+ first_changes[old] = new_ancestor # or usoa, since new_ancestor == usoa
+ continue
+ assert(usoa == intermediate) # old wasn't pruned => usoa == intermediate
+
+ # Check whether parents of intermediate were rewritten. Note that
+ # intermediate in self._commit_renames only means that intermediate was
+ # processed by the latest filtering (not necessarily that it changed),
+ # but we need to know that before we can check for parent hashes having
+ # changed.
+ if intermediate not in self._commit_renames:
+ # This commit was not processed by this run, so it remains a first
+ # change
+ first_changes[old] = usoa
+ continue
+ if any(parent in changed_commits
+ for parent in self._orig_graph.get_parent_hashes(intermediate)):
+ # An ancestor was modified by this run, so it is no longer a first
+ # change; continue to the next one.
+ continue
+ # This change is a first_change; find the new commit its usoa maps to
+ new = self._remap_to(intermediate)
+ assert(new is not None)
+ first_changes[old] = new
+
+ return commit_renames, ref_maps, first_changes
+
+ def _handle_lfs_metadata(self, metadata_dir):
+ if self._lfs_object_tracker is None:
+ print("NOTE: LFS object orphaning not checked (LFS not in use)")
+ return
+
+ if self._args.partial:
+ target_working_dir = self._args.target or b'.'
+ source = False
+ self._lfs_object_tracker.find_all_lfs_objects_in_repo(target_working_dir,
+ source)
+
+ with open(os.path.join(metadata_dir, b'original_lfs_objects'), 'bw') as f:
+ for obj in sorted(self._lfs_object_tracker.source_objects.objects):
+ f.write(obj+b"\n")
+
+ orphaned_lfs_path = os.path.join(metadata_dir, b'orphaned_lfs_objects')
+ msg = textwrap.dedent(_(f"""\
+ NOTE: There were LFS Objects Orphaned by this rewrite recorded in
+ {decode(orphaned_lfs_path)}."""))
+ with open(orphaned_lfs_path, 'bw') as f:
+ differences = self._lfs_object_tracker.source_objects.objects - \
+ self._lfs_object_tracker.target_objects.objects
+ for obj in sorted(differences):
+ f.write(obj+b"\n")
+ if differences:
+ self._lfs_object_tracker.objects_orphaned = True
+ print(msg)
+
+ def _record_metadata(self, metadata_dir, orig_refs):
+ self._flush_renames()
+ commit_renames, ref_maps, first_changes = \
+ self._compute_metadata(metadata_dir, orig_refs)
+
+ if self._args.sensitive_data_removal:
+ changed_commits = sum(k!=v for (k,v) in commit_renames.items())
+ print(f"You rewrote {changed_commits} (of {len(commit_renames)}) commits.")
+ print("") # Add a blank line before important rewrite information
+ print(f"NOTE: First Changed Commit(s) is/are:\n "
+ + decode(b"\n ".join(x for x in first_changes)))
+
+ with open(os.path.join(metadata_dir, b'sensitive_data_removal'), 'bw') as f:
+ pass # Write nothing; we only need the file created
+
+ self._handle_lfs_metadata(metadata_dir)
+ print("") # Add a blank line after important rewrite information
+
+ with open(os.path.join(metadata_dir, b'commit-map'), 'bw') as f:
+ f.write(("%-40s %s\n" % (_("old"), _("new"))).encode())
+ for (old,new) in sorted(commit_renames.items()):
+ msg = b'%s %s\n' % (old, new if new != None else deleted_hash)
+ f.write(msg)
+
+ with open(os.path.join(metadata_dir, b'ref-map'), 'bw') as f:
+ f.write(("%-40s %-40s %s\n" % (_("old"), _("new"), _("ref"))).encode())
+ for refname, hash_pair in sorted(ref_maps.items()):
+ (old_hash, new_hash) = hash_pair
+ f.write(b'%s %s %s\n' % (old_hash, new_hash, refname))
+ if old_hash != new_hash:
+ self._changed_refs.add(refname)
+
+ with open(os.path.join(metadata_dir, b'changed-refs'), 'bw') as f:
+ for refname in sorted(self._changed_refs):
+ f.write(b'%s\n' % refname)
+
+ with open(os.path.join(metadata_dir, b'first-changed-commits'), 'bw') as f:
+ for commit, undeleted_self_or_ancestor in sorted(first_changes.items()):
+ f.write(b'%s %s\n' % (commit, undeleted_self_or_ancestor))
+
+ with open(os.path.join(metadata_dir, b'suboptimal-issues'), 'bw') as f:
+ issues_found = False
+ if self._commits_no_longer_merges:
+ issues_found = True
+
+ f.write(textwrap.dedent(_('''
+ The following commits used to be merge commits but due to filtering
+ are now regular commits; they likely have suboptimal commit messages
+ (e.g. "Merge branch next into master"). Original commit hash on the
+ left, commit hash after filtering/rewriting on the right:
+ ''')[1:]).encode())
+ for oldhash, newhash in self._commits_no_longer_merges:
+ f.write(' {} {}\n'.format(oldhash, newhash).encode())
+ f.write(b'\n')
+
+ if self._commits_referenced_but_removed:
+ issues_found = True
+ f.write(textwrap.dedent(_('''
+ The following commits were filtered out, but referenced in another
+ commit message. The reference to the now-nonexistent commit hash
+ (or a substring thereof) was left as-is in any commit messages:
+ ''')[1:]).encode())
+ for bad_commit_reference in self._commits_referenced_but_removed:
+ f.write(' {}\n'.format(bad_commit_reference).encode())
+ f.write(b'\n')
+
+ if not issues_found:
+ f.write(_("No filtering problems encountered.\n").encode())
+
+ with open(os.path.join(metadata_dir, b'already_ran'), 'bw') as f:
+ f.write(_("This file exists to allow you to filter again without --force,\n"
+ "and to specify that metadata files should be updated instead\n"
+ "of rewritten").encode())
+
+ def finish(self):
+ ''' Alternative to run() when there is no input of our own to parse,
+ meaning that run only really needs to close the handle to fast-import
+ and let it finish, thus making a call to "run" feel like a misnomer. '''
+ assert not self._input
+ assert self._managed_output
+ self.run()
+
+ def insert(self, obj, direct_insertion = False):
+ if not direct_insertion:
+ if type(obj) == Blob:
+ self._tweak_blob(obj)
+ elif type(obj) == Commit:
+ aux_info = {'orig_parents': obj.parents,
+ 'had_file_changes': bool(obj.file_changes)}
+ self._tweak_commit(obj, aux_info)
+ elif type(obj) == Reset:
+ self._tweak_reset(obj)
+ elif type(obj) == Tag:
+ self._tweak_tag(obj)
+ self._insert_into_stream(obj)
+
+ def _insert_into_stream(self, obj):
+ if not obj.dumped:
+ if self._lfs_object_tracker:
+ self._lfs_object_tracker.check_output_object(obj)
+ if self._parser:
+ self._parser.insert(obj)
+ else:
+ obj.dump(self._output)
+
+ def get_exported_and_imported_refs(self):
+ return self._parser.get_exported_and_imported_refs()
+
+ def run(self):
+ start = time.time()
+ if not self._input and not self._output:
+ self._run_sanity_checks()
+ if not self._args.dry_run and not self._args.partial:
+ self._read_stash()
+ self._migrate_origin_to_heads()
+ self._setup_input(use_done_feature = True)
+ self._setup_output()
+ assert self._sanity_checks_handled
+
+ if self._input:
+ # Create and run the filter
+ self._repo_working_dir = self._args.source or b'.'
+ self._parser = FastExportParser(blob_callback = self._tweak_blob,
+ commit_callback = self._tweak_commit,
+ tag_callback = self._tweak_tag,
+ reset_callback = self._tweak_reset,
+ done_callback = self._final_commands)
+ self._setup_lfs_orphaning_checks()
+ self._parser.run(self._input, self._output)
+ if not self._finalize_handled:
+ self._final_commands()
+
+ # Make sure fast-export completed successfully
+ if not self._args.stdin and self._fep.wait():
+ raise SystemExit(_("Error: fast-export failed; see above.")) # pragma: no cover
+ self._input.close()
+
+ # If we're not the manager of self._output, we should avoid post-run cleanup
+ if not self._managed_output:
+ return
+
+ # Close the output and ensure fast-import successfully completes
+ self._output.close()
+ if not self._args.dry_run and self._fip.wait():
+ raise SystemExit(_("Error: fast-import failed; see above.")) # pragma: no cover
+
+ # With fast-export and fast-import complete, update state if requested
+ if self._args.state_branch:
+ self._save_marks_files()
+
+ # Notify user how long it took, before doing a gc and such
+ msg = "New history written in {:.2f} seconds..."
+ if self._args.repack:
+ msg = "New history written in {:.2f} seconds; now repacking/cleaning..."
+ print(msg.format(time.time()-start))
+
+ # Exit early, if requested
+ if self._args.dry_run:
+ print(_("NOTE: Not running fast-import or cleaning up; --dry-run passed."))
+ if self._fe_orig:
+ print(_(" Requested filtering can be seen by comparing:"))
+ print(" " + decode(self._fe_orig))
+ else:
+ print(_(" Requested filtering can be seen at:"))
+ print(" " + decode(self._fe_filt))
+ return
+
+ target_working_dir = self._args.target or b'.'
+ if self._input:
+ self._ref_update(target_working_dir)
+
+ # Write out data about run
+ self._record_metadata(self.results_tmp_dir(), self._orig_refs)
+
+ # Final cleanup:
+ # If we need a repack, then nuke the reflogs and repack.
+ # If we need a reset, do a reset --hard
+ reset = not GitUtils.is_repository_bare(target_working_dir)
+ self.cleanup(target_working_dir, self._args.repack, reset,
+ run_quietly=self._args.quiet,
+ show_debuginfo=self._args.debug)
+
+ # Let user know how long it took
+ print(_("Completely finished after {:.2f} seconds.")
+ .format(time.time()-start))
+
+ # Give post-rewrite instructions for cleaning up other copies for SDR
+ if self._args.sensitive_data_removal:
+ lfs_note = ""
+ if self._lfs_object_tracker and \
+ self._lfs_object_tracker.objects_orphaned == True:
+ lfs_note = _(" and LFS Objects Orphaned")
+ push_command = "git push --force --mirror origin"
+ if self._args.no_fetch:
+ if self._args.partial:
+ push_command = "git push --force origin " + \
+ " ".join(sorted([decode(x) for x in self._changed_refs]))
+ else:
+ push_command = "git push --all --tags origin"
+ print("")
+ print(sdr_next_steps % (push_command, lfs_note, lfs_note))
+
+def main():
+ setup_gettext()
+ args = FilteringOptions.parse_args(sys.argv[1:])
+ if args.analyze:
+ RepoAnalyze.run(args)
+ else:
+ filter = RepoFilter(args)
+ filter.run()
+
+if __name__ == '__main__':
+ main()
diff --git a/contrib/pre-commit b/contrib/pre-commit
new file mode 100644
index 00000000000..9836ae75070
--- /dev/null
+++ b/contrib/pre-commit
@@ -0,0 +1,38 @@
+#!/bin/sh
+FILES=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php`
+PROJECT=`php -r "echo dirname(dirname(realpath('$0')));"`
+
+# Determine if a file list is passed
+if [ "$#" -eq 1 ]
+then
+ oIFS=$IFS
+ IFS='
+ '
+ SFILES="$1"
+ IFS=$oIFS
+fi
+SFILES=${SFILES:-$FILES}
+
+echo "Checking PHP Lint..."
+for FILE in $SFILES
+do
+ php -l -d display_errors=0 $PROJECT/$FILE
+ if [ $? != 0 ]
+ then
+ echo "Fix the error before commit."
+ exit 1
+ fi
+ FILES="$FILES $PROJECT/$FILE"
+done
+
+if [ "$SFILES" != "" ]
+then
+ echo "Running PHPCS"
+ ./vendor/bin/phpcs $SFILES
+ if [ $? != 0 ]
+ then
+ echo "PHPCS Errors found; commit aborted."
+ exit 1
+ fi
+fi
+exit $?
diff --git a/contrib/validate-deprecation-aliases.php b/contrib/validate-deprecation-aliases.php
new file mode 100644
index 00000000000..175c338d519
--- /dev/null
+++ b/contrib/validate-deprecation-aliases.php
@@ -0,0 +1,76 @@
+#!/usr/bin/php -q
+ $iterator */
+$iterator = new RecursiveIteratorIterator($di);
+
+$code = 0;
+foreach ($iterator as $file) {
+ if (pathinfo((string)$file, PATHINFO_EXTENSION) !== 'php') {
+ continue;
+ }
+ if (pathinfo((string)$file, PATHINFO_FILENAME) === 'functions') {
+ continue;
+ }
+ if (strpos($file->getRealPath(), '/TestSuite/')) {
+ continue;
+ }
+
+ $content = file_get_contents((string)$file);
+ if (!strpos($content, 'class_alias(')) {
+ continue;
+ }
+
+ preg_match('#class_alias\(\s*\'([^\']+)\',#', $content, $matches);
+ if (!$matches) {
+ var_dump($content);
+ var_dump($file->getPath());
+ exit(1);
+ }
+
+ echo $matches[1] . PHP_EOL;
+ $filePath = str_replace('\\', '/', $matches[1]);
+ $filePath = str_replace('Cake/', $path, $filePath);
+ $filePath .= '.php';
+ if (!file_exists($filePath)) {
+ throw new RuntimeException('Cannot find path for `' . $matches[1] . '`');
+ }
+
+ $newFileContent = file_get_contents($filePath);
+
+ if (!str_contains($newFileContent, 'class_exists(') && !str_contains($newFileContent, 'class_alias(')) {
+ $oldPath = str_replace($path, '', $file->getRealPath());
+ $newPath = str_replace($path, '', $filePath);
+ echo "\033[31m" . ' * Missing `class_exists()` or `class_alias()` on new file for `' . $oldPath . '` => `' . $newPath . '`' . "\033[0m" . PHP_EOL;
+ $code = 1;
+ } else {
+ echo ' * OK' . PHP_EOL;
+ }
+}
+
+exit($code);
diff --git a/contrib/validate-split-packages-phpstan.php b/contrib/validate-split-packages-phpstan.php
new file mode 100644
index 00000000000..1cf084cda52
--- /dev/null
+++ b/contrib/validate-split-packages-phpstan.php
@@ -0,0 +1,73 @@
+#!/usr/bin/php -q
+ $iterator */
+$iterator = new RegexIterator($iterator, '~/src/\w+/composer.json$~');
+
+$packages = [];
+$code = 0;
+foreach ($iterator as $file) {
+ $filePath = $file->getPath();
+ $package = substr($filePath, strrpos($filePath, '/') + 1);
+ $packages[$filePath . '/'] = $package;
+}
+ksort($packages);
+
+$phivePharsXml = simplexml_load_file(dirname(__FILE__, 2) . DS . '.phive' . DS . 'phars.xml');
+$phpstanVersion = null;
+foreach ($phivePharsXml->phar as $phar) {
+ if ($phar->attributes()->name == 'phpstan') {
+ $phpstanVersion = (string)$phar->attributes()->version;
+ break;
+ }
+}
+$composerCommand = 'composer require --dev phpstan/phpstan:' . $phpstanVersion;
+
+$issues = [];
+foreach ($packages as $path => $package) {
+ if (!file_exists($path . 'phpstan.neon.dist')) {
+ continue;
+ }
+
+ $exitCode = null;
+ exec(
+ 'cd ' . $path . ' && ' . $composerCommand . ' && vendor/bin/phpstan analyze ./',
+ $output,
+ $exitCode
+ );
+ if ($exitCode !== 0) {
+ $code = $exitCode;
+
+ $issues[] = $package . ': ' . PHP_EOL . implode(PHP_EOL, $output);
+ }
+ exec('cd ' . $path . ' && rm composer.lock && rm -rf vendor && git checkout composer.json');
+}
+
+echo implode(PHP_EOL . PHP_EOL, $issues);
+
+exit($code);
diff --git a/contrib/validate-split-packages.php b/contrib/validate-split-packages.php
new file mode 100644
index 00000000000..01dfa998945
--- /dev/null
+++ b/contrib/validate-split-packages.php
@@ -0,0 +1,103 @@
+#!/usr/bin/php -q
+ $iterator */
+$iterator = new RegexIterator($iterator, '~/src/\w+/composer.json$~');
+
+$packages = [];
+$code = 0;
+foreach ($iterator as $file) {
+ $filePath = $file->getPath();
+ $package = substr($filePath, strrpos($filePath, '/') + 1);
+ if ($package === 'ORM') {
+ $fullName = 'cakephp/orm';
+ } else {
+ $fullName = 'cakephp/' . Inflector::dasherize($package);
+ }
+ $packages[$fullName] = $package;
+}
+ksort($packages);
+
+$mainJsonContent = file_get_contents(dirname(__FILE__, 2) . DS . 'composer.json');
+$mainJson = json_decode($mainJsonContent, true);
+$mainReplace = $mainJson['replace'];
+$missing = [];
+foreach ($packages as $fullPackageName => $package) {
+ if (!empty($mainReplace[$fullPackageName])) {
+ unset($mainReplace[$fullPackageName]);
+
+ continue;
+ }
+
+ $missing[] = $package;
+}
+if ($mainReplace) {
+ echo "\033[31m" . ' * Missing "replace" statement in ROOT composer.json for package `' . $package . '`' . "\033[0m" . PHP_EOL;
+ $code = 1;
+}
+if ($missing) {
+ echo "\033[31m" . ' * Extra "replace" statement in ROOT composer.json for non-existent package(s) `' . implode(', ', $missing) . '`' . "\033[0m" . PHP_EOL;
+ $code = 1;
+}
+
+$mainRequire = $mainJson['require'];
+
+$issues = [];
+foreach ($packages as $package) {
+ $content = file_get_contents($path . $package . DS . 'composer.json');
+ $json = json_decode($content, true);
+ $require = $json['require'] ?? [];
+
+ foreach ($require as $packageName => $constraint) {
+ if (isset($packages[$packageName])) {
+ continue;
+ }
+
+ if (!isset($mainRequire[$packageName])) {
+ $issues[$package][] = 'Missing package requirement `' . $packageName . ': ' . $constraint . '` in ROOT composer.json';
+
+ continue;
+ }
+
+ if ($mainRequire[$packageName] !== $constraint) {
+ $issues[$package][] = 'Package requirement `' . $packageName . ': ' . $constraint . '` does not match the one in ROOT composer.json (`' . $mainRequire[$packageName] . '`)';
+ }
+ }
+}
+
+foreach ($issues as $packageName => $packageIssues) {
+ echo "\033[31m" . $packageName . ':' . "\033[0m" . PHP_EOL;
+ foreach ($packageIssues as $issue) {
+ echo "\033[31m" . ' - ' . $issue . "\033[0m" . PHP_EOL;
+ $code = 1;
+ }
+}
+
+exit($code);
diff --git a/index.php b/index.php
deleted file mode 100644
index 480a9c73206..00000000000
--- a/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
- 'Apc',
- * 'prefix' => 'my_app_'
- * ));
- * }}}
- *
- * This would configure an APC cache engine to the 'shared' alias. You could then read and write
- * to that cache alias by using it for the `$config` parameter in the various Cache methods. In
- * general all Cache operations are supported by all cache engines. However, Cache::increment() and
- * Cache::decrement() are not supported by File caching.
- *
- * @package Cake.Cache
- */
-class Cache {
-
-/**
- * Cache configuration stack
- * Keeps the permanent/default settings for each cache engine.
- * These settings are used to reset the engines after temporary modification.
- *
- * @var array
- */
- protected static $_config = array();
-
-/**
- * Whether to reset the settings with the next call to Cache::set();
- *
- * @var array
- */
- protected static $_reset = false;
-
-/**
- * Engine instances keyed by configuration name.
- *
- * @var array
- */
- protected static $_engines = array();
-
-/**
- * Set the cache configuration to use. config() can
- * both create new configurations, return the settings for already configured
- * configurations.
- *
- * To create a new configuration, or to modify an existing configuration permanently:
- *
- * `Cache::config('my_config', array('engine' => 'File', 'path' => TMP));`
- *
- * If you need to modify a configuration temporarily, use Cache::set().
- * To get the settings for a configuration:
- *
- * `Cache::config('default');`
- *
- * There are 5 built-in caching engines:
- *
- * - `FileEngine` - Uses simple files to store content. Poor performance, but good for
- * storing large objects, or things that are not IO sensitive.
- * - `ApcEngine` - Uses the APC object cache, one of the fastest caching engines.
- * - `MemcacheEngine` - Uses the PECL::Memcache extension and Memcached for storage.
- * Fast reads/writes, and benefits from memcache being distributed.
- * - `XcacheEngine` - Uses the Xcache extension, an alternative to APC.
- * - `WincacheEngine` - Uses Windows Cache Extension for PHP. Supports wincache 1.1.0 and higher.
- *
- * The following keys are used in core cache engines:
- *
- * - `duration` Specify how long items in this cache configuration last.
- * - `prefix` Prefix appended to all entries. Good for when you need to share a keyspace
- * with either another cache config or another application.
- * - `probability` Probability of hitting a cache gc cleanup. Setting to 0 will disable
- * cache::gc from ever being called automatically.
- * - `servers' Used by memcache. Give the address of the memcached servers to use.
- * - `compress` Used by memcache. Enables memcache's compressed format.
- * - `serialize` Used by FileCache. Should cache objects be serialized first.
- * - `path` Used by FileCache. Path to where cachefiles should be saved.
- * - `lock` Used by FileCache. Should files be locked before writing to them?
- * - `user` Used by Xcache. Username for XCache
- * - `password` Used by Xcache. Password for XCache
- *
- * @see app/Config/core.php for configuration settings
- * @param string $name Name of the configuration
- * @param array $settings Optional associative array of settings passed to the engine
- * @return array(engine, settings) on success, false on failure
- * @throws CacheException
- */
- public static function config($name = null, $settings = array()) {
- if (is_array($name)) {
- $settings = $name;
- }
-
- $current = array();
- if (isset(self::$_config[$name])) {
- $current = self::$_config[$name];
- }
-
- if (!empty($settings)) {
- self::$_config[$name] = array_merge($current, $settings);
- }
-
- if (empty(self::$_config[$name]['engine'])) {
- return false;
- }
-
- $engine = self::$_config[$name]['engine'];
-
- if (!isset(self::$_engines[$name])) {
- self::_buildEngine($name);
- $settings = self::$_config[$name] = self::settings($name);
- } elseif ($settings = self::set(self::$_config[$name], null, $name)) {
- self::$_config[$name] = $settings;
- }
- return compact('engine', 'settings');
- }
-
-/**
- * Finds and builds the instance of the required engine class.
- *
- * @param string $name Name of the config array that needs an engine instance built
- * @return boolean
- * @throws CacheException
- */
- protected static function _buildEngine($name) {
- $config = self::$_config[$name];
-
- list($plugin, $class) = pluginSplit($config['engine'], true);
- $cacheClass = $class . 'Engine';
- App::uses($cacheClass, $plugin . 'Cache/Engine');
- if (!class_exists($cacheClass)) {
- return false;
- }
- $cacheClass = $class . 'Engine';
- if (!is_subclass_of($cacheClass, 'CacheEngine')) {
- throw new CacheException(__d('cake_dev', 'Cache engines must use CacheEngine as a base class.'));
- }
- self::$_engines[$name] = new $cacheClass();
- if (self::$_engines[$name]->init($config)) {
- if (self::$_engines[$name]->settings['probability'] && time() % self::$_engines[$name]->settings['probability'] === 0) {
- self::$_engines[$name]->gc();
- }
- return true;
- }
- return false;
- }
-
-/**
- * Returns an array containing the currently configured Cache settings.
- *
- * @return array Array of configured Cache config names.
- */
- public static function configured() {
- return array_keys(self::$_config);
- }
-
-/**
- * Drops a cache engine. Deletes the cache configuration information
- * If the deleted configuration is the last configuration using an certain engine,
- * the Engine instance is also unset.
- *
- * @param string $name A currently configured cache config you wish to remove.
- * @return boolean success of the removal, returns false when the config does not exist.
- */
- public static function drop($name) {
- if (!isset(self::$_config[$name])) {
- return false;
- }
- unset(self::$_config[$name], self::$_engines[$name]);
- return true;
- }
-
-/**
- * Temporarily change the settings on a cache config. The settings will persist for the next write
- * operation (write, decrement, increment, clear). Any reads that are done before the write, will
- * use the modified settings. If `$settings` is empty, the settings will be reset to the
- * original configuration.
- *
- * Can be called with 2 or 3 parameters. To set multiple values at once.
- *
- * `Cache::set(array('duration' => '+30 minutes'), 'my_config');`
- *
- * Or to set one value.
- *
- * `Cache::set('duration', '+30 minutes', 'my_config');`
- *
- * To reset a config back to the originally configured values.
- *
- * `Cache::set(null, 'my_config');`
- *
- * @param mixed $settings Optional string for simple name-value pair or array
- * @param string $value Optional for a simple name-value pair
- * @param string $config The configuration name you are changing. Defaults to 'default'
- * @return array Array of settings.
- */
- public static function set($settings = array(), $value = null, $config = 'default') {
- if (is_array($settings) && $value !== null) {
- $config = $value;
- }
- if (!isset(self::$_config[$config]) || !isset(self::$_engines[$config])) {
- return false;
- }
- if (!empty($settings)) {
- self::$_reset = true;
- }
-
- if (self::$_reset === true) {
- if (empty($settings)) {
- self::$_reset = false;
- $settings = self::$_config[$config];
- } else {
- if (is_string($settings) && $value !== null) {
- $settings = array($settings => $value);
- }
- $settings = array_merge(self::$_config[$config], $settings);
- if (isset($settings['duration']) && !is_numeric($settings['duration'])) {
- $settings['duration'] = strtotime($settings['duration']) - time();
- }
- }
- self::$_engines[$config]->settings = $settings;
- }
- return self::settings($config);
- }
-
-/**
- * Garbage collection
- *
- * Permanently remove all expired and deleted data
- *
- * @param string $config The config name you wish to have garbage collected. Defaults to 'default'
- * @return void
- */
- public static function gc($config = 'default') {
- self::$_engines[$config]->gc();
- }
-
-/**
- * Write data for key into cache. Will automatically use the currently
- * active cache configuration. To set the currently active configuration use
- * Cache::config()
- *
- * ### Usage:
- *
- * Writing to the active cache config:
- *
- * `Cache::write('cached_data', $data);`
- *
- * Writing to a specific cache config:
- *
- * `Cache::write('cached_data', $data, 'long_term');`
- *
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached - anything except a resource
- * @param string $config Optional string configuration name to write to. Defaults to 'default'
- * @return boolean True if the data was successfully cached, false on failure
- */
- public static function write($key, $value, $config = 'default') {
- $settings = self::settings($config);
-
- if (empty($settings)) {
- return false;
- }
- if (!self::isInitialized($config)) {
- return false;
- }
- $key = self::$_engines[$config]->key($key);
-
- if (!$key || is_resource($value)) {
- return false;
- }
-
- $success = self::$_engines[$config]->write($settings['prefix'] . $key, $value, $settings['duration']);
- self::set(null, $config);
- if ($success === false && $value !== '') {
- trigger_error(
- __d('cake_dev',
- "%s cache was unable to write '%s' to %s cache",
- $config,
- $key,
- self::$_engines[$config]->settings['engine']
- ),
- E_USER_WARNING
- );
- }
- return $success;
- }
-
-/**
- * Read a key from the cache. Will automatically use the currently
- * active cache configuration. To set the currently active configuration use
- * Cache::config()
- *
- * ### Usage:
- *
- * Reading from the active cache configuration.
- *
- * `Cache::read('my_data');`
- *
- * Reading from a specific cache configuration.
- *
- * `Cache::read('my_data', 'long_term');`
- *
- * @param string $key Identifier for the data
- * @param string $config optional name of the configuration to use. Defaults to 'default'
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
- */
- public static function read($key, $config = 'default') {
- $settings = self::settings($config);
-
- if (empty($settings)) {
- return false;
- }
- if (!self::isInitialized($config)) {
- return false;
- }
- $key = self::$_engines[$config]->key($key);
- if (!$key) {
- return false;
- }
- return self::$_engines[$config]->read($settings['prefix'] . $key);
- }
-
-/**
- * Increment a number under the key and return incremented value.
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to add
- * @param string $config Optional string configuration name. Defaults to 'default'
- * @return mixed new value, or false if the data doesn't exist, is not integer,
- * or if there was an error fetching it.
- */
- public static function increment($key, $offset = 1, $config = 'default') {
- $settings = self::settings($config);
-
- if (empty($settings)) {
- return false;
- }
- if (!self::isInitialized($config)) {
- return false;
- }
- $key = self::$_engines[$config]->key($key);
-
- if (!$key || !is_integer($offset) || $offset < 0) {
- return false;
- }
- $success = self::$_engines[$config]->increment($settings['prefix'] . $key, $offset);
- self::set(null, $config);
- return $success;
- }
-
-/**
- * Decrement a number under the key and return decremented value.
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
- * @param string $config Optional string configuration name. Defaults to 'default'
- * @return mixed new value, or false if the data doesn't exist, is not integer,
- * or if there was an error fetching it
- */
- public static function decrement($key, $offset = 1, $config = 'default') {
- $settings = self::settings($config);
-
- if (empty($settings)) {
- return false;
- }
- if (!self::isInitialized($config)) {
- return false;
- }
- $key = self::$_engines[$config]->key($key);
-
- if (!$key || !is_integer($offset) || $offset < 0) {
- return false;
- }
- $success = self::$_engines[$config]->decrement($settings['prefix'] . $key, $offset);
- self::set(null, $config);
- return $success;
- }
-
-/**
- * Delete a key from the cache.
- *
- * ### Usage:
- *
- * Deleting from the active cache configuration.
- *
- * `Cache::delete('my_data');`
- *
- * Deleting from a specific cache configuration.
- *
- * `Cache::delete('my_data', 'long_term');`
- *
- * @param string $key Identifier for the data
- * @param string $config name of the configuration to use. Defaults to 'default'
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
- */
- public static function delete($key, $config = 'default') {
- $settings = self::settings($config);
-
- if (empty($settings)) {
- return false;
- }
- if (!self::isInitialized($config)) {
- return false;
- }
- $key = self::$_engines[$config]->key($key);
- if (!$key) {
- return false;
- }
-
- $success = self::$_engines[$config]->delete($settings['prefix'] . $key);
- self::set(null, $config);
- return $success;
- }
-
-/**
- * Delete all keys from the cache.
- *
- * @param boolean $check if true will check expiration, otherwise delete all
- * @param string $config name of the configuration to use. Defaults to 'default'
- * @return boolean True if the cache was successfully cleared, false otherwise
- */
- public static function clear($check = false, $config = 'default') {
- if (!self::isInitialized($config)) {
- return false;
- }
- $success = self::$_engines[$config]->clear($check);
- self::set(null, $config);
- return $success;
- }
-
-/**
- * Check if Cache has initialized a working config for the given name.
- *
- * @param string $config name of the configuration to use. Defaults to 'default'
- * @return boolean Whether or not the config name has been initialized.
- */
- public static function isInitialized($config = 'default') {
- if (Configure::read('Cache.disable')) {
- return false;
- }
- return isset(self::$_engines[$config]);
- }
-
-/**
- * Return the settings for the named cache engine.
- *
- * @param string $name Name of the configuration to get settings for. Defaults to 'default'
- * @return array list of settings for this engine
- * @see Cache::config()
- */
- public static function settings($name = 'default') {
- if (!empty(self::$_engines[$name])) {
- return self::$_engines[$name]->settings();
- }
- return array();
- }
-
-}
-
diff --git a/lib/Cake/Cache/CacheEngine.php b/lib/Cake/Cache/CacheEngine.php
deleted file mode 100644
index f71b8a15902..00000000000
--- a/lib/Cake/Cache/CacheEngine.php
+++ /dev/null
@@ -1,134 +0,0 @@
-settings = array_merge(
- array('prefix' => 'cake_', 'duration' => 3600, 'probability' => 100),
- $this->settings,
- $settings
- );
- if (!is_numeric($this->settings['duration'])) {
- $this->settings['duration'] = strtotime($this->settings['duration']) - time();
- }
- return true;
- }
-
-/**
- * Garbage collection
- *
- * Permanently remove all expired and deleted data
- * @return void
- */
- public function gc() {
- }
-
-/**
- * Write value for a key into cache
- *
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached
- * @param mixed $duration How long to cache for.
- * @return boolean True if the data was successfully cached, false on failure
- */
- abstract public function write($key, $value, $duration);
-
-/**
- * Read a key from the cache
- *
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
- */
- abstract public function read($key);
-
-/**
- * Increment a number under the key and return incremented value
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to add
- * @return New incremented value, false otherwise
- */
- abstract public function increment($key, $offset = 1);
-
-/**
- * Decrement a number under the key and return decremented value
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
- * @return New incremented value, false otherwise
- */
- abstract public function decrement($key, $offset = 1);
-
-/**
- * Delete a key from the cache
- *
- * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
- */
- abstract public function delete($key);
-
-/**
- * Delete all keys from the cache
- *
- * @param boolean $check if true will check expiration, otherwise delete all
- * @return boolean True if the cache was successfully cleared, false otherwise
- */
- abstract public function clear($check);
-
-/**
- * Cache Engine settings
- *
- * @return array settings
- */
- public function settings() {
- return $this->settings;
- }
-
-/**
- * Generates a safe key for use with cache engine storage engines.
- *
- * @param string $key the key passed over
- * @return mixed string $key or false
- */
- public function key($key) {
- if (empty($key)) {
- return false;
- }
- $key = Inflector::underscore(str_replace(array(DS, '/', '.'), '_', strval($key)));
- return $key;
- }
-
-}
diff --git a/lib/Cake/Cache/Engine/ApcEngine.php b/lib/Cake/Cache/Engine/ApcEngine.php
deleted file mode 100644
index a453ecd1fe5..00000000000
--- a/lib/Cake/Cache/Engine/ApcEngine.php
+++ /dev/null
@@ -1,130 +0,0 @@
- 'Apc', 'prefix' => Inflector::slug(APP_DIR) . '_'), $settings));
- return function_exists('apc_dec');
- }
-
-/**
- * Write data for key into cache
- *
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
- */
- public function write($key, $value, $duration) {
- if ($duration == 0) {
- $expires = 0;
- } else {
- $expires = time() + $duration;
- }
- apc_store($key . '_expires', $expires, $duration);
- return apc_store($key, $value, $duration);
- }
-
-/**
- * Read a key from the cache
- *
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
- */
- public function read($key) {
- $time = time();
- $cachetime = intval(apc_fetch($key . '_expires'));
- if ($cachetime !== 0 && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) {
- return false;
- }
- return apc_fetch($key);
- }
-
-/**
- * Increments the value of an integer cached key
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to increment
- * @return New incremented value, false otherwise
- */
- public function increment($key, $offset = 1) {
- return apc_inc($key, $offset);
- }
-
-/**
- * Decrements the value of an integer cached key
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
- * @return New decremented value, false otherwise
- */
- public function decrement($key, $offset = 1) {
- return apc_dec($key, $offset);
- }
-
-/**
- * Delete a key from the cache
- *
- * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
- */
- public function delete($key) {
- return apc_delete($key);
- }
-
-/**
- * Delete all keys from the cache. This will clear every cache config using APC.
- *
- * @param boolean $check If true, nothing will be cleared, as entries are removed
- * from APC as they expired. This flag is really only used by FileEngine.
- * @return boolean True Returns true.
- */
- public function clear($check) {
- if ($check) {
- return true;
- }
- $info = apc_cache_info('user');
- $cacheKeys = $info['cache_list'];
- unset($info);
- foreach ($cacheKeys as $key) {
- if (strpos($key['info'], $this->settings['prefix']) === 0) {
- apc_delete($key['info']);
- }
- }
- return true;
- }
-
-}
diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php
deleted file mode 100644
index 9213a5f2a37..00000000000
--- a/lib/Cake/Cache/Engine/FileEngine.php
+++ /dev/null
@@ -1,326 +0,0 @@
- CACHE
- * - prefix = string prefix for filename, default => cake_
- * - lock = enable file locking on write, default => false
- * - serialize = serialize the data, default => true
- *
- * @var array
- * @see CacheEngine::__defaults
- */
- public $settings = array();
-
-/**
- * True unless FileEngine::__active(); fails
- *
- * @var boolean
- */
- protected $_init = true;
-
-/**
- * Initialize the Cache Engine
- *
- * Called automatically by the cache frontend
- * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
- *
- * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
- */
- public function init($settings = array()) {
- parent::init(array_merge(
- array(
- 'engine' => 'File', 'path' => CACHE, 'prefix' => 'cake_', 'lock' => true,
- 'serialize' => true, 'isWindows' => false, 'mask' => 0664
- ),
- $settings
- ));
-
- if (DS === '\\') {
- $this->settings['isWindows'] = true;
- }
- if (substr($this->settings['path'], -1) !== DS) {
- $this->settings['path'] .= DS;
- }
- return $this->_active();
- }
-
-/**
- * Garbage collection. Permanently remove all expired and deleted data
- *
- * @return boolean True if garbage collection was successful, false on failure
- */
- public function gc() {
- return $this->clear(true);
- }
-
-/**
- * Write data for key into cache
- *
- * @param string $key Identifier for the data
- * @param mixed $data Data to be cached
- * @param mixed $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
- */
- public function write($key, $data, $duration) {
- if ($data === '' || !$this->_init) {
- return false;
- }
-
- if ($this->_setKey($key, true) === false) {
- return false;
- }
-
- $lineBreak = "\n";
-
- if ($this->settings['isWindows']) {
- $lineBreak = "\r\n";
- }
-
- if (!empty($this->settings['serialize'])) {
- if ($this->settings['isWindows']) {
- $data = str_replace('\\', '\\\\\\\\', serialize($data));
- } else {
- $data = serialize($data);
- }
- }
-
- $expires = time() + $duration;
- $contents = $expires . $lineBreak . $data . $lineBreak;
-
- if ($this->settings['lock']) {
- $this->_File->flock(LOCK_EX);
- }
-
- $this->_File->rewind();
- $success = $this->_File->ftruncate(0) && $this->_File->fwrite($contents) && $this->_File->fflush();
-
- if ($this->settings['lock']) {
- $this->_File->flock(LOCK_UN);
- }
-
- return $success;
- }
-
-/**
- * Read a key from the cache
- *
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
- */
- public function read($key) {
- if (!$this->_init || $this->_setKey($key) === false) {
- return false;
- }
-
- if ($this->settings['lock']) {
- $this->_File->flock(LOCK_SH);
- }
-
- $this->_File->rewind();
- $time = time();
- $cachetime = intval($this->_File->current());
-
- if ($cachetime !== false && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) {
- if ($this->settings['lock']) {
- $this->_File->flock(LOCK_UN);
- }
- return false;
- }
-
- $data = '';
- $this->_File->next();
- while ($this->_File->valid()) {
- $data .= $this->_File->current();
- $this->_File->next();
- }
-
- if ($this->settings['lock']) {
- $this->_File->flock(LOCK_UN);
- }
-
- $data = trim($data);
-
- if ($data !== '' && !empty($this->settings['serialize'])) {
- if ($this->settings['isWindows']) {
- $data = str_replace('\\\\\\\\', '\\', $data);
- }
- $data = unserialize((string)$data);
- }
- return $data;
- }
-
-/**
- * Delete a key from the cache
- *
- * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
- */
- public function delete($key) {
- if ($this->_setKey($key) === false || !$this->_init) {
- return false;
- }
- $path = $this->_File->getRealPath();
- $this->_File = null;
- return unlink($path);
- }
-
-/**
- * Delete all values from the cache
- *
- * @param boolean $check Optional - only delete expired cache items
- * @return boolean True if the cache was successfully cleared, false otherwise
- */
- public function clear($check) {
- if (!$this->_init) {
- return false;
- }
- $dir = dir($this->settings['path']);
- if ($check) {
- $now = time();
- $threshold = $now - $this->settings['duration'];
- }
- $prefixLength = strlen($this->settings['prefix']);
- while (($entry = $dir->read()) !== false) {
- if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) {
- continue;
- }
- if ($this->_setKey($entry) === false) {
- continue;
- }
- if ($check) {
- $mtime = $this->_File->getMTime();
-
- if ($mtime > $threshold) {
- continue;
- }
-
- $expires = (int)$this->_File->current();
-
- if ($expires > $now) {
- continue;
- }
- }
- $path = $this->_File->getRealPath();
- $this->_File = null;
- if (file_exists($path)) {
- unlink($path);
- }
- }
- $dir->close();
- return true;
- }
-
-/**
- * Not implemented
- *
- * @param string $key
- * @param integer $offset
- * @return void
- * @throws CacheException
- */
- public function decrement($key, $offset = 1) {
- throw new CacheException(__d('cake_dev', 'Files cannot be atomically decremented.'));
- }
-
-/**
- * Not implemented
- *
- * @param string $key
- * @param integer $offset
- * @return void
- * @throws CacheException
- */
- public function increment($key, $offset = 1) {
- throw new CacheException(__d('cake_dev', 'Files cannot be atomically incremented.'));
- }
-
-/**
- * Sets the current cache key this class is managing, and creates a writable SplFileObject
- * for the cache file the key is referring to.
- *
- * @param string $key The key
- * @param boolean $createKey Whether the key should be created if it doesn't exists, or not
- * @return boolean true if the cache key could be set, false otherwise
- */
- protected function _setKey($key, $createKey = false) {
- $path = new SplFileInfo($this->settings['path'] . $key);
-
- if (!$createKey && !$path->isFile()) {
- return false;
- }
- if (empty($this->_File) || $this->_File->getBaseName() !== $key) {
- $exists = file_exists($path->getPathname());
- try {
- $this->_File = $path->openFile('c+');
- } catch (Exception $e) {
- trigger_error($e->getMessage(), E_USER_WARNING);
- return false;
- }
- unset($path);
-
- if (!$exists && !chmod($this->_File->getPathname(), (int)$this->settings['mask'])) {
- trigger_error(__d(
- 'cake_dev', 'Could not apply permission mask "%s" on cache file "%s"',
- array($this->_File->getPathname(), $this->settings['mask'])), E_USER_WARNING);
- }
- }
- return true;
- }
-
-/**
- * Determine is cache directory is writable
- *
- * @return boolean
- */
- protected function _active() {
- $dir = new SplFileInfo($this->settings['path']);
- if ($this->_init && !($dir->isDir() && $dir->isWritable())) {
- $this->_init = false;
- trigger_error(__d('cake_dev', '%s is not writable', $this->settings['path']), E_USER_WARNING);
- return false;
- }
- return true;
- }
-
-}
diff --git a/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php
deleted file mode 100644
index e68035c3f05..00000000000
--- a/lib/Cake/Cache/Engine/MemcacheEngine.php
+++ /dev/null
@@ -1,238 +0,0 @@
- 127.0.0.1. If an
- * array MemcacheEngine will use them as a pool.
- * - compress = boolean, default => false
- *
- * @var array
- */
- public $settings = array();
-
-/**
- * Initialize the Cache Engine
- *
- * Called automatically by the cache frontend
- * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
- *
- * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
- */
- public function init($settings = array()) {
- if (!class_exists('Memcache')) {
- return false;
- }
- parent::init(array_merge(array(
- 'engine' => 'Memcache',
- 'prefix' => Inflector::slug(APP_DIR) . '_',
- 'servers' => array('127.0.0.1'),
- 'compress' => false,
- 'persistent' => true
- ), $settings)
- );
-
- if ($this->settings['compress']) {
- $this->settings['compress'] = MEMCACHE_COMPRESSED;
- }
- if (!is_array($this->settings['servers'])) {
- $this->settings['servers'] = array($this->settings['servers']);
- }
- if (!isset($this->_Memcache)) {
- $return = false;
- $this->_Memcache = new Memcache();
- foreach ($this->settings['servers'] as $server) {
- list($host, $port) = $this->_parseServerString($server);
- if ($this->_Memcache->addServer($host, $port, $this->settings['persistent'])) {
- $return = true;
- }
- }
- return $return;
- }
- return true;
- }
-
-/**
- * Parses the server address into the host/port. Handles both IPv6 and IPv4
- * addresses and Unix sockets
- *
- * @param string $server The server address string.
- * @return array Array containing host, port
- */
- protected function _parseServerString($server) {
- if ($server[0] == 'u') {
- return array($server, 0);
- }
- if (substr($server, 0, 1) == '[') {
- $position = strpos($server, ']:');
- if ($position !== false) {
- $position++;
- }
- } else {
- $position = strpos($server, ':');
- }
- $port = 11211;
- $host = $server;
- if ($position !== false) {
- $host = substr($server, 0, $position);
- $port = substr($server, $position + 1);
- }
- return array($host, $port);
- }
-
-/**
- * Write data for key into cache. When using memcache as your cache engine
- * remember that the Memcache pecl extension does not support cache expiry times greater
- * than 30 days in the future. Any duration greater than 30 days will be treated as never expiring.
- *
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
- * @see http://php.net/manual/en/memcache.set.php
- */
- public function write($key, $value, $duration) {
- if ($duration > 30 * DAY) {
- $duration = 0;
- }
- return $this->_Memcache->set($key, $value, $this->settings['compress'], $duration);
- }
-
-/**
- * Read a key from the cache
- *
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
- */
- public function read($key) {
- return $this->_Memcache->get($key);
- }
-
-/**
- * Increments the value of an integer cached key
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to increment
- * @return New incremented value, false otherwise
- * @throws CacheException when you try to increment with compress = true
- */
- public function increment($key, $offset = 1) {
- if ($this->settings['compress']) {
- throw new CacheException(
- __d('cake_dev', 'Method increment() not implemented for compressed cache in %s', __CLASS__)
- );
- }
- return $this->_Memcache->increment($key, $offset);
- }
-
-/**
- * Decrements the value of an integer cached key
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
- * @return New decremented value, false otherwise
- * @throws CacheException when you try to decrement with compress = true
- */
- public function decrement($key, $offset = 1) {
- if ($this->settings['compress']) {
- throw new CacheException(
- __d('cake_dev', 'Method decrement() not implemented for compressed cache in %s', __CLASS__)
- );
- }
- return $this->_Memcache->decrement($key, $offset);
- }
-
-/**
- * Delete a key from the cache
- *
- * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
- */
- public function delete($key) {
- return $this->_Memcache->delete($key);
- }
-
-/**
- * Delete all keys from the cache
- *
- * @param boolean $check
- * @return boolean True if the cache was successfully cleared, false otherwise
- */
- public function clear($check) {
- if ($check) {
- return true;
- }
- foreach ($this->_Memcache->getExtendedStats('slabs') as $slabs) {
- foreach (array_keys($slabs) as $slabId) {
- if (!is_numeric($slabId)) {
- continue;
- }
-
- foreach ($this->_Memcache->getExtendedStats('cachedump', $slabId) as $stats) {
- if (!is_array($stats)) {
- continue;
- }
- foreach (array_keys($stats) as $key) {
- if (strpos($key, $this->settings['prefix']) === 0) {
- $this->_Memcache->delete($key);
- }
- }
- }
- }
- }
- return true;
- }
-
-/**
- * Connects to a server in connection pool
- *
- * @param string $host host ip address or name
- * @param integer $port Server port
- * @return boolean True if memcache server was connected
- */
- public function connect($host, $port = 11211) {
- if ($this->_Memcache->getServerStatus($host, $port) === 0) {
- if ($this->_Memcache->connect($host, $port)) {
- return true;
- }
- return false;
- }
- return true;
- }
-
-}
diff --git a/lib/Cake/Cache/Engine/WincacheEngine.php b/lib/Cake/Cache/Engine/WincacheEngine.php
deleted file mode 100644
index f6dc6de240c..00000000000
--- a/lib/Cake/Cache/Engine/WincacheEngine.php
+++ /dev/null
@@ -1,137 +0,0 @@
- 'Wincache',
- 'prefix' => Inflector::slug(APP_DIR) . '_'),
- $settings));
- return function_exists('wincache_ucache_info');
- }
-
-/**
- * Write data for key into cache
- *
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
- */
- public function write($key, $value, $duration) {
- $expires = time() + $duration;
-
- $data = array(
- $key . '_expires' => $expires,
- $key => $value
- );
- $result = wincache_ucache_set($data, null, $duration);
- return empty($result);
- }
-
-/**
- * Read a key from the cache
- *
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if
- * there was an error fetching it
- */
- public function read($key) {
- $time = time();
- $cachetime = intval(wincache_ucache_get($key . '_expires'));
- if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
- return false;
- }
- return wincache_ucache_get($key);
- }
-
-/**
- * Increments the value of an integer cached key
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to increment
- * @return New incremented value, false otherwise
- */
- public function increment($key, $offset = 1) {
- return wincache_ucache_inc($key, $offset);
- }
-
-/**
- * Decrements the value of an integer cached key
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
- * @return New decremented value, false otherwise
- */
- public function decrement($key, $offset = 1) {
- return wincache_ucache_dec($key, $offset);
- }
-
-/**
- * Delete a key from the cache
- *
- * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
- */
- public function delete($key) {
- return wincache_ucache_delete($key);
- }
-
-/**
- * Delete all keys from the cache. This will clear every
- * item in the cache matching the cache config prefix.
- *
- * @param boolean $check If true, nothing will be cleared, as entries will
- * naturally expire in wincache..
- * @return boolean True Returns true.
- */
- public function clear($check) {
- if ($check) {
- return true;
- }
- $info = wincache_ucache_info();
- $cacheKeys = $info['ucache_entries'];
- unset($info);
- foreach ($cacheKeys as $key) {
- if (strpos($key['key_name'], $this->settings['prefix']) === 0) {
- wincache_ucache_delete($key['key_name']);
- }
- }
- return true;
- }
-
-}
diff --git a/lib/Cake/Cache/Engine/XcacheEngine.php b/lib/Cake/Cache/Engine/XcacheEngine.php
deleted file mode 100644
index d41cfdb6db1..00000000000
--- a/lib/Cake/Cache/Engine/XcacheEngine.php
+++ /dev/null
@@ -1,177 +0,0 @@
- 'Xcache',
- 'prefix' => Inflector::slug(APP_DIR) . '_',
- 'PHP_AUTH_USER' => 'user',
- 'PHP_AUTH_PW' => 'password'
- ), $settings)
- );
- return function_exists('xcache_info');
- }
-
-/**
- * Write data for key into cache
- *
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
- */
- public function write($key, $value, $duration) {
- $expires = time() + $duration;
- xcache_set($key . '_expires', $expires, $duration);
- return xcache_set($key, $value, $duration);
- }
-
-/**
- * Read a key from the cache
- *
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
- */
- public function read($key) {
- if (xcache_isset($key)) {
- $time = time();
- $cachetime = intval(xcache_get($key . '_expires'));
- if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
- return false;
- }
- return xcache_get($key);
- }
- return false;
- }
-
-/**
- * Increments the value of an integer cached key
- * If the cache key is not an integer it will be treated as 0
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to increment
- * @return New incremented value, false otherwise
- */
- public function increment($key, $offset = 1) {
- return xcache_inc($key, $offset);
- }
-
-/**
- * Decrements the value of an integer cached key.
- * If the cache key is not an integer it will be treated as 0
- *
- * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
- * @return New decremented value, false otherwise
- */
- public function decrement($key, $offset = 1) {
- return xcache_dec($key, $offset);
- }
-
-/**
- * Delete a key from the cache
- *
- * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
- */
- public function delete($key) {
- return xcache_unset($key);
- }
-
-/**
- * Delete all keys from the cache
- *
- * @param boolean $check
- * @return boolean True if the cache was successfully cleared, false otherwise
- */
- public function clear($check) {
- $this->_auth();
- $max = xcache_count(XC_TYPE_VAR);
- for ($i = 0; $i < $max; $i++) {
- xcache_clear_cache(XC_TYPE_VAR, $i);
- }
- $this->_auth(true);
- return true;
- }
-
-/**
- * Populates and reverses $_SERVER authentication values
- * Makes necessary changes (and reverting them back) in $_SERVER
- *
- * This has to be done because xcache_clear_cache() needs to pass Basic Http Auth
- * (see xcache.admin configuration settings)
- *
- * @param boolean $reverse Revert changes
- * @return void
- */
- protected function _auth($reverse = false) {
- static $backup = array();
- $keys = array('PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'password');
- foreach ($keys as $key => $setting) {
- if ($reverse) {
- if (isset($backup[$key])) {
- $_SERVER[$key] = $backup[$key];
- unset($backup[$key]);
- } else {
- unset($_SERVER[$key]);
- }
- } else {
- $value = env($key);
- if (!empty($value)) {
- $backup[$key] = $value;
- }
- if (!empty($this->settings[$setting])) {
- $_SERVER[$key] = $this->settings[$setting];
- } elseif (!empty($this->settings[$key])) {
- $_SERVER[$key] = $this->settings[$key];
- } else {
- $_SERVER[$key] = $value;
- }
- }
- }
- }
-
-}
diff --git a/lib/Cake/Config/config.php b/lib/Cake/Config/config.php
deleted file mode 100644
index f8528e8ef14..00000000000
--- a/lib/Cake/Config/config.php
+++ /dev/null
@@ -1,21 +0,0 @@
- $value) {
- $plugins[$key] = Inflector::underscore($value);
- }
- $pluginPattern = implode('|', $plugins);
- $match = array('plugin' => $pluginPattern);
- $shortParams = array('routeClass' => 'PluginShortRoute', 'plugin' => $pluginPattern);
-
- foreach ($prefixes as $prefix) {
- $params = array('prefix' => $prefix, $prefix => true);
- $indexParams = $params + array('action' => 'index');
- Router::connect("/{$prefix}/:plugin", $indexParams, $shortParams);
- Router::connect("/{$prefix}/:plugin/:controller", $indexParams, $match);
- Router::connect("/{$prefix}/:plugin/:controller/:action/*", $params, $match);
- }
- Router::connect('/:plugin', array('action' => 'index'), $shortParams);
- Router::connect('/:plugin/:controller', array('action' => 'index'), $match);
- Router::connect('/:plugin/:controller/:action/*', array(), $match);
-}
-
-foreach ($prefixes as $prefix) {
- $params = array('prefix' => $prefix, $prefix => true);
- $indexParams = $params + array('action' => 'index');
- Router::connect("/{$prefix}/:controller", $indexParams);
- Router::connect("/{$prefix}/:controller/:action/*", $params);
-}
-Router::connect('/:controller', array('action' => 'index'));
-Router::connect('/:controller/:action/*');
-
-$namedConfig = Router::namedConfig();
-if ($namedConfig['rules'] === false) {
- Router::connectNamed(true);
-}
-
-unset($namedConfig, $params, $indexParams, $prefix, $prefixes, $shortParams, $match,
- $pluginPattern, $plugins, $key, $value);
diff --git a/lib/Cake/Config/unicode/casefolding/0080_00ff.php b/lib/Cake/Config/unicode/casefolding/0080_00ff.php
deleted file mode 100644
index 542f47d2b37..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0080_00ff.php
+++ /dev/null
@@ -1,73 +0,0 @@
- 181, 'status' => 'C', 'lower' => array(956));
-$config['0080_00ff'][] = array('upper' => 924, 'status' => 'C', 'lower' => array(181));
-$config['0080_00ff'][] = array('upper' => 192, 'status' => 'C', 'lower' => array(224)); /* LATIN CAPITAL LETTER A WITH GRAVE */
-$config['0080_00ff'][] = array('upper' => 193, 'status' => 'C', 'lower' => array(225)); /* LATIN CAPITAL LETTER A WITH ACUTE */
-$config['0080_00ff'][] = array('upper' => 194, 'status' => 'C', 'lower' => array(226)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
-$config['0080_00ff'][] = array('upper' => 195, 'status' => 'C', 'lower' => array(227)); /* LATIN CAPITAL LETTER A WITH TILDE */
-$config['0080_00ff'][] = array('upper' => 196, 'status' => 'C', 'lower' => array(228)); /* LATIN CAPITAL LETTER A WITH DIAERESIS */
-$config['0080_00ff'][] = array('upper' => 197, 'status' => 'C', 'lower' => array(229)); /* LATIN CAPITAL LETTER A WITH RING ABOVE */
-$config['0080_00ff'][] = array('upper' => 198, 'status' => 'C', 'lower' => array(230)); /* LATIN CAPITAL LETTER AE */
-$config['0080_00ff'][] = array('upper' => 199, 'status' => 'C', 'lower' => array(231)); /* LATIN CAPITAL LETTER C WITH CEDILLA */
-$config['0080_00ff'][] = array('upper' => 200, 'status' => 'C', 'lower' => array(232)); /* LATIN CAPITAL LETTER E WITH GRAVE */
-$config['0080_00ff'][] = array('upper' => 201, 'status' => 'C', 'lower' => array(233)); /* LATIN CAPITAL LETTER E WITH ACUTE */
-$config['0080_00ff'][] = array('upper' => 202, 'status' => 'C', 'lower' => array(234)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
-$config['0080_00ff'][] = array('upper' => 203, 'status' => 'C', 'lower' => array(235)); /* LATIN CAPITAL LETTER E WITH DIAERESIS */
-$config['0080_00ff'][] = array('upper' => 204, 'status' => 'C', 'lower' => array(236)); /* LATIN CAPITAL LETTER I WITH GRAVE */
-$config['0080_00ff'][] = array('upper' => 205, 'status' => 'C', 'lower' => array(237)); /* LATIN CAPITAL LETTER I WITH ACUTE */
-$config['0080_00ff'][] = array('upper' => 206, 'status' => 'C', 'lower' => array(238)); /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
-$config['0080_00ff'][] = array('upper' => 207, 'status' => 'C', 'lower' => array(239)); /* LATIN CAPITAL LETTER I WITH DIAERESIS */
-$config['0080_00ff'][] = array('upper' => 208, 'status' => 'C', 'lower' => array(240)); /* LATIN CAPITAL LETTER ETH */
-$config['0080_00ff'][] = array('upper' => 209, 'status' => 'C', 'lower' => array(241)); /* LATIN CAPITAL LETTER N WITH TILDE */
-$config['0080_00ff'][] = array('upper' => 210, 'status' => 'C', 'lower' => array(242)); /* LATIN CAPITAL LETTER O WITH GRAVE */
-$config['0080_00ff'][] = array('upper' => 211, 'status' => 'C', 'lower' => array(243)); /* LATIN CAPITAL LETTER O WITH ACUTE */
-$config['0080_00ff'][] = array('upper' => 212, 'status' => 'C', 'lower' => array(244)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-$config['0080_00ff'][] = array('upper' => 213, 'status' => 'C', 'lower' => array(245)); /* LATIN CAPITAL LETTER O WITH TILDE */
-$config['0080_00ff'][] = array('upper' => 214, 'status' => 'C', 'lower' => array(246)); /* LATIN CAPITAL LETTER O WITH DIAERESIS */
-$config['0080_00ff'][] = array('upper' => 216, 'status' => 'C', 'lower' => array(248)); /* LATIN CAPITAL LETTER O WITH STROKE */
-$config['0080_00ff'][] = array('upper' => 217, 'status' => 'C', 'lower' => array(249)); /* LATIN CAPITAL LETTER U WITH GRAVE */
-$config['0080_00ff'][] = array('upper' => 218, 'status' => 'C', 'lower' => array(250)); /* LATIN CAPITAL LETTER U WITH ACUTE */
-$config['0080_00ff'][] = array('upper' => 219, 'status' => 'C', 'lower' => array(251)); /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
-$config['0080_00ff'][] = array('upper' => 220, 'status' => 'C', 'lower' => array(252)); /* LATIN CAPITAL LETTER U WITH DIAERESIS */
-$config['0080_00ff'][] = array('upper' => 221, 'status' => 'C', 'lower' => array(253)); /* LATIN CAPITAL LETTER Y WITH ACUTE */
-$config['0080_00ff'][] = array('upper' => 222, 'status' => 'C', 'lower' => array(254)); /* LATIN CAPITAL LETTER THORN */
-$config['0080_00ff'][] = array('upper' => 223, 'status' => 'F', 'lower' => array(115, 115)); /* LATIN SMALL LETTER SHARP S */
diff --git a/lib/Cake/Config/unicode/casefolding/0100_017f.php b/lib/Cake/Config/unicode/casefolding/0100_017f.php
deleted file mode 100644
index e8c3ff6c427..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0100_017f.php
+++ /dev/null
@@ -1,106 +0,0 @@
- 256, 'status' => 'C', 'lower' => array(257)); /* LATIN CAPITAL LETTER A WITH MACRON */
-$config['0100_017f'][] = array('upper' => 258, 'status' => 'C', 'lower' => array(259)); /* LATIN CAPITAL LETTER A WITH BREVE */
-$config['0100_017f'][] = array('upper' => 260, 'status' => 'C', 'lower' => array(261)); /* LATIN CAPITAL LETTER A WITH OGONEK */
-$config['0100_017f'][] = array('upper' => 262, 'status' => 'C', 'lower' => array(263)); /* LATIN CAPITAL LETTER C WITH ACUTE */
-$config['0100_017f'][] = array('upper' => 264, 'status' => 'C', 'lower' => array(265)); /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
-$config['0100_017f'][] = array('upper' => 266, 'status' => 'C', 'lower' => array(267)); /* LATIN CAPITAL LETTER C WITH DOT ABOVE */
-$config['0100_017f'][] = array('upper' => 268, 'status' => 'C', 'lower' => array(269)); /* LATIN CAPITAL LETTER C WITH CARON */
-$config['0100_017f'][] = array('upper' => 270, 'status' => 'C', 'lower' => array(271)); /* LATIN CAPITAL LETTER D WITH CARON */
-$config['0100_017f'][] = array('upper' => 272, 'status' => 'C', 'lower' => array(273)); /* LATIN CAPITAL LETTER D WITH STROKE */
-$config['0100_017f'][] = array('upper' => 274, 'status' => 'C', 'lower' => array(275)); /* LATIN CAPITAL LETTER E WITH MACRON */
-$config['0100_017f'][] = array('upper' => 276, 'status' => 'C', 'lower' => array(277)); /* LATIN CAPITAL LETTER E WITH BREVE */
-$config['0100_017f'][] = array('upper' => 278, 'status' => 'C', 'lower' => array(279)); /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
-$config['0100_017f'][] = array('upper' => 280, 'status' => 'C', 'lower' => array(281)); /* LATIN CAPITAL LETTER E WITH OGONEK */
-$config['0100_017f'][] = array('upper' => 282, 'status' => 'C', 'lower' => array(283)); /* LATIN CAPITAL LETTER E WITH CARON */
-$config['0100_017f'][] = array('upper' => 284, 'status' => 'C', 'lower' => array(285)); /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
-$config['0100_017f'][] = array('upper' => 286, 'status' => 'C', 'lower' => array(287)); /* LATIN CAPITAL LETTER G WITH BREVE */
-$config['0100_017f'][] = array('upper' => 288, 'status' => 'C', 'lower' => array(289)); /* LATIN CAPITAL LETTER G WITH DOT ABOVE */
-$config['0100_017f'][] = array('upper' => 290, 'status' => 'C', 'lower' => array(291)); /* LATIN CAPITAL LETTER G WITH CEDILLA */
-$config['0100_017f'][] = array('upper' => 292, 'status' => 'C', 'lower' => array(293)); /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
-$config['0100_017f'][] = array('upper' => 294, 'status' => 'C', 'lower' => array(295)); /* LATIN CAPITAL LETTER H WITH STROKE */
-$config['0100_017f'][] = array('upper' => 296, 'status' => 'C', 'lower' => array(297)); /* LATIN CAPITAL LETTER I WITH TILDE */
-$config['0100_017f'][] = array('upper' => 298, 'status' => 'C', 'lower' => array(299)); /* LATIN CAPITAL LETTER I WITH MACRON */
-$config['0100_017f'][] = array('upper' => 300, 'status' => 'C', 'lower' => array(301)); /* LATIN CAPITAL LETTER I WITH BREVE */
-$config['0100_017f'][] = array('upper' => 302, 'status' => 'C', 'lower' => array(303)); /* LATIN CAPITAL LETTER I WITH OGONEK */
-$config['0100_017f'][] = array('upper' => 304, 'status' => 'F', 'lower' => array(105, 775)); /* LATIN CAPITAL LETTER I WITH DOT ABOVE */
-$config['0100_017f'][] = array('upper' => 304, 'status' => 'T', 'lower' => array(105)); /* LATIN CAPITAL LETTER I WITH DOT ABOVE */
-$config['0100_017f'][] = array('upper' => 306, 'status' => 'C', 'lower' => array(307)); /* LATIN CAPITAL LIGATURE IJ */
-$config['0100_017f'][] = array('upper' => 308, 'status' => 'C', 'lower' => array(309)); /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
-$config['0100_017f'][] = array('upper' => 310, 'status' => 'C', 'lower' => array(311)); /* LATIN CAPITAL LETTER K WITH CEDILLA */
-$config['0100_017f'][] = array('upper' => 313, 'status' => 'C', 'lower' => array(314)); /* LATIN CAPITAL LETTER L WITH ACUTE */
-$config['0100_017f'][] = array('upper' => 315, 'status' => 'C', 'lower' => array(316)); /* LATIN CAPITAL LETTER L WITH CEDILLA */
-$config['0100_017f'][] = array('upper' => 317, 'status' => 'C', 'lower' => array(318)); /* LATIN CAPITAL LETTER L WITH CARON */
-$config['0100_017f'][] = array('upper' => 319, 'status' => 'C', 'lower' => array(320)); /* LATIN CAPITAL LETTER L WITH MIDDLE DOT */
-$config['0100_017f'][] = array('upper' => 321, 'status' => 'C', 'lower' => array(322)); /* LATIN CAPITAL LETTER L WITH STROKE */
-$config['0100_017f'][] = array('upper' => 323, 'status' => 'C', 'lower' => array(324)); /* LATIN CAPITAL LETTER N WITH ACUTE */
-$config['0100_017f'][] = array('upper' => 325, 'status' => 'C', 'lower' => array(326)); /* LATIN CAPITAL LETTER N WITH CEDILLA */
-$config['0100_017f'][] = array('upper' => 327, 'status' => 'C', 'lower' => array(328)); /* LATIN CAPITAL LETTER N WITH CARON */
-$config['0100_017f'][] = array('upper' => 329, 'status' => 'F', 'lower' => array(700, 110)); /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */
-$config['0100_017f'][] = array('upper' => 330, 'status' => 'C', 'lower' => array(331)); /* LATIN CAPITAL LETTER ENG */
-$config['0100_017f'][] = array('upper' => 332, 'status' => 'C', 'lower' => array(333)); /* LATIN CAPITAL LETTER O WITH MACRON */
-$config['0100_017f'][] = array('upper' => 334, 'status' => 'C', 'lower' => array(335)); /* LATIN CAPITAL LETTER O WITH BREVE */
-$config['0100_017f'][] = array('upper' => 336, 'status' => 'C', 'lower' => array(337)); /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-$config['0100_017f'][] = array('upper' => 338, 'status' => 'C', 'lower' => array(339)); /* LATIN CAPITAL LIGATURE OE */
-$config['0100_017f'][] = array('upper' => 340, 'status' => 'C', 'lower' => array(341)); /* LATIN CAPITAL LETTER R WITH ACUTE */
-$config['0100_017f'][] = array('upper' => 342, 'status' => 'C', 'lower' => array(343)); /* LATIN CAPITAL LETTER R WITH CEDILLA */
-$config['0100_017f'][] = array('upper' => 344, 'status' => 'C', 'lower' => array(345)); /* LATIN CAPITAL LETTER R WITH CARON */
-$config['0100_017f'][] = array('upper' => 346, 'status' => 'C', 'lower' => array(347)); /* LATIN CAPITAL LETTER S WITH ACUTE */
-$config['0100_017f'][] = array('upper' => 348, 'status' => 'C', 'lower' => array(349)); /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
-$config['0100_017f'][] = array('upper' => 350, 'status' => 'C', 'lower' => array(351)); /* LATIN CAPITAL LETTER S WITH CEDILLA */
-$config['0100_017f'][] = array('upper' => 352, 'status' => 'C', 'lower' => array(353)); /* LATIN CAPITAL LETTER S WITH CARON */
-$config['0100_017f'][] = array('upper' => 354, 'status' => 'C', 'lower' => array(355)); /* LATIN CAPITAL LETTER T WITH CEDILLA */
-$config['0100_017f'][] = array('upper' => 356, 'status' => 'C', 'lower' => array(357)); /* LATIN CAPITAL LETTER T WITH CARON */
-$config['0100_017f'][] = array('upper' => 358, 'status' => 'C', 'lower' => array(359)); /* LATIN CAPITAL LETTER T WITH STROKE */
-$config['0100_017f'][] = array('upper' => 360, 'status' => 'C', 'lower' => array(361)); /* LATIN CAPITAL LETTER U WITH TILDE */
-$config['0100_017f'][] = array('upper' => 362, 'status' => 'C', 'lower' => array(363)); /* LATIN CAPITAL LETTER U WITH MACRON */
-$config['0100_017f'][] = array('upper' => 364, 'status' => 'C', 'lower' => array(365)); /* LATIN CAPITAL LETTER U WITH BREVE */
-$config['0100_017f'][] = array('upper' => 366, 'status' => 'C', 'lower' => array(367)); /* LATIN CAPITAL LETTER U WITH RING ABOVE */
-$config['0100_017f'][] = array('upper' => 368, 'status' => 'C', 'lower' => array(369)); /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-$config['0100_017f'][] = array('upper' => 370, 'status' => 'C', 'lower' => array(371)); /* LATIN CAPITAL LETTER U WITH OGONEK */
-$config['0100_017f'][] = array('upper' => 372, 'status' => 'C', 'lower' => array(373)); /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX */
-$config['0100_017f'][] = array('upper' => 374, 'status' => 'C', 'lower' => array(375)); /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */
-$config['0100_017f'][] = array('upper' => 376, 'status' => 'C', 'lower' => array(255)); /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
-$config['0100_017f'][] = array('upper' => 377, 'status' => 'C', 'lower' => array(378)); /* LATIN CAPITAL LETTER Z WITH ACUTE */
-$config['0100_017f'][] = array('upper' => 379, 'status' => 'C', 'lower' => array(380)); /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-$config['0100_017f'][] = array('upper' => 381, 'status' => 'C', 'lower' => array(382)); /* LATIN CAPITAL LETTER Z WITH CARON */
-$config['0100_017f'][] = array('upper' => 383, 'status' => 'C', 'lower' => array(115)); /* LATIN SMALL LETTER LONG S */
diff --git a/lib/Cake/Config/unicode/casefolding/0180_024F.php b/lib/Cake/Config/unicode/casefolding/0180_024F.php
deleted file mode 100644
index e8baaa32c2f..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0180_024F.php
+++ /dev/null
@@ -1,148 +0,0 @@
- 385, 'status' => 'C', 'lower' => array(595)); /* LATIN CAPITAL LETTER B WITH HOOK */
-$config['0180_024F'][] = array('upper' => 386, 'status' => 'C', 'lower' => array(387)); /* LATIN CAPITAL LETTER B WITH TOPBAR */
-$config['0180_024F'][] = array('upper' => 388, 'status' => 'C', 'lower' => array(389)); /* LATIN CAPITAL LETTER TONE SIX */
-$config['0180_024F'][] = array('upper' => 390, 'status' => 'C', 'lower' => array(596)); /* LATIN CAPITAL LETTER OPEN O */
-$config['0180_024F'][] = array('upper' => 391, 'status' => 'C', 'lower' => array(392)); /* LATIN CAPITAL LETTER C WITH HOOK */
-$config['0180_024F'][] = array('upper' => 393, 'status' => 'C', 'lower' => array(598)); /* LATIN CAPITAL LETTER AFRICAN D */
-$config['0180_024F'][] = array('upper' => 394, 'status' => 'C', 'lower' => array(599)); /* LATIN CAPITAL LETTER D WITH HOOK */
-$config['0180_024F'][] = array('upper' => 395, 'status' => 'C', 'lower' => array(396)); /* LATIN CAPITAL LETTER D WITH TOPBAR */
-$config['0180_024F'][] = array('upper' => 398, 'status' => 'C', 'lower' => array(477)); /* LATIN CAPITAL LETTER REVERSED E */
-$config['0180_024F'][] = array('upper' => 399, 'status' => 'C', 'lower' => array(601)); /* LATIN CAPITAL LETTER SCHWA */
-$config['0180_024F'][] = array('upper' => 400, 'status' => 'C', 'lower' => array(603)); /* LATIN CAPITAL LETTER OPEN E */
-$config['0180_024F'][] = array('upper' => 401, 'status' => 'C', 'lower' => array(402)); /* LATIN CAPITAL LETTER F WITH HOOK */
-$config['0180_024F'][] = array('upper' => 403, 'status' => 'C', 'lower' => array(608)); /* LATIN CAPITAL LETTER G WITH HOOK */
-$config['0180_024F'][] = array('upper' => 404, 'status' => 'C', 'lower' => array(611)); /* LATIN CAPITAL LETTER GAMMA */
-$config['0180_024F'][] = array('upper' => 406, 'status' => 'C', 'lower' => array(617)); /* LATIN CAPITAL LETTER IOTA */
-$config['0180_024F'][] = array('upper' => 407, 'status' => 'C', 'lower' => array(616)); /* LATIN CAPITAL LETTER I WITH STROKE */
-$config['0180_024F'][] = array('upper' => 408, 'status' => 'C', 'lower' => array(409)); /* LATIN CAPITAL LETTER K WITH HOOK */
-$config['0180_024F'][] = array('upper' => 412, 'status' => 'C', 'lower' => array(623)); /* LATIN CAPITAL LETTER TURNED M */
-$config['0180_024F'][] = array('upper' => 413, 'status' => 'C', 'lower' => array(626)); /* LATIN CAPITAL LETTER N WITH LEFT HOOK */
-$config['0180_024F'][] = array('upper' => 415, 'status' => 'C', 'lower' => array(629)); /* LATIN CAPITAL LETTER O WITH MIDDLE TILDE */
-$config['0180_024F'][] = array('upper' => 416, 'status' => 'C', 'lower' => array(417)); /* LATIN CAPITAL LETTER O WITH HORN */
-$config['0180_024F'][] = array('upper' => 418, 'status' => 'C', 'lower' => array(419)); /* LATIN CAPITAL LETTER OI */
-$config['0180_024F'][] = array('upper' => 420, 'status' => 'C', 'lower' => array(421)); /* LATIN CAPITAL LETTER P WITH HOOK */
-$config['0180_024F'][] = array('upper' => 422, 'status' => 'C', 'lower' => array(640)); /* LATIN LETTER YR */
-$config['0180_024F'][] = array('upper' => 423, 'status' => 'C', 'lower' => array(424)); /* LATIN CAPITAL LETTER TONE TWO */
-$config['0180_024F'][] = array('upper' => 425, 'status' => 'C', 'lower' => array(643)); /* LATIN CAPITAL LETTER ESH */
-$config['0180_024F'][] = array('upper' => 428, 'status' => 'C', 'lower' => array(429)); /* LATIN CAPITAL LETTER T WITH HOOK */
-$config['0180_024F'][] = array('upper' => 430, 'status' => 'C', 'lower' => array(648)); /* LATIN CAPITAL LETTER T WITH RETROFLEX HOOK */
-$config['0180_024F'][] = array('upper' => 431, 'status' => 'C', 'lower' => array(432)); /* LATIN CAPITAL LETTER U WITH HORN */
-$config['0180_024F'][] = array('upper' => 433, 'status' => 'C', 'lower' => array(650)); /* LATIN CAPITAL LETTER UPSILON */
-$config['0180_024F'][] = array('upper' => 434, 'status' => 'C', 'lower' => array(651)); /* LATIN CAPITAL LETTER V WITH HOOK */
-$config['0180_024F'][] = array('upper' => 435, 'status' => 'C', 'lower' => array(436)); /* LATIN CAPITAL LETTER Y WITH HOOK */
-$config['0180_024F'][] = array('upper' => 437, 'status' => 'C', 'lower' => array(438)); /* LATIN CAPITAL LETTER Z WITH STROKE */
-$config['0180_024F'][] = array('upper' => 439, 'status' => 'C', 'lower' => array(658)); /* LATIN CAPITAL LETTER EZH */
-$config['0180_024F'][] = array('upper' => 440, 'status' => 'C', 'lower' => array(441)); /* LATIN CAPITAL LETTER EZH REVERSED */
-$config['0180_024F'][] = array('upper' => 444, 'status' => 'C', 'lower' => array(445)); /* LATIN CAPITAL LETTER TONE FIVE */
-$config['0180_024F'][] = array('upper' => 452, 'status' => 'C', 'lower' => array(454)); /* LATIN CAPITAL LETTER DZ WITH CARON */
-$config['0180_024F'][] = array('upper' => 453, 'status' => 'C', 'lower' => array(454)); /* LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON */
-$config['0180_024F'][] = array('upper' => 455, 'status' => 'C', 'lower' => array(457)); /* LATIN CAPITAL LETTER LJ */
-$config['0180_024F'][] = array('upper' => 456, 'status' => 'C', 'lower' => array(457)); /* LATIN CAPITAL LETTER L WITH SMALL LETTER J */
-$config['0180_024F'][] = array('upper' => 458, 'status' => 'C', 'lower' => array(460)); /* LATIN CAPITAL LETTER NJ */
-$config['0180_024F'][] = array('upper' => 459, 'status' => 'C', 'lower' => array(460)); /* LATIN CAPITAL LETTER N WITH SMALL LETTER J */
-$config['0180_024F'][] = array('upper' => 461, 'status' => 'C', 'lower' => array(462)); /* LATIN CAPITAL LETTER A WITH CARON */
-$config['0180_024F'][] = array('upper' => 463, 'status' => 'C', 'lower' => array(464)); /* LATIN CAPITAL LETTER I WITH CARON */
-$config['0180_024F'][] = array('upper' => 465, 'status' => 'C', 'lower' => array(466)); /* LATIN CAPITAL LETTER O WITH CARON */
-$config['0180_024F'][] = array('upper' => 467, 'status' => 'C', 'lower' => array(468)); /* LATIN CAPITAL LETTER U WITH CARON */
-$config['0180_024F'][] = array('upper' => 469, 'status' => 'C', 'lower' => array(470)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON */
-$config['0180_024F'][] = array('upper' => 471, 'status' => 'C', 'lower' => array(472)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE */
-$config['0180_024F'][] = array('upper' => 473, 'status' => 'C', 'lower' => array(474)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON */
-$config['0180_024F'][] = array('upper' => 475, 'status' => 'C', 'lower' => array(476)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE */
-$config['0180_024F'][] = array('upper' => 478, 'status' => 'C', 'lower' => array(479)); /* LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON */
-$config['0180_024F'][] = array('upper' => 480, 'status' => 'C', 'lower' => array(481)); /* LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON */
-$config['0180_024F'][] = array('upper' => 482, 'status' => 'C', 'lower' => array(483)); /* LATIN CAPITAL LETTER AE WITH MACRON */
-$config['0180_024F'][] = array('upper' => 484, 'status' => 'C', 'lower' => array(485)); /* LATIN CAPITAL LETTER G WITH STROKE */
-$config['0180_024F'][] = array('upper' => 486, 'status' => 'C', 'lower' => array(487)); /* LATIN CAPITAL LETTER G WITH CARON */
-$config['0180_024F'][] = array('upper' => 488, 'status' => 'C', 'lower' => array(489)); /* LATIN CAPITAL LETTER K WITH CARON */
-$config['0180_024F'][] = array('upper' => 490, 'status' => 'C', 'lower' => array(491)); /* LATIN CAPITAL LETTER O WITH OGONEK */
-$config['0180_024F'][] = array('upper' => 492, 'status' => 'C', 'lower' => array(493)); /* LATIN CAPITAL LETTER O WITH OGONEK AND MACRON */
-$config['0180_024F'][] = array('upper' => 494, 'status' => 'C', 'lower' => array(495)); /* LATIN CAPITAL LETTER EZH WITH CARON */
-$config['0180_024F'][] = array('upper' => 496, 'status' => 'F', 'lower' => array(106, 780)); /* LATIN SMALL LETTER J WITH CARON */
-$config['0180_024F'][] = array('upper' => 497, 'status' => 'C', 'lower' => array(499)); /* LATIN CAPITAL LETTER DZ */
-$config['0180_024F'][] = array('upper' => 498, 'status' => 'C', 'lower' => array(499)); /* LATIN CAPITAL LETTER D WITH SMALL LETTER Z */
-$config['0180_024F'][] = array('upper' => 500, 'status' => 'C', 'lower' => array(501)); /* LATIN CAPITAL LETTER G WITH ACUTE */
-$config['0180_024F'][] = array('upper' => 502, 'status' => 'C', 'lower' => array(405)); /* LATIN CAPITAL LETTER HWAIR */
-$config['0180_024F'][] = array('upper' => 503, 'status' => 'C', 'lower' => array(447)); /* LATIN CAPITAL LETTER WYNN */
-$config['0180_024F'][] = array('upper' => 504, 'status' => 'C', 'lower' => array(505)); /* LATIN CAPITAL LETTER N WITH GRAVE */
-$config['0180_024F'][] = array('upper' => 506, 'status' => 'C', 'lower' => array(507)); /* LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE */
-$config['0180_024F'][] = array('upper' => 508, 'status' => 'C', 'lower' => array(509)); /* LATIN CAPITAL LETTER AE WITH ACUTE */
-$config['0180_024F'][] = array('upper' => 510, 'status' => 'C', 'lower' => array(511)); /* LATIN CAPITAL LETTER O WITH STROKE AND ACUTE */
-$config['0180_024F'][] = array('upper' => 512, 'status' => 'C', 'lower' => array(513)); /* LATIN CAPITAL LETTER A WITH DOUBLE GRAVE */
-$config['0180_024F'][] = array('upper' => 514, 'status' => 'C', 'lower' => array(515)); /* LATIN CAPITAL LETTER A WITH INVERTED BREVE */
-$config['0180_024F'][] = array('upper' => 516, 'status' => 'C', 'lower' => array(517)); /* LATIN CAPITAL LETTER E WITH DOUBLE GRAVE */
-$config['0180_024F'][] = array('upper' => 518, 'status' => 'C', 'lower' => array(519)); /* LATIN CAPITAL LETTER E WITH INVERTED BREVE */
-$config['0180_024F'][] = array('upper' => 520, 'status' => 'C', 'lower' => array(521)); /* LATIN CAPITAL LETTER I WITH DOUBLE GRAVE */
-$config['0180_024F'][] = array('upper' => 522, 'status' => 'C', 'lower' => array(523)); /* LATIN CAPITAL LETTER I WITH INVERTED BREVE */
-$config['0180_024F'][] = array('upper' => 524, 'status' => 'C', 'lower' => array(525)); /* LATIN CAPITAL LETTER O WITH DOUBLE GRAVE */
-$config['0180_024F'][] = array('upper' => 526, 'status' => 'C', 'lower' => array(527)); /* LATIN CAPITAL LETTER O WITH INVERTED BREVE */
-$config['0180_024F'][] = array('upper' => 528, 'status' => 'C', 'lower' => array(529)); /* LATIN CAPITAL LETTER R WITH DOUBLE GRAVE */
-$config['0180_024F'][] = array('upper' => 530, 'status' => 'C', 'lower' => array(531)); /* LATIN CAPITAL LETTER R WITH INVERTED BREVE */
-$config['0180_024F'][] = array('upper' => 532, 'status' => 'C', 'lower' => array(533)); /* LATIN CAPITAL LETTER U WITH DOUBLE GRAVE */
-$config['0180_024F'][] = array('upper' => 534, 'status' => 'C', 'lower' => array(535)); /* LATIN CAPITAL LETTER U WITH INVERTED BREVE */
-$config['0180_024F'][] = array('upper' => 536, 'status' => 'C', 'lower' => array(537)); /* LATIN CAPITAL LETTER S WITH COMMA BELOW */
-$config['0180_024F'][] = array('upper' => 538, 'status' => 'C', 'lower' => array(539)); /* LATIN CAPITAL LETTER T WITH COMMA BELOW */
-$config['0180_024F'][] = array('upper' => 540, 'status' => 'C', 'lower' => array(541)); /* LATIN CAPITAL LETTER YOGH */
-$config['0180_024F'][] = array('upper' => 542, 'status' => 'C', 'lower' => array(543)); /* LATIN CAPITAL LETTER H WITH CARON */
-$config['0180_024F'][] = array('upper' => 544, 'status' => 'C', 'lower' => array(414)); /* LATIN CAPITAL LETTER N WITH LONG RIGHT LEG */
-$config['0180_024F'][] = array('upper' => 546, 'status' => 'C', 'lower' => array(547)); /* LATIN CAPITAL LETTER OU */
-$config['0180_024F'][] = array('upper' => 548, 'status' => 'C', 'lower' => array(549)); /* LATIN CAPITAL LETTER Z WITH HOOK */
-$config['0180_024F'][] = array('upper' => 550, 'status' => 'C', 'lower' => array(551)); /* LATIN CAPITAL LETTER A WITH DOT ABOVE */
-$config['0180_024F'][] = array('upper' => 552, 'status' => 'C', 'lower' => array(553)); /* LATIN CAPITAL LETTER E WITH CEDILLA */
-$config['0180_024F'][] = array('upper' => 554, 'status' => 'C', 'lower' => array(555)); /* LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON */
-$config['0180_024F'][] = array('upper' => 556, 'status' => 'C', 'lower' => array(557)); /* LATIN CAPITAL LETTER O WITH TILDE AND MACRON */
-$config['0180_024F'][] = array('upper' => 558, 'status' => 'C', 'lower' => array(559)); /* LATIN CAPITAL LETTER O WITH DOT ABOVE */
-$config['0180_024F'][] = array('upper' => 560, 'status' => 'C', 'lower' => array(561)); /* LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON */
-$config['0180_024F'][] = array('upper' => 562, 'status' => 'C', 'lower' => array(563)); /* LATIN CAPITAL LETTER Y WITH MACRON */
-$config['0180_024F'][] = array('upper' => 570, 'status' => 'C', 'lower' => array(11365)); /* LATIN CAPITAL LETTER A WITH STROKE */
-$config['0180_024F'][] = array('upper' => 571, 'status' => 'C', 'lower' => array(572)); /* LATIN CAPITAL LETTER C WITH STROKE */
-$config['0180_024F'][] = array('upper' => 573, 'status' => 'C', 'lower' => array(410)); /* LATIN CAPITAL LETTER L WITH BAR */
-$config['0180_024F'][] = array('upper' => 574, 'status' => 'C', 'lower' => array(11366)); /* LATIN CAPITAL LETTER T WITH DIAGONAL STROKE */
-$config['0180_024F'][] = array('upper' => 577, 'status' => 'C', 'lower' => array(578)); /* LATIN CAPITAL LETTER GLOTTAL STOP */
-$config['0180_024F'][] = array('upper' => 579, 'status' => 'C', 'lower' => array(384)); /* LATIN CAPITAL LETTER B WITH STROKE */
-$config['0180_024F'][] = array('upper' => 580, 'status' => 'C', 'lower' => array(649)); /* LATIN CAPITAL LETTER U BAR */
-$config['0180_024F'][] = array('upper' => 581, 'status' => 'C', 'lower' => array(652)); /* LATIN CAPITAL LETTER TURNED V */
-$config['0180_024F'][] = array('upper' => 582, 'status' => 'C', 'lower' => array(583)); /* LATIN CAPITAL LETTER E WITH STROKE */
-$config['0180_024F'][] = array('upper' => 584, 'status' => 'C', 'lower' => array(585)); /* LATIN CAPITAL LETTER J WITH STROKE */
-$config['0180_024F'][] = array('upper' => 586, 'status' => 'C', 'lower' => array(587)); /* LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL */
-$config['0180_024F'][] = array('upper' => 588, 'status' => 'C', 'lower' => array(589)); /* LATIN CAPITAL LETTER R WITH STROKE */
-$config['0180_024F'][] = array('upper' => 590, 'status' => 'C', 'lower' => array(591)); /* LATIN CAPITAL LETTER Y WITH STROKE */
diff --git a/lib/Cake/Config/unicode/casefolding/0250_02af.php b/lib/Cake/Config/unicode/casefolding/0250_02af.php
deleted file mode 100644
index 6ffa59d1b8c..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0250_02af.php
+++ /dev/null
@@ -1,41 +0,0 @@
- 422, 'status' => 'C', 'lower' => array(640));
diff --git a/lib/Cake/Config/unicode/casefolding/0370_03ff.php b/lib/Cake/Config/unicode/casefolding/0370_03ff.php
deleted file mode 100644
index bb7ecde79c8..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0370_03ff.php
+++ /dev/null
@@ -1,102 +0,0 @@
- 902, 'status' => 'C', 'lower' => array(940)); /* GREEK CAPITAL LETTER ALPHA WITH TONOS */
-$config['0370_03ff'][] = array('upper' => 904, 'status' => 'C', 'lower' => array(941)); /* GREEK CAPITAL LETTER EPSILON WITH TONOS */
-$config['0370_03ff'][] = array('upper' => 905, 'status' => 'C', 'lower' => array(942)); /* GREEK CAPITAL LETTER ETA WITH TONOS */
-$config['0370_03ff'][] = array('upper' => 906, 'status' => 'C', 'lower' => array(943)); /* GREEK CAPITAL LETTER IOTA WITH TONOS */
-$config['0370_03ff'][] = array('upper' => 908, 'status' => 'C', 'lower' => array(972)); /* GREEK CAPITAL LETTER OMICRON WITH TONOS */
-$config['0370_03ff'][] = array('upper' => 910, 'status' => 'C', 'lower' => array(973)); /* GREEK CAPITAL LETTER UPSILON WITH TONOS */
-$config['0370_03ff'][] = array('upper' => 911, 'status' => 'C', 'lower' => array(974)); /* GREEK CAPITAL LETTER OMEGA WITH TONOS */
-//$config['0370_03ff'][] = array('upper' => 912, 'status' => 'F', 'lower' => array(953, 776, 769)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
-$config['0370_03ff'][] = array('upper' => 913, 'status' => 'C', 'lower' => array(945)); /* GREEK CAPITAL LETTER ALPHA */
-$config['0370_03ff'][] = array('upper' => 914, 'status' => 'C', 'lower' => array(946)); /* GREEK CAPITAL LETTER BETA */
-$config['0370_03ff'][] = array('upper' => 915, 'status' => 'C', 'lower' => array(947)); /* GREEK CAPITAL LETTER GAMMA */
-$config['0370_03ff'][] = array('upper' => 916, 'status' => 'C', 'lower' => array(948)); /* GREEK CAPITAL LETTER DELTA */
-$config['0370_03ff'][] = array('upper' => 917, 'status' => 'C', 'lower' => array(949)); /* GREEK CAPITAL LETTER EPSILON */
-$config['0370_03ff'][] = array('upper' => 918, 'status' => 'C', 'lower' => array(950)); /* GREEK CAPITAL LETTER ZETA */
-$config['0370_03ff'][] = array('upper' => 919, 'status' => 'C', 'lower' => array(951)); /* GREEK CAPITAL LETTER ETA */
-$config['0370_03ff'][] = array('upper' => 920, 'status' => 'C', 'lower' => array(952)); /* GREEK CAPITAL LETTER THETA */
-$config['0370_03ff'][] = array('upper' => 921, 'status' => 'C', 'lower' => array(953)); /* GREEK CAPITAL LETTER IOTA */
-$config['0370_03ff'][] = array('upper' => 922, 'status' => 'C', 'lower' => array(954)); /* GREEK CAPITAL LETTER KAPPA */
-$config['0370_03ff'][] = array('upper' => 923, 'status' => 'C', 'lower' => array(955)); /* GREEK CAPITAL LETTER LAMDA */
-$config['0370_03ff'][] = array('upper' => 924, 'status' => 'C', 'lower' => array(956)); /* GREEK CAPITAL LETTER MU */
-$config['0370_03ff'][] = array('upper' => 925, 'status' => 'C', 'lower' => array(957)); /* GREEK CAPITAL LETTER NU */
-$config['0370_03ff'][] = array('upper' => 926, 'status' => 'C', 'lower' => array(958)); /* GREEK CAPITAL LETTER XI */
-$config['0370_03ff'][] = array('upper' => 927, 'status' => 'C', 'lower' => array(959)); /* GREEK CAPITAL LETTER OMICRON */
-$config['0370_03ff'][] = array('upper' => 928, 'status' => 'C', 'lower' => array(960)); /* GREEK CAPITAL LETTER PI */
-$config['0370_03ff'][] = array('upper' => 929, 'status' => 'C', 'lower' => array(961)); /* GREEK CAPITAL LETTER RHO */
-$config['0370_03ff'][] = array('upper' => 931, 'status' => 'C', 'lower' => array(963)); /* GREEK CAPITAL LETTER SIGMA */
-$config['0370_03ff'][] = array('upper' => 932, 'status' => 'C', 'lower' => array(964)); /* GREEK CAPITAL LETTER TAU */
-$config['0370_03ff'][] = array('upper' => 933, 'status' => 'C', 'lower' => array(965)); /* GREEK CAPITAL LETTER UPSILON */
-$config['0370_03ff'][] = array('upper' => 934, 'status' => 'C', 'lower' => array(966)); /* GREEK CAPITAL LETTER PHI */
-$config['0370_03ff'][] = array('upper' => 935, 'status' => 'C', 'lower' => array(967)); /* GREEK CAPITAL LETTER CHI */
-$config['0370_03ff'][] = array('upper' => 936, 'status' => 'C', 'lower' => array(968)); /* GREEK CAPITAL LETTER PSI */
-$config['0370_03ff'][] = array('upper' => 937, 'status' => 'C', 'lower' => array(969)); /* GREEK CAPITAL LETTER OMEGA */
-$config['0370_03ff'][] = array('upper' => 938, 'status' => 'C', 'lower' => array(970)); /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
-$config['0370_03ff'][] = array('upper' => 939, 'status' => 'C', 'lower' => array(971)); /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
-$config['0370_03ff'][] = array('upper' => 944, 'status' => 'F', 'lower' => array(965, 776, 769)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
-$config['0370_03ff'][] = array('upper' => 962, 'status' => 'C', 'lower' => array(963)); /* GREEK SMALL LETTER FINAL SIGMA */
-$config['0370_03ff'][] = array('upper' => 976, 'status' => 'C', 'lower' => array(946)); /* GREEK BETA SYMBOL */
-$config['0370_03ff'][] = array('upper' => 977, 'status' => 'C', 'lower' => array(952)); /* GREEK THETA SYMBOL */
-$config['0370_03ff'][] = array('upper' => 981, 'status' => 'C', 'lower' => array(966)); /* GREEK PHI SYMBOL */
-$config['0370_03ff'][] = array('upper' => 982, 'status' => 'C', 'lower' => array(960)); /* GREEK PI SYMBOL */
-$config['0370_03ff'][] = array('upper' => 984, 'status' => 'C', 'lower' => array(985)); /* GREEK LETTER ARCHAIC KOPPA */
-$config['0370_03ff'][] = array('upper' => 986, 'status' => 'C', 'lower' => array(987)); /* GREEK LETTER STIGMA */
-$config['0370_03ff'][] = array('upper' => 988, 'status' => 'C', 'lower' => array(989)); /* GREEK LETTER DIGAMMA */
-$config['0370_03ff'][] = array('upper' => 990, 'status' => 'C', 'lower' => array(991)); /* GREEK LETTER KOPPA */
-$config['0370_03ff'][] = array('upper' => 992, 'status' => 'C', 'lower' => array(993)); /* GREEK LETTER SAMPI */
-$config['0370_03ff'][] = array('upper' => 994, 'status' => 'C', 'lower' => array(995)); /* COPTIC CAPITAL LETTER SHEI */
-$config['0370_03ff'][] = array('upper' => 996, 'status' => 'C', 'lower' => array(997)); /* COPTIC CAPITAL LETTER FEI */
-$config['0370_03ff'][] = array('upper' => 998, 'status' => 'C', 'lower' => array(999)); /* COPTIC CAPITAL LETTER KHEI */
-$config['0370_03ff'][] = array('upper' => 1000, 'status' => 'C', 'lower' => array(1001)); /* COPTIC CAPITAL LETTER HORI */
-$config['0370_03ff'][] = array('upper' => 1002, 'status' => 'C', 'lower' => array(1003)); /* COPTIC CAPITAL LETTER GANGIA */
-$config['0370_03ff'][] = array('upper' => 1004, 'status' => 'C', 'lower' => array(1005)); /* COPTIC CAPITAL LETTER SHIMA */
-$config['0370_03ff'][] = array('upper' => 1006, 'status' => 'C', 'lower' => array(1007)); /* COPTIC CAPITAL LETTER DEI */
-$config['0370_03ff'][] = array('upper' => 1008, 'status' => 'C', 'lower' => array(954)); /* GREEK KAPPA SYMBOL */
-$config['0370_03ff'][] = array('upper' => 1009, 'status' => 'C', 'lower' => array(961)); /* GREEK RHO SYMBOL */
-$config['0370_03ff'][] = array('upper' => 1012, 'status' => 'C', 'lower' => array(952)); /* GREEK CAPITAL THETA SYMBOL */
-$config['0370_03ff'][] = array('upper' => 1013, 'status' => 'C', 'lower' => array(949)); /* GREEK LUNATE EPSILON SYMBOL */
-$config['0370_03ff'][] = array('upper' => 1015, 'status' => 'C', 'lower' => array(1016)); /* GREEK CAPITAL LETTER SHO */
-$config['0370_03ff'][] = array('upper' => 1017, 'status' => 'C', 'lower' => array(1010)); /* GREEK CAPITAL LUNATE SIGMA SYMBOL */
-$config['0370_03ff'][] = array('upper' => 1018, 'status' => 'C', 'lower' => array(1019)); /* GREEK CAPITAL LETTER SAN */
-$config['0370_03ff'][] = array('upper' => 1021, 'status' => 'C', 'lower' => array(891)); /* GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL */
-$config['0370_03ff'][] = array('upper' => 1022, 'status' => 'C', 'lower' => array(892)); /* GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL */
-$config['0370_03ff'][] = array('upper' => 1023, 'status' => 'C', 'lower' => array(893)); /* GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL */
diff --git a/lib/Cake/Config/unicode/casefolding/0400_04ff.php b/lib/Cake/Config/unicode/casefolding/0400_04ff.php
deleted file mode 100644
index 7a3f93a5cd6..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0400_04ff.php
+++ /dev/null
@@ -1,164 +0,0 @@
- 1024, 'status' => 'C', 'lower' => array(1104)); /* CYRILLIC CAPITAL LETTER IE WITH GRAVE */
-$config['0400_04ff'][] = array('upper' => 1025, 'status' => 'C', 'lower' => array(1105)); /* CYRILLIC CAPITAL LETTER IO */
-$config['0400_04ff'][] = array('upper' => 1026, 'status' => 'C', 'lower' => array(1106)); /* CYRILLIC CAPITAL LETTER DJE */
-$config['0400_04ff'][] = array('upper' => 1027, 'status' => 'C', 'lower' => array(1107)); /* CYRILLIC CAPITAL LETTER GJE */
-$config['0400_04ff'][] = array('upper' => 1028, 'status' => 'C', 'lower' => array(1108)); /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
-$config['0400_04ff'][] = array('upper' => 1029, 'status' => 'C', 'lower' => array(1109)); /* CYRILLIC CAPITAL LETTER DZE */
-$config['0400_04ff'][] = array('upper' => 1030, 'status' => 'C', 'lower' => array(1110)); /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
-$config['0400_04ff'][] = array('upper' => 1031, 'status' => 'C', 'lower' => array(1111)); /* CYRILLIC CAPITAL LETTER YI */
-$config['0400_04ff'][] = array('upper' => 1032, 'status' => 'C', 'lower' => array(1112)); /* CYRILLIC CAPITAL LETTER JE */
-$config['0400_04ff'][] = array('upper' => 1033, 'status' => 'C', 'lower' => array(1113)); /* CYRILLIC CAPITAL LETTER LJE */
-$config['0400_04ff'][] = array('upper' => 1034, 'status' => 'C', 'lower' => array(1114)); /* CYRILLIC CAPITAL LETTER NJE */
-$config['0400_04ff'][] = array('upper' => 1035, 'status' => 'C', 'lower' => array(1115)); /* CYRILLIC CAPITAL LETTER TSHE */
-$config['0400_04ff'][] = array('upper' => 1036, 'status' => 'C', 'lower' => array(1116)); /* CYRILLIC CAPITAL LETTER KJE */
-$config['0400_04ff'][] = array('upper' => 1037, 'status' => 'C', 'lower' => array(1117)); /* CYRILLIC CAPITAL LETTER I WITH GRAVE */
-$config['0400_04ff'][] = array('upper' => 1038, 'status' => 'C', 'lower' => array(1118)); /* CYRILLIC CAPITAL LETTER SHORT U */
-$config['0400_04ff'][] = array('upper' => 1039, 'status' => 'C', 'lower' => array(1119)); /* CYRILLIC CAPITAL LETTER DZHE */
-$config['0400_04ff'][] = array('upper' => 1040, 'status' => 'C', 'lower' => array(1072)); /* CYRILLIC CAPITAL LETTER A */
-$config['0400_04ff'][] = array('upper' => 1041, 'status' => 'C', 'lower' => array(1073)); /* CYRILLIC CAPITAL LETTER BE */
-$config['0400_04ff'][] = array('upper' => 1042, 'status' => 'C', 'lower' => array(1074)); /* CYRILLIC CAPITAL LETTER VE */
-$config['0400_04ff'][] = array('upper' => 1043, 'status' => 'C', 'lower' => array(1075)); /* CYRILLIC CAPITAL LETTER GHE */
-$config['0400_04ff'][] = array('upper' => 1044, 'status' => 'C', 'lower' => array(1076)); /* CYRILLIC CAPITAL LETTER DE */
-$config['0400_04ff'][] = array('upper' => 1045, 'status' => 'C', 'lower' => array(1077)); /* CYRILLIC CAPITAL LETTER IE */
-$config['0400_04ff'][] = array('upper' => 1046, 'status' => 'C', 'lower' => array(1078)); /* CYRILLIC CAPITAL LETTER ZHE */
-$config['0400_04ff'][] = array('upper' => 1047, 'status' => 'C', 'lower' => array(1079)); /* CYRILLIC CAPITAL LETTER ZE */
-$config['0400_04ff'][] = array('upper' => 1048, 'status' => 'C', 'lower' => array(1080)); /* CYRILLIC CAPITAL LETTER I */
-$config['0400_04ff'][] = array('upper' => 1049, 'status' => 'C', 'lower' => array(1081)); /* CYRILLIC CAPITAL LETTER SHORT I */
-$config['0400_04ff'][] = array('upper' => 1050, 'status' => 'C', 'lower' => array(1082)); /* CYRILLIC CAPITAL LETTER KA */
-$config['0400_04ff'][] = array('upper' => 1051, 'status' => 'C', 'lower' => array(1083)); /* CYRILLIC CAPITAL LETTER EL */
-$config['0400_04ff'][] = array('upper' => 1052, 'status' => 'C', 'lower' => array(1084)); /* CYRILLIC CAPITAL LETTER EM */
-$config['0400_04ff'][] = array('upper' => 1053, 'status' => 'C', 'lower' => array(1085)); /* CYRILLIC CAPITAL LETTER EN */
-$config['0400_04ff'][] = array('upper' => 1054, 'status' => 'C', 'lower' => array(1086)); /* CYRILLIC CAPITAL LETTER O */
-$config['0400_04ff'][] = array('upper' => 1055, 'status' => 'C', 'lower' => array(1087)); /* CYRILLIC CAPITAL LETTER PE */
-$config['0400_04ff'][] = array('upper' => 1056, 'status' => 'C', 'lower' => array(1088)); /* CYRILLIC CAPITAL LETTER ER */
-$config['0400_04ff'][] = array('upper' => 1057, 'status' => 'C', 'lower' => array(1089)); /* CYRILLIC CAPITAL LETTER ES */
-$config['0400_04ff'][] = array('upper' => 1058, 'status' => 'C', 'lower' => array(1090)); /* CYRILLIC CAPITAL LETTER TE */
-$config['0400_04ff'][] = array('upper' => 1059, 'status' => 'C', 'lower' => array(1091)); /* CYRILLIC CAPITAL LETTER U */
-$config['0400_04ff'][] = array('upper' => 1060, 'status' => 'C', 'lower' => array(1092)); /* CYRILLIC CAPITAL LETTER EF */
-$config['0400_04ff'][] = array('upper' => 1061, 'status' => 'C', 'lower' => array(1093)); /* CYRILLIC CAPITAL LETTER HA */
-$config['0400_04ff'][] = array('upper' => 1062, 'status' => 'C', 'lower' => array(1094)); /* CYRILLIC CAPITAL LETTER TSE */
-$config['0400_04ff'][] = array('upper' => 1063, 'status' => 'C', 'lower' => array(1095)); /* CYRILLIC CAPITAL LETTER CHE */
-$config['0400_04ff'][] = array('upper' => 1064, 'status' => 'C', 'lower' => array(1096)); /* CYRILLIC CAPITAL LETTER SHA */
-$config['0400_04ff'][] = array('upper' => 1065, 'status' => 'C', 'lower' => array(1097)); /* CYRILLIC CAPITAL LETTER SHCHA */
-$config['0400_04ff'][] = array('upper' => 1066, 'status' => 'C', 'lower' => array(1098)); /* CYRILLIC CAPITAL LETTER HARD SIGN */
-$config['0400_04ff'][] = array('upper' => 1067, 'status' => 'C', 'lower' => array(1099)); /* CYRILLIC CAPITAL LETTER YERU */
-$config['0400_04ff'][] = array('upper' => 1068, 'status' => 'C', 'lower' => array(1100)); /* CYRILLIC CAPITAL LETTER SOFT SIGN */
-$config['0400_04ff'][] = array('upper' => 1069, 'status' => 'C', 'lower' => array(1101)); /* CYRILLIC CAPITAL LETTER E */
-$config['0400_04ff'][] = array('upper' => 1070, 'status' => 'C', 'lower' => array(1102)); /* CYRILLIC CAPITAL LETTER YU */
-$config['0400_04ff'][] = array('upper' => 1071, 'status' => 'C', 'lower' => array(1103)); /* CYRILLIC CAPITAL LETTER YA */
-$config['0400_04ff'][] = array('upper' => 1120, 'status' => 'C', 'lower' => array(1121)); /* CYRILLIC CAPITAL LETTER OMEGA */
-$config['0400_04ff'][] = array('upper' => 1122, 'status' => 'C', 'lower' => array(1123)); /* CYRILLIC CAPITAL LETTER YAT */
-$config['0400_04ff'][] = array('upper' => 1124, 'status' => 'C', 'lower' => array(1125)); /* CYRILLIC CAPITAL LETTER IOTIFIED E */
-$config['0400_04ff'][] = array('upper' => 1126, 'status' => 'C', 'lower' => array(1127)); /* CYRILLIC CAPITAL LETTER LITTLE YUS */
-$config['0400_04ff'][] = array('upper' => 1128, 'status' => 'C', 'lower' => array(1129)); /* CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS */
-$config['0400_04ff'][] = array('upper' => 1130, 'status' => 'C', 'lower' => array(1131)); /* CYRILLIC CAPITAL LETTER BIG YUS */
-$config['0400_04ff'][] = array('upper' => 1132, 'status' => 'C', 'lower' => array(1133)); /* CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS */
-$config['0400_04ff'][] = array('upper' => 1134, 'status' => 'C', 'lower' => array(1135)); /* CYRILLIC CAPITAL LETTER KSI */
-$config['0400_04ff'][] = array('upper' => 1136, 'status' => 'C', 'lower' => array(1137)); /* CYRILLIC CAPITAL LETTER PSI */
-$config['0400_04ff'][] = array('upper' => 1138, 'status' => 'C', 'lower' => array(1139)); /* CYRILLIC CAPITAL LETTER FITA */
-$config['0400_04ff'][] = array('upper' => 1140, 'status' => 'C', 'lower' => array(1141)); /* CYRILLIC CAPITAL LETTER IZHITSA */
-$config['0400_04ff'][] = array('upper' => 1142, 'status' => 'C', 'lower' => array(1143)); /* CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */
-$config['0400_04ff'][] = array('upper' => 1144, 'status' => 'C', 'lower' => array(1145)); /* CYRILLIC CAPITAL LETTER UK */
-$config['0400_04ff'][] = array('upper' => 1146, 'status' => 'C', 'lower' => array(1147)); /* CYRILLIC CAPITAL LETTER ROUND OMEGA */
-$config['0400_04ff'][] = array('upper' => 1148, 'status' => 'C', 'lower' => array(1149)); /* CYRILLIC CAPITAL LETTER OMEGA WITH TITLO */
-$config['0400_04ff'][] = array('upper' => 1150, 'status' => 'C', 'lower' => array(1151)); /* CYRILLIC CAPITAL LETTER OT */
-$config['0400_04ff'][] = array('upper' => 1152, 'status' => 'C', 'lower' => array(1153)); /* CYRILLIC CAPITAL LETTER KOPPA */
-$config['0400_04ff'][] = array('upper' => 1162, 'status' => 'C', 'lower' => array(1163)); /* CYRILLIC CAPITAL LETTER SHORT I WITH TAIL */
-$config['0400_04ff'][] = array('upper' => 1164, 'status' => 'C', 'lower' => array(1165)); /* CYRILLIC CAPITAL LETTER SEMISOFT SIGN */
-$config['0400_04ff'][] = array('upper' => 1166, 'status' => 'C', 'lower' => array(1167)); /* CYRILLIC CAPITAL LETTER ER WITH TICK */
-$config['0400_04ff'][] = array('upper' => 1168, 'status' => 'C', 'lower' => array(1169)); /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
-$config['0400_04ff'][] = array('upper' => 1170, 'status' => 'C', 'lower' => array(1171)); /* CYRILLIC CAPITAL LETTER GHE WITH STROKE */
-$config['0400_04ff'][] = array('upper' => 1172, 'status' => 'C', 'lower' => array(1173)); /* CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK */
-$config['0400_04ff'][] = array('upper' => 1174, 'status' => 'C', 'lower' => array(1175)); /* CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1176, 'status' => 'C', 'lower' => array(1177)); /* CYRILLIC CAPITAL LETTER ZE WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1178, 'status' => 'C', 'lower' => array(1179)); /* CYRILLIC CAPITAL LETTER KA WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1180, 'status' => 'C', 'lower' => array(1181)); /* CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE */
-$config['0400_04ff'][] = array('upper' => 1182, 'status' => 'C', 'lower' => array(1183)); /* CYRILLIC CAPITAL LETTER KA WITH STROKE */
-$config['0400_04ff'][] = array('upper' => 1184, 'status' => 'C', 'lower' => array(1185)); /* CYRILLIC CAPITAL LETTER BASHKIR KA */
-$config['0400_04ff'][] = array('upper' => 1186, 'status' => 'C', 'lower' => array(1187)); /* CYRILLIC CAPITAL LETTER EN WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1188, 'status' => 'C', 'lower' => array(1189)); /* CYRILLIC CAPITAL LIGATURE EN GHE */
-$config['0400_04ff'][] = array('upper' => 1190, 'status' => 'C', 'lower' => array(1191)); /* CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK */
-$config['0400_04ff'][] = array('upper' => 1192, 'status' => 'C', 'lower' => array(1193)); /* CYRILLIC CAPITAL LETTER ABKHASIAN HA */
-$config['0400_04ff'][] = array('upper' => 1194, 'status' => 'C', 'lower' => array(1195)); /* CYRILLIC CAPITAL LETTER ES WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1196, 'status' => 'C', 'lower' => array(1197)); /* CYRILLIC CAPITAL LETTER TE WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1198, 'status' => 'C', 'lower' => array(1199)); /* CYRILLIC CAPITAL LETTER STRAIGHT U */
-$config['0400_04ff'][] = array('upper' => 1200, 'status' => 'C', 'lower' => array(1201)); /* CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE */
-$config['0400_04ff'][] = array('upper' => 1202, 'status' => 'C', 'lower' => array(1203)); /* CYRILLIC CAPITAL LETTER HA WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1204, 'status' => 'C', 'lower' => array(1205)); /* CYRILLIC CAPITAL LIGATURE TE TSE */
-$config['0400_04ff'][] = array('upper' => 1206, 'status' => 'C', 'lower' => array(1207)); /* CYRILLIC CAPITAL LETTER CHE WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1208, 'status' => 'C', 'lower' => array(1209)); /* CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE */
-$config['0400_04ff'][] = array('upper' => 1210, 'status' => 'C', 'lower' => array(1211)); /* CYRILLIC CAPITAL LETTER SHHA */
-$config['0400_04ff'][] = array('upper' => 1212, 'status' => 'C', 'lower' => array(1213)); /* CYRILLIC CAPITAL LETTER ABKHASIAN CHE */
-$config['0400_04ff'][] = array('upper' => 1214, 'status' => 'C', 'lower' => array(1215)); /* CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1216, 'status' => 'C', 'lower' => array(1231)); /* CYRILLIC LETTER PALOCHKA */
-$config['0400_04ff'][] = array('upper' => 1217, 'status' => 'C', 'lower' => array(1218)); /* CYRILLIC CAPITAL LETTER ZHE WITH BREVE */
-$config['0400_04ff'][] = array('upper' => 1219, 'status' => 'C', 'lower' => array(1220)); /* CYRILLIC CAPITAL LETTER KA WITH HOOK */
-$config['0400_04ff'][] = array('upper' => 1221, 'status' => 'C', 'lower' => array(1222)); /* CYRILLIC CAPITAL LETTER EL WITH TAIL */
-$config['0400_04ff'][] = array('upper' => 1223, 'status' => 'C', 'lower' => array(1224)); /* CYRILLIC CAPITAL LETTER EN WITH HOOK */
-$config['0400_04ff'][] = array('upper' => 1225, 'status' => 'C', 'lower' => array(1226)); /* CYRILLIC CAPITAL LETTER EN WITH TAIL */
-$config['0400_04ff'][] = array('upper' => 1227, 'status' => 'C', 'lower' => array(1228)); /* CYRILLIC CAPITAL LETTER KHAKASSIAN CHE */
-$config['0400_04ff'][] = array('upper' => 1229, 'status' => 'C', 'lower' => array(1230)); /* CYRILLIC CAPITAL LETTER EM WITH TAIL */
-$config['0400_04ff'][] = array('upper' => 1232, 'status' => 'C', 'lower' => array(1233)); /* CYRILLIC CAPITAL LETTER A WITH BREVE */
-$config['0400_04ff'][] = array('upper' => 1234, 'status' => 'C', 'lower' => array(1235)); /* CYRILLIC CAPITAL LETTER A WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1236, 'status' => 'C', 'lower' => array(1237)); /* CYRILLIC CAPITAL LIGATURE A IE */
-$config['0400_04ff'][] = array('upper' => 1238, 'status' => 'C', 'lower' => array(1239)); /* CYRILLIC CAPITAL LETTER IE WITH BREVE */
-$config['0400_04ff'][] = array('upper' => 1240, 'status' => 'C', 'lower' => array(1241)); /* CYRILLIC CAPITAL LETTER SCHWA */
-$config['0400_04ff'][] = array('upper' => 1242, 'status' => 'C', 'lower' => array(1243)); /* CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1244, 'status' => 'C', 'lower' => array(1245)); /* CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1246, 'status' => 'C', 'lower' => array(1247)); /* CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1248, 'status' => 'C', 'lower' => array(1249)); /* CYRILLIC CAPITAL LETTER ABKHASIAN DZE */
-$config['0400_04ff'][] = array('upper' => 1250, 'status' => 'C', 'lower' => array(1251)); /* CYRILLIC CAPITAL LETTER I WITH MACRON */
-$config['0400_04ff'][] = array('upper' => 1252, 'status' => 'C', 'lower' => array(1253)); /* CYRILLIC CAPITAL LETTER I WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1254, 'status' => 'C', 'lower' => array(1255)); /* CYRILLIC CAPITAL LETTER O WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1256, 'status' => 'C', 'lower' => array(1257)); /* CYRILLIC CAPITAL LETTER BARRED O */
-$config['0400_04ff'][] = array('upper' => 1258, 'status' => 'C', 'lower' => array(1259)); /* CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1260, 'status' => 'C', 'lower' => array(1261)); /* CYRILLIC CAPITAL LETTER E WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1262, 'status' => 'C', 'lower' => array(1263)); /* CYRILLIC CAPITAL LETTER U WITH MACRON */
-$config['0400_04ff'][] = array('upper' => 1264, 'status' => 'C', 'lower' => array(1265)); /* CYRILLIC CAPITAL LETTER U WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1266, 'status' => 'C', 'lower' => array(1267)); /* CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE */
-$config['0400_04ff'][] = array('upper' => 1268, 'status' => 'C', 'lower' => array(1269)); /* CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1270, 'status' => 'C', 'lower' => array(1271)); /* CYRILLIC CAPITAL LETTER GHE WITH DESCENDER */
-$config['0400_04ff'][] = array('upper' => 1272, 'status' => 'C', 'lower' => array(1273)); /* CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS */
-$config['0400_04ff'][] = array('upper' => 1274, 'status' => 'C', 'lower' => array(1275)); /* CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK */
-$config['0400_04ff'][] = array('upper' => 1276, 'status' => 'C', 'lower' => array(1277)); /* CYRILLIC CAPITAL LETTER HA WITH HOOK */
-$config['0400_04ff'][] = array('upper' => 1278, 'status' => 'C', 'lower' => array(1279)); /* CYRILLIC CAPITAL LETTER HA WITH STROKE */
diff --git a/lib/Cake/Config/unicode/casefolding/0500_052f.php b/lib/Cake/Config/unicode/casefolding/0500_052f.php
deleted file mode 100644
index 73b81fa8134..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0500_052f.php
+++ /dev/null
@@ -1,50 +0,0 @@
- 1280, 'status' => 'C', 'lower' => array(1281)); /* CYRILLIC CAPITAL LETTER KOMI DE */
-$config['0500_052f'][] = array('upper' => 1282, 'status' => 'C', 'lower' => array(1283)); /* CYRILLIC CAPITAL LETTER KOMI DJE */
-$config['0500_052f'][] = array('upper' => 1284, 'status' => 'C', 'lower' => array(1285)); /* CYRILLIC CAPITAL LETTER KOMI ZJE */
-$config['0500_052f'][] = array('upper' => 1286, 'status' => 'C', 'lower' => array(1287)); /* CYRILLIC CAPITAL LETTER KOMI DZJE */
-$config['0500_052f'][] = array('upper' => 1288, 'status' => 'C', 'lower' => array(1289)); /* CYRILLIC CAPITAL LETTER KOMI LJE */
-$config['0500_052f'][] = array('upper' => 1290, 'status' => 'C', 'lower' => array(1291)); /* CYRILLIC CAPITAL LETTER KOMI NJE */
-$config['0500_052f'][] = array('upper' => 1292, 'status' => 'C', 'lower' => array(1293)); /* CYRILLIC CAPITAL LETTER KOMI SJE */
-$config['0500_052f'][] = array('upper' => 1294, 'status' => 'C', 'lower' => array(1295)); /* CYRILLIC CAPITAL LETTER KOMI TJE */
-$config['0500_052f'][] = array('upper' => 1296, 'status' => 'C', 'lower' => array(1297)); /* CYRILLIC CAPITAL LETTER ZE */
-$config['0500_052f'][] = array('upper' => 1298, 'status' => 'C', 'lower' => array(1299)); /* CYRILLIC CAPITAL LETTER El with hook */
diff --git a/lib/Cake/Config/unicode/casefolding/0530_058f.php b/lib/Cake/Config/unicode/casefolding/0530_058f.php
deleted file mode 100644
index 4ffb553e90a..00000000000
--- a/lib/Cake/Config/unicode/casefolding/0530_058f.php
+++ /dev/null
@@ -1,78 +0,0 @@
- 1329, 'status' => 'C', 'lower' => array(1377)); /* ARMENIAN CAPITAL LETTER AYB */
-$config['0530_058f'][] = array('upper' => 1330, 'status' => 'C', 'lower' => array(1378)); /* ARMENIAN CAPITAL LETTER BEN */
-$config['0530_058f'][] = array('upper' => 1331, 'status' => 'C', 'lower' => array(1379)); /* ARMENIAN CAPITAL LETTER GIM */
-$config['0530_058f'][] = array('upper' => 1332, 'status' => 'C', 'lower' => array(1380)); /* ARMENIAN CAPITAL LETTER DA */
-$config['0530_058f'][] = array('upper' => 1333, 'status' => 'C', 'lower' => array(1381)); /* ARMENIAN CAPITAL LETTER ECH */
-$config['0530_058f'][] = array('upper' => 1334, 'status' => 'C', 'lower' => array(1382)); /* ARMENIAN CAPITAL LETTER ZA */
-$config['0530_058f'][] = array('upper' => 1335, 'status' => 'C', 'lower' => array(1383)); /* ARMENIAN CAPITAL LETTER EH */
-$config['0530_058f'][] = array('upper' => 1336, 'status' => 'C', 'lower' => array(1384)); /* ARMENIAN CAPITAL LETTER ET */
-$config['0530_058f'][] = array('upper' => 1337, 'status' => 'C', 'lower' => array(1385)); /* ARMENIAN CAPITAL LETTER TO */
-$config['0530_058f'][] = array('upper' => 1338, 'status' => 'C', 'lower' => array(1386)); /* ARMENIAN CAPITAL LETTER ZHE */
-$config['0530_058f'][] = array('upper' => 1339, 'status' => 'C', 'lower' => array(1387)); /* ARMENIAN CAPITAL LETTER INI */
-$config['0530_058f'][] = array('upper' => 1340, 'status' => 'C', 'lower' => array(1388)); /* ARMENIAN CAPITAL LETTER LIWN */
-$config['0530_058f'][] = array('upper' => 1341, 'status' => 'C', 'lower' => array(1389)); /* ARMENIAN CAPITAL LETTER XEH */
-$config['0530_058f'][] = array('upper' => 1342, 'status' => 'C', 'lower' => array(1390)); /* ARMENIAN CAPITAL LETTER CA */
-$config['0530_058f'][] = array('upper' => 1343, 'status' => 'C', 'lower' => array(1391)); /* ARMENIAN CAPITAL LETTER KEN */
-$config['0530_058f'][] = array('upper' => 1344, 'status' => 'C', 'lower' => array(1392)); /* ARMENIAN CAPITAL LETTER HO */
-$config['0530_058f'][] = array('upper' => 1345, 'status' => 'C', 'lower' => array(1393)); /* ARMENIAN CAPITAL LETTER JA */
-$config['0530_058f'][] = array('upper' => 1346, 'status' => 'C', 'lower' => array(1394)); /* ARMENIAN CAPITAL LETTER GHAD */
-$config['0530_058f'][] = array('upper' => 1347, 'status' => 'C', 'lower' => array(1395)); /* ARMENIAN CAPITAL LETTER CHEH */
-$config['0530_058f'][] = array('upper' => 1348, 'status' => 'C', 'lower' => array(1396)); /* ARMENIAN CAPITAL LETTER MEN */
-$config['0530_058f'][] = array('upper' => 1349, 'status' => 'C', 'lower' => array(1397)); /* ARMENIAN CAPITAL LETTER YI */
-$config['0530_058f'][] = array('upper' => 1350, 'status' => 'C', 'lower' => array(1398)); /* ARMENIAN CAPITAL LETTER NOW */
-$config['0530_058f'][] = array('upper' => 1351, 'status' => 'C', 'lower' => array(1399)); /* ARMENIAN CAPITAL LETTER SHA */
-$config['0530_058f'][] = array('upper' => 1352, 'status' => 'C', 'lower' => array(1400)); /* ARMENIAN CAPITAL LETTER VO */
-$config['0530_058f'][] = array('upper' => 1353, 'status' => 'C', 'lower' => array(1401)); /* ARMENIAN CAPITAL LETTER CHA */
-$config['0530_058f'][] = array('upper' => 1354, 'status' => 'C', 'lower' => array(1402)); /* ARMENIAN CAPITAL LETTER PEH */
-$config['0530_058f'][] = array('upper' => 1355, 'status' => 'C', 'lower' => array(1403)); /* ARMENIAN CAPITAL LETTER JHEH */
-$config['0530_058f'][] = array('upper' => 1356, 'status' => 'C', 'lower' => array(1404)); /* ARMENIAN CAPITAL LETTER RA */
-$config['0530_058f'][] = array('upper' => 1357, 'status' => 'C', 'lower' => array(1405)); /* ARMENIAN CAPITAL LETTER SEH */
-$config['0530_058f'][] = array('upper' => 1358, 'status' => 'C', 'lower' => array(1406)); /* ARMENIAN CAPITAL LETTER VEW */
-$config['0530_058f'][] = array('upper' => 1359, 'status' => 'C', 'lower' => array(1407)); /* ARMENIAN CAPITAL LETTER TIWN */
-$config['0530_058f'][] = array('upper' => 1360, 'status' => 'C', 'lower' => array(1408)); /* ARMENIAN CAPITAL LETTER REH */
-$config['0530_058f'][] = array('upper' => 1361, 'status' => 'C', 'lower' => array(1409)); /* ARMENIAN CAPITAL LETTER CO */
-$config['0530_058f'][] = array('upper' => 1362, 'status' => 'C', 'lower' => array(1410)); /* ARMENIAN CAPITAL LETTER YIWN */
-$config['0530_058f'][] = array('upper' => 1363, 'status' => 'C', 'lower' => array(1411)); /* ARMENIAN CAPITAL LETTER PIWR */
-$config['0530_058f'][] = array('upper' => 1364, 'status' => 'C', 'lower' => array(1412)); /* ARMENIAN CAPITAL LETTER KEH */
-$config['0530_058f'][] = array('upper' => 1365, 'status' => 'C', 'lower' => array(1413)); /* ARMENIAN CAPITAL LETTER OH */
-$config['0530_058f'][] = array('upper' => 1366, 'status' => 'C', 'lower' => array(1414)); /* ARMENIAN CAPITAL LETTER FEH */
diff --git a/lib/Cake/Config/unicode/casefolding/1e00_1eff.php b/lib/Cake/Config/unicode/casefolding/1e00_1eff.php
deleted file mode 100644
index 5b534a3c410..00000000000
--- a/lib/Cake/Config/unicode/casefolding/1e00_1eff.php
+++ /dev/null
@@ -1,168 +0,0 @@
- 7680, 'status' => 'C', 'lower' => array(7681)); /* LATIN CAPITAL LETTER A WITH RING BELOW */
-$config['1e00_1eff'][] = array('upper' => 7682, 'status' => 'C', 'lower' => array(7683)); /* LATIN CAPITAL LETTER B WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7684, 'status' => 'C', 'lower' => array(7685)); /* LATIN CAPITAL LETTER B WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7686, 'status' => 'C', 'lower' => array(7687)); /* LATIN CAPITAL LETTER B WITH LINE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7688, 'status' => 'C', 'lower' => array(7689)); /* LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7690, 'status' => 'C', 'lower' => array(7691)); /* LATIN CAPITAL LETTER D WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7692, 'status' => 'C', 'lower' => array(7693)); /* LATIN CAPITAL LETTER D WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7694, 'status' => 'C', 'lower' => array(7695)); /* LATIN CAPITAL LETTER D WITH LINE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7696, 'status' => 'C', 'lower' => array(7697)); /* LATIN CAPITAL LETTER D WITH CEDILLA */
-$config['1e00_1eff'][] = array('upper' => 7698, 'status' => 'C', 'lower' => array(7699)); /* LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW */
-$config['1e00_1eff'][] = array('upper' => 7700, 'status' => 'C', 'lower' => array(7701)); /* LATIN CAPITAL LETTER E WITH MACRON AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7702, 'status' => 'C', 'lower' => array(7703)); /* LATIN CAPITAL LETTER E WITH MACRON AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7704, 'status' => 'C', 'lower' => array(7705)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW */
-$config['1e00_1eff'][] = array('upper' => 7706, 'status' => 'C', 'lower' => array(7707)); /* LATIN CAPITAL LETTER E WITH TILDE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7708, 'status' => 'C', 'lower' => array(7709)); /* LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE */
-$config['1e00_1eff'][] = array('upper' => 7710, 'status' => 'C', 'lower' => array(7711)); /* LATIN CAPITAL LETTER F WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7712, 'status' => 'C', 'lower' => array(7713)); /* LATIN CAPITAL LETTER G WITH MACRON */
-$config['1e00_1eff'][] = array('upper' => 7714, 'status' => 'C', 'lower' => array(7715)); /* LATIN CAPITAL LETTER H WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7716, 'status' => 'C', 'lower' => array(7717)); /* LATIN CAPITAL LETTER H WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7718, 'status' => 'C', 'lower' => array(7719)); /* LATIN CAPITAL LETTER H WITH DIAERESIS */
-$config['1e00_1eff'][] = array('upper' => 7720, 'status' => 'C', 'lower' => array(7721)); /* LATIN CAPITAL LETTER H WITH CEDILLA */
-$config['1e00_1eff'][] = array('upper' => 7722, 'status' => 'C', 'lower' => array(7723)); /* LATIN CAPITAL LETTER H WITH BREVE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7724, 'status' => 'C', 'lower' => array(7725)); /* LATIN CAPITAL LETTER I WITH TILDE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7726, 'status' => 'C', 'lower' => array(7727)); /* LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7728, 'status' => 'C', 'lower' => array(7729)); /* LATIN CAPITAL LETTER K WITH ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7730, 'status' => 'C', 'lower' => array(7731)); /* LATIN CAPITAL LETTER K WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7732, 'status' => 'C', 'lower' => array(7733)); /* LATIN CAPITAL LETTER K WITH LINE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7734, 'status' => 'C', 'lower' => array(7735)); /* LATIN CAPITAL LETTER L WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7736, 'status' => 'C', 'lower' => array(7737)); /* LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON */
-$config['1e00_1eff'][] = array('upper' => 7738, 'status' => 'C', 'lower' => array(7739)); /* LATIN CAPITAL LETTER L WITH LINE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7740, 'status' => 'C', 'lower' => array(7741)); /* LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW */
-$config['1e00_1eff'][] = array('upper' => 7742, 'status' => 'C', 'lower' => array(7743)); /* LATIN CAPITAL LETTER M WITH ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7744, 'status' => 'C', 'lower' => array(7745)); /* LATIN CAPITAL LETTER M WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7746, 'status' => 'C', 'lower' => array(7747)); /* LATIN CAPITAL LETTER M WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7748, 'status' => 'C', 'lower' => array(7749)); /* LATIN CAPITAL LETTER N WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7750, 'status' => 'C', 'lower' => array(7751)); /* LATIN CAPITAL LETTER N WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7752, 'status' => 'C', 'lower' => array(7753)); /* LATIN CAPITAL LETTER N WITH LINE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7754, 'status' => 'C', 'lower' => array(7755)); /* LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW */
-$config['1e00_1eff'][] = array('upper' => 7756, 'status' => 'C', 'lower' => array(7757)); /* LATIN CAPITAL LETTER O WITH TILDE AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7758, 'status' => 'C', 'lower' => array(7759)); /* LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS */
-$config['1e00_1eff'][] = array('upper' => 7760, 'status' => 'C', 'lower' => array(7761)); /* LATIN CAPITAL LETTER O WITH MACRON AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7762, 'status' => 'C', 'lower' => array(7763)); /* LATIN CAPITAL LETTER O WITH MACRON AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7764, 'status' => 'C', 'lower' => array(7765)); /* LATIN CAPITAL LETTER P WITH ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7766, 'status' => 'C', 'lower' => array(7767)); /* LATIN CAPITAL LETTER P WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7768, 'status' => 'C', 'lower' => array(7769)); /* LATIN CAPITAL LETTER R WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7770, 'status' => 'C', 'lower' => array(7771)); /* LATIN CAPITAL LETTER R WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7772, 'status' => 'C', 'lower' => array(7773)); /* LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON */
-$config['1e00_1eff'][] = array('upper' => 7774, 'status' => 'C', 'lower' => array(7775)); /* LATIN CAPITAL LETTER R WITH LINE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7776, 'status' => 'C', 'lower' => array(7777)); /* LATIN CAPITAL LETTER S WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7778, 'status' => 'C', 'lower' => array(7779)); /* LATIN CAPITAL LETTER S WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7780, 'status' => 'C', 'lower' => array(7781)); /* LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7782, 'status' => 'C', 'lower' => array(7783)); /* LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7784, 'status' => 'C', 'lower' => array(7785)); /* LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7786, 'status' => 'C', 'lower' => array(7787)); /* LATIN CAPITAL LETTER T WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7788, 'status' => 'C', 'lower' => array(7789)); /* LATIN CAPITAL LETTER T WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7790, 'status' => 'C', 'lower' => array(7791)); /* LATIN CAPITAL LETTER T WITH LINE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7792, 'status' => 'C', 'lower' => array(7793)); /* LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW */
-$config['1e00_1eff'][] = array('upper' => 7794, 'status' => 'C', 'lower' => array(7795)); /* LATIN CAPITAL LETTER U WITH DIAERESIS BELOW */
-$config['1e00_1eff'][] = array('upper' => 7796, 'status' => 'C', 'lower' => array(7797)); /* LATIN CAPITAL LETTER U WITH TILDE BELOW */
-$config['1e00_1eff'][] = array('upper' => 7798, 'status' => 'C', 'lower' => array(7799)); /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW */
-$config['1e00_1eff'][] = array('upper' => 7800, 'status' => 'C', 'lower' => array(7801)); /* LATIN CAPITAL LETTER U WITH TILDE AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7802, 'status' => 'C', 'lower' => array(7803)); /* LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS */
-$config['1e00_1eff'][] = array('upper' => 7804, 'status' => 'C', 'lower' => array(7805)); /* LATIN CAPITAL LETTER V WITH TILDE */
-$config['1e00_1eff'][] = array('upper' => 7806, 'status' => 'C', 'lower' => array(7807)); /* LATIN CAPITAL LETTER V WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7808, 'status' => 'C', 'lower' => array(7809)); /* LATIN CAPITAL LETTER W WITH GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7810, 'status' => 'C', 'lower' => array(7811)); /* LATIN CAPITAL LETTER W WITH ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7812, 'status' => 'C', 'lower' => array(7813)); /* LATIN CAPITAL LETTER W WITH DIAERESIS */
-$config['1e00_1eff'][] = array('upper' => 7814, 'status' => 'C', 'lower' => array(7815)); /* LATIN CAPITAL LETTER W WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7816, 'status' => 'C', 'lower' => array(7817)); /* LATIN CAPITAL LETTER W WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7818, 'status' => 'C', 'lower' => array(7819)); /* LATIN CAPITAL LETTER X WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7820, 'status' => 'C', 'lower' => array(7821)); /* LATIN CAPITAL LETTER X WITH DIAERESIS */
-$config['1e00_1eff'][] = array('upper' => 7822, 'status' => 'C', 'lower' => array(7823)); /* LATIN CAPITAL LETTER Y WITH DOT ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7824, 'status' => 'C', 'lower' => array(7825)); /* LATIN CAPITAL LETTER Z WITH CIRCUMFLEX */
-$config['1e00_1eff'][] = array('upper' => 7826, 'status' => 'C', 'lower' => array(7827)); /* LATIN CAPITAL LETTER Z WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7828, 'status' => 'C', 'lower' => array(7829)); /* LATIN CAPITAL LETTER Z WITH LINE BELOW */
-
-//$config['1e00_1eff'][] = array('upper' => 7830, 'status' => 'F', 'lower' => array(104, 817)); /* LATIN SMALL LETTER H WITH LINE BELOW */
-//$config['1e00_1eff'][] = array('upper' => 7831, 'status' => 'F', 'lower' => array(116, 776)); /* LATIN SMALL LETTER T WITH DIAERESIS */
-//$config['1e00_1eff'][] = array('upper' => 7832, 'status' => 'F', 'lower' => array(119, 778)); /* LATIN SMALL LETTER W WITH RING ABOVE */
-//$config['1e00_1eff'][] = array('upper' => 7833, 'status' => 'F', 'lower' => array(121, 778)); /* LATIN SMALL LETTER Y WITH RING ABOVE */
-//$config['1e00_1eff'][] = array('upper' => 7834, 'status' => 'F', 'lower' => array(97, 702)); /* LATIN SMALL LETTER A WITH RIGHT HALF RING */
-//$config['1e00_1eff'][] = array('upper' => 7835, 'status' => 'C', 'lower' => array(7777)); /* LATIN SMALL LETTER LONG S WITH DOT ABOVE */
-
-$config['1e00_1eff'][] = array('upper' => 7840, 'status' => 'C', 'lower' => array(7841)); /* LATIN CAPITAL LETTER A WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7842, 'status' => 'C', 'lower' => array(7843)); /* LATIN CAPITAL LETTER A WITH HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7844, 'status' => 'C', 'lower' => array(7845)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7846, 'status' => 'C', 'lower' => array(7847)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7848, 'status' => 'C', 'lower' => array(7849)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7850, 'status' => 'C', 'lower' => array(7851)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */
-$config['1e00_1eff'][] = array('upper' => 7852, 'status' => 'C', 'lower' => array(7853)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7854, 'status' => 'C', 'lower' => array(7855)); /* LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7856, 'status' => 'C', 'lower' => array(7857)); /* LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7858, 'status' => 'C', 'lower' => array(7859)); /* LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7860, 'status' => 'C', 'lower' => array(7861)); /* LATIN CAPITAL LETTER A WITH BREVE AND TILDE */
-$config['1e00_1eff'][] = array('upper' => 7862, 'status' => 'C', 'lower' => array(7863)); /* LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7864, 'status' => 'C', 'lower' => array(7865)); /* LATIN CAPITAL LETTER E WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7866, 'status' => 'C', 'lower' => array(7867)); /* LATIN CAPITAL LETTER E WITH HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7868, 'status' => 'C', 'lower' => array(7869)); /* LATIN CAPITAL LETTER E WITH TILDE */
-$config['1e00_1eff'][] = array('upper' => 7870, 'status' => 'C', 'lower' => array(7871)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7872, 'status' => 'C', 'lower' => array(7873)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7874, 'status' => 'C', 'lower' => array(7875)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7876, 'status' => 'C', 'lower' => array(7877)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */
-$config['1e00_1eff'][] = array('upper' => 7878, 'status' => 'C', 'lower' => array(7879)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7880, 'status' => 'C', 'lower' => array(7881)); /* LATIN CAPITAL LETTER I WITH HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7882, 'status' => 'C', 'lower' => array(7883)); /* LATIN CAPITAL LETTER I WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7884, 'status' => 'C', 'lower' => array(7885)); /* LATIN CAPITAL LETTER O WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7886, 'status' => 'C', 'lower' => array(7887)); /* LATIN CAPITAL LETTER O WITH HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7888, 'status' => 'C', 'lower' => array(7889)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7890, 'status' => 'C', 'lower' => array(7891)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7892, 'status' => 'C', 'lower' => array(7893)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7894, 'status' => 'C', 'lower' => array(7895)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */
-$config['1e00_1eff'][] = array('upper' => 7896, 'status' => 'C', 'lower' => array(7897)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7898, 'status' => 'C', 'lower' => array(7899)); /* LATIN CAPITAL LETTER O WITH HORN AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7900, 'status' => 'C', 'lower' => array(7901)); /* LATIN CAPITAL LETTER O WITH HORN AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7902, 'status' => 'C', 'lower' => array(7903)); /* LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7904, 'status' => 'C', 'lower' => array(7905)); /* LATIN CAPITAL LETTER O WITH HORN AND TILDE */
-$config['1e00_1eff'][] = array('upper' => 7906, 'status' => 'C', 'lower' => array(7907)); /* LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7908, 'status' => 'C', 'lower' => array(7909)); /* LATIN CAPITAL LETTER U WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7910, 'status' => 'C', 'lower' => array(7911)); /* LATIN CAPITAL LETTER U WITH HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7912, 'status' => 'C', 'lower' => array(7913)); /* LATIN CAPITAL LETTER U WITH HORN AND ACUTE */
-$config['1e00_1eff'][] = array('upper' => 7914, 'status' => 'C', 'lower' => array(7915)); /* LATIN CAPITAL LETTER U WITH HORN AND GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7916, 'status' => 'C', 'lower' => array(7917)); /* LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7918, 'status' => 'C', 'lower' => array(7919)); /* LATIN CAPITAL LETTER U WITH HORN AND TILDE */
-$config['1e00_1eff'][] = array('upper' => 7920, 'status' => 'C', 'lower' => array(7921)); /* LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7922, 'status' => 'C', 'lower' => array(7923)); /* LATIN CAPITAL LETTER Y WITH GRAVE */
-$config['1e00_1eff'][] = array('upper' => 7924, 'status' => 'C', 'lower' => array(7925)); /* LATIN CAPITAL LETTER Y WITH DOT BELOW */
-$config['1e00_1eff'][] = array('upper' => 7926, 'status' => 'C', 'lower' => array(7927)); /* LATIN CAPITAL LETTER Y WITH HOOK ABOVE */
-$config['1e00_1eff'][] = array('upper' => 7928, 'status' => 'C', 'lower' => array(7929)); /* LATIN CAPITAL LETTER Y WITH TILDE */
diff --git a/lib/Cake/Config/unicode/casefolding/1f00_1fff.php b/lib/Cake/Config/unicode/casefolding/1f00_1fff.php
deleted file mode 100644
index be09aa5a157..00000000000
--- a/lib/Cake/Config/unicode/casefolding/1f00_1fff.php
+++ /dev/null
@@ -1,216 +0,0 @@
- 7944, 'status' => 'C', 'lower' => array(7936, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 7945, 'status' => 'C', 'lower' => array(7937)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 7946, 'status' => 'C', 'lower' => array(7938)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7947, 'status' => 'C', 'lower' => array(7939)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7948, 'status' => 'C', 'lower' => array(7940)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7949, 'status' => 'C', 'lower' => array(7941)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7950, 'status' => 'C', 'lower' => array(7942)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 7951, 'status' => 'C', 'lower' => array(7943)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 7960, 'status' => 'C', 'lower' => array(7952)); /* GREEK CAPITAL LETTER EPSILON WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 7961, 'status' => 'C', 'lower' => array(7953)); /* GREEK CAPITAL LETTER EPSILON WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 7962, 'status' => 'C', 'lower' => array(7954)); /* GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7963, 'status' => 'C', 'lower' => array(7955)); /* GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7964, 'status' => 'C', 'lower' => array(7956)); /* GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7965, 'status' => 'C', 'lower' => array(7957)); /* GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7976, 'status' => 'C', 'lower' => array(7968)); /* GREEK CAPITAL LETTER ETA WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 7977, 'status' => 'C', 'lower' => array(7969)); /* GREEK CAPITAL LETTER ETA WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 7978, 'status' => 'C', 'lower' => array(7970)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7979, 'status' => 'C', 'lower' => array(7971)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7980, 'status' => 'C', 'lower' => array(7972)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7981, 'status' => 'C', 'lower' => array(7973)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7982, 'status' => 'C', 'lower' => array(7974)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 7983, 'status' => 'C', 'lower' => array(7975)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 7992, 'status' => 'C', 'lower' => array(7984)); /* GREEK CAPITAL LETTER IOTA WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 7993, 'status' => 'C', 'lower' => array(7985)); /* GREEK CAPITAL LETTER IOTA WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 7994, 'status' => 'C', 'lower' => array(7986)); /* GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7995, 'status' => 'C', 'lower' => array(7987)); /* GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 7996, 'status' => 'C', 'lower' => array(7988)); /* GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7997, 'status' => 'C', 'lower' => array(7989)); /* GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 7998, 'status' => 'C', 'lower' => array(7990)); /* GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 7999, 'status' => 'C', 'lower' => array(7991)); /* GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8008, 'status' => 'C', 'lower' => array(8000)); /* GREEK CAPITAL LETTER OMICRON WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 8009, 'status' => 'C', 'lower' => array(8001)); /* GREEK CAPITAL LETTER OMICRON WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 8010, 'status' => 'C', 'lower' => array(8002)); /* GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8011, 'status' => 'C', 'lower' => array(8003)); /* GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8012, 'status' => 'C', 'lower' => array(8004)); /* GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8013, 'status' => 'C', 'lower' => array(8005)); /* GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8016, 'status' => 'F', 'lower' => array(965, 787)); /* GREEK SMALL LETTER UPSILON WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 8018, 'status' => 'F', 'lower' => array(965, 787, 768)); /* GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8020, 'status' => 'F', 'lower' => array(965, 787, 769)); /* GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8022, 'status' => 'F', 'lower' => array(965, 787, 834)); /* GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8025, 'status' => 'C', 'lower' => array(8017)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 8027, 'status' => 'C', 'lower' => array(8019)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8029, 'status' => 'C', 'lower' => array(8021)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8031, 'status' => 'C', 'lower' => array(8023)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8040, 'status' => 'C', 'lower' => array(8032)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 8041, 'status' => 'C', 'lower' => array(8033)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 8042, 'status' => 'C', 'lower' => array(8034)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8043, 'status' => 'C', 'lower' => array(8035)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8044, 'status' => 'C', 'lower' => array(8036)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8045, 'status' => 'C', 'lower' => array(8037)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8046, 'status' => 'C', 'lower' => array(8038)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8047, 'status' => 'C', 'lower' => array(8039)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8064, 'status' => 'F', 'lower' => array(7936, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8065, 'status' => 'F', 'lower' => array(7937, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8066, 'status' => 'F', 'lower' => array(7938, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8067, 'status' => 'F', 'lower' => array(7939, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8068, 'status' => 'F', 'lower' => array(7940, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8069, 'status' => 'F', 'lower' => array(7941, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8070, 'status' => 'F', 'lower' => array(7942, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8071, 'status' => 'F', 'lower' => array(7943, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8072, 'status' => 'F', 'lower' => array(7936, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8072, 'status' => 'S', 'lower' => array(8064)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8073, 'status' => 'F', 'lower' => array(7937, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8073, 'status' => 'S', 'lower' => array(8065)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8074, 'status' => 'F', 'lower' => array(7938, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8074, 'status' => 'S', 'lower' => array(8066)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8075, 'status' => 'F', 'lower' => array(7939, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8075, 'status' => 'S', 'lower' => array(8067)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8076, 'status' => 'F', 'lower' => array(7940, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8076, 'status' => 'S', 'lower' => array(8068)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8077, 'status' => 'F', 'lower' => array(7941, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8077, 'status' => 'S', 'lower' => array(8069)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8078, 'status' => 'F', 'lower' => array(7942, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8078, 'status' => 'S', 'lower' => array(8070)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8079, 'status' => 'F', 'lower' => array(7943, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8079, 'status' => 'S', 'lower' => array(8071)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8080, 'status' => 'F', 'lower' => array(7968, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8081, 'status' => 'F', 'lower' => array(7969, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8082, 'status' => 'F', 'lower' => array(7970, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8083, 'status' => 'F', 'lower' => array(7971, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8084, 'status' => 'F', 'lower' => array(7972, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8085, 'status' => 'F', 'lower' => array(7973, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8086, 'status' => 'F', 'lower' => array(7974, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8087, 'status' => 'F', 'lower' => array(7975, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8088, 'status' => 'F', 'lower' => array(7968, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8088, 'status' => 'S', 'lower' => array(8080)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8089, 'status' => 'F', 'lower' => array(7969, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8089, 'status' => 'S', 'lower' => array(8081)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8090, 'status' => 'F', 'lower' => array(7970, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8090, 'status' => 'S', 'lower' => array(8082)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8091, 'status' => 'F', 'lower' => array(7971, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8091, 'status' => 'S', 'lower' => array(8083)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8092, 'status' => 'F', 'lower' => array(7972, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8092, 'status' => 'S', 'lower' => array(8084)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8093, 'status' => 'F', 'lower' => array(7973, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8093, 'status' => 'S', 'lower' => array(8085)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8094, 'status' => 'F', 'lower' => array(7974, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8094, 'status' => 'S', 'lower' => array(8086)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8095, 'status' => 'F', 'lower' => array(7975, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8095, 'status' => 'S', 'lower' => array(8087)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8096, 'status' => 'F', 'lower' => array(8032, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8097, 'status' => 'F', 'lower' => array(8033, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8098, 'status' => 'F', 'lower' => array(8034, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8099, 'status' => 'F', 'lower' => array(8035, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8100, 'status' => 'F', 'lower' => array(8036, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8101, 'status' => 'F', 'lower' => array(8037, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8102, 'status' => 'F', 'lower' => array(8038, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8103, 'status' => 'F', 'lower' => array(8039, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8104, 'status' => 'F', 'lower' => array(8032, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8104, 'status' => 'S', 'lower' => array(8096)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8105, 'status' => 'F', 'lower' => array(8033, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8105, 'status' => 'S', 'lower' => array(8097)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8106, 'status' => 'F', 'lower' => array(8034, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8106, 'status' => 'S', 'lower' => array(8098)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8107, 'status' => 'F', 'lower' => array(8035, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8107, 'status' => 'S', 'lower' => array(8099)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8108, 'status' => 'F', 'lower' => array(8036, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8108, 'status' => 'S', 'lower' => array(8100)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8109, 'status' => 'F', 'lower' => array(8037, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8109, 'status' => 'S', 'lower' => array(8101)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8110, 'status' => 'F', 'lower' => array(8038, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8110, 'status' => 'S', 'lower' => array(8102)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8111, 'status' => 'F', 'lower' => array(8039, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8111, 'status' => 'S', 'lower' => array(8103)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8114, 'status' => 'F', 'lower' => array(8048, 953)); /* GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8115, 'status' => 'F', 'lower' => array(945, 953)); /* GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8116, 'status' => 'F', 'lower' => array(940, 953)); /* GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8118, 'status' => 'F', 'lower' => array(945, 834)); /* GREEK SMALL LETTER ALPHA WITH PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8119, 'status' => 'F', 'lower' => array(945, 834, 953)); /* GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8120, 'status' => 'C', 'lower' => array(8112)); /* GREEK CAPITAL LETTER ALPHA WITH VRACHY */
-$config['1f00_1fff'][] = array('upper' => 8121, 'status' => 'C', 'lower' => array(8113)); /* GREEK CAPITAL LETTER ALPHA WITH MACRON */
-$config['1f00_1fff'][] = array('upper' => 8122, 'status' => 'C', 'lower' => array(8048)); /* GREEK CAPITAL LETTER ALPHA WITH VARIA */
-$config['1f00_1fff'][] = array('upper' => 8123, 'status' => 'C', 'lower' => array(8049)); /* GREEK CAPITAL LETTER ALPHA WITH OXIA */
-$config['1f00_1fff'][] = array('upper' => 8124, 'status' => 'F', 'lower' => array(945, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8124, 'status' => 'S', 'lower' => array(8115)); /* GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8126, 'status' => 'C', 'lower' => array(953)); /* GREEK PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8130, 'status' => 'F', 'lower' => array(8052, 953)); /* GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8131, 'status' => 'F', 'lower' => array(951, 953)); /* GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8132, 'status' => 'F', 'lower' => array(942, 953)); /* GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8134, 'status' => 'F', 'lower' => array(951, 834)); /* GREEK SMALL LETTER ETA WITH PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8135, 'status' => 'F', 'lower' => array(951, 834, 953)); /* GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8136, 'status' => 'C', 'lower' => array(8050)); /* GREEK CAPITAL LETTER EPSILON WITH VARIA */
-$config['1f00_1fff'][] = array('upper' => 8137, 'status' => 'C', 'lower' => array(8051)); /* GREEK CAPITAL LETTER EPSILON WITH OXIA */
-$config['1f00_1fff'][] = array('upper' => 8138, 'status' => 'C', 'lower' => array(8052)); /* GREEK CAPITAL LETTER ETA WITH VARIA */
-$config['1f00_1fff'][] = array('upper' => 8139, 'status' => 'C', 'lower' => array(8053)); /* GREEK CAPITAL LETTER ETA WITH OXIA */
-$config['1f00_1fff'][] = array('upper' => 8140, 'status' => 'F', 'lower' => array(951, 953)); /* GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8140, 'status' => 'S', 'lower' => array(8131)); /* GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8146, 'status' => 'F', 'lower' => array(953, 776, 768)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8147, 'status' => 'F', 'lower' => array(953, 776, 769)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8150, 'status' => 'F', 'lower' => array(953, 834)); /* GREEK SMALL LETTER IOTA WITH PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8151, 'status' => 'F', 'lower' => array(953, 776, 834)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8152, 'status' => 'C', 'lower' => array(8144)); /* GREEK CAPITAL LETTER IOTA WITH VRACHY */
-$config['1f00_1fff'][] = array('upper' => 8153, 'status' => 'C', 'lower' => array(8145)); /* GREEK CAPITAL LETTER IOTA WITH MACRON */
-$config['1f00_1fff'][] = array('upper' => 8154, 'status' => 'C', 'lower' => array(8054)); /* GREEK CAPITAL LETTER IOTA WITH VARIA */
-$config['1f00_1fff'][] = array('upper' => 8155, 'status' => 'C', 'lower' => array(8055)); /* GREEK CAPITAL LETTER IOTA WITH OXIA */
-$config['1f00_1fff'][] = array('upper' => 8162, 'status' => 'F', 'lower' => array(965, 776, 768)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA */
-$config['1f00_1fff'][] = array('upper' => 8163, 'status' => 'F', 'lower' => array(965, 776, 769)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA */
-$config['1f00_1fff'][] = array('upper' => 8164, 'status' => 'F', 'lower' => array(961, 787)); /* GREEK SMALL LETTER RHO WITH PSILI */
-$config['1f00_1fff'][] = array('upper' => 8166, 'status' => 'F', 'lower' => array(965, 834)); /* GREEK SMALL LETTER UPSILON WITH PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8167, 'status' => 'F', 'lower' => array(965, 776, 834)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8168, 'status' => 'C', 'lower' => array(8160)); /* GREEK CAPITAL LETTER UPSILON WITH VRACHY */
-$config['1f00_1fff'][] = array('upper' => 8169, 'status' => 'C', 'lower' => array(8161)); /* GREEK CAPITAL LETTER UPSILON WITH MACRON */
-$config['1f00_1fff'][] = array('upper' => 8170, 'status' => 'C', 'lower' => array(8058)); /* GREEK CAPITAL LETTER UPSILON WITH VARIA */
-$config['1f00_1fff'][] = array('upper' => 8171, 'status' => 'C', 'lower' => array(8059)); /* GREEK CAPITAL LETTER UPSILON WITH OXIA */
-$config['1f00_1fff'][] = array('upper' => 8172, 'status' => 'C', 'lower' => array(8165)); /* GREEK CAPITAL LETTER RHO WITH DASIA */
-$config['1f00_1fff'][] = array('upper' => 8178, 'status' => 'F', 'lower' => array(8060, 953)); /* GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8179, 'status' => 'F', 'lower' => array(969, 953)); /* GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8180, 'status' => 'F', 'lower' => array(974, 953)); /* GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8182, 'status' => 'F', 'lower' => array(969, 834)); /* GREEK SMALL LETTER OMEGA WITH PERISPOMENI */
-$config['1f00_1fff'][] = array('upper' => 8183, 'status' => 'F', 'lower' => array(969, 834, 953)); /* GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8184, 'status' => 'C', 'lower' => array(8056)); /* GREEK CAPITAL LETTER OMICRON WITH VARIA */
-$config['1f00_1fff'][] = array('upper' => 8185, 'status' => 'C', 'lower' => array(8057)); /* GREEK CAPITAL LETTER OMICRON WITH OXIA */
-$config['1f00_1fff'][] = array('upper' => 8186, 'status' => 'C', 'lower' => array(8060)); /* GREEK CAPITAL LETTER OMEGA WITH VARIA */
-$config['1f00_1fff'][] = array('upper' => 8187, 'status' => 'C', 'lower' => array(8061)); /* GREEK CAPITAL LETTER OMEGA WITH OXIA */
-$config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'F', 'lower' => array(969, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */
-$config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'S', 'lower' => array(8179)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */
diff --git a/lib/Cake/Config/unicode/casefolding/2100_214f.php b/lib/Cake/Config/unicode/casefolding/2100_214f.php
deleted file mode 100644
index 77705ede8fb..00000000000
--- a/lib/Cake/Config/unicode/casefolding/2100_214f.php
+++ /dev/null
@@ -1,44 +0,0 @@
- 8486, 'status' => 'C', 'lower' => array(969)); /* OHM SIGN */
-$config['2100_214f'][] = array('upper' => 8490, 'status' => 'C', 'lower' => array(107)); /* KELVIN SIGN */
-$config['2100_214f'][] = array('upper' => 8491, 'status' => 'C', 'lower' => array(229)); /* ANGSTROM SIGN */
-$config['2100_214f'][] = array('upper' => 8498, 'status' => 'C', 'lower' => array(8526)); /* TURNED CAPITAL F */
diff --git a/lib/Cake/Config/unicode/casefolding/2150_218f.php b/lib/Cake/Config/unicode/casefolding/2150_218f.php
deleted file mode 100644
index 8821fbdea8b..00000000000
--- a/lib/Cake/Config/unicode/casefolding/2150_218f.php
+++ /dev/null
@@ -1,57 +0,0 @@
- 8544, 'status' => 'C', 'lower' => array(8560)); /* ROMAN NUMERAL ONE */
-$config['2150_218f'][] = array('upper' => 8545, 'status' => 'C', 'lower' => array(8561)); /* ROMAN NUMERAL TWO */
-$config['2150_218f'][] = array('upper' => 8546, 'status' => 'C', 'lower' => array(8562)); /* ROMAN NUMERAL THREE */
-$config['2150_218f'][] = array('upper' => 8547, 'status' => 'C', 'lower' => array(8563)); /* ROMAN NUMERAL FOUR */
-$config['2150_218f'][] = array('upper' => 8548, 'status' => 'C', 'lower' => array(8564)); /* ROMAN NUMERAL FIVE */
-$config['2150_218f'][] = array('upper' => 8549, 'status' => 'C', 'lower' => array(8565)); /* ROMAN NUMERAL SIX */
-$config['2150_218f'][] = array('upper' => 8550, 'status' => 'C', 'lower' => array(8566)); /* ROMAN NUMERAL SEVEN */
-$config['2150_218f'][] = array('upper' => 8551, 'status' => 'C', 'lower' => array(8567)); /* ROMAN NUMERAL EIGHT */
-$config['2150_218f'][] = array('upper' => 8552, 'status' => 'C', 'lower' => array(8568)); /* ROMAN NUMERAL NINE */
-$config['2150_218f'][] = array('upper' => 8553, 'status' => 'C', 'lower' => array(8569)); /* ROMAN NUMERAL TEN */
-$config['2150_218f'][] = array('upper' => 8554, 'status' => 'C', 'lower' => array(8570)); /* ROMAN NUMERAL ELEVEN */
-$config['2150_218f'][] = array('upper' => 8555, 'status' => 'C', 'lower' => array(8571)); /* ROMAN NUMERAL TWELVE */
-$config['2150_218f'][] = array('upper' => 8556, 'status' => 'C', 'lower' => array(8572)); /* ROMAN NUMERAL FIFTY */
-$config['2150_218f'][] = array('upper' => 8557, 'status' => 'C', 'lower' => array(8573)); /* ROMAN NUMERAL ONE HUNDRED */
-$config['2150_218f'][] = array('upper' => 8558, 'status' => 'C', 'lower' => array(8574)); /* ROMAN NUMERAL FIVE HUNDRED */
-$config['2150_218f'][] = array('upper' => 8559, 'status' => 'C', 'lower' => array(8575)); /* ROMAN NUMERAL ONE THOUSAND */
-$config['2150_218f'][] = array('upper' => 8579, 'status' => 'C', 'lower' => array(8580)); /* ROMAN NUMERAL REVERSED ONE HUNDRED */
diff --git a/lib/Cake/Config/unicode/casefolding/2460_24ff.php b/lib/Cake/Config/unicode/casefolding/2460_24ff.php
deleted file mode 100644
index 08b26159444..00000000000
--- a/lib/Cake/Config/unicode/casefolding/2460_24ff.php
+++ /dev/null
@@ -1,66 +0,0 @@
- 9398, 'status' => 'C', 'lower' => array(9424)); /* CIRCLED LATIN CAPITAL LETTER A */
-$config['2460_24ff'][] = array('upper' => 9399, 'status' => 'C', 'lower' => array(9425)); /* CIRCLED LATIN CAPITAL LETTER B */
-$config['2460_24ff'][] = array('upper' => 9400, 'status' => 'C', 'lower' => array(9426)); /* CIRCLED LATIN CAPITAL LETTER C */
-$config['2460_24ff'][] = array('upper' => 9401, 'status' => 'C', 'lower' => array(9427)); /* CIRCLED LATIN CAPITAL LETTER D */
-$config['2460_24ff'][] = array('upper' => 9402, 'status' => 'C', 'lower' => array(9428)); /* CIRCLED LATIN CAPITAL LETTER E */
-$config['2460_24ff'][] = array('upper' => 9403, 'status' => 'C', 'lower' => array(9429)); /* CIRCLED LATIN CAPITAL LETTER F */
-$config['2460_24ff'][] = array('upper' => 9404, 'status' => 'C', 'lower' => array(9430)); /* CIRCLED LATIN CAPITAL LETTER G */
-$config['2460_24ff'][] = array('upper' => 9405, 'status' => 'C', 'lower' => array(9431)); /* CIRCLED LATIN CAPITAL LETTER H */
-$config['2460_24ff'][] = array('upper' => 9406, 'status' => 'C', 'lower' => array(9432)); /* CIRCLED LATIN CAPITAL LETTER I */
-$config['2460_24ff'][] = array('upper' => 9407, 'status' => 'C', 'lower' => array(9433)); /* CIRCLED LATIN CAPITAL LETTER J */
-$config['2460_24ff'][] = array('upper' => 9408, 'status' => 'C', 'lower' => array(9434)); /* CIRCLED LATIN CAPITAL LETTER K */
-$config['2460_24ff'][] = array('upper' => 9409, 'status' => 'C', 'lower' => array(9435)); /* CIRCLED LATIN CAPITAL LETTER L */
-$config['2460_24ff'][] = array('upper' => 9410, 'status' => 'C', 'lower' => array(9436)); /* CIRCLED LATIN CAPITAL LETTER M */
-$config['2460_24ff'][] = array('upper' => 9411, 'status' => 'C', 'lower' => array(9437)); /* CIRCLED LATIN CAPITAL LETTER N */
-$config['2460_24ff'][] = array('upper' => 9412, 'status' => 'C', 'lower' => array(9438)); /* CIRCLED LATIN CAPITAL LETTER O */
-$config['2460_24ff'][] = array('upper' => 9413, 'status' => 'C', 'lower' => array(9439)); /* CIRCLED LATIN CAPITAL LETTER P */
-$config['2460_24ff'][] = array('upper' => 9414, 'status' => 'C', 'lower' => array(9440)); /* CIRCLED LATIN CAPITAL LETTER Q */
-$config['2460_24ff'][] = array('upper' => 9415, 'status' => 'C', 'lower' => array(9441)); /* CIRCLED LATIN CAPITAL LETTER R */
-$config['2460_24ff'][] = array('upper' => 9416, 'status' => 'C', 'lower' => array(9442)); /* CIRCLED LATIN CAPITAL LETTER S */
-$config['2460_24ff'][] = array('upper' => 9417, 'status' => 'C', 'lower' => array(9443)); /* CIRCLED LATIN CAPITAL LETTER T */
-$config['2460_24ff'][] = array('upper' => 9418, 'status' => 'C', 'lower' => array(9444)); /* CIRCLED LATIN CAPITAL LETTER U */
-$config['2460_24ff'][] = array('upper' => 9419, 'status' => 'C', 'lower' => array(9445)); /* CIRCLED LATIN CAPITAL LETTER V */
-$config['2460_24ff'][] = array('upper' => 9420, 'status' => 'C', 'lower' => array(9446)); /* CIRCLED LATIN CAPITAL LETTER W */
-$config['2460_24ff'][] = array('upper' => 9421, 'status' => 'C', 'lower' => array(9447)); /* CIRCLED LATIN CAPITAL LETTER X */
-$config['2460_24ff'][] = array('upper' => 9422, 'status' => 'C', 'lower' => array(9448)); /* CIRCLED LATIN CAPITAL LETTER Y */
-$config['2460_24ff'][] = array('upper' => 9423, 'status' => 'C', 'lower' => array(9449)); /* CIRCLED LATIN CAPITAL LETTER Z */
diff --git a/lib/Cake/Config/unicode/casefolding/2c00_2c5f.php b/lib/Cake/Config/unicode/casefolding/2c00_2c5f.php
deleted file mode 100644
index 185f39011ab..00000000000
--- a/lib/Cake/Config/unicode/casefolding/2c00_2c5f.php
+++ /dev/null
@@ -1,87 +0,0 @@
- 11264, 'status' => 'C', 'lower' => array(11312)); /* GLAGOLITIC CAPITAL LETTER AZU */
-$config['2c00_2c5f'][] = array('upper' => 11265, 'status' => 'C', 'lower' => array(11313)); /* GLAGOLITIC CAPITAL LETTER BUKY */
-$config['2c00_2c5f'][] = array('upper' => 11266, 'status' => 'C', 'lower' => array(11314)); /* GLAGOLITIC CAPITAL LETTER VEDE */
-$config['2c00_2c5f'][] = array('upper' => 11267, 'status' => 'C', 'lower' => array(11315)); /* GLAGOLITIC CAPITAL LETTER GLAGOLI */
-$config['2c00_2c5f'][] = array('upper' => 11268, 'status' => 'C', 'lower' => array(11316)); /* GLAGOLITIC CAPITAL LETTER DOBRO */
-$config['2c00_2c5f'][] = array('upper' => 11269, 'status' => 'C', 'lower' => array(11317)); /* GLAGOLITIC CAPITAL LETTER YESTU */
-$config['2c00_2c5f'][] = array('upper' => 11270, 'status' => 'C', 'lower' => array(11318)); /* GLAGOLITIC CAPITAL LETTER ZHIVETE */
-$config['2c00_2c5f'][] = array('upper' => 11271, 'status' => 'C', 'lower' => array(11319)); /* GLAGOLITIC CAPITAL LETTER DZELO */
-$config['2c00_2c5f'][] = array('upper' => 11272, 'status' => 'C', 'lower' => array(11320)); /* GLAGOLITIC CAPITAL LETTER ZEMLJA */
-$config['2c00_2c5f'][] = array('upper' => 11273, 'status' => 'C', 'lower' => array(11321)); /* GLAGOLITIC CAPITAL LETTER IZHE */
-$config['2c00_2c5f'][] = array('upper' => 11274, 'status' => 'C', 'lower' => array(11322)); /* GLAGOLITIC CAPITAL LETTER INITIAL IZHE */
-$config['2c00_2c5f'][] = array('upper' => 11275, 'status' => 'C', 'lower' => array(11323)); /* GLAGOLITIC CAPITAL LETTER I */
-$config['2c00_2c5f'][] = array('upper' => 11276, 'status' => 'C', 'lower' => array(11324)); /* GLAGOLITIC CAPITAL LETTER DJERVI */
-$config['2c00_2c5f'][] = array('upper' => 11277, 'status' => 'C', 'lower' => array(11325)); /* GLAGOLITIC CAPITAL LETTER KAKO */
-$config['2c00_2c5f'][] = array('upper' => 11278, 'status' => 'C', 'lower' => array(11326)); /* GLAGOLITIC CAPITAL LETTER LJUDIJE */
-$config['2c00_2c5f'][] = array('upper' => 11279, 'status' => 'C', 'lower' => array(11327)); /* GLAGOLITIC CAPITAL LETTER MYSLITE */
-$config['2c00_2c5f'][] = array('upper' => 11280, 'status' => 'C', 'lower' => array(11328)); /* GLAGOLITIC CAPITAL LETTER NASHI */
-$config['2c00_2c5f'][] = array('upper' => 11281, 'status' => 'C', 'lower' => array(11329)); /* GLAGOLITIC CAPITAL LETTER ONU */
-$config['2c00_2c5f'][] = array('upper' => 11282, 'status' => 'C', 'lower' => array(11330)); /* GLAGOLITIC CAPITAL LETTER POKOJI */
-$config['2c00_2c5f'][] = array('upper' => 11283, 'status' => 'C', 'lower' => array(11331)); /* GLAGOLITIC CAPITAL LETTER RITSI */
-$config['2c00_2c5f'][] = array('upper' => 11284, 'status' => 'C', 'lower' => array(11332)); /* GLAGOLITIC CAPITAL LETTER SLOVO */
-$config['2c00_2c5f'][] = array('upper' => 11285, 'status' => 'C', 'lower' => array(11333)); /* GLAGOLITIC CAPITAL LETTER TVRIDO */
-$config['2c00_2c5f'][] = array('upper' => 11286, 'status' => 'C', 'lower' => array(11334)); /* GLAGOLITIC CAPITAL LETTER UKU */
-$config['2c00_2c5f'][] = array('upper' => 11287, 'status' => 'C', 'lower' => array(11335)); /* GLAGOLITIC CAPITAL LETTER FRITU */
-$config['2c00_2c5f'][] = array('upper' => 11288, 'status' => 'C', 'lower' => array(11336)); /* GLAGOLITIC CAPITAL LETTER HERU */
-$config['2c00_2c5f'][] = array('upper' => 11289, 'status' => 'C', 'lower' => array(11337)); /* GLAGOLITIC CAPITAL LETTER OTU */
-$config['2c00_2c5f'][] = array('upper' => 11290, 'status' => 'C', 'lower' => array(11338)); /* GLAGOLITIC CAPITAL LETTER PE */
-$config['2c00_2c5f'][] = array('upper' => 11291, 'status' => 'C', 'lower' => array(11339)); /* GLAGOLITIC CAPITAL LETTER SHTA */
-$config['2c00_2c5f'][] = array('upper' => 11292, 'status' => 'C', 'lower' => array(11340)); /* GLAGOLITIC CAPITAL LETTER TSI */
-$config['2c00_2c5f'][] = array('upper' => 11293, 'status' => 'C', 'lower' => array(11341)); /* GLAGOLITIC CAPITAL LETTER CHRIVI */
-$config['2c00_2c5f'][] = array('upper' => 11294, 'status' => 'C', 'lower' => array(11342)); /* GLAGOLITIC CAPITAL LETTER SHA */
-$config['2c00_2c5f'][] = array('upper' => 11295, 'status' => 'C', 'lower' => array(11343)); /* GLAGOLITIC CAPITAL LETTER YERU */
-$config['2c00_2c5f'][] = array('upper' => 11296, 'status' => 'C', 'lower' => array(11344)); /* GLAGOLITIC CAPITAL LETTER YERI */
-$config['2c00_2c5f'][] = array('upper' => 11297, 'status' => 'C', 'lower' => array(11345)); /* GLAGOLITIC CAPITAL LETTER YATI */
-$config['2c00_2c5f'][] = array('upper' => 11298, 'status' => 'C', 'lower' => array(11346)); /* GLAGOLITIC CAPITAL LETTER SPIDERY HA */
-$config['2c00_2c5f'][] = array('upper' => 11299, 'status' => 'C', 'lower' => array(11347)); /* GLAGOLITIC CAPITAL LETTER YU */
-$config['2c00_2c5f'][] = array('upper' => 11300, 'status' => 'C', 'lower' => array(11348)); /* GLAGOLITIC CAPITAL LETTER SMALL YUS */
-$config['2c00_2c5f'][] = array('upper' => 11301, 'status' => 'C', 'lower' => array(11349)); /* GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL */
-$config['2c00_2c5f'][] = array('upper' => 11302, 'status' => 'C', 'lower' => array(11350)); /* GLAGOLITIC CAPITAL LETTER YO */
-$config['2c00_2c5f'][] = array('upper' => 11303, 'status' => 'C', 'lower' => array(11351)); /* GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS */
-$config['2c00_2c5f'][] = array('upper' => 11304, 'status' => 'C', 'lower' => array(11352)); /* GLAGOLITIC CAPITAL LETTER BIG YUS */
-$config['2c00_2c5f'][] = array('upper' => 11305, 'status' => 'C', 'lower' => array(11353)); /* GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS */
-$config['2c00_2c5f'][] = array('upper' => 11306, 'status' => 'C', 'lower' => array(11354)); /* GLAGOLITIC CAPITAL LETTER FITA */
-$config['2c00_2c5f'][] = array('upper' => 11307, 'status' => 'C', 'lower' => array(11355)); /* GLAGOLITIC CAPITAL LETTER IZHITSA */
-$config['2c00_2c5f'][] = array('upper' => 11308, 'status' => 'C', 'lower' => array(11356)); /* GLAGOLITIC CAPITAL LETTER SHTAPIC */
-$config['2c00_2c5f'][] = array('upper' => 11309, 'status' => 'C', 'lower' => array(11357)); /* GLAGOLITIC CAPITAL LETTER TROKUTASTI A */
-$config['2c00_2c5f'][] = array('upper' => 11310, 'status' => 'C', 'lower' => array(11358)); /* GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE */
diff --git a/lib/Cake/Config/unicode/casefolding/2c60_2c7f.php b/lib/Cake/Config/unicode/casefolding/2c60_2c7f.php
deleted file mode 100644
index f0f1e906673..00000000000
--- a/lib/Cake/Config/unicode/casefolding/2c60_2c7f.php
+++ /dev/null
@@ -1,48 +0,0 @@
- 11360, 'status' => 'C', 'lower' => array(11361)); /* LATIN CAPITAL LETTER L WITH DOUBLE BAR */
-$config['2c60_2c7f'][] = array('upper' => 11362, 'status' => 'C', 'lower' => array(619)); /* LATIN CAPITAL LETTER L WITH MIDDLE TILDE */
-$config['2c60_2c7f'][] = array('upper' => 11363, 'status' => 'C', 'lower' => array(7549)); /* LATIN CAPITAL LETTER P WITH STROKE */
-$config['2c60_2c7f'][] = array('upper' => 11364, 'status' => 'C', 'lower' => array(637)); /* LATIN CAPITAL LETTER R WITH TAIL */
-$config['2c60_2c7f'][] = array('upper' => 11367, 'status' => 'C', 'lower' => array(11368)); /* LATIN CAPITAL LETTER H WITH DESCENDER */
-$config['2c60_2c7f'][] = array('upper' => 11369, 'status' => 'C', 'lower' => array(11370)); /* LATIN CAPITAL LETTER K WITH DESCENDER */
-$config['2c60_2c7f'][] = array('upper' => 11371, 'status' => 'C', 'lower' => array(11372)); /* LATIN CAPITAL LETTER Z WITH DESCENDER */
-$config['2c60_2c7f'][] = array('upper' => 11381, 'status' => 'C', 'lower' => array(11382)); /* LATIN CAPITAL LETTER HALF H */
diff --git a/lib/Cake/Config/unicode/casefolding/2c80_2cff.php b/lib/Cake/Config/unicode/casefolding/2c80_2cff.php
deleted file mode 100644
index c073a534f2f..00000000000
--- a/lib/Cake/Config/unicode/casefolding/2c80_2cff.php
+++ /dev/null
@@ -1,90 +0,0 @@
- 11392, 'status' => 'C', 'lower' => array(11393)); /* COPTIC CAPITAL LETTER ALFA */
-$config['2c80_2cff'][] = array('upper' => 11394, 'status' => 'C', 'lower' => array(11395)); /* COPTIC CAPITAL LETTER VIDA */
-$config['2c80_2cff'][] = array('upper' => 11396, 'status' => 'C', 'lower' => array(11397)); /* COPTIC CAPITAL LETTER GAMMA */
-$config['2c80_2cff'][] = array('upper' => 11398, 'status' => 'C', 'lower' => array(11399)); /* COPTIC CAPITAL LETTER DALDA */
-$config['2c80_2cff'][] = array('upper' => 11400, 'status' => 'C', 'lower' => array(11401)); /* COPTIC CAPITAL LETTER EIE */
-$config['2c80_2cff'][] = array('upper' => 11402, 'status' => 'C', 'lower' => array(11403)); /* COPTIC CAPITAL LETTER SOU */
-$config['2c80_2cff'][] = array('upper' => 11404, 'status' => 'C', 'lower' => array(11405)); /* COPTIC CAPITAL LETTER ZATA */
-$config['2c80_2cff'][] = array('upper' => 11406, 'status' => 'C', 'lower' => array(11407)); /* COPTIC CAPITAL LETTER HATE */
-$config['2c80_2cff'][] = array('upper' => 11408, 'status' => 'C', 'lower' => array(11409)); /* COPTIC CAPITAL LETTER THETHE */
-$config['2c80_2cff'][] = array('upper' => 11410, 'status' => 'C', 'lower' => array(11411)); /* COPTIC CAPITAL LETTER IAUDA */
-$config['2c80_2cff'][] = array('upper' => 11412, 'status' => 'C', 'lower' => array(11413)); /* COPTIC CAPITAL LETTER KAPA */
-$config['2c80_2cff'][] = array('upper' => 11414, 'status' => 'C', 'lower' => array(11415)); /* COPTIC CAPITAL LETTER LAULA */
-$config['2c80_2cff'][] = array('upper' => 11416, 'status' => 'C', 'lower' => array(11417)); /* COPTIC CAPITAL LETTER MI */
-$config['2c80_2cff'][] = array('upper' => 11418, 'status' => 'C', 'lower' => array(11419)); /* COPTIC CAPITAL LETTER NI */
-$config['2c80_2cff'][] = array('upper' => 11420, 'status' => 'C', 'lower' => array(11421)); /* COPTIC CAPITAL LETTER KSI */
-$config['2c80_2cff'][] = array('upper' => 11422, 'status' => 'C', 'lower' => array(11423)); /* COPTIC CAPITAL LETTER O */
-$config['2c80_2cff'][] = array('upper' => 11424, 'status' => 'C', 'lower' => array(11425)); /* COPTIC CAPITAL LETTER PI */
-$config['2c80_2cff'][] = array('upper' => 11426, 'status' => 'C', 'lower' => array(11427)); /* COPTIC CAPITAL LETTER RO */
-$config['2c80_2cff'][] = array('upper' => 11428, 'status' => 'C', 'lower' => array(11429)); /* COPTIC CAPITAL LETTER SIMA */
-$config['2c80_2cff'][] = array('upper' => 11430, 'status' => 'C', 'lower' => array(11431)); /* COPTIC CAPITAL LETTER TAU */
-$config['2c80_2cff'][] = array('upper' => 11432, 'status' => 'C', 'lower' => array(11433)); /* COPTIC CAPITAL LETTER UA */
-$config['2c80_2cff'][] = array('upper' => 11434, 'status' => 'C', 'lower' => array(11435)); /* COPTIC CAPITAL LETTER FI */
-$config['2c80_2cff'][] = array('upper' => 11436, 'status' => 'C', 'lower' => array(11437)); /* COPTIC CAPITAL LETTER KHI */
-$config['2c80_2cff'][] = array('upper' => 11438, 'status' => 'C', 'lower' => array(11439)); /* COPTIC CAPITAL LETTER PSI */
-$config['2c80_2cff'][] = array('upper' => 11440, 'status' => 'C', 'lower' => array(11441)); /* COPTIC CAPITAL LETTER OOU */
-$config['2c80_2cff'][] = array('upper' => 11442, 'status' => 'C', 'lower' => array(11443)); /* COPTIC CAPITAL LETTER DIALECT-P ALEF */
-$config['2c80_2cff'][] = array('upper' => 11444, 'status' => 'C', 'lower' => array(11445)); /* COPTIC CAPITAL LETTER OLD COPTIC AIN */
-$config['2c80_2cff'][] = array('upper' => 11446, 'status' => 'C', 'lower' => array(11447)); /* COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE */
-$config['2c80_2cff'][] = array('upper' => 11448, 'status' => 'C', 'lower' => array(11449)); /* COPTIC CAPITAL LETTER DIALECT-P KAPA */
-$config['2c80_2cff'][] = array('upper' => 11450, 'status' => 'C', 'lower' => array(11451)); /* COPTIC CAPITAL LETTER DIALECT-P NI */
-$config['2c80_2cff'][] = array('upper' => 11452, 'status' => 'C', 'lower' => array(11453)); /* COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI */
-$config['2c80_2cff'][] = array('upper' => 11454, 'status' => 'C', 'lower' => array(11455)); /* COPTIC CAPITAL LETTER OLD COPTIC OOU */
-$config['2c80_2cff'][] = array('upper' => 11456, 'status' => 'C', 'lower' => array(11457)); /* COPTIC CAPITAL LETTER SAMPI */
-$config['2c80_2cff'][] = array('upper' => 11458, 'status' => 'C', 'lower' => array(11459)); /* COPTIC CAPITAL LETTER CROSSED SHEI */
-$config['2c80_2cff'][] = array('upper' => 11460, 'status' => 'C', 'lower' => array(11461)); /* COPTIC CAPITAL LETTER OLD COPTIC SHEI */
-$config['2c80_2cff'][] = array('upper' => 11462, 'status' => 'C', 'lower' => array(11463)); /* COPTIC CAPITAL LETTER OLD COPTIC ESH */
-$config['2c80_2cff'][] = array('upper' => 11464, 'status' => 'C', 'lower' => array(11465)); /* COPTIC CAPITAL LETTER AKHMIMIC KHEI */
-$config['2c80_2cff'][] = array('upper' => 11466, 'status' => 'C', 'lower' => array(11467)); /* COPTIC CAPITAL LETTER DIALECT-P HORI */
-$config['2c80_2cff'][] = array('upper' => 11468, 'status' => 'C', 'lower' => array(11469)); /* COPTIC CAPITAL LETTER OLD COPTIC HORI */
-$config['2c80_2cff'][] = array('upper' => 11470, 'status' => 'C', 'lower' => array(11471)); /* COPTIC CAPITAL LETTER OLD COPTIC HA */
-$config['2c80_2cff'][] = array('upper' => 11472, 'status' => 'C', 'lower' => array(11473)); /* COPTIC CAPITAL LETTER L-SHAPED HA */
-$config['2c80_2cff'][] = array('upper' => 11474, 'status' => 'C', 'lower' => array(11475)); /* COPTIC CAPITAL LETTER OLD COPTIC HEI */
-$config['2c80_2cff'][] = array('upper' => 11476, 'status' => 'C', 'lower' => array(11477)); /* COPTIC CAPITAL LETTER OLD COPTIC HAT */
-$config['2c80_2cff'][] = array('upper' => 11478, 'status' => 'C', 'lower' => array(11479)); /* COPTIC CAPITAL LETTER OLD COPTIC GANGIA */
-$config['2c80_2cff'][] = array('upper' => 11480, 'status' => 'C', 'lower' => array(11481)); /* COPTIC CAPITAL LETTER OLD COPTIC DJA */
-$config['2c80_2cff'][] = array('upper' => 11482, 'status' => 'C', 'lower' => array(11483)); /* COPTIC CAPITAL LETTER OLD COPTIC SHIMA */
-$config['2c80_2cff'][] = array('upper' => 11484, 'status' => 'C', 'lower' => array(11485)); /* COPTIC CAPITAL LETTER OLD NUBIAN SHIMA */
-$config['2c80_2cff'][] = array('upper' => 11486, 'status' => 'C', 'lower' => array(11487)); /* COPTIC CAPITAL LETTER OLD NUBIAN NGI */
-$config['2c80_2cff'][] = array('upper' => 11488, 'status' => 'C', 'lower' => array(11489)); /* COPTIC CAPITAL LETTER OLD NUBIAN NYI */
-$config['2c80_2cff'][] = array('upper' => 11490, 'status' => 'C', 'lower' => array(11491)); /* COPTIC CAPITAL LETTER OLD NUBIAN WAU */
diff --git a/lib/Cake/Config/unicode/casefolding/ff00_ffef.php b/lib/Cake/Config/unicode/casefolding/ff00_ffef.php
deleted file mode 100644
index 22d7a2d4686..00000000000
--- a/lib/Cake/Config/unicode/casefolding/ff00_ffef.php
+++ /dev/null
@@ -1,66 +0,0 @@
- 65313, 'status' => 'C', 'lower' => array(65345)); /* FULLWIDTH LATIN CAPITAL LETTER A */
-$config['ff00_ffef'][] = array('upper' => 65314, 'status' => 'C', 'lower' => array(65346)); /* FULLWIDTH LATIN CAPITAL LETTER B */
-$config['ff00_ffef'][] = array('upper' => 65315, 'status' => 'C', 'lower' => array(65347)); /* FULLWIDTH LATIN CAPITAL LETTER C */
-$config['ff00_ffef'][] = array('upper' => 65316, 'status' => 'C', 'lower' => array(65348)); /* FULLWIDTH LATIN CAPITAL LETTER D */
-$config['ff00_ffef'][] = array('upper' => 65317, 'status' => 'C', 'lower' => array(65349)); /* FULLWIDTH LATIN CAPITAL LETTER E */
-$config['ff00_ffef'][] = array('upper' => 65318, 'status' => 'C', 'lower' => array(65350)); /* FULLWIDTH LATIN CAPITAL LETTER F */
-$config['ff00_ffef'][] = array('upper' => 65319, 'status' => 'C', 'lower' => array(65351)); /* FULLWIDTH LATIN CAPITAL LETTER G */
-$config['ff00_ffef'][] = array('upper' => 65320, 'status' => 'C', 'lower' => array(65352)); /* FULLWIDTH LATIN CAPITAL LETTER H */
-$config['ff00_ffef'][] = array('upper' => 65321, 'status' => 'C', 'lower' => array(65353)); /* FULLWIDTH LATIN CAPITAL LETTER I */
-$config['ff00_ffef'][] = array('upper' => 65322, 'status' => 'C', 'lower' => array(65354)); /* FULLWIDTH LATIN CAPITAL LETTER J */
-$config['ff00_ffef'][] = array('upper' => 65323, 'status' => 'C', 'lower' => array(65355)); /* FULLWIDTH LATIN CAPITAL LETTER K */
-$config['ff00_ffef'][] = array('upper' => 65324, 'status' => 'C', 'lower' => array(65356)); /* FULLWIDTH LATIN CAPITAL LETTER L */
-$config['ff00_ffef'][] = array('upper' => 65325, 'status' => 'C', 'lower' => array(65357)); /* FULLWIDTH LATIN CAPITAL LETTER M */
-$config['ff00_ffef'][] = array('upper' => 65326, 'status' => 'C', 'lower' => array(65358)); /* FULLWIDTH LATIN CAPITAL LETTER N */
-$config['ff00_ffef'][] = array('upper' => 65327, 'status' => 'C', 'lower' => array(65359)); /* FULLWIDTH LATIN CAPITAL LETTER O */
-$config['ff00_ffef'][] = array('upper' => 65328, 'status' => 'C', 'lower' => array(65360)); /* FULLWIDTH LATIN CAPITAL LETTER P */
-$config['ff00_ffef'][] = array('upper' => 65329, 'status' => 'C', 'lower' => array(65361)); /* FULLWIDTH LATIN CAPITAL LETTER Q */
-$config['ff00_ffef'][] = array('upper' => 65330, 'status' => 'C', 'lower' => array(65362)); /* FULLWIDTH LATIN CAPITAL LETTER R */
-$config['ff00_ffef'][] = array('upper' => 65331, 'status' => 'C', 'lower' => array(65363)); /* FULLWIDTH LATIN CAPITAL LETTER S */
-$config['ff00_ffef'][] = array('upper' => 65332, 'status' => 'C', 'lower' => array(65364)); /* FULLWIDTH LATIN CAPITAL LETTER T */
-$config['ff00_ffef'][] = array('upper' => 65333, 'status' => 'C', 'lower' => array(65365)); /* FULLWIDTH LATIN CAPITAL LETTER U */
-$config['ff00_ffef'][] = array('upper' => 65334, 'status' => 'C', 'lower' => array(65366)); /* FULLWIDTH LATIN CAPITAL LETTER V */
-$config['ff00_ffef'][] = array('upper' => 65335, 'status' => 'C', 'lower' => array(65367)); /* FULLWIDTH LATIN CAPITAL LETTER W */
-$config['ff00_ffef'][] = array('upper' => 65336, 'status' => 'C', 'lower' => array(65368)); /* FULLWIDTH LATIN CAPITAL LETTER X */
-$config['ff00_ffef'][] = array('upper' => 65337, 'status' => 'C', 'lower' => array(65369)); /* FULLWIDTH LATIN CAPITAL LETTER Y */
-$config['ff00_ffef'][] = array('upper' => 65338, 'status' => 'C', 'lower' => array(65370)); /* FULLWIDTH LATIN CAPITAL LETTER Z */
diff --git a/lib/Cake/Configure/ConfigReaderInterface.php b/lib/Cake/Configure/ConfigReaderInterface.php
deleted file mode 100644
index f1373550519..00000000000
--- a/lib/Cake/Configure/ConfigReaderInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
- array('password' => 'secret'))`
- *
- * You can nest properties as deeply as needed using `.`'s. In addition to using `.` you
- * can use standard ini section notation to create nested structures:
- *
- * {{{
- * [section]
- * key = value
- * }}}
- *
- * Once loaded into Configure, the above would be accessed using:
- *
- * `Configure::read('section.key');
- *
- * You can combine `.` separated values with sections to create more deeply
- * nested structures.
- *
- * IniReader also manipulates how the special ini values of
- * 'yes', 'no', 'on', 'off', 'null' are handled. These values will be
- * converted to their boolean equivalents.
- *
- * @package Cake.Configure
- * @see http://php.net/parse_ini_file
- */
-class IniReader implements ConfigReaderInterface {
-
-/**
- * The path to read ini files from.
- *
- * @var array
- */
- protected $_path;
-
-/**
- * The section to read, if null all sections will be read.
- *
- * @var string
- */
- protected $_section;
-
-/**
- * Build and construct a new ini file parser. The parser can be used to read
- * ini files that are on the filesystem.
- *
- * @param string $path Path to load ini config files from.
- * @param string $section Only get one section, leave null to parse and fetch
- * all sections in the ini file.
- */
- public function __construct($path, $section = null) {
- $this->_path = $path;
- $this->_section = $section;
- }
-
-/**
- * Read an ini file and return the results as an array.
- *
- * @param string $file Name of the file to read. The chosen file
- * must be on the reader's path.
- * @return array
- * @throws ConfigureException
- */
- public function read($file) {
- $filename = $this->_path . $file;
- if (!file_exists($filename)) {
- $filename .= '.ini';
- if (!file_exists($filename)) {
- throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename));
- }
- }
- $contents = parse_ini_file($filename, true);
- if (!empty($this->_section) && isset($contents[$this->_section])) {
- $values = $this->_parseNestedValues($contents[$this->_section]);
- } else {
- $values = array();
- foreach ($contents as $section => $attribs) {
- if (is_array($attribs)) {
- $values[$section] = $this->_parseNestedValues($attribs);
- } else {
- $parse = $this->_parseNestedValues(array($attribs));
- $values[$section] = array_shift($parse);
- }
- }
- }
- return $values;
- }
-
-/**
- * parses nested values out of keys.
- *
- * @param array $values Values to be exploded.
- * @return array Array of values exploded
- */
- protected function _parseNestedValues($values) {
- foreach ($values as $key => $value) {
- if ($value === '1') {
- $value = true;
- }
- if ($value === '') {
- $value = false;
- }
- if (strpos($key, '.') !== false) {
- $values = Set::insert($values, $key, $value);
- } else {
- $values[$key] = $value;
- }
- }
- return $values;
- }
-
-}
diff --git a/lib/Cake/Configure/PhpReader.php b/lib/Cake/Configure/PhpReader.php
deleted file mode 100644
index 2043351b88b..00000000000
--- a/lib/Cake/Configure/PhpReader.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice
- *
- * @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://book.cakephp.org/2.0/en/development/configuration.html#loading-configuration-files CakePHP(tm) Configuration
- * @package Cake.Configure
- * @since CakePHP(tm) v 2.0
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-
-/**
- * PHP Reader allows Configure to load configuration values from
- * files containing simple PHP arrays.
- *
- * Files compatible with PhpReader should define a `$config` variable, that
- * contains all of the configuration data contained in the file.
- *
- * @package Cake.Configure
- */
-class PhpReader implements ConfigReaderInterface {
-
-/**
- * The path this reader finds files on.
- *
- * @var string
- */
- protected $_path = null;
-
-/**
- * Constructor for PHP Config file reading.
- *
- * @param string $path The path to read config files from. Defaults to APP . 'Config' . DS
- */
- public function __construct($path = null) {
- if (!$path) {
- $path = APP . 'Config' . DS;
- }
- $this->_path = $path;
- }
-
-/**
- * Read a config file and return its contents.
- *
- * Files with `.` in the name will be treated as values in plugins. Instead of reading from
- * the initialized path, plugin keys will be located using App::pluginPath().
- *
- * @param string $key The identifier to read from. If the key has a . it will be treated
- * as a plugin prefix.
- * @return array Parsed configuration values.
- * @throws ConfigureException when files don't exist or they don't contain `$config`.
- * Or when files contain '..' as this could lead to abusive reads.
- */
- public function read($key) {
- if (strpos($key, '..') !== false) {
- throw new ConfigureException(__d('cake_dev', 'Cannot load configuration files with ../ in them.'));
- }
- if (substr($key, -4) === '.php') {
- $key = substr($key, 0, -4);
- }
- list($plugin, $key) = pluginSplit($key);
-
- if ($plugin) {
- $file = App::pluginPath($plugin) . 'Config' . DS . $key;
- } else {
- $file = $this->_path . $key;
- }
- $file .= '.php';
- if (!is_file($file)) {
- if (!is_file(substr($file, 0, -4))) {
- throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', $file, substr($file, 0, -4)));
- }
- }
- include $file;
- if (!isset($config)) {
- throw new ConfigureException(
- sprintf(__d('cake_dev', 'No variable $config found in %s.php'), $file)
- );
- }
- return $config;
- }
-
-}
diff --git a/lib/Cake/Console/Command/AclShell.php b/lib/Cake/Console/Command/AclShell.php
deleted file mode 100644
index a935f6b2a1c..00000000000
--- a/lib/Cake/Console/Command/AclShell.php
+++ /dev/null
@@ -1,608 +0,0 @@
-params['connection'])) {
- $this->connection = $this->params['connection'];
- }
-
- if (!in_array(Configure::read('Acl.classname'), array('DbAcl', 'DB_ACL'))) {
- $out = "--------------------------------------------------\n";
- $out .= __d('cake_console', 'Error: Your current Cake configuration is set to an ACL implementation other than DB.') . "\n";
- $out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script') . "\n";
- $out .= "--------------------------------------------------\n";
- $out .= __d('cake_console', 'Current ACL Classname: %s', Configure::read('Acl.classname')) . "\n";
- $out .= "--------------------------------------------------\n";
- $this->err($out);
- $this->_stop();
- }
-
- if ($this->command) {
- if (!config('database')) {
- $this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.'), true);
- $this->args = null;
- return $this->DbConfig->execute();
- }
- require_once (APP . 'Config' . DS . 'database.php');
-
- if (!in_array($this->command, array('initdb'))) {
- $collection = new ComponentCollection();
- $this->Acl = new AclComponent($collection);
- $controller = new Controller();
- $this->Acl->startup($controller);
- }
- }
- }
-
-/**
- * Override main() for help message hook
- *
- * @return void
- */
- public function main() {
- $this->out($this->OptionParser->help());
- }
-
-/**
- * Creates an ARO/ACO node
- *
- * @return void
- */
- public function create() {
- extract($this->_dataVars());
-
- $class = ucfirst($this->args[0]);
- $parent = $this->parseIdentifier($this->args[1]);
-
- if (!empty($parent) && $parent != '/' && $parent != 'root') {
- $parent = $this->_getNodeId($class, $parent);
- } else {
- $parent = null;
- }
-
- $data = $this->parseIdentifier($this->args[2]);
- if (is_string($data) && $data != '/') {
- $data = array('alias' => $data);
- } elseif (is_string($data)) {
- $this->error(__d('cake_console', '/ can not be used as an alias!') . __d('cake_console', " / is the root, please supply a sub alias"));
- }
-
- $data['parent_id'] = $parent;
- $this->Acl->{$class}->create();
- if ($this->Acl->{$class}->save($data)) {
- $this->out(__d('cake_console', "New %s '%s' created.", $class, $this->args[2]), 2);
- } else {
- $this->err(__d('cake_console', "There was a problem creating a new %s '%s'.", $class, $this->args[2]));
- }
- }
-
-/**
- * Delete an ARO/ACO node.
- *
- * @return void
- */
- public function delete() {
- extract($this->_dataVars());
-
- $identifier = $this->parseIdentifier($this->args[1]);
- $nodeId = $this->_getNodeId($class, $identifier);
-
- if (!$this->Acl->{$class}->delete($nodeId)) {
- $this->error(__d('cake_console', 'Node Not Deleted') . __d('cake_console', 'There was an error deleting the %s. Check that the node exists.', $class) . "\n");
- }
- $this->out(__d('cake_console', '%s deleted. ', $class), 2);
- }
-
-/**
- * Set parent for an ARO/ACO node.
- *
- * @return void
- */
- public function setParent() {
- extract($this->_dataVars());
- $target = $this->parseIdentifier($this->args[1]);
- $parent = $this->parseIdentifier($this->args[2]);
-
- $data = array(
- $class => array(
- 'id' => $this->_getNodeId($class, $target),
- 'parent_id' => $this->_getNodeId($class, $parent)
- )
- );
- $this->Acl->{$class}->create();
- if (!$this->Acl->{$class}->save($data)) {
- $this->out(__d('cake_console', 'Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.'), true);
- } else {
- $this->out(__d('cake_console', 'Node parent set to %s', $this->args[2]) . "\n", true);
- }
- }
-
-/**
- * Get path to specified ARO/ACO node.
- *
- * @return void
- */
- public function getPath() {
- extract($this->_dataVars());
- $identifier = $this->parseIdentifier($this->args[1]);
-
- $id = $this->_getNodeId($class, $identifier);
- $nodes = $this->Acl->{$class}->getPath($id);
-
- if (empty($nodes)) {
- $this->error(
- __d('cake_console', "Supplied Node '%s' not found", $this->args[1]),
- __d('cake_console', 'No tree returned.')
- );
- }
- $this->out(__d('cake_console', 'Path:'));
- $this->hr();
- for ($i = 0, $len = count($nodes); $i < $len; $i++) {
- $this->_outputNode($class, $nodes[$i], $i);
- }
- }
-
-/**
- * Outputs a single node, Either using the alias or Model.key
- *
- * @param string $class Class name that is being used.
- * @param array $node Array of node information.
- * @param integer $indent indent level.
- * @return void
- */
- protected function _outputNode($class, $node, $indent) {
- $indent = str_repeat(' ', $indent);
- $data = $node[$class];
- if ($data['alias']) {
- $this->out($indent . "[" . $data['id'] . "] " . $data['alias']);
- } else {
- $this->out($indent . "[" . $data['id'] . "] " . $data['model'] . '.' . $data['foreign_key']);
- }
- }
-
-/**
- * Check permission for a given ARO to a given ACO.
- *
- * @return void
- */
- public function check() {
- extract($this->_getParams());
-
- if ($this->Acl->check($aro, $aco, $action)) {
- $this->out(__d('cake_console', '%s is allowed .', $aroName), true);
- } else {
- $this->out(__d('cake_console', '%s is not allowed .', $aroName), true);
- }
- }
-
-/**
- * Grant permission for a given ARO to a given ACO.
- *
- * @return void
- */
- public function grant() {
- extract($this->_getParams());
-
- if ($this->Acl->allow($aro, $aco, $action)) {
- $this->out(__d('cake_console', 'Permission granted .'), true);
- } else {
- $this->out(__d('cake_console', 'Permission was not granted .'), true);
- }
- }
-
-/**
- * Deny access for an ARO to an ACO.
- *
- * @return void
- */
- public function deny() {
- extract($this->_getParams());
-
- if ($this->Acl->deny($aro, $aco, $action)) {
- $this->out(__d('cake_console', 'Permission denied.'), true);
- } else {
- $this->out(__d('cake_console', 'Permission was not denied.'), true);
- }
- }
-
-/**
- * Set an ARO to inherit permission to an ACO.
- *
- * @return void
- */
- public function inherit() {
- extract($this->_getParams());
-
- if ($this->Acl->inherit($aro, $aco, $action)) {
- $this->out(__d('cake_console', 'Permission inherited.'), true);
- } else {
- $this->out(__d('cake_console', 'Permission was not inherited.'), true);
- }
- }
-
-/**
- * Show a specific ARO/ACO node.
- *
- * @return void
- */
- public function view() {
- extract($this->_dataVars());
-
- if (isset($this->args[1])) {
- $identity = $this->parseIdentifier($this->args[1]);
-
- $topNode = $this->Acl->{$class}->find('first', array(
- 'conditions' => array($class . '.id' => $this->_getNodeId($class, $identity))
- ));
-
- $nodes = $this->Acl->{$class}->find('all', array(
- 'conditions' => array(
- $class . '.lft >=' => $topNode[$class]['lft'],
- $class . '.lft <=' => $topNode[$class]['rght']
- ),
- 'order' => $class . '.lft ASC'
- ));
- } else {
- $nodes = $this->Acl->{$class}->find('all', array('order' => $class . '.lft ASC'));
- }
-
- if (empty($nodes)) {
- if (isset($this->args[1])) {
- $this->error(__d('cake_console', '%s not found', $this->args[1]), __d('cake_console', 'No tree returned.'));
- } elseif (isset($this->args[0])) {
- $this->error(__d('cake_console', '%s not found', $this->args[0]), __d('cake_console', 'No tree returned.'));
- }
- }
- $this->out($class . ' tree:');
- $this->hr();
-
- $stack = array();
- $last = null;
-
- foreach ($nodes as $n) {
- $stack[] = $n;
- if (!empty($last)) {
- $end = end($stack);
- if ($end[$class]['rght'] > $last) {
- foreach ($stack as $k => $v) {
- $end = end($stack);
- if ($v[$class]['rght'] < $end[$class]['rght']) {
- unset($stack[$k]);
- }
- }
- }
- }
- $last = $n[$class]['rght'];
- $count = count($stack);
-
- $this->_outputNode($class, $n, $count);
- }
- $this->hr();
- }
-
-/**
- * Initialize ACL database.
- *
- * @return mixed
- */
- public function initdb() {
- return $this->dispatchShell('schema create DbAcl');
- }
-
-/**
- * Get the option parser.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
-
- $type = array(
- 'choices' => array('aro', 'aco'),
- 'required' => true,
- 'help' => __d('cake_console', 'Type of node to create.')
- );
-
- $parser->description(
- __d('cake_console', 'A console tool for managing the DbAcl')
- )->addSubcommand('create', array(
- 'help' => __d('cake_console', 'Create a new ACL node'),
- 'parser' => array(
- 'description' => __d('cake_console', 'Creates a new ACL object under the parent'),
- 'arguments' => array(
- 'type' => $type,
- 'parent' => array(
- 'help' => __d('cake_console', 'The node selector for the parent.'),
- 'required' => true
- ),
- 'alias' => array(
- 'help' => __d('cake_console', 'The alias to use for the newly created node.'),
- 'required' => true
- )
- )
- )
- ))->addSubcommand('delete', array(
- 'help' => __d('cake_console', 'Deletes the ACL object with the given reference'),
- 'parser' => array(
- 'description' => __d('cake_console', 'Delete an ACL node.'),
- 'arguments' => array(
- 'type' => $type,
- 'node' => array(
- 'help' => __d('cake_console', 'The node identifier to delete.'),
- 'required' => true,
- )
- )
- )
- ))->addSubcommand('setparent', array(
- 'help' => __d('cake_console', 'Moves the ACL node under a new parent.'),
- 'parser' => array(
- 'description' => __d('cake_console', 'Moves the ACL object specified by beneath '),
- 'arguments' => array(
- 'type' => $type,
- 'node' => array(
- 'help' => __d('cake_console', 'The node to move'),
- 'required' => true,
- ),
- 'parent' => array(
- 'help' => __d('cake_console', 'The new parent for .'),
- 'required' => true
- )
- )
- )
- ))->addSubcommand('getpath', array(
- 'help' => __d('cake_console', 'Print out the path to an ACL node.'),
- 'parser' => array(
- 'description' => array(
- __d('cake_console', "Returns the path to the ACL object specified by ."),
- __d('cake_console', "This command is useful in determining the inheritance of permissions for a certain object in the tree.")
- ),
- 'arguments' => array(
- 'type' => $type,
- 'node' => array(
- 'help' => __d('cake_console', 'The node to get the path of'),
- 'required' => true,
- )
- )
- )
- ))->addSubcommand('check', array(
- 'help' => __d('cake_console', 'Check the permissions between an ACO and ARO.'),
- 'parser' => array(
- 'description' => array(
- __d('cake_console', 'Use this command to check ACL permissions.')
- ),
- 'arguments' => array(
- 'aro' => array('help' => __d('cake_console', 'ARO to check.'), 'required' => true),
- 'aco' => array('help' => __d('cake_console', 'ACO to check.'), 'required' => true),
- 'action' => array('help' => __d('cake_console', 'Action to check'), 'default' => 'all')
- )
- )
- ))->addSubcommand('grant', array(
- 'help' => __d('cake_console', 'Grant an ARO permissions to an ACO.'),
- 'parser' => array(
- 'description' => array(
- __d('cake_console', 'Use this command to grant ACL permissions. Once executed, the ARO specified (and its children, if any) will have ALLOW access to the specified ACO action (and the ACO\'s children, if any).')
- ),
- 'arguments' => array(
- 'aro' => array('help' => __d('cake_console', 'ARO to grant permission to.'), 'required' => true),
- 'aco' => array('help' => __d('cake_console', 'ACO to grant access to.'), 'required' => true),
- 'action' => array('help' => __d('cake_console', 'Action to grant'), 'default' => 'all')
- )
- )
- ))->addSubcommand('deny', array(
- 'help' => __d('cake_console', 'Deny an ARO permissions to an ACO.'),
- 'parser' => array(
- 'description' => array(
- __d('cake_console', 'Use this command to deny ACL permissions. Once executed, the ARO specified (and its children, if any) will have DENY access to the specified ACO action (and the ACO\'s children, if any).')
- ),
- 'arguments' => array(
- 'aro' => array('help' => __d('cake_console', 'ARO to deny.'), 'required' => true),
- 'aco' => array('help' => __d('cake_console', 'ACO to deny.'), 'required' => true),
- 'action' => array('help' => __d('cake_console', 'Action to deny'), 'default' => 'all')
- )
- )
- ))->addSubcommand('inherit', array(
- 'help' => __d('cake_console', 'Inherit an ARO\'s parent permissions.'),
- 'parser' => array(
- 'description' => array(
- __d('cake_console', "Use this command to force a child ARO object to inherit its permissions settings from its parent.")
- ),
- 'arguments' => array(
- 'aro' => array('help' => __d('cake_console', 'ARO to have permissions inherit.'), 'required' => true),
- 'aco' => array('help' => __d('cake_console', 'ACO to inherit permissions on.'), 'required' => true),
- 'action' => array('help' => __d('cake_console', 'Action to inherit'), 'default' => 'all')
- )
- )
- ))->addSubcommand('view', array(
- 'help' => __d('cake_console', 'View a tree or a single node\'s subtree.'),
- 'parser' => array(
- 'description' => array(
- __d('cake_console', "The view command will return the ARO or ACO tree."),
- __d('cake_console', "The optional node parameter allows you to return"),
- __d('cake_console', "only a portion of the requested tree.")
- ),
- 'arguments' => array(
- 'type' => $type,
- 'node' => array('help' => __d('cake_console', 'The optional node to view the subtree of.'))
- )
- )
- ))->addSubcommand('initdb', array(
- 'help' => __d('cake_console', 'Initialize the DbAcl tables. Uses this command : cake schema create DbAcl')
- ))->epilog(
- array(
- 'Node and parent arguments can be in one of the following formats:',
- '',
- ' - . - The node will be bound to a specific record of the given model.',
- '',
- ' - - The node will be given a string alias (or path, in the case of )',
- " i.e. 'John'. When used with , this takes the form of an alias path,",
- " i.e. //.",
- '',
- "To add a node at the root level, enter 'root' or '/' as the parameter."
- )
- );
- return $parser;
- }
-
-/**
- * Checks that given node exists
- *
- * @return boolean Success
- */
- public function nodeExists() {
- if (!isset($this->args[0]) || !isset($this->args[1])) {
- return false;
- }
- $dataVars = $this->_dataVars($this->args[0]);
- extract($dataVars);
- $key = is_numeric($this->args[1]) ? $dataVars['secondary_id'] : 'alias';
- $conditions = array($class . '.' . $key => $this->args[1]);
- $possibility = $this->Acl->{$class}->find('all', compact('conditions'));
- if (empty($possibility)) {
- $this->error(__d('cake_console', '%s not found', $this->args[1]), __d('cake_console', 'No tree returned.'));
- }
- return $possibility;
- }
-
-/**
- * Parse an identifier into Model.foreignKey or an alias.
- * Takes an identifier determines its type and returns the result as used by other methods.
- *
- * @param string $identifier Identifier to parse
- * @return mixed a string for aliases, and an array for model.foreignKey
- */
- public function parseIdentifier($identifier) {
- if (preg_match('/^([\w]+)\.(.*)$/', $identifier, $matches)) {
- return array(
- 'model' => $matches[1],
- 'foreign_key' => $matches[2],
- );
- }
- return $identifier;
- }
-
-/**
- * Get the node for a given identifier. $identifier can either be a string alias
- * or an array of properties to use in AcoNode::node()
- *
- * @param string $class Class type you want (Aro/Aco)
- * @param mixed $identifier A mixed identifier for finding the node.
- * @return integer Integer of NodeId. Will trigger an error if nothing is found.
- */
- protected function _getNodeId($class, $identifier) {
- $node = $this->Acl->{$class}->node($identifier);
- if (empty($node)) {
- if (is_array($identifier)) {
- $identifier = var_export($identifier, true);
- }
- $this->error(__d('cake_console', 'Could not find node using reference "%s"', $identifier));
- }
- return Set::extract($node, "0.{$class}.id");
- }
-
-/**
- * get params for standard Acl methods
- *
- * @return array aro, aco, action
- */
- protected function _getParams() {
- $aro = is_numeric($this->args[0]) ? intval($this->args[0]) : $this->args[0];
- $aco = is_numeric($this->args[1]) ? intval($this->args[1]) : $this->args[1];
- $aroName = $aro;
- $acoName = $aco;
-
- if (is_string($aro)) {
- $aro = $this->parseIdentifier($aro);
- }
- if (is_string($aco)) {
- $aco = $this->parseIdentifier($aco);
- }
- $action = '*';
- if (isset($this->args[2]) && !in_array($this->args[2], array('', 'all'))) {
- $action = $this->args[2];
- }
- return compact('aro', 'aco', 'action', 'aroName', 'acoName');
- }
-
-/**
- * Build data parameters based on node type
- *
- * @param string $type Node type (ARO/ACO)
- * @return array Variables
- */
- protected function _dataVars($type = null) {
- if ($type == null) {
- $type = $this->args[0];
- }
- $vars = array();
- $class = ucwords($type);
- $vars['secondary_id'] = (strtolower($class) == 'aro') ? 'foreign_key' : 'object_id';
- $vars['data_name'] = $type;
- $vars['table_name'] = $type . 's';
- $vars['class'] = $class;
- return $vars;
- }
-
-}
diff --git a/lib/Cake/Console/Command/ApiShell.php b/lib/Cake/Console/Command/ApiShell.php
deleted file mode 100644
index 8ba50e7fbbf..00000000000
--- a/lib/Cake/Console/Command/ApiShell.php
+++ /dev/null
@@ -1,238 +0,0 @@
-paths = array_merge($this->paths, array(
- 'behavior' => CAKE . 'Model' . DS . 'Behavior' . DS,
- 'cache' => CAKE . 'Cache' . DS,
- 'controller' => CAKE . 'Controller' . DS,
- 'component' => CAKE . 'Controller' . DS . 'Component' . DS,
- 'helper' => CAKE . 'View' . DS . 'Helper' . DS,
- 'model' => CAKE . 'Model' . DS,
- 'view' => CAKE . 'View' . DS,
- 'core' => CAKE
- ));
- }
-
-/**
- * Override main() to handle action
- *
- * @return void
- */
- public function main() {
- if (empty($this->args)) {
- return $this->out($this->OptionParser->help());
- }
-
- $type = strtolower($this->args[0]);
-
- if (isset($this->paths[$type])) {
- $path = $this->paths[$type];
- } else {
- $path = $this->paths['core'];
- }
-
- if (count($this->args) == 1) {
- $file = $type;
- $class = Inflector::camelize($type);
- } elseif (count($this->args) > 1) {
- $file = Inflector::underscore($this->args[1]);
- $class = Inflector::camelize($this->args[1]);
- }
- $objects = App::objects('class', $path);
- if (in_array($class, $objects)) {
- if (in_array($type, array('behavior', 'component', 'helper')) && $type !== $file) {
- if (!preg_match('/' . Inflector::camelize($type) . '$/', $class)) {
- $class .= Inflector::camelize($type);
- }
- }
-
- } else {
- $this->error(__d('cake_console', '%s not found', $class));
- }
-
- $parsed = $this->_parseClass($path . $class . '.php', $class);
-
- if (!empty($parsed)) {
- if (isset($this->params['method'])) {
- if (!isset($parsed[$this->params['method']])) {
- $this->err(__d('cake_console', '%s::%s() could not be found', $class, $this->params['method']));
- $this->_stop();
- }
- $method = $parsed[$this->params['method']];
- $this->out($class . '::' . $method['method'] . $method['parameters']);
- $this->hr();
- $this->out($method['comment'], true);
- } else {
- $this->out(ucwords($class));
- $this->hr();
- $i = 0;
- foreach ($parsed as $method) {
- $list[] = ++$i . ". " . $method['method'] . $method['parameters'];
- }
- $this->out($list);
-
- $methods = array_keys($parsed);
- while ($number = strtolower($this->in(__d('cake_console', 'Select a number to see the more information about a specific method. q to quit. l to list.'), null, 'q'))) {
- if ($number === 'q') {
- $this->out(__d('cake_console', 'Done'));
- return $this->_stop();
- }
-
- if ($number === 'l') {
- $this->out($list);
- }
-
- if (isset($methods[--$number])) {
- $method = $parsed[$methods[$number]];
- $this->hr();
- $this->out($class . '::' . $method['method'] . $method['parameters']);
- $this->hr();
- $this->out($method['comment'], true);
- }
- }
- }
- }
- }
-
-/**
- * Get and configure the optionparser.
- *
- * @return ConsoleOptionParser
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- $parser->addArgument('type', array(
- 'help' => __d('cake_console', 'Either a full path or type of class (model, behavior, controller, component, view, helper)')
- ))->addArgument('className', array(
- 'help' => __d('cake_console', 'A CakePHP core class name (e.g: Component, HtmlHelper).')
- ))->addOption('method', array(
- 'short' => 'm',
- 'help' => __d('cake_console', 'The specific method you want help on.')
- ))->description(__d('cake_console', 'Lookup doc block comments for classes in CakePHP.'));
- return $parser;
- }
-
-/**
- * Show help for this shell.
- *
- * @return void
- */
- public function help() {
- $head = "Usage: cake api [] [-m ]\n";
- $head .= "-----------------------------------------------\n";
- $head .= "Parameters:\n\n";
-
- $commands = array(
- 'path' => "\t\n" .
- "\t\tEither a full path or type of class (model, behavior, controller, component, view, helper).\n" .
- "\t\tAvailable values:\n\n" .
- "\t\tbehavior\tLook for class in CakePHP behavior path\n" .
- "\t\tcache\tLook for class in CakePHP cache path\n" .
- "\t\tcontroller\tLook for class in CakePHP controller path\n" .
- "\t\tcomponent\tLook for class in CakePHP component path\n" .
- "\t\thelper\tLook for class in CakePHP helper path\n" .
- "\t\tmodel\tLook for class in CakePHP model path\n" .
- "\t\tview\tLook for class in CakePHP view path\n",
- 'className' => "\t\n" .
- "\t\tA CakePHP core class name (e.g: Component, HtmlHelper).\n"
- );
-
- $this->out($head);
- if (!isset($this->args[1])) {
- foreach ($commands as $cmd) {
- $this->out("{$cmd}\n\n");
- }
- } elseif (isset($commands[strtolower($this->args[1])])) {
- $this->out($commands[strtolower($this->args[1])] . "\n\n");
- } else {
- $this->out(__d('cake_console', 'Command %s not found', $this->args[1]));
- }
- }
-
-/**
- * Parse a given class (located on given file) and get public methods and their
- * signatures.
- *
- * @param string $path File path
- * @param string $class Class name
- * @return array Methods and signatures indexed by method name
- */
- protected function _parseClass($path, $class) {
- $parsed = array();
-
- if (!class_exists($class)) {
- if (!include_once $path) {
- $this->err(__d('cake_console', '%s could not be found', $path));
- }
- }
-
- $reflection = new ReflectionClass($class);
-
- foreach ($reflection->getMethods() as $method) {
- if (!$method->isPublic() || strpos($method->getName(), '_') === 0) {
- continue;
- }
- if ($method->getDeclaringClass()->getName() != $class) {
- continue;
- }
- $args = array();
- foreach ($method->getParameters() as $param) {
- $paramString = '$' . $param->getName();
- if ($param->isDefaultValueAvailable()) {
- $paramString .= ' = ' . str_replace("\n", '', var_export($param->getDefaultValue(), true));
- }
- $args[] = $paramString;
- }
- $parsed[$method->getName()] = array(
- 'comment' => str_replace(array('/*', '*/', '*'), '', $method->getDocComment()),
- 'method' => $method->getName(),
- 'parameters' => '(' . implode(', ', $args) . ')'
- );
- }
- ksort($parsed);
- return $parsed;
- }
-
-}
diff --git a/lib/Cake/Console/Command/AppShell.php b/lib/Cake/Console/Command/AppShell.php
deleted file mode 100644
index 5cc915f6bfe..00000000000
--- a/lib/Cake/Console/Command/AppShell.php
+++ /dev/null
@@ -1,31 +0,0 @@
-connection to the active task if a connection param is set.
- *
- * @return void
- */
- public function startup() {
- parent::startup();
- Configure::write('debug', 2);
- Configure::write('Cache.disable', 1);
-
- $task = Inflector::classify($this->command);
- if (isset($this->{$task}) && !in_array($task, array('Project', 'DbConfig'))) {
- if (isset($this->params['connection'])) {
- $this->{$task}->connection = $this->params['connection'];
- }
- }
- }
-
-/**
- * Override main() to handle action
- *
- * @return mixed
- */
- public function main() {
- if (!is_dir($this->DbConfig->path)) {
- $path = $this->Project->execute();
- if (!empty($path)) {
- $this->DbConfig->path = $path . 'Config' . DS;
- } else {
- return false;
- }
- }
-
- if (!config('database')) {
- $this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.'));
- $this->args = null;
- return $this->DbConfig->execute();
- }
- $this->out(__d('cake_console', 'Interactive Bake Shell'));
- $this->hr();
- $this->out(__d('cake_console', '[D]atabase Configuration'));
- $this->out(__d('cake_console', '[M]odel'));
- $this->out(__d('cake_console', '[V]iew'));
- $this->out(__d('cake_console', '[C]ontroller'));
- $this->out(__d('cake_console', '[P]roject'));
- $this->out(__d('cake_console', '[F]ixture'));
- $this->out(__d('cake_console', '[T]est case'));
- $this->out(__d('cake_console', '[Q]uit'));
-
- $classToBake = strtoupper($this->in(__d('cake_console', 'What would you like to Bake?'), array('D', 'M', 'V', 'C', 'P', 'F', 'T', 'Q')));
- switch ($classToBake) {
- case 'D':
- $this->DbConfig->execute();
- break;
- case 'M':
- $this->Model->execute();
- break;
- case 'V':
- $this->View->execute();
- break;
- case 'C':
- $this->Controller->execute();
- break;
- case 'P':
- $this->Project->execute();
- break;
- case 'F':
- $this->Fixture->execute();
- break;
- case 'T':
- $this->Test->execute();
- break;
- case 'Q':
- exit(0);
- break;
- default:
- $this->out(__d('cake_console', 'You have made an invalid selection. Please choose a type of class to Bake by entering D, M, V, F, T, or C.'));
- }
- $this->hr();
- $this->main();
- }
-
-/**
- * Quickly bake the MVC
- *
- * @return void
- */
- public function all() {
- $this->out('Bake All');
- $this->hr();
-
- if (!isset($this->params['connection']) && empty($this->connection)) {
- $this->connection = $this->DbConfig->getConfig();
- }
-
- if (empty($this->args)) {
- $this->Model->interactive = true;
- $name = $this->Model->getName($this->connection);
- }
-
- foreach (array('Model', 'Controller', 'View') as $task) {
- $this->{$task}->connection = $this->connection;
- $this->{$task}->interactive = false;
- }
-
- if (!empty($this->args[0])) {
- $name = $this->args[0];
- }
-
- $modelExists = false;
- $model = $this->_modelName($name);
-
- App::uses('AppModel', 'Model');
- App::uses($model, 'Model');
- if (class_exists($model)) {
- $object = new $model();
- $modelExists = true;
- } else {
- $object = new Model(array('name' => $name, 'ds' => $this->connection));
- }
-
- $modelBaked = $this->Model->bake($object, false);
-
- if ($modelBaked && $modelExists === false) {
- if ($this->_checkUnitTest()) {
- $this->Model->bakeFixture($model);
- $this->Model->bakeTest($model);
- }
- $modelExists = true;
- }
-
- if ($modelExists === true) {
- $controller = $this->_controllerName($name);
- if ($this->Controller->bake($controller, $this->Controller->bakeActions($controller))) {
- if ($this->_checkUnitTest()) {
- $this->Controller->bakeTest($controller);
- }
- }
- App::uses($controller . 'Controller', 'Controller');
- if (class_exists($controller . 'Controller')) {
- $this->View->args = array($name);
- $this->View->execute();
- }
- $this->out('', 1, Shell::QUIET);
- $this->out(__d('cake_console', 'Bake All complete '), 1, Shell::QUIET);
- array_shift($this->args);
- } else {
- $this->error(__d('cake_console', 'Bake All could not continue without a valid model'));
- }
- return $this->_stop();
- }
-
-/**
- * get the option parser.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(__d('cake_console',
- 'The Bake script generates controllers, views and models for your application.' .
- ' If run with no command line arguments, Bake guides the user through the class creation process.' .
- ' You can customize the generation process by telling Bake where different parts of your application are using command line arguments.'
- ))->addSubcommand('all', array(
- 'help' => __d('cake_console', 'Bake a complete MVC. optional of a Model'),
- ))->addSubcommand('project', array(
- 'help' => __d('cake_console', 'Bake a new app folder in the path supplied or in current directory if no path is specified'),
- 'parser' => $this->Project->getOptionParser()
- ))->addSubcommand('plugin', array(
- 'help' => __d('cake_console', 'Bake a new plugin folder in the path supplied or in current directory if no path is specified.'),
- 'parser' => $this->Plugin->getOptionParser()
- ))->addSubcommand('db_config', array(
- 'help' => __d('cake_console', 'Bake a database.php file in config directory.'),
- 'parser' => $this->DbConfig->getOptionParser()
- ))->addSubcommand('model', array(
- 'help' => __d('cake_console', 'Bake a model.'),
- 'parser' => $this->Model->getOptionParser()
- ))->addSubcommand('view', array(
- 'help' => __d('cake_console', 'Bake views for controllers.'),
- 'parser' => $this->View->getOptionParser()
- ))->addSubcommand('controller', array(
- 'help' => __d('cake_console', 'Bake a controller.'),
- 'parser' => $this->Controller->getOptionParser()
- ))->addSubcommand('fixture', array(
- 'help' => __d('cake_console', 'Bake a fixture.'),
- 'parser' => $this->Fixture->getOptionParser()
- ))->addSubcommand('test', array(
- 'help' => __d('cake_console', 'Bake a unit test.'),
- 'parser' => $this->Test->getOptionParser()
- ))->addOption('connection', array(
- 'help' => __d('cake_console', 'Database connection to use in conjunction with `bake all`.'),
- 'short' => 'c',
- 'default' => 'default'
- ));
- }
-
-}
diff --git a/lib/Cake/Console/Command/CommandListShell.php b/lib/Cake/Console/Command/CommandListShell.php
deleted file mode 100644
index 9b5db93fd42..00000000000
--- a/lib/Cake/Console/Command/CommandListShell.php
+++ /dev/null
@@ -1,234 +0,0 @@
-params['xml'])) {
- parent::startup();
- }
- }
-
-/**
- * Main function Prints out the list of shells.
- *
- * @return void
- */
- public function main() {
- if (empty($this->params['xml'])) {
- $this->out(__d('cake_console', "Current Paths: "), 2);
- $this->out(" -app: " . APP_DIR);
- $this->out(" -working: " . rtrim(APP, DS));
- $this->out(" -root: " . rtrim(ROOT, DS));
- $this->out(" -core: " . rtrim(CORE_PATH, DS));
- $this->out("");
- $this->out(__d('cake_console', "Changing Paths: "), 2);
- $this->out(__d('cake_console', "Your working path should be the same as your application path to change your path use the '-app' param."));
- $this->out(__d('cake_console', "Example: -app relative/path/to/myapp or -app /absolute/path/to/myapp"), 2);
-
- $this->out(__d('cake_console', "Available Shells: "), 2);
- }
-
- $shellList = $this->_getShellList();
-
- if ($shellList) {
- ksort($shellList);
- if (empty($this->params['xml'])) {
- if (!empty($this->params['sort'])) {
- $this->_asSorted($shellList);
- } else {
- $this->_asText($shellList);
- }
- } else {
- $this->_asXml($shellList);
- }
- }
- }
-
-/**
- * Gets the shell command listing.
- *
- * @return array
- */
- protected function _getShellList() {
- $shellList = array();
- $skipFiles = array('AppShell');
-
- $corePath = App::core('Console/Command');
- $shells = App::objects('file', $corePath[0]);
- $shells = array_diff($shells, $skipFiles);
- $shellList = $this->_appendShells('CORE', $shells, $shellList);
-
- $appShells = App::objects('Console/Command', null, false);
- $appShells = array_diff($appShells, $shells, $skipFiles);
- $shellList = $this->_appendShells('app', $appShells, $shellList);
-
- $plugins = CakePlugin::loaded();
- foreach ($plugins as $plugin) {
- $pluginShells = App::objects($plugin . '.Console/Command');
- $shellList = $this->_appendShells($plugin, $pluginShells, $shellList);
- }
-
- return $shellList;
- }
-
-/**
- * Scan the provided paths for shells, and append them into $shellList
- *
- * @param string $type
- * @param array $shells
- * @param array $shellList
- * @return array
- */
- protected function _appendShells($type, $shells, $shellList) {
- foreach ($shells as $shell) {
- $shell = Inflector::underscore(str_replace('Shell', '', $shell));
- $shellList[$shell][$type] = $type;
- }
- return $shellList;
- }
-
-/**
- * Output text.
- *
- * @param array $shellList
- * @return void
- */
- protected function _asText($shellList) {
- if (DS === '/') {
- $width = exec('tput cols') - 2;
- }
- if (empty($width)) {
- $width = 80;
- }
- $columns = max(1, floor($width / 30));
- $rows = ceil(count($shellList) / $columns);
-
- foreach ($shellList as $shell => $types) {
- sort($types);
- $shellList[$shell] = str_pad($shell . ' [' . implode ($types, ', ') . ']', $width / $columns);
- }
- $out = array_chunk($shellList, $rows);
- for ($i = 0; $i < $rows; $i++) {
- $row = '';
- for ($j = 0; $j < $columns; $j++) {
- if (!isset($out[$j][$i])) {
- continue;
- }
- $row .= $out[$j][$i];
- }
- $this->out(" " . $row);
- }
- $this->out();
- $this->out(__d('cake_console', "To run an app or core command, type cake shell_name [args] "));
- $this->out(__d('cake_console', "To run a plugin command, type cake Plugin.shell_name [args] "));
- $this->out(__d('cake_console', "To get help on a specific command, type cake shell_name --help "), 2);
- }
-
-/**
- * Generates the shell list sorted by where the shells are found.
- *
- * @param array $shellList
- * @return void
- */
- protected function _asSorted($shellList) {
- $grouped = array();
- foreach ($shellList as $shell => $types) {
- foreach ($types as $type) {
- $type = Inflector::camelize($type);
- if (empty($grouped[$type])) {
- $grouped[$type] = array();
- }
- $grouped[$type][] = $shell;
- }
- }
- if (!empty($grouped['App'])) {
- sort($grouped['App'], SORT_STRING);
- $this->out('[ App ]');
- $this->out(' ' . implode(', ', $grouped['App']), 2);
- unset($grouped['App']);
- }
- foreach ($grouped as $section => $shells) {
- if ($section == 'CORE') {
- continue;
- }
- sort($shells, SORT_STRING);
- $this->out('[ ' . $section . ' ]');
- $this->out(' ' . implode(', ', $shells), 2);
- }
- if (!empty($grouped['CORE'])) {
- sort($grouped['CORE'], SORT_STRING);
- $this->out('[ Core ]');
- $this->out(' ' . implode(', ', $grouped['CORE']), 2);
- }
- $this->out();
- }
-
-/**
- * Output as XML
- *
- * @param array $shellList
- * @return void
- */
- protected function _asXml($shellList) {
- $plugins = CakePlugin::loaded();
- $shells = new SimpleXmlElement(' ModelB";
- $out .= "where the supported associations are hasOne, hasMany, belongsTo, hasAndBelongsToMany";
- $out .= "\n";
- $out .= 'To dynamically remove associations, you can do the following:';
- $out .= "\t ModelA unbind ModelB";
- $out .= "where the supported associations are the same as above";
- $out .= "\n";
- $out .= "To save a new field in a model, you can do the following:";
- $out .= "\tModelA->save(array('foo' => 'bar', 'baz' => 0))";
- $out .= "where you are passing a hash of data to be saved in the format";
- $out .= "of field => value pairs";
- $out .= "\n";
- $out .= "To get column information for a model, use the following:";
- $out .= "\tModelA columns";
- $out .= "which returns a list of columns and their type";
- $out .= "\n";
- $out .= "\n";
- $out .= 'Route testing:';
- $out .= "\n";
- $out .= 'To test URLs against your app\'s route configuration, type:';
- $out .= "\n";
- $out .= "\tRoute ";
- $out .= "\n";
- $out .= "where url is the path to your your action plus any query parameters,";
- $out .= "minus the application's base path. For example:";
- $out .= "\n";
- $out .= "\tRoute /posts/view/1";
- $out .= "\n";
- $out .= "will return something like the following:";
- $out .= "\n";
- $out .= "\tarray(";
- $out .= "\t [...]";
- $out .= "\t 'controller' => 'posts',";
- $out .= "\t 'action' => 'view',";
- $out .= "\t [...]";
- $out .= "\t)";
- $out .= "\n";
- $out .= 'Alternatively, you can use simple array syntax to test reverse';
- $out .= 'To reload your routes config (Config/routes.php), do the following:';
- $out .= "\n";
- $out .= "\tRoutes reload";
- $out .= "\n";
- $out .= 'To show all connected routes, do the following:';
- $out .= "\tRoutes show";
- $this->out($out);
- }
-
-/**
- * Override main() to handle action
- *
- * @param string $command
- * @return void
- */
- public function main($command = null) {
- while (true) {
- if (empty($command)) {
- $command = trim($this->in(''));
- }
-
- switch ($command) {
- case 'help':
- $this->help();
- break;
- case 'quit':
- case 'exit':
- return true;
- break;
- case 'models':
- $this->out(__d('cake_console', 'Model classes:'));
- $this->hr();
- foreach ($this->models as $model) {
- $this->out(" - {$model}");
- }
- break;
- case (preg_match("/^(\w+) bind (\w+) (\w+)/", $command, $tmp) == true):
- foreach ($tmp as $data) {
- $data = strip_tags($data);
- $data = str_replace($this->badCommandChars, "", $data);
- }
-
- $modelA = $tmp[1];
- $association = $tmp[2];
- $modelB = $tmp[3];
-
- if ($this->_isValidModel($modelA) && $this->_isValidModel($modelB) && in_array($association, $this->associations)) {
- $this->{$modelA}->bindModel(array($association => array($modelB => array('className' => $modelB))), false);
- $this->out(__d('cake_console', "Created %s association between %s and %s",
- $association, $modelA, $modelB));
- } else {
- $this->out(__d('cake_console', "Please verify you are using valid models and association types"));
- }
- break;
- case (preg_match("/^(\w+) unbind (\w+) (\w+)/", $command, $tmp) == true):
- foreach ($tmp as $data) {
- $data = strip_tags($data);
- $data = str_replace($this->badCommandChars, "", $data);
- }
-
- $modelA = $tmp[1];
- $association = $tmp[2];
- $modelB = $tmp[3];
-
- // Verify that there is actually an association to unbind
- $currentAssociations = $this->{$modelA}->getAssociated();
- $validCurrentAssociation = false;
-
- foreach ($currentAssociations as $model => $currentAssociation) {
- if ($model == $modelB && $association == $currentAssociation) {
- $validCurrentAssociation = true;
- }
- }
-
- if ($this->_isValidModel($modelA) && $this->_isValidModel($modelB) && in_array($association, $this->associations) && $validCurrentAssociation) {
- $this->{$modelA}->unbindModel(array($association => array($modelB)));
- $this->out(__d('cake_console', "Removed %s association between %s and %s",
- $association, $modelA, $modelB));
- } else {
- $this->out(__d('cake_console', "Please verify you are using valid models, valid current association, and valid association types"));
- }
- break;
- case (strpos($command, "->find") > 0):
- // Remove any bad info
- $command = strip_tags($command);
- $command = str_replace($this->badCommandChars, "", $command);
-
- // Do we have a valid model?
- list($modelToCheck, $tmp) = explode('->', $command);
-
- if ($this->_isValidModel($modelToCheck)) {
- $findCommand = "\$data = \$this->$command;";
- @eval($findCommand);
-
- if (is_array($data)) {
- foreach ($data as $idx => $results) {
- if (is_numeric($idx)) { // findAll() output
- foreach ($results as $modelName => $result) {
- $this->out("$modelName");
-
- foreach ($result as $field => $value) {
- if (is_array($value)) {
- foreach ($value as $field2 => $value2) {
- $this->out("\t$field2: $value2");
- }
-
- $this->out();
- } else {
- $this->out("\t$field: $value");
- }
- }
- }
- } else { // find() output
- $this->out($idx);
-
- foreach ($results as $field => $value) {
- if (is_array($value)) {
- foreach ($value as $field2 => $value2) {
- $this->out("\t$field2: $value2");
- }
-
- $this->out();
- } else {
- $this->out("\t$field: $value");
- }
- }
- }
- }
- } else {
- $this->out();
- $this->out(__d('cake_console', "No result set found"));
- }
- } else {
- $this->out(__d('cake_console', "%s is not a valid model", $modelToCheck));
- }
-
- break;
- case (strpos($command, '->save') > 0):
- // Validate the model we're trying to save here
- $command = strip_tags($command);
- $command = str_replace($this->badCommandChars, "", $command);
- list($modelToSave, $tmp) = explode("->", $command);
-
- if ($this->_isValidModel($modelToSave)) {
- // Extract the array of data we are trying to build
- list($foo, $data) = explode("->save", $command);
- $data = preg_replace('/^\(*(array)?\(*(.+?)\)*$/i', '\\2', $data);
- $saveCommand = "\$this->{$modelToSave}->save(array('{$modelToSave}' => array({$data})));";
- @eval($saveCommand);
- $this->out(__d('cake_console', 'Saved record for %s', $modelToSave));
- }
- break;
- case (preg_match("/^(\w+) columns/", $command, $tmp) == true):
- $modelToCheck = strip_tags(str_replace($this->badCommandChars, "", $tmp[1]));
-
- if ($this->_isValidModel($modelToCheck)) {
- // Get the column info for this model
- $fieldsCommand = "\$data = \$this->{$modelToCheck}->getColumnTypes();";
- @eval($fieldsCommand);
-
- if (is_array($data)) {
- foreach ($data as $field => $type) {
- $this->out("\t{$field}: {$type}");
- }
- }
- } else {
- $this->out(__d('cake_console', "Please verify that you selected a valid model"));
- }
- break;
- case (preg_match("/^routes\s+reload/i", $command, $tmp) == true):
- $router = Router::getInstance();
- if (!$this->_loadRoutes()) {
- $this->out(__d('cake_console', "There was an error loading the routes config. Please check that the file exists and is free of parse errors."));
- break;
- }
- $this->out(__d('cake_console', "Routes configuration reloaded, %d routes connected", count($router->routes)));
- break;
- case (preg_match("/^routes\s+show/i", $command, $tmp) == true):
- $router = Router::getInstance();
- $this->out(implode("\n", Set::extract($router->routes, '{n}.0')));
- break;
- case (preg_match("/^route\s+(\(.*\))$/i", $command, $tmp) == true):
- if ($url = eval('return array' . $tmp[1] . ';')) {
- $this->out(Router::url($url));
- }
- break;
- case (preg_match("/^route\s+(.*)/i", $command, $tmp) == true):
- $this->out(var_export(Router::parse($tmp[1]), true));
- break;
- default:
- $this->out(__d('cake_console', "Invalid command"));
- $this->out();
- break;
- }
- $command = '';
- }
- }
-
-/**
- * Tells if the specified model is included in the list of available models
- *
- * @param string $modelToCheck
- * @return boolean true if is an available model, false otherwise
- */
- protected function _isValidModel($modelToCheck) {
- return in_array($modelToCheck, $this->models);
- }
-
-/**
- * Reloads the routes configuration from app/Config/routes.php, and compiles
- * all routes found
- *
- * @return boolean True if config reload was a success, otherwise false
- */
- protected function _loadRoutes() {
- Router::reload();
- extract(Router::getNamedExpressions());
-
- if (!@include APP . 'Config' . DS . 'routes.php') {
- return false;
- }
- CakePlugin::routes();
-
- Router::parse('/');
-
- foreach (array_keys(Router::getNamedExpressions()) as $var) {
- unset(${$var});
- }
-
- foreach (Router::$routes as $route) {
- $route->compile();
- }
- return true;
- }
-
-}
diff --git a/lib/Cake/Console/Command/I18nShell.php b/lib/Cake/Console/Command/I18nShell.php
deleted file mode 100644
index 73e67a26025..00000000000
--- a/lib/Cake/Console/Command/I18nShell.php
+++ /dev/null
@@ -1,121 +0,0 @@
-_welcome();
- if (isset($this->params['datasource'])) {
- $this->dataSource = $this->params['datasource'];
- }
-
- if ($this->command && !in_array($this->command, array('help'))) {
- if (!config('database')) {
- $this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.'), true);
- return $this->DbConfig->execute();
- }
- }
- }
-
-/**
- * Override main() for help message hook
- *
- * @return void
- */
- public function main() {
- $this->out(__d('cake_console', 'I18n Shell '));
- $this->hr();
- $this->out(__d('cake_console', '[E]xtract POT file from sources'));
- $this->out(__d('cake_console', '[I]nitialize i18n database table'));
- $this->out(__d('cake_console', '[H]elp'));
- $this->out(__d('cake_console', '[Q]uit'));
-
- $choice = strtolower($this->in(__d('cake_console', 'What would you like to do?'), array('E', 'I', 'H', 'Q')));
- switch ($choice) {
- case 'e':
- $this->Extract->execute();
- break;
- case 'i':
- $this->initdb();
- break;
- case 'h':
- $this->out($this->OptionParser->help());
- break;
- case 'q':
- exit(0);
- break;
- default:
- $this->out(__d('cake_console', 'You have made an invalid selection. Please choose a command to execute by entering E, I, H, or Q.'));
- }
- $this->hr();
- $this->main();
- }
-
-/**
- * Initialize I18N database.
- *
- * @return void
- */
- public function initdb() {
- $this->dispatchShell('schema create i18n');
- }
-
-/**
- * Get and configure the Option parser
- *
- * @return ConsoleOptionParser
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(
- __d('cake_console', 'I18n Shell initializes i18n database table for your application and generates .pot files(s) with translations.')
- )->addSubcommand('initdb', array(
- 'help' => __d('cake_console', 'Initialize the i18n table.')
- ))->addSubcommand('extract', array(
- 'help' => __d('cake_console', 'Extract the po translations from your application'),
- 'parser' => $this->Extract->getOptionParser()
- ));
- }
-
-}
diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php
deleted file mode 100644
index eb332150096..00000000000
--- a/lib/Cake/Console/Command/SchemaShell.php
+++ /dev/null
@@ -1,533 +0,0 @@
-_welcome();
- $this->out('Cake Schema Shell');
- $this->hr();
-
- $name = $path = $connection = $plugin = null;
- if (!empty($this->params['name'])) {
- $name = $this->params['name'];
- } elseif (!empty($this->args[0]) && $this->args[0] !== 'snapshot') {
- $name = $this->params['name'] = $this->args[0];
- }
-
- if (strpos($name, '.')) {
- list($this->params['plugin'], $splitName) = pluginSplit($name);
- $name = $this->params['name'] = $splitName;
- }
-
- if ($name) {
- $this->params['file'] = Inflector::underscore($name);
- }
-
- if (empty($this->params['file'])) {
- $this->params['file'] = 'schema.php';
- }
- if (strpos($this->params['file'], '.php') === false) {
- $this->params['file'] .= '.php';
- }
- $file = $this->params['file'];
-
- if (!empty($this->params['path'])) {
- $path = $this->params['path'];
- }
-
- if (!empty($this->params['connection'])) {
- $connection = $this->params['connection'];
- }
- if (!empty($this->params['plugin'])) {
- $plugin = $this->params['plugin'];
- if (empty($name)) {
- $name = $plugin;
- }
- }
- $this->Schema = new CakeSchema(compact('name', 'path', 'file', 'connection', 'plugin'));
- }
-
-/**
- * Read and output contents of schema object
- * path to read as second arg
- *
- * @return void
- */
- public function view() {
- $File = new File($this->Schema->path . DS . $this->params['file']);
- if ($File->exists()) {
- $this->out($File->read());
- $this->_stop();
- } else {
- $file = $this->Schema->path . DS . $this->params['file'];
- $this->err(__d('cake_console', 'Schema file (%s) could not be found.', $file));
- $this->_stop();
- }
- }
-
-/**
- * Read database and Write schema object
- * accepts a connection as first arg or path to save as second arg
- *
- * @return void
- */
- public function generate() {
- $this->out(__d('cake_console', 'Generating Schema...'));
- $options = array();
- if ($this->params['force']) {
- $options = array('models' => false);
- }
-
- $snapshot = false;
- if (isset($this->args[0]) && $this->args[0] === 'snapshot') {
- $snapshot = true;
- }
-
- if (!$snapshot && file_exists($this->Schema->path . DS . $this->params['file'])) {
- $snapshot = true;
- $prompt = __d('cake_console', "Schema file exists.\n [O]verwrite\n [S]napshot\n [Q]uit\nWould you like to do?");
- $result = strtolower($this->in($prompt, array('o', 's', 'q'), 's'));
- if ($result === 'q') {
- return $this->_stop();
- }
- if ($result === 'o') {
- $snapshot = false;
- }
- }
-
- $cacheDisable = Configure::read('Cache.disable');
- Configure::write('Cache.disable', true);
-
- $content = $this->Schema->read($options);
- $content['file'] = $this->params['file'];
-
- Configure::write('Cache.disable', $cacheDisable);
-
- if ($snapshot === true) {
- $fileName = rtrim($this->params['file'], '.php');
- $Folder = new Folder($this->Schema->path);
- $result = $Folder->read();
-
- $numToUse = false;
- if (isset($this->params['snapshot'])) {
- $numToUse = $this->params['snapshot'];
- }
-
- $count = 0;
- if (!empty($result[1])) {
- foreach ($result[1] as $file) {
- if (preg_match('/' . preg_quote($fileName) . '(?:[_\d]*)?\.php$/', $file)) {
- $count++;
- }
- }
- }
-
- if ($numToUse !== false) {
- if ($numToUse > $count) {
- $count = $numToUse;
- }
- }
-
- $content['file'] = $fileName . '_' . $count . '.php';
- }
-
- if ($this->Schema->write($content)) {
- $this->out(__d('cake_console', 'Schema file: %s generated', $content['file']));
- $this->_stop();
- } else {
- $this->err(__d('cake_console', 'Schema file: %s generated'));
- $this->_stop();
- }
- }
-
-/**
- * Dump Schema object to sql file
- * Use the `write` param to enable and control SQL file output location.
- * Simply using -write will write the sql file to the same dir as the schema file.
- * If -write contains a full path name the file will be saved there. If -write only
- * contains no DS, that will be used as the file name, in the same dir as the schema file.
- *
- * @return string
- */
- public function dump() {
- $write = false;
- $Schema = $this->Schema->load();
- if (!$Schema) {
- $this->err(__d('cake_console', 'Schema could not be loaded'));
- $this->_stop();
- }
- if (!empty($this->params['write'])) {
- if ($this->params['write'] == 1) {
- $write = Inflector::underscore($this->Schema->name);
- } else {
- $write = $this->params['write'];
- }
- }
- $db = ConnectionManager::getDataSource($this->Schema->connection);
- $contents = "\n\n" . $db->dropSchema($Schema) . "\n\n" . $db->createSchema($Schema);
-
- if ($write) {
- if (strpos($write, '.sql') === false) {
- $write .= '.sql';
- }
- if (strpos($write, DS) !== false) {
- $File = new File($write, true);
- } else {
- $File = new File($this->Schema->path . DS . $write, true);
- }
-
- if ($File->write($contents)) {
- $this->out(__d('cake_console', 'SQL dump file created in %s', $File->pwd()));
- $this->_stop();
- } else {
- $this->err(__d('cake_console', 'SQL dump could not be created'));
- $this->_stop();
- }
- }
- $this->out($contents);
- return $contents;
- }
-
-/**
- * Run database create commands. Alias for run create.
- *
- * @return void
- */
- public function create() {
- list($Schema, $table) = $this->_loadSchema();
- $this->_create($Schema, $table);
- }
-
-/**
- * Run database create commands. Alias for run create.
- *
- * @return void
- */
- public function update() {
- list($Schema, $table) = $this->_loadSchema();
- $this->_update($Schema, $table);
- }
-
-/**
- * Prepares the Schema objects for database operations.
- *
- * @return void
- */
- protected function _loadSchema() {
- $name = $plugin = null;
- if (!empty($this->params['name'])) {
- $name = $this->params['name'];
- }
- if (!empty($this->params['plugin'])) {
- $plugin = $this->params['plugin'];
- }
-
- if (!empty($this->params['dry'])) {
- $this->_dry = true;
- $this->out(__d('cake_console', 'Performing a dry run.'));
- }
-
- $options = array('name' => $name, 'plugin' => $plugin);
- if (!empty($this->params['snapshot'])) {
- $fileName = rtrim($this->Schema->file, '.php');
- $options['file'] = $fileName . '_' . $this->params['snapshot'] . '.php';
- }
-
- $Schema = $this->Schema->load($options);
-
- if (!$Schema) {
- $this->err(__d('cake_console', '%s could not be loaded', $this->Schema->path . DS . $this->Schema->file));
- $this->_stop();
- }
- $table = null;
- if (isset($this->args[1])) {
- $table = $this->args[1];
- }
- return array(&$Schema, $table);
- }
-
-/**
- * Create database from Schema object
- * Should be called via the run method
- *
- * @param CakeSchema $Schema
- * @param string $table
- * @return void
- */
- protected function _create($Schema, $table = null) {
- $db = ConnectionManager::getDataSource($this->Schema->connection);
-
- $drop = $create = array();
-
- if (!$table) {
- foreach ($Schema->tables as $table => $fields) {
- $drop[$table] = $db->dropSchema($Schema, $table);
- $create[$table] = $db->createSchema($Schema, $table);
- }
- } elseif (isset($Schema->tables[$table])) {
- $drop[$table] = $db->dropSchema($Schema, $table);
- $create[$table] = $db->createSchema($Schema, $table);
- }
- if (empty($drop) || empty($create)) {
- $this->out(__d('cake_console', 'Schema is up to date.'));
- $this->_stop();
- }
-
- $this->out("\n" . __d('cake_console', 'The following table(s) will be dropped.'));
- $this->out(array_keys($drop));
-
- if ('y' == $this->in(__d('cake_console', 'Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n')) {
- $this->out(__d('cake_console', 'Dropping table(s).'));
- $this->_run($drop, 'drop', $Schema);
- }
-
- $this->out("\n" . __d('cake_console', 'The following table(s) will be created.'));
- $this->out(array_keys($create));
-
- if ('y' == $this->in(__d('cake_console', 'Are you sure you want to create the table(s)?'), array('y', 'n'), 'y')) {
- $this->out(__d('cake_console', 'Creating table(s).'));
- $this->_run($create, 'create', $Schema);
- }
- $this->out(__d('cake_console', 'End create.'));
- }
-
-/**
- * Update database with Schema object
- * Should be called via the run method
- *
- * @param CakeSchema $Schema
- * @param string $table
- * @return void
- */
- protected function _update(&$Schema, $table = null) {
- $db = ConnectionManager::getDataSource($this->Schema->connection);
-
- $this->out(__d('cake_console', 'Comparing Database to Schema...'));
- $options = array();
- if (isset($this->params['force'])) {
- $options['models'] = false;
- }
- $Old = $this->Schema->read($options);
- $compare = $this->Schema->compare($Old, $Schema);
-
- $contents = array();
-
- if (empty($table)) {
- foreach ($compare as $table => $changes) {
- $contents[$table] = $db->alterSchema(array($table => $changes), $table);
- }
- } elseif (isset($compare[$table])) {
- $contents[$table] = $db->alterSchema(array($table => $compare[$table]), $table);
- }
-
- if (empty($contents)) {
- $this->out(__d('cake_console', 'Schema is up to date.'));
- $this->_stop();
- }
-
- $this->out("\n" . __d('cake_console', 'The following statements will run.'));
- $this->out(array_map('trim', $contents));
- if ('y' == $this->in(__d('cake_console', 'Are you sure you want to alter the tables?'), array('y', 'n'), 'n')) {
- $this->out();
- $this->out(__d('cake_console', 'Updating Database...'));
- $this->_run($contents, 'update', $Schema);
- }
-
- $this->out(__d('cake_console', 'End update.'));
- }
-
-/**
- * Runs sql from _create() or _update()
- *
- * @param array $contents
- * @param string $event
- * @param CakeSchema $Schema
- * @return void
- */
- protected function _run($contents, $event, &$Schema) {
- if (empty($contents)) {
- $this->err(__d('cake_console', 'Sql could not be run'));
- return;
- }
- Configure::write('debug', 2);
- $db = ConnectionManager::getDataSource($this->Schema->connection);
-
- foreach ($contents as $table => $sql) {
- if (empty($sql)) {
- $this->out(__d('cake_console', '%s is up to date.', $table));
- } else {
- if ($this->_dry === true) {
- $this->out(__d('cake_console', 'Dry run for %s :', $table));
- $this->out($sql);
- } else {
- if (!$Schema->before(array($event => $table))) {
- return false;
- }
- $error = null;
- try {
- $db->execute($sql);
- } catch (PDOException $e) {
- $error = $table . ': ' . $e->getMessage();
- }
-
- $Schema->after(array($event => $table, 'errors' => $error));
-
- if (!empty($error)) {
- $this->err($error);
- } else {
- $this->out(__d('cake_console', '%s updated.', $table));
- }
- }
- }
- }
- }
-
-/**
- * get the option parser
- *
- * @return void
- */
- public function getOptionParser() {
- $plugin = array(
- 'short' => 'p',
- 'help' => __d('cake_console', 'The plugin to use.'),
- );
- $connection = array(
- 'short' => 'c',
- 'help' => __d('cake_console', 'Set the db config to use.'),
- 'default' => 'default'
- );
- $path = array(
- 'help' => __d('cake_console', 'Path to read and write schema.php'),
- 'default' => APP . 'Config' . DS . 'Schema'
- );
- $file = array(
- 'help' => __d('cake_console', 'File name to read and write.'),
- 'default' => 'schema.php'
- );
- $name = array(
- 'help' => __d('cake_console', 'Classname to use. If its Plugin.class, both name and plugin options will be set.')
- );
- $snapshot = array(
- 'short' => 's',
- 'help' => __d('cake_console', 'Snapshot number to use/make.')
- );
- $dry = array(
- 'help' => __d('cake_console', 'Perform a dry run on create and update commands. Queries will be output instead of run.'),
- 'boolean' => true
- );
- $force = array(
- 'short' => 'f',
- 'help' => __d('cake_console', 'Force "generate" to create a new schema'),
- 'boolean' => true
- );
- $write = array(
- 'help' => __d('cake_console', 'Write the dumped SQL to a file.')
- );
-
- $parser = parent::getOptionParser();
- $parser->description(
- __d('cake_console', 'The Schema Shell generates a schema object from the database and updates the database from the schema.')
- )->addSubcommand('view', array(
- 'help' => __d('cake_console', 'Read and output the contents of a schema file'),
- 'parser' => array(
- 'options' => compact('plugin', 'path', 'file', 'name', 'connection'),
- 'arguments' => compact('name')
- )
- ))->addSubcommand('generate', array(
- 'help' => __d('cake_console', 'Reads from --connection and writes to --path. Generate snapshots with -s'),
- 'parser' => array(
- 'options' => compact('plugin', 'path', 'file', 'name', 'connection', 'snapshot', 'force'),
- 'arguments' => array(
- 'snapshot' => array('help' => __d('cake_console', 'Generate a snapshot.'))
- )
- )
- ))->addSubcommand('dump', array(
- 'help' => __d('cake_console', 'Dump database SQL based on a schema file to stdout.'),
- 'parser' => array(
- 'options' => compact('plugin', 'path', 'file', 'name', 'connection', 'write'),
- 'arguments' => compact('name')
- )
- ))->addSubcommand('create', array(
- 'help' => __d('cake_console', 'Drop and create tables based on the schema file.'),
- 'parser' => array(
- 'options' => compact('plugin', 'path', 'file', 'name', 'connection', 'dry', 'snapshot'),
- 'args' => array(
- 'name' => array(
- 'help' => __d('cake_console', 'Name of schema to use.')
- ),
- 'table' => array(
- 'help' => __d('cake_console', 'Only create the specified table.')
- )
- )
- )
- ))->addSubcommand('update', array(
- 'help' => __d('cake_console', 'Alter the tables based on the schema file.'),
- 'parser' => array(
- 'options' => compact('plugin', 'path', 'file', 'name', 'connection', 'dry', 'snapshot', 'force'),
- 'args' => array(
- 'name' => array(
- 'help' => __d('cake_console', 'Name of schema to use.')
- ),
- 'table' => array(
- 'help' => __d('cake_console', 'Only create the specified table.')
- )
- )
- )
- ));
- return $parser;
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/BakeTask.php b/lib/Cake/Console/Command/Task/BakeTask.php
deleted file mode 100644
index e32e2539e38..00000000000
--- a/lib/Cake/Console/Command/Task/BakeTask.php
+++ /dev/null
@@ -1,93 +0,0 @@
-path;
- if (isset($this->plugin)) {
- $path = $this->_pluginPath($this->plugin) . $this->name . DS;
- }
- return $path;
- }
-
-/**
- * Base execute method parses some parameters and sets some properties on the bake tasks.
- * call when overriding execute()
- *
- * @return void
- */
- public function execute() {
- foreach ($this->args as $i => $arg) {
- if (strpos($arg, '.')) {
- list($this->params['plugin'], $this->args[$i]) = pluginSplit($arg);
- break;
- }
- }
- if (isset($this->params['plugin'])) {
- $this->plugin = $this->params['plugin'];
- }
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/ControllerTask.php b/lib/Cake/Console/Command/Task/ControllerTask.php
deleted file mode 100644
index ca68389adfa..00000000000
--- a/lib/Cake/Console/Command/Task/ControllerTask.php
+++ /dev/null
@@ -1,470 +0,0 @@
-path = current(App::path('Controller'));
- }
-
-/**
- * Execution method always used for tasks
- *
- * @return void
- */
- public function execute() {
- parent::execute();
- if (empty($this->args)) {
- return $this->_interactive();
- }
-
- if (isset($this->args[0])) {
- if (!isset($this->connection)) {
- $this->connection = 'default';
- }
- if (strtolower($this->args[0]) == 'all') {
- return $this->all();
- }
-
- $controller = $this->_controllerName($this->args[0]);
- $actions = '';
-
- if (!empty($this->params['public'])) {
- $this->out(__d('cake_console', 'Baking basic crud methods for ') . $controller);
- $actions .= $this->bakeActions($controller);
- }
- if (!empty($this->params['admin'])) {
- $admin = $this->Project->getPrefix();
- if ($admin) {
- $this->out(__d('cake_console', 'Adding %s methods', $admin));
- $actions .= "\n" . $this->bakeActions($controller, $admin);
- }
- }
- if (empty($actions)) {
- $actions = 'scaffold';
- }
-
- if ($this->bake($controller, $actions)) {
- if ($this->_checkUnitTest()) {
- $this->bakeTest($controller);
- }
- }
- }
- }
-
-/**
- * Bake All the controllers at once. Will only bake controllers for models that exist.
- *
- * @return void
- */
- public function all() {
- $this->interactive = false;
- $this->listAll($this->connection, false);
- ClassRegistry::config('Model', array('ds' => $this->connection));
- $unitTestExists = $this->_checkUnitTest();
- foreach ($this->__tables as $table) {
- $model = $this->_modelName($table);
- $controller = $this->_controllerName($model);
- App::uses($model, 'Model');
- if (class_exists($model)) {
- $actions = $this->bakeActions($controller);
- if ($this->bake($controller, $actions) && $unitTestExists) {
- $this->bakeTest($controller);
- }
- }
- }
- }
-
-/**
- * Interactive
- *
- * @return void
- */
- protected function _interactive() {
- $this->interactive = true;
- $this->hr();
- $this->out(__d('cake_console', "Bake Controller\nPath: %s", $this->getPath()));
- $this->hr();
-
- if (empty($this->connection)) {
- $this->connection = $this->DbConfig->getConfig();
- }
-
- $controllerName = $this->getName();
- $this->hr();
- $this->out(__d('cake_console', 'Baking %sController', $controllerName));
- $this->hr();
-
- $helpers = $components = array();
- $actions = '';
- $wannaUseSession = 'y';
- $wannaBakeAdminCrud = 'n';
- $useDynamicScaffold = 'n';
- $wannaBakeCrud = 'y';
-
- $question[] = __d('cake_console', "Would you like to build your controller interactively?");
- if (file_exists($this->path . $controllerName . 'Controller.php')) {
- $question[] = __d('cake_console', "Warning: Choosing no will overwrite the %sController.", $controllerName);
- }
- $doItInteractive = $this->in(implode("\n", $question), array('y', 'n'), 'y');
-
- if (strtolower($doItInteractive) == 'y') {
- $this->interactive = true;
- $useDynamicScaffold = $this->in(
- __d('cake_console', "Would you like to use dynamic scaffolding?"), array('y', 'n'), 'n'
- );
-
- if (strtolower($useDynamicScaffold) == 'y') {
- $wannaBakeCrud = 'n';
- $actions = 'scaffold';
- } else {
- list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
-
- $helpers = $this->doHelpers();
- $components = $this->doComponents();
-
- $wannaUseSession = $this->in(
- __d('cake_console', "Would you like to use Session flash messages?"), array('y','n'), 'y'
- );
- }
- } else {
- list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
- }
-
- if (strtolower($wannaBakeCrud) == 'y') {
- $actions = $this->bakeActions($controllerName, null, strtolower($wannaUseSession) == 'y');
- }
- if (strtolower($wannaBakeAdminCrud) == 'y') {
- $admin = $this->Project->getPrefix();
- $actions .= $this->bakeActions($controllerName, $admin, strtolower($wannaUseSession) == 'y');
- }
-
- $baked = false;
- if ($this->interactive === true) {
- $this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components);
- $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y');
-
- if (strtolower($looksGood) == 'y') {
- $baked = $this->bake($controllerName, $actions, $helpers, $components);
- if ($baked && $this->_checkUnitTest()) {
- $this->bakeTest($controllerName);
- }
- }
- } else {
- $baked = $this->bake($controllerName, $actions, $helpers, $components);
- if ($baked && $this->_checkUnitTest()) {
- $this->bakeTest($controllerName);
- }
- }
- return $baked;
- }
-
-/**
- * Confirm a to be baked controller with the user
- *
- * @param string $controllerName
- * @param string $useDynamicScaffold
- * @param array $helpers
- * @param array $components
- * @return void
- */
- public function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) {
- $this->out();
- $this->hr();
- $this->out(__d('cake_console', 'The following controller will be created:'));
- $this->hr();
- $this->out(__d('cake_console', "Controller Name:\n\t%s", $controllerName));
-
- if (strtolower($useDynamicScaffold) == 'y') {
- $this->out("public \$scaffold;");
- }
-
- $properties = array(
- 'helpers' => __d('cake_console', 'Helpers:'),
- 'components' => __d('cake_console', 'Components:'),
- );
-
- foreach ($properties as $var => $title) {
- if (count($$var)) {
- $output = '';
- $length = count($$var);
- foreach ($$var as $i => $propElement) {
- if ($i != $length - 1) {
- $output .= ucfirst($propElement) . ', ';
- } else {
- $output .= ucfirst($propElement);
- }
- }
- $this->out($title . "\n\t" . $output);
- }
- }
- $this->hr();
- }
-
-/**
- * Interact with the user and ask about which methods (admin or regular they want to bake)
- *
- * @return array Array containing (bakeRegular, bakeAdmin) answers
- */
- protected function _askAboutMethods() {
- $wannaBakeCrud = $this->in(
- __d('cake_console', "Would you like to create some basic class methods \n(index(), add(), view(), edit())?"),
- array('y','n'), 'n'
- );
- $wannaBakeAdminCrud = $this->in(
- __d('cake_console', "Would you like to create the basic class methods for admin routing?"),
- array('y','n'), 'n'
- );
- return array($wannaBakeCrud, $wannaBakeAdminCrud);
- }
-
-/**
- * Bake scaffold actions
- *
- * @param string $controllerName Controller name
- * @param string $admin Admin route to use
- * @param boolean $wannaUseSession Set to true to use sessions, false otherwise
- * @return string Baked actions
- */
- public function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
- $currentModelName = $modelImport = $this->_modelName($controllerName);
- $plugin = $this->plugin;
- if ($plugin) {
- $plugin .= '.';
- }
- App::uses($modelImport, $plugin . 'Model');
- if (!class_exists($modelImport)) {
- $this->err(__d('cake_console', 'You must have a model for this class to build basic methods. Please try again.'));
- $this->_stop();
- }
-
- $modelObj = ClassRegistry::init($currentModelName);
- $controllerPath = $this->_controllerPath($controllerName);
- $pluralName = $this->_pluralName($currentModelName);
- $singularName = Inflector::variable($currentModelName);
- $singularHumanName = $this->_singularHumanName($controllerName);
- $pluralHumanName = $this->_pluralName($controllerName);
- $displayField = $modelObj->displayField;
- $primaryKey = $modelObj->primaryKey;
-
- $this->Template->set(compact(
- 'plugin', 'admin', 'controllerPath', 'pluralName', 'singularName',
- 'singularHumanName', 'pluralHumanName', 'modelObj', 'wannaUseSession', 'currentModelName',
- 'displayField', 'primaryKey'
- ));
- $actions = $this->Template->generate('actions', 'controller_actions');
- return $actions;
- }
-
-/**
- * Assembles and writes a Controller file
- *
- * @param string $controllerName Controller name already pluralized and correctly cased.
- * @param string $actions Actions to add, or set the whole controller to use $scaffold (set $actions to 'scaffold')
- * @param array $helpers Helpers to use in controller
- * @param array $components Components to use in controller
- * @return string Baked controller
- */
- public function bake($controllerName, $actions = '', $helpers = null, $components = null) {
- $this->out("\n" . __d('cake_console', 'Baking controller class for %s...', $controllerName), 1, Shell::QUIET);
-
- $isScaffold = ($actions === 'scaffold') ? true : false;
-
- $this->Template->set(array(
- 'plugin' => $this->plugin,
- 'pluginPath' => empty($this->plugin) ? '' : $this->plugin . '.'
- ));
- $this->Template->set(compact('controllerName', 'actions', 'helpers', 'components', 'isScaffold'));
- $contents = $this->Template->generate('classes', 'controller');
-
- $path = $this->getPath();
- $filename = $path . $controllerName . 'Controller.php';
- if ($this->createFile($filename, $contents)) {
- return $contents;
- }
- return false;
- }
-
-/**
- * Assembles and writes a unit test file
- *
- * @param string $className Controller class name
- * @return string Baked test
- */
- public function bakeTest($className) {
- $this->Test->plugin = $this->plugin;
- $this->Test->connection = $this->connection;
- $this->Test->interactive = $this->interactive;
- return $this->Test->bake('Controller', $className);
- }
-
-/**
- * Interact with the user and get a list of additional helpers
- *
- * @return array Helpers that the user wants to use.
- */
- public function doHelpers() {
- return $this->_doPropertyChoices(
- __d('cake_console', "Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?"),
- __d('cake_console', "Please provide a comma separated list of the other\nhelper names you'd like to use.\nExample: 'Ajax, Javascript, Time'")
- );
- }
-
-/**
- * Interact with the user and get a list of additional components
- *
- * @return array Components the user wants to use.
- */
- public function doComponents() {
- return $this->_doPropertyChoices(
- __d('cake_console', "Would you like this controller to use any components?"),
- __d('cake_console', "Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'")
- );
- }
-
-/**
- * Common code for property choice handling.
- *
- * @param string $prompt A yes/no question to precede the list
- * @param string $example A question for a comma separated list, with examples.
- * @return array Array of values for property.
- */
- protected function _doPropertyChoices($prompt, $example) {
- $proceed = $this->in($prompt, array('y','n'), 'n');
- $property = array();
- if (strtolower($proceed) == 'y') {
- $propertyList = $this->in($example);
- $propertyListTrimmed = str_replace(' ', '', $propertyList);
- $property = explode(',', $propertyListTrimmed);
- }
- return array_filter($property);
- }
-
-/**
- * Outputs and gets the list of possible controllers from database
- *
- * @param string $useDbConfig Database configuration name
- * @return array Set of controllers
- */
- public function listAll($useDbConfig = null) {
- if (is_null($useDbConfig)) {
- $useDbConfig = $this->connection;
- }
- $this->__tables = $this->Model->getAllTables($useDbConfig);
-
- if ($this->interactive == true) {
- $this->out(__d('cake_console', 'Possible Controllers based on your current database:'));
- $this->_controllerNames = array();
- $count = count($this->__tables);
- for ($i = 0; $i < $count; $i++) {
- $this->_controllerNames[] = $this->_controllerName($this->_modelName($this->__tables[$i]));
- $this->out($i + 1 . ". " . $this->_controllerNames[$i]);
- }
- return $this->_controllerNames;
- }
- return $this->__tables;
- }
-
-/**
- * Forces the user to specify the controller he wants to bake, and returns the selected controller name.
- *
- * @param string $useDbConfig Connection name to get a controller name for.
- * @return string Controller name
- */
- public function getName($useDbConfig = null) {
- $controllers = $this->listAll($useDbConfig);
- $enteredController = '';
-
- while ($enteredController == '') {
- $enteredController = $this->in(__d('cake_console', "Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit"), null, 'q');
- if ($enteredController === 'q') {
- $this->out(__d('cake_console', 'Exit'));
- return $this->_stop();
- }
-
- if ($enteredController == '' || intval($enteredController) > count($controllers)) {
- $this->err(__d('cake_console', "The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again."));
- $enteredController = '';
- }
- }
-
- if (intval($enteredController) > 0 && intval($enteredController) <= count($controllers) ) {
- $controllerName = $controllers[intval($enteredController) - 1];
- } else {
- $controllerName = Inflector::camelize($enteredController);
- }
- return $controllerName;
- }
-
-/**
- * get the option parser.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(
- __d('cake_console', 'Bake a controller for a model. Using options you can bake public, admin or both.')
- )->addArgument('name', array(
- 'help' => __d('cake_console', 'Name of the controller to bake. Can use Plugin.name to bake controllers into plugins.')
- ))->addOption('public', array(
- 'help' => __d('cake_console', 'Bake a controller with basic crud actions (index, view, add, edit, delete).'),
- 'boolean' => true
- ))->addOption('admin', array(
- 'help' => __d('cake_console', 'Bake a controller with crud actions for one of the Routing.prefixes.'),
- 'boolean' => true
- ))->addOption('plugin', array(
- 'short' => 'p',
- 'help' => __d('cake_console', 'Plugin to bake the controller into.')
- ))->addOption('connection', array(
- 'short' => 'c',
- 'help' => __d('cake_console', 'The connection the controller\'s model is on.')
- ))->addSubcommand('all', array(
- 'help' => __d('cake_console', 'Bake all controllers with CRUD methods.')
- ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.'));
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
deleted file mode 100644
index 0bf28ff9659..00000000000
--- a/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ /dev/null
@@ -1,384 +0,0 @@
- 'default',
- 'datasource' => 'Database/Mysql',
- 'persistent' => 'false',
- 'host' => 'localhost',
- 'login' => 'root',
- 'password' => 'password',
- 'database' => 'project_name',
- 'schema' => null,
- 'prefix' => null,
- 'encoding' => null,
- 'port' => null
- );
-
-/**
- * String name of the database config class name.
- * Used for testing.
- *
- * @var string
- */
- public $databaseClassName = 'DATABASE_CONFIG';
-
-/**
- * initialization callback
- *
- * @return void
- */
- public function initialize() {
- $this->path = APP . 'Config' . DS;
- }
-
-/**
- * Execution method always used for tasks
- *
- * @return void
- */
- public function execute() {
- if (empty($this->args)) {
- $this->_interactive();
- $this->_stop();
- }
- }
-
-/**
- * Interactive interface
- *
- * @return void
- */
- protected function _interactive() {
- $this->hr();
- $this->out(__d('cake_console', 'Database Configuration:'));
- $this->hr();
- $done = false;
- $dbConfigs = array();
-
- while ($done == false) {
- $name = '';
-
- while ($name == '') {
- $name = $this->in(__d('cake_console', "Name:"), null, 'default');
- if (preg_match('/[^a-z0-9_]/i', $name)) {
- $name = '';
- $this->out(__d('cake_console', 'The name may only contain unaccented latin characters, numbers or underscores'));
- } elseif (preg_match('/^[^a-z_]/i', $name)) {
- $name = '';
- $this->out(__d('cake_console', 'The name must start with an unaccented latin character or an underscore'));
- }
- }
-
- $datasource = $this->in(__d('cake_console', 'Datasource:'), array('Mysql', 'Postgres', 'Sqlite', 'Sqlserver'), 'Mysql');
-
- $persistent = $this->in(__d('cake_console', 'Persistent Connection?'), array('y', 'n'), 'n');
- if (strtolower($persistent) == 'n') {
- $persistent = 'false';
- } else {
- $persistent = 'true';
- }
-
- $host = '';
- while ($host == '') {
- $host = $this->in(__d('cake_console', 'Database Host:'), null, 'localhost');
- }
-
- $port = '';
- while ($port == '') {
- $port = $this->in(__d('cake_console', 'Port?'), null, 'n');
- }
-
- if (strtolower($port) == 'n') {
- $port = null;
- }
-
- $login = '';
- while ($login == '') {
- $login = $this->in(__d('cake_console', 'User:'), null, 'root');
- }
- $password = '';
- $blankPassword = false;
-
- while ($password == '' && $blankPassword == false) {
- $password = $this->in(__d('cake_console', 'Password:'));
-
- if ($password == '') {
- $blank = $this->in(__d('cake_console', 'The password you supplied was empty. Use an empty password?'), array('y', 'n'), 'n');
- if ($blank == 'y') {
- $blankPassword = true;
- }
- }
- }
-
- $database = '';
- while ($database == '') {
- $database = $this->in(__d('cake_console', 'Database Name:'), null, 'cake');
- }
-
- $prefix = '';
- while ($prefix == '') {
- $prefix = $this->in(__d('cake_console', 'Table Prefix?'), null, 'n');
- }
- if (strtolower($prefix) == 'n') {
- $prefix = null;
- }
-
- $encoding = '';
- while ($encoding == '') {
- $encoding = $this->in(__d('cake_console', 'Table encoding?'), null, 'n');
- }
- if (strtolower($encoding) == 'n') {
- $encoding = null;
- }
-
- $schema = '';
- if ($datasource == 'postgres') {
- while ($schema == '') {
- $schema = $this->in(__d('cake_console', 'Table schema?'), null, 'n');
- }
- }
- if (strtolower($schema) == 'n') {
- $schema = null;
- }
-
- $config = compact('name', 'datasource', 'persistent', 'host', 'login', 'password', 'database', 'prefix', 'encoding', 'port', 'schema');
-
- while ($this->_verify($config) == false) {
- $this->_interactive();
- }
-
- $dbConfigs[] = $config;
- $doneYet = $this->in(__d('cake_console', 'Do you wish to add another database configuration?'), null, 'n');
-
- if (strtolower($doneYet == 'n')) {
- $done = true;
- }
- }
-
- $this->bake($dbConfigs);
- config('database');
- return true;
- }
-
-/**
- * Output verification message and bake if it looks good
- *
- * @param array $config
- * @return boolean True if user says it looks good, false otherwise
- */
- protected function _verify($config) {
- $config = array_merge($this->_defaultConfig, $config);
- extract($config);
- $this->out();
- $this->hr();
- $this->out(__d('cake_console', 'The following database configuration will be created:'));
- $this->hr();
- $this->out(__d('cake_console', "Name: %s", $name));
- $this->out(__d('cake_console', "Datasource: %s", $datasource));
- $this->out(__d('cake_console', "Persistent: %s", $persistent));
- $this->out(__d('cake_console', "Host: %s", $host));
-
- if ($port) {
- $this->out(__d('cake_console', "Port: %s", $port));
- }
-
- $this->out(__d('cake_console', "User: %s", $login));
- $this->out(__d('cake_console', "Pass: %s", str_repeat('*', strlen($password))));
- $this->out(__d('cake_console', "Database: %s", $database));
-
- if ($prefix) {
- $this->out(__d('cake_console', "Table prefix: %s", $prefix));
- }
-
- if ($schema) {
- $this->out(__d('cake_console', "Schema: %s", $schema));
- }
-
- if ($encoding) {
- $this->out(__d('cake_console', "Encoding: %s", $encoding));
- }
-
- $this->hr();
- $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
-
- if (strtolower($looksGood) == 'y') {
- return $config;
- }
- return false;
- }
-
-/**
- * Assembles and writes database.php
- *
- * @param array $configs Configuration settings to use
- * @return boolean Success
- */
- public function bake($configs) {
- if (!is_dir($this->path)) {
- $this->err(__d('cake_console', '%s not found', $this->path));
- return false;
- }
-
- $filename = $this->path . 'database.php';
- $oldConfigs = array();
-
- if (file_exists($filename)) {
- config('database');
- $db = new $this->databaseClassName;
- $temp = get_class_vars(get_class($db));
-
- foreach ($temp as $configName => $info) {
- $info = array_merge($this->_defaultConfig, $info);
-
- if (!isset($info['schema'])) {
- $info['schema'] = null;
- }
- if (!isset($info['encoding'])) {
- $info['encoding'] = null;
- }
- if (!isset($info['port'])) {
- $info['port'] = null;
- }
-
- if ($info['persistent'] === false) {
- $info['persistent'] = 'false';
- } else {
- $info['persistent'] = ($info['persistent'] == true) ? 'true' : 'false';
- }
-
- $oldConfigs[] = array(
- 'name' => $configName,
- 'datasource' => $info['datasource'],
- 'persistent' => $info['persistent'],
- 'host' => $info['host'],
- 'port' => $info['port'],
- 'login' => $info['login'],
- 'password' => $info['password'],
- 'database' => $info['database'],
- 'prefix' => $info['prefix'],
- 'schema' => $info['schema'],
- 'encoding' => $info['encoding']
- );
- }
- }
-
- foreach ($oldConfigs as $key => $oldConfig) {
- foreach ($configs as $key1 => $config) {
- if ($oldConfig['name'] == $config['name']) {
- unset($oldConfigs[$key]);
- }
- }
- }
-
- $configs = array_merge($oldConfigs, $configs);
- $out = "_defaultConfig, $config);
- extract($config);
-
- $out .= "\tpublic \${$name} = array(\n";
- $out .= "\t\t'datasource' => 'Database/{$datasource}',\n";
- $out .= "\t\t'persistent' => {$persistent},\n";
- $out .= "\t\t'host' => '{$host}',\n";
-
- if ($port) {
- $out .= "\t\t'port' => {$port},\n";
- }
-
- $out .= "\t\t'login' => '{$login}',\n";
- $out .= "\t\t'password' => '{$password}',\n";
- $out .= "\t\t'database' => '{$database}',\n";
-
- if ($schema) {
- $out .= "\t\t'schema' => '{$schema}',\n";
- }
-
- if ($prefix) {
- $out .= "\t\t'prefix' => '{$prefix}',\n";
- }
-
- if ($encoding) {
- $out .= "\t\t'encoding' => '{$encoding}'\n";
- }
-
- $out .= "\t);\n";
- }
-
- $out .= "}\n";
- $filename = $this->path . 'database.php';
- return $this->createFile($filename, $out);
- }
-
-/**
- * Get a user specified Connection name
- *
- * @return void
- */
- public function getConfig() {
- App::uses('ConnectionManager', 'Model');
- $configs = ConnectionManager::enumConnectionObjects();
-
- $useDbConfig = key($configs);
- if (!is_array($configs) || empty($configs)) {
- return $this->execute();
- }
- $connections = array_keys($configs);
-
- if (count($connections) > 1) {
- $useDbConfig = $this->in(__d('cake_console', 'Use Database Config') . ':', $connections, $useDbConfig);
- }
- return $useDbConfig;
- }
-
-/**
- * get the option parser
- *
- * @return ConsoleOptionParser
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(
- __d('cake_console', 'Bake new database configuration settings.')
- );
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/ExtractTask.php b/lib/Cake/Console/Command/Task/ExtractTask.php
deleted file mode 100644
index 64aad3b032f..00000000000
--- a/lib/Cake/Console/Command/Task/ExtractTask.php
+++ /dev/null
@@ -1,700 +0,0 @@
-params['exclude'])) {
- $this->_exclude = explode(',', $this->params['exclude']);
- }
- if (isset($this->params['files']) && !is_array($this->params['files'])) {
- $this->_files = explode(',', $this->params['files']);
- }
- if (isset($this->params['paths'])) {
- $this->_paths = explode(',', $this->params['paths']);
- } elseif (isset($this->params['plugin'])) {
- $plugin = Inflector::camelize($this->params['plugin']);
- if (!CakePlugin::loaded($plugin)) {
- CakePlugin::load($plugin);
- }
- $this->_paths = array(CakePlugin::path($plugin));
- $this->params['plugin'] = $plugin;
- } else {
- $defaultPath = APP;
- $message = __d('cake_console', "What is the path you would like to extract?\n[Q]uit [D]one");
- while (true) {
- $response = $this->in($message, null, $defaultPath);
- if (strtoupper($response) === 'Q') {
- $this->out(__d('cake_console', 'Extract Aborted'));
- $this->_stop();
- } elseif (strtoupper($response) === 'D') {
- $this->out();
- break;
- } elseif (is_dir($response)) {
- $this->_paths[] = $response;
- $defaultPath = 'D';
- } else {
- $this->err(__d('cake_console', 'The directory path you supplied was not found. Please try again.'));
- }
- $this->out();
- }
- }
-
- if (!empty($this->params['exclude-plugins']) && $this->_isExtractingApp()) {
- $this->_exclude = array_merge($this->_exclude, App::path('plugins'));
- }
-
- if (!empty($this->params['ignore-model-validation']) || (!$this->_isExtractingApp() && empty($plugin))) {
- $this->_extractValidation = false;
- }
- if (!empty($this->params['validation-domain'])) {
- $this->_validationDomain = $this->params['validation-domain'];
- }
-
- if (isset($this->params['output'])) {
- $this->_output = $this->params['output'];
- } elseif (isset($this->params['plugin'])) {
- $this->_output = $this->_paths[0] . DS . 'Locale';
- } else {
- $message = __d('cake_console', "What is the path you would like to output?\n[Q]uit", $this->_paths[0] . DS . 'Locale');
- while (true) {
- $response = $this->in($message, null, rtrim($this->_paths[0], DS) . DS . 'Locale');
- if (strtoupper($response) === 'Q') {
- $this->out(__d('cake_console', 'Extract Aborted'));
- $this->_stop();
- } elseif (is_dir($response)) {
- $this->_output = $response . DS;
- break;
- } else {
- $this->err(__d('cake_console', 'The directory path you supplied was not found. Please try again.'));
- }
- $this->out();
- }
- }
-
- if (isset($this->params['merge'])) {
- $this->_merge = !(strtolower($this->params['merge']) === 'no');
- } else {
- $this->out();
- $response = $this->in(__d('cake_console', 'Would you like to merge all domains strings into the default.pot file?'), array('y', 'n'), 'n');
- $this->_merge = strtolower($response) === 'y';
- }
-
- if (empty($this->_files)) {
- $this->_searchFiles();
- }
- $this->_output = rtrim($this->_output, DS) . DS;
- $this->_extract();
- }
-
-/**
- * Add a translation to the internal translations property
- *
- * Takes care of duplicate translations
- *
- * @param string $domain
- * @param string $msgid
- * @param array $details
- */
- protected function _addTranslation($domain, $msgid, $details = array()) {
- if (empty($this->_translations[$domain][$msgid])) {
- $this->_translations[$domain][$msgid] = array(
- 'msgid_plural' => false
- );
- }
-
- if (isset($details['msgid_plural'])) {
- $this->_translations[$domain][$msgid]['msgid_plural'] = $details['msgid_plural'];
- }
-
- if (isset($details['file'])) {
- $line = 0;
- if (isset($details['line'])) {
- $line = $details['line'];
- }
- $this->_translations[$domain][$msgid]['references'][$details['file']][] = $line;
- }
- }
-
-/**
- * Extract text
- *
- * @return void
- */
- protected function _extract() {
- $this->out();
- $this->out();
- $this->out(__d('cake_console', 'Extracting...'));
- $this->hr();
- $this->out(__d('cake_console', 'Paths:'));
- foreach ($this->_paths as $path) {
- $this->out(' ' . $path);
- }
- $this->out(__d('cake_console', 'Output Directory: ') . $this->_output);
- $this->hr();
- $this->_extractTokens();
- $this->_extractValidationMessages();
- $this->_buildFiles();
- $this->_writeFiles();
- $this->_paths = $this->_files = $this->_storage = array();
- $this->_translations = $this->_tokens = array();
- $this->_extractValidation = true;
- $this->out();
- $this->out(__d('cake_console', 'Done.'));
- }
-
-/**
- * Get & configure the option parser
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(__d('cake_console', 'CakePHP Language String Extraction:'))
- ->addOption('app', array('help' => __d('cake_console', 'Directory where your application is located.')))
- ->addOption('paths', array('help' => __d('cake_console', 'Comma separated list of paths.')))
- ->addOption('merge', array(
- 'help' => __d('cake_console', 'Merge all domain strings into the default.po file.'),
- 'choices' => array('yes', 'no')
- ))
- ->addOption('output', array('help' => __d('cake_console', 'Full path to output directory.')))
- ->addOption('files', array('help' => __d('cake_console', 'Comma separated list of files.')))
- ->addOption('exclude-plugins', array(
- 'boolean' => true,
- 'default' => true,
- 'help' => __d('cake_console', 'Ignores all files in plugins if this command is run inside from the same app directory.')
- ))
- ->addOption('plugin', array(
- 'help' => __d('cake_console', 'Extracts tokens only from the plugin specified and puts the result in the plugin\'s Locale directory.')
- ))
- ->addOption('ignore-model-validation', array(
- 'boolean' => true,
- 'default' => false,
- 'help' => __d('cake_console', 'Ignores validation messages in the $validate property.' .
- ' If this flag is not set and the command is run from the same app directory,' .
- ' all messages in model validation rules will be extracted as tokens.')
- ))
- ->addOption('validation-domain', array(
- 'help' => __d('cake_console', 'If set to a value, the localization domain to be used for model validation messages.')
- ))
- ->addOption('exclude', array(
- 'help' => __d('cake_console', 'Comma separated list of directories to exclude.' .
- ' Any path containing a path segment with the provided values will be skipped. E.g. test,vendors')
- ));
- }
-
-/**
- * Extract tokens out of all files to be processed
- *
- * @return void
- */
- protected function _extractTokens() {
- foreach ($this->_files as $file) {
- $this->_file = $file;
- $this->out(__d('cake_console', 'Processing %s...', $file));
-
- $code = file_get_contents($file);
- $allTokens = token_get_all($code);
-
- $this->_tokens = array();
- foreach ($allTokens as $token) {
- if (!is_array($token) || ($token[0] != T_WHITESPACE && $token[0] != T_INLINE_HTML)) {
- $this->_tokens[] = $token;
- }
- }
- unset($allTokens);
- $this->_parse('__', array('singular'));
- $this->_parse('__n', array('singular', 'plural'));
- $this->_parse('__d', array('domain', 'singular'));
- $this->_parse('__c', array('singular'));
- $this->_parse('__dc', array('domain', 'singular'));
- $this->_parse('__dn', array('domain', 'singular', 'plural'));
- $this->_parse('__dcn', array('domain', 'singular', 'plural'));
- }
- }
-
-/**
- * Parse tokens
- *
- * @param string $functionName Function name that indicates translatable string (e.g: '__')
- * @param array $map Array containing what variables it will find (e.g: domain, singular, plural)
- * @return void
- */
- protected function _parse($functionName, $map) {
- $count = 0;
- $tokenCount = count($this->_tokens);
-
- while (($tokenCount - $count) > 1) {
- $countToken = $this->_tokens[$count];
- $firstParenthesis = $this->_tokens[$count + 1];
- if (!is_array($countToken)) {
- $count++;
- continue;
- }
-
- list($type, $string, $line) = $countToken;
- if (($type == T_STRING) && ($string == $functionName) && ($firstParenthesis == '(')) {
- $position = $count;
- $depth = 0;
-
- while ($depth == 0) {
- if ($this->_tokens[$position] == '(') {
- $depth++;
- } elseif ($this->_tokens[$position] == ')') {
- $depth--;
- }
- $position++;
- }
-
- $mapCount = count($map);
- $strings = $this->_getStrings($position, $mapCount);
-
- if ($mapCount == count($strings)) {
- extract(array_combine($map, $strings));
- $domain = isset($domain) ? $domain : 'default';
- $details = array(
- 'file' => $this->_file,
- 'line' => $line,
- );
- if (isset($plural)) {
- $details['msgid_plural'] = $plural;
- }
- $this->_addTranslation($domain, $singular, $details);
- } else {
- $this->_markerError($this->_file, $line, $functionName, $count);
- }
- }
- $count++;
- }
- }
-
-/**
- * Looks for models in the application and extracts the validation messages
- * to be added to the translation map
- *
- * @return void
- */
- protected function _extractValidationMessages() {
- if (!$this->_extractValidation) {
- return;
- }
-
- App::uses('AppModel', 'Model');
- $plugin = null;
- if (!empty($this->params['plugin'])) {
- App::uses($this->params['plugin'] . 'AppModel', $this->params['plugin'] . '.Model');
- $plugin = $this->params['plugin'] . '.';
- }
- $models = App::objects($plugin . 'Model', null, false);
-
- foreach ($models as $model) {
- App::uses($model, $plugin . 'Model');
- $reflection = new ReflectionClass($model);
- if (!$reflection->isSubClassOf('Model')) {
- continue;
- }
- $properties = $reflection->getDefaultProperties();
- $validate = $properties['validate'];
- if (empty($validate)) {
- continue;
- }
-
- $file = $reflection->getFileName();
- $domain = $this->_validationDomain;
- if (!empty($properties['validationDomain'])) {
- $domain = $properties['validationDomain'];
- }
- foreach ($validate as $field => $rules) {
- $this->_processValidationRules($field, $rules, $file, $domain);
- }
- }
- }
-
-/**
- * Process a validation rule for a field and looks for a message to be added
- * to the translation map
- *
- * @param string $field the name of the field that is being processed
- * @param array $rules the set of validation rules for the field
- * @param string $file the file name where this validation rule was found
- * @param string $domain default domain to bind the validations to
- * @return void
- */
- protected function _processValidationRules($field, $rules, $file, $domain) {
- if (!is_array($rules)) {
- return;
- }
-
- $dims = Set::countDim($rules);
- if ($dims == 1 || ($dims == 2 && isset($rules['message']))) {
- $rules = array($rules);
- }
-
- foreach ($rules as $rule => $validateProp) {
- $msgid = null;
- if (isset($validateProp['message'])) {
- if (is_array($validateProp['message'])) {
- $msgid = $validateProp['message'][0];
- } else {
- $msgid = $validateProp['message'];
- }
- } elseif (is_string($rule)) {
- $msgid = $rule;
- }
- if ($msgid) {
- $details = array(
- 'file' => $file,
- 'line' => 'validation for field ' . $field
- );
- $this->_addTranslation($domain, $msgid, $details);
- }
- }
- }
-
-/**
- * Build the translate template file contents out of obtained strings
- *
- * @return void
- */
- protected function _buildFiles() {
- foreach ($this->_translations as $domain => $translations) {
- foreach ($translations as $msgid => $details) {
- $plural = $details['msgid_plural'];
- $files = $details['references'];
- $occurrences = array();
- foreach ($files as $file => $lines) {
- $lines = array_unique($lines);
- $occurrences[] = $file . ':' . implode(';', $lines);
- }
- $occurrences = implode("\n#: ", $occurrences);
- $header = '#: ' . str_replace($this->_paths, '', $occurrences) . "\n";
-
- if ($plural === false) {
- $sentence = "msgid \"{$msgid}\"\n";
- $sentence .= "msgstr \"\"\n\n";
- } else {
- $sentence = "msgid \"{$msgid}\"\n";
- $sentence .= "msgid_plural \"{$plural}\"\n";
- $sentence .= "msgstr[0] \"\"\n";
- $sentence .= "msgstr[1] \"\"\n\n";
- }
-
- $this->_store($domain, $header, $sentence);
- if ($domain != 'default' && $this->_merge) {
- $this->_store('default', $header, $sentence);
- }
- }
- }
- }
-
-/**
- * Prepare a file to be stored
- *
- * @param string $domain
- * @param string $header
- * @param string $sentence
- * @return void
- */
- protected function _store($domain, $header, $sentence) {
- if (!isset($this->_storage[$domain])) {
- $this->_storage[$domain] = array();
- }
- if (!isset($this->_storage[$domain][$sentence])) {
- $this->_storage[$domain][$sentence] = $header;
- } else {
- $this->_storage[$domain][$sentence] .= $header;
- }
- }
-
-/**
- * Write the files that need to be stored
- *
- * @return void
- */
- protected function _writeFiles() {
- $overwriteAll = false;
- foreach ($this->_storage as $domain => $sentences) {
- $output = $this->_writeHeader();
- foreach ($sentences as $sentence => $header) {
- $output .= $header . $sentence;
- }
-
- $filename = $domain . '.pot';
- $File = new File($this->_output . $filename);
- $response = '';
- while ($overwriteAll === false && $File->exists() && strtoupper($response) !== 'Y') {
- $this->out();
- $response = $this->in(
- __d('cake_console', 'Error: %s already exists in this location. Overwrite? [Y]es, [N]o, [A]ll', $filename),
- array('y', 'n', 'a'),
- 'y'
- );
- if (strtoupper($response) === 'N') {
- $response = '';
- while ($response == '') {
- $response = $this->in(__d('cake_console', "What would you like to name this file?"), null, 'new_' . $filename);
- $File = new File($this->_output . $response);
- $filename = $response;
- }
- } elseif (strtoupper($response) === 'A') {
- $overwriteAll = true;
- }
- }
- $File->write($output);
- $File->close();
- }
- }
-
-/**
- * Build the translation template header
- *
- * @return string Translation template header
- */
- protected function _writeHeader() {
- $output = "# LANGUAGE translation of CakePHP Application\n";
- $output .= "# Copyright YEAR NAME \n";
- $output .= "#\n";
- $output .= "#, fuzzy\n";
- $output .= "msgid \"\"\n";
- $output .= "msgstr \"\"\n";
- $output .= "\"Project-Id-Version: PROJECT VERSION\\n\"\n";
- $output .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
- $output .= "\"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\\n\"\n";
- $output .= "\"Last-Translator: NAME \\n\"\n";
- $output .= "\"Language-Team: LANGUAGE \\n\"\n";
- $output .= "\"MIME-Version: 1.0\\n\"\n";
- $output .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n";
- $output .= "\"Content-Transfer-Encoding: 8bit\\n\"\n";
- $output .= "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n\"\n\n";
- return $output;
- }
-
-/**
- * Get the strings from the position forward
- *
- * @param integer $position Actual position on tokens array
- * @param integer $target Number of strings to extract
- * @return array Strings extracted
- */
- protected function _getStrings(&$position, $target) {
- $strings = array();
- $count = count($strings);
- while ($count < $target && ($this->_tokens[$position] == ',' || $this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING)) {
- $count = count($strings);
- if ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING && $this->_tokens[$position + 1] == '.') {
- $string = '';
- while ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING || $this->_tokens[$position] == '.') {
- if ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING) {
- $string .= $this->_formatString($this->_tokens[$position][1]);
- }
- $position++;
- }
- $strings[] = $string;
- } elseif ($this->_tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING) {
- $strings[] = $this->_formatString($this->_tokens[$position][1]);
- }
- $position++;
- }
- return $strings;
- }
-
-/**
- * Format a string to be added as a translatable string
- *
- * @param string $string String to format
- * @return string Formatted string
- */
- protected function _formatString($string) {
- $quote = substr($string, 0, 1);
- $string = substr($string, 1, -1);
- if ($quote == '"') {
- $string = stripcslashes($string);
- } else {
- $string = strtr($string, array("\\'" => "'", "\\\\" => "\\"));
- }
- $string = str_replace("\r\n", "\n", $string);
- return addcslashes($string, "\0..\37\\\"");
- }
-
-/**
- * Indicate an invalid marker on a processed file
- *
- * @param string $file File where invalid marker resides
- * @param integer $line Line number
- * @param string $marker Marker found
- * @param integer $count Count
- * @return void
- */
- protected function _markerError($file, $line, $marker, $count) {
- $this->out(__d('cake_console', "Invalid marker content in %s:%s\n* %s(", $file, $line, $marker), true);
- $count += 2;
- $tokenCount = count($this->_tokens);
- $parenthesis = 1;
-
- while ((($tokenCount - $count) > 0) && $parenthesis) {
- if (is_array($this->_tokens[$count])) {
- $this->out($this->_tokens[$count][1], false);
- } else {
- $this->out($this->_tokens[$count], false);
- if ($this->_tokens[$count] == '(') {
- $parenthesis++;
- }
-
- if ($this->_tokens[$count] == ')') {
- $parenthesis--;
- }
- }
- $count++;
- }
- $this->out("\n", true);
- }
-
-/**
- * Search files that may contain translatable strings
- *
- * @return void
- */
- protected function _searchFiles() {
- $pattern = false;
- if (!empty($this->_exclude)) {
- $exclude = array();
- foreach ($this->_exclude as $e) {
- if (DS !== '\\' && $e[0] !== DS) {
- $e = DS . $e;
- }
- $exclude[] = preg_quote($e, '/');
- }
- $pattern = '/' . implode('|', $exclude) . '/';
- }
- foreach ($this->_paths as $path) {
- $Folder = new Folder($path);
- $files = $Folder->findRecursive('.*\.(php|ctp|thtml|inc|tpl)', true);
- if (!empty($pattern)) {
- foreach ($files as $i => $file) {
- if (preg_match($pattern, $file)) {
- unset($files[$i]);
- }
- }
- $files = array_values($files);
- }
- $this->_files = array_merge($this->_files, $files);
- }
- }
-
-/**
- * Returns whether this execution is meant to extract string only from directories in folder represented by the
- * APP constant, i.e. this task is extracting strings from same application.
- *
- * @return boolean
- */
- protected function _isExtractingApp() {
- return $this->_paths === array(APP);
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php
deleted file mode 100644
index c4bf93d6251..00000000000
--- a/lib/Cake/Console/Command/Task/FixtureTask.php
+++ /dev/null
@@ -1,418 +0,0 @@
-path = APP . 'Test' . DS . 'Fixture' . DS;
- }
-
-/**
- * get the option parser.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(
- __d('cake_console', 'Generate fixtures for use with the test suite. You can use `bake fixture all` to bake all fixtures.')
- )->addArgument('name', array(
- 'help' => __d('cake_console', 'Name of the fixture to bake. Can use Plugin.name to bake plugin fixtures.')
- ))->addOption('count', array(
- 'help' => __d('cake_console', 'When using generated data, the number of records to include in the fixture(s).'),
- 'short' => 'n',
- 'default' => 10
- ))->addOption('connection', array(
- 'help' => __d('cake_console', 'Which database configuration to use for baking.'),
- 'short' => 'c',
- 'default' => 'default'
- ))->addOption('plugin', array(
- 'help' => __d('cake_console', 'CamelCased name of the plugin to bake fixtures for.'),
- 'short' => 'p',
- ))->addOption('records', array(
- 'help' => __d('cake_console', 'Used with --count and /all commands to pull [n] records from the live tables, where [n] is either --count or the default of 10'),
- 'short' => 'r',
- 'boolean' => true
- ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.'));
- }
-
-/**
- * Execution method always used for tasks
- * Handles dispatching to interactive, named, or all processes.
- *
- * @return void
- */
- public function execute() {
- parent::execute();
- if (empty($this->args)) {
- $this->_interactive();
- }
-
- if (isset($this->args[0])) {
- $this->interactive = false;
- if (!isset($this->connection)) {
- $this->connection = 'default';
- }
- if (strtolower($this->args[0]) == 'all') {
- return $this->all();
- }
- $model = $this->_modelName($this->args[0]);
- $this->bake($model);
- }
- }
-
-/**
- * Bake All the Fixtures at once. Will only bake fixtures for models that exist.
- *
- * @return void
- */
- public function all() {
- $this->interactive = false;
- $this->Model->interactive = false;
- $tables = $this->Model->listAll($this->connection, false);
- foreach ($tables as $table) {
- $model = $this->_modelName($table);
- $this->bake($model);
- }
- }
-
-/**
- * Interactive baking function
- *
- * @return void
- */
- protected function _interactive() {
- $this->DbConfig->interactive = $this->Model->interactive = $this->interactive = true;
- $this->hr();
- $this->out(__d('cake_console', "Bake Fixture\nPath: %s", $this->getPath()));
- $this->hr();
-
- if (!isset($this->connection)) {
- $this->connection = $this->DbConfig->getConfig();
- }
- $modelName = $this->Model->getName($this->connection);
- $useTable = $this->Model->getTable($modelName, $this->connection);
- $importOptions = $this->importOptions($modelName);
- $this->bake($modelName, $useTable, $importOptions);
- }
-
-/**
- * Interacts with the User to setup an array of import options. For a fixture.
- *
- * @param string $modelName Name of model you are dealing with.
- * @return array Array of import options.
- */
- public function importOptions($modelName) {
- $options = array();
- $doSchema = $this->in(__d('cake_console', 'Would you like to import schema for this fixture?'), array('y', 'n'), 'n');
- if ($doSchema == 'y') {
- $options['schema'] = $modelName;
- }
- $doRecords = $this->in(__d('cake_console', 'Would you like to use record importing for this fixture?'), array('y', 'n'), 'n');
- if ($doRecords == 'y') {
- $options['records'] = true;
- }
- if ($doRecords == 'n') {
- $prompt = __d('cake_console', "Would you like to build this fixture with data from %s's table?", $modelName);
- $fromTable = $this->in($prompt, array('y', 'n'), 'n');
- if (strtolower($fromTable) == 'y') {
- $options['fromTable'] = true;
- }
- }
- return $options;
- }
-
-/**
- * Assembles and writes a Fixture file
- *
- * @param string $model Name of model to bake.
- * @param string $useTable Name of table to use.
- * @param array $importOptions Options for public $import
- * @return string Baked fixture content
- */
- public function bake($model, $useTable = false, $importOptions = array()) {
- App::uses('CakeSchema', 'Model');
- $table = $schema = $records = $import = $modelImport = null;
- $importBits = array();
-
- if (!$useTable) {
- $useTable = Inflector::tableize($model);
- } elseif ($useTable != Inflector::tableize($model)) {
- $table = $useTable;
- }
-
- if (!empty($importOptions)) {
- if (isset($importOptions['schema'])) {
- $modelImport = true;
- $importBits[] = "'model' => '{$importOptions['schema']}'";
- }
- if (isset($importOptions['records'])) {
- $importBits[] = "'records' => true";
- }
- if ($this->connection != 'default') {
- $importBits[] .= "'connection' => '{$this->connection}'";
- }
- if (!empty($importBits)) {
- $import = sprintf("array(%s)", implode(', ', $importBits));
- }
- }
-
- $this->_Schema = new CakeSchema();
- $data = $this->_Schema->read(array('models' => false, 'connection' => $this->connection));
- if (!isset($data['tables'][$useTable])) {
- $this->err('Could not find your selected table ' . $useTable);
- return false;
- }
-
- $tableInfo = $data['tables'][$useTable];
- if (is_null($modelImport)) {
- $schema = $this->_generateSchema($tableInfo);
- }
-
- if (empty($importOptions['records']) && !isset($importOptions['fromTable'])) {
- $recordCount = 1;
- if (isset($this->params['count'])) {
- $recordCount = $this->params['count'];
- }
- $records = $this->_makeRecordString($this->_generateRecords($tableInfo, $recordCount));
- }
- if (!empty($this->params['records']) || isset($importOptions['fromTable'])) {
- $records = $this->_makeRecordString($this->_getRecordsFromTable($model, $useTable));
- }
- $out = $this->generateFixtureFile($model, compact('records', 'table', 'schema', 'import', 'fields'));
- return $out;
- }
-
-/**
- * Generate the fixture file, and write to disk
- *
- * @param string $model name of the model being generated
- * @param string $otherVars Contents of the fixture file.
- * @return string Content saved into fixture file.
- */
- public function generateFixtureFile($model, $otherVars) {
- $defaults = array('table' => null, 'schema' => null, 'records' => null, 'import' => null, 'fields' => null);
- $vars = array_merge($defaults, $otherVars);
-
- $path = $this->getPath();
- $filename = Inflector::camelize($model) . 'Fixture.php';
-
- $this->Template->set('model', $model);
- $this->Template->set($vars);
- $content = $this->Template->generate('classes', 'fixture');
-
- $this->out("\n" . __d('cake_console', 'Baking test fixture for %s...', $model), 1, Shell::QUIET);
- $this->createFile($path . $filename, $content);
- return $content;
- }
-
-/**
- * Get the path to the fixtures.
- *
- * @return string Path for the fixtures
- */
- public function getPath() {
- $path = $this->path;
- if (isset($this->plugin)) {
- $path = $this->_pluginPath($this->plugin) . 'Test' . DS . 'Fixture' . DS;
- }
- return $path;
- }
-
-/**
- * Generates a string representation of a schema.
- *
- * @param array $tableInfo Table schema array
- * @return string fields definitions
- */
- protected function _generateSchema($tableInfo) {
- $schema = $this->_Schema->generateTable('f', $tableInfo);
- return substr($schema, 13, -2);
- }
-
-/**
- * Generate String representation of Records
- *
- * @param array $tableInfo Table schema array
- * @param integer $recordCount
- * @return array Array of records to use in the fixture.
- */
- protected function _generateRecords($tableInfo, $recordCount = 1) {
- $records = array();
- for ($i = 0; $i < $recordCount; $i++) {
- $record = array();
- foreach ($tableInfo as $field => $fieldInfo) {
- if (empty($fieldInfo['type'])) {
- continue;
- }
- switch ($fieldInfo['type']) {
- case 'integer':
- case 'float':
- $insert = $i + 1;
- break;
- case 'string':
- case 'binary':
- $isPrimaryUuid = (
- isset($fieldInfo['key']) && strtolower($fieldInfo['key']) == 'primary' &&
- isset($fieldInfo['length']) && $fieldInfo['length'] == 36
- );
- if ($isPrimaryUuid) {
- $insert = String::uuid();
- } else {
- $insert = "Lorem ipsum dolor sit amet";
- if (!empty($fieldInfo['length'])) {
- $insert = substr($insert, 0, (int)$fieldInfo['length'] - 2);
- }
- }
- break;
- case 'timestamp':
- $insert = time();
- break;
- case 'datetime':
- $insert = date('Y-m-d H:i:s');
- break;
- case 'date':
- $insert = date('Y-m-d');
- break;
- case 'time':
- $insert = date('H:i:s');
- break;
- case 'boolean':
- $insert = 1;
- break;
- case 'text':
- $insert = "Lorem ipsum dolor sit amet, aliquet feugiat.";
- $insert .= " Convallis morbi fringilla gravida,";
- $insert .= " phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin";
- $insert .= " venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla";
- $insert .= " vestibulum massa neque ut et, id hendrerit sit,";
- $insert .= " feugiat in taciti enim proin nibh, tempor dignissim, rhoncus";
- $insert .= " duis vestibulum nunc mattis convallis.";
- break;
- }
- $record[$field] = $insert;
- }
- $records[] = $record;
- }
- return $records;
- }
-
-/**
- * Convert a $records array into a a string.
- *
- * @param array $records Array of records to be converted to string
- * @return string A string value of the $records array.
- */
- protected function _makeRecordString($records) {
- $out = "array(\n";
- foreach ($records as $record) {
- $values = array();
- foreach ($record as $field => $value) {
- $val = var_export($value, true);
- $values[] = "\t\t\t'$field' => $val";
- }
- $out .= "\t\tarray(\n";
- $out .= implode(",\n", $values);
- $out .= "\n\t\t),\n";
- }
- $out .= "\t)";
- return $out;
- }
-
-/**
- * Interact with the user to get a custom SQL condition and use that to extract data
- * to build a fixture.
- *
- * @param string $modelName name of the model to take records from.
- * @param string $useTable Name of table to use.
- * @return array Array of records.
- */
- protected function _getRecordsFromTable($modelName, $useTable = null) {
- if ($this->interactive) {
- $condition = null;
- $prompt = __d('cake_console', "Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1");
- while (!$condition) {
- $condition = $this->in($prompt, null, 'WHERE 1=1');
- }
- $prompt = __d('cake_console', "How many records do you want to import?");
- $recordCount = $this->in($prompt, null, 10);
- } else {
- $condition = 'WHERE 1=1';
- $recordCount = (isset($this->params['count']) ? $this->params['count'] : 10);
- }
- $modelObject = new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection));
- $records = $modelObject->find('all', array(
- 'conditions' => $condition,
- 'recursive' => -1,
- 'limit' => $recordCount
- ));
- $db = $modelObject->getDatasource();
- $schema = $modelObject->schema(true);
- $out = array();
- foreach ($records as $record) {
- $row = array();
- foreach ($record[$modelObject->alias] as $field => $value) {
- if ($schema[$field]['type'] === 'boolean') {
- $value = (int)(bool)$value;
- }
- $row[$field] = $value;
- }
- $out[] = $row;
- }
- return $out;
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php
deleted file mode 100644
index 424674950ed..00000000000
--- a/lib/Cake/Console/Command/Task/ModelTask.php
+++ /dev/null
@@ -1,988 +0,0 @@
-path = current(App::path('Model'));
- }
-
-/**
- * Execution method always used for tasks
- *
- * @return void
- */
- public function execute() {
- parent::execute();
-
- if (empty($this->args)) {
- $this->_interactive();
- }
-
- if (!empty($this->args[0])) {
- $this->interactive = false;
- if (!isset($this->connection)) {
- $this->connection = 'default';
- }
- if (strtolower($this->args[0]) == 'all') {
- return $this->all();
- }
- $model = $this->_modelName($this->args[0]);
- $this->listAll($this->connection);
- $useTable = $this->getTable($model);
- $object = $this->_getModelObject($model, $useTable);
- if ($this->bake($object, false)) {
- if ($this->_checkUnitTest()) {
- $this->bakeFixture($model, $useTable);
- $this->bakeTest($model);
- }
- }
- }
- }
-
-/**
- * Bake all models at once.
- *
- * @return void
- */
- public function all() {
- $this->listAll($this->connection, false);
- $unitTestExists = $this->_checkUnitTest();
- foreach ($this->_tables as $table) {
- if (in_array($table, $this->skipTables)) {
- continue;
- }
- $modelClass = Inflector::classify($table);
- $this->out(__d('cake_console', 'Baking %s', $modelClass));
- $object = $this->_getModelObject($modelClass, $table);
- if ($this->bake($object, false) && $unitTestExists) {
- $this->bakeFixture($modelClass, $table);
- $this->bakeTest($modelClass);
- }
- }
- }
-
-/**
- * Get a model object for a class name.
- *
- * @param string $className Name of class you want model to be.
- * @param string $table Table name
- * @return Model Model instance
- */
- protected function _getModelObject($className, $table = null) {
- if (!$table) {
- $table = Inflector::tableize($className);
- }
- $object = new Model(array('name' => $className, 'table' => $table, 'ds' => $this->connection));
- $fields = $object->schema(true);
- foreach ($fields as $name => $field) {
- if (isset($field['key']) && $field['key'] == 'primary') {
- $object->primaryKey = $name;
- break;
- }
- }
- return $object;
- }
-
-/**
- * Generate a key value list of options and a prompt.
- *
- * @param array $options Array of options to use for the selections. indexes must start at 0
- * @param string $prompt Prompt to use for options list.
- * @param integer $default The default option for the given prompt.
- * @return integer result of user choice.
- */
- public function inOptions($options, $prompt = null, $default = null) {
- $valid = false;
- $max = count($options);
- while (!$valid) {
- foreach ($options as $i => $option) {
- $this->out($i + 1 . '. ' . $option);
- }
- if (empty($prompt)) {
- $prompt = __d('cake_console', 'Make a selection from the choices above');
- }
- $choice = $this->in($prompt, null, $default);
- if (intval($choice) > 0 && intval($choice) <= $max) {
- $valid = true;
- }
- }
- return $choice - 1;
- }
-
-/**
- * Handles interactive baking
- *
- * @return boolean
- */
- protected function _interactive() {
- $this->hr();
- $this->out(__d('cake_console', "Bake Model\nPath: %s", $this->getPath()));
- $this->hr();
- $this->interactive = true;
-
- $primaryKey = 'id';
- $validate = $associations = array();
-
- if (empty($this->connection)) {
- $this->connection = $this->DbConfig->getConfig();
- }
- $currentModelName = $this->getName();
- $useTable = $this->getTable($currentModelName);
- $db = ConnectionManager::getDataSource($this->connection);
- $fullTableName = $db->fullTableName($useTable);
- if (!in_array($useTable, $this->_tables)) {
- $prompt = __d('cake_console', "The table %s doesn't exist or could not be automatically detected\ncontinue anyway?", $useTable);
- $continue = $this->in($prompt, array('y', 'n'));
- if (strtolower($continue) == 'n') {
- return false;
- }
- }
-
- $tempModel = new Model(array('name' => $currentModelName, 'table' => $useTable, 'ds' => $this->connection));
-
- $knownToExist = false;
- try {
- $fields = $tempModel->schema(true);
- $knownToExist = true;
- } catch (Exception $e) {
- $fields = array($tempModel->primaryKey);
- }
- if (!array_key_exists('id', $fields)) {
- $primaryKey = $this->findPrimaryKey($fields);
- }
-
- if ($knownToExist) {
- $displayField = $tempModel->hasField(array('name', 'title'));
- if (!$displayField) {
- $displayField = $this->findDisplayField($tempModel->schema());
- }
-
- $prompt = __d('cake_console', "Would you like to supply validation criteria \nfor the fields in your model?");
- $wannaDoValidation = $this->in($prompt, array('y','n'), 'y');
- if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) == 'y') {
- $validate = $this->doValidation($tempModel);
- }
-
- $prompt = __d('cake_console', "Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?");
- $wannaDoAssoc = $this->in($prompt, array('y','n'), 'y');
- if (strtolower($wannaDoAssoc) == 'y') {
- $associations = $this->doAssociations($tempModel);
- }
- }
-
- $this->out();
- $this->hr();
- $this->out(__d('cake_console', 'The following Model will be created:'));
- $this->hr();
- $this->out(__d('cake_console', "Name: %s", $currentModelName));
-
- if ($this->connection !== 'default') {
- $this->out(__d('cake_console', "DB Config: %s", $this->connection));
- }
- if ($fullTableName !== Inflector::tableize($currentModelName)) {
- $this->out(__d('cake_console', 'DB Table: %s', $fullTableName));
- }
- if ($primaryKey != 'id') {
- $this->out(__d('cake_console', 'Primary Key: %s', $primaryKey));
- }
- if (!empty($validate)) {
- $this->out(__d('cake_console', 'Validation: %s', print_r($validate, true)));
- }
- if (!empty($associations)) {
- $this->out(__d('cake_console', 'Associations:'));
- $assocKeys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
- foreach ($assocKeys as $assocKey) {
- $this->_printAssociation($currentModelName, $assocKey, $associations);
- }
- }
-
- $this->hr();
- $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
-
- if (strtolower($looksGood) == 'y') {
- $vars = compact('associations', 'validate', 'primaryKey', 'useTable', 'displayField');
- $vars['useDbConfig'] = $this->connection;
- if ($this->bake($currentModelName, $vars)) {
- if ($this->_checkUnitTest()) {
- $this->bakeFixture($currentModelName, $useTable);
- $this->bakeTest($currentModelName, $useTable, $associations);
- }
- }
- } else {
- return false;
- }
- }
-
-/**
- * Print out all the associations of a particular type
- *
- * @param string $modelName Name of the model relations belong to.
- * @param string $type Name of association you want to see. i.e. 'belongsTo'
- * @param string $associations Collection of associations.
- * @return void
- */
- protected function _printAssociation($modelName, $type, $associations) {
- if (!empty($associations[$type])) {
- for ($i = 0, $len = count($associations[$type]); $i < $len; $i++) {
- $out = "\t" . $modelName . ' ' . $type . ' ' . $associations[$type][$i]['alias'];
- $this->out($out);
- }
- }
- }
-
-/**
- * Finds a primary Key in a list of fields.
- *
- * @param array $fields Array of fields that might have a primary key.
- * @return string Name of field that is a primary key.
- */
- public function findPrimaryKey($fields) {
- $name = 'id';
- foreach ($fields as $name => $field) {
- if (isset($field['key']) && $field['key'] == 'primary') {
- break;
- }
- }
- return $this->in(__d('cake_console', 'What is the primaryKey?'), null, $name);
- }
-
-/**
- * interact with the user to find the displayField value for a model.
- *
- * @param array $fields Array of fields to look for and choose as a displayField
- * @return mixed Name of field to use for displayField or false if the user declines to choose
- */
- public function findDisplayField($fields) {
- $fieldNames = array_keys($fields);
- $prompt = __d('cake_console', "A displayField could not be automatically detected\nwould you like to choose one?");
- $continue = $this->in($prompt, array('y', 'n'));
- if (strtolower($continue) == 'n') {
- return false;
- }
- $prompt = __d('cake_console', 'Choose a field from the options above:');
- $choice = $this->inOptions($fieldNames, $prompt);
- return $fieldNames[$choice];
- }
-
-/**
- * Handles Generation and user interaction for creating validation.
- *
- * @param Model $model Model to have validations generated for.
- * @return array $validate Array of user selected validations.
- */
- public function doValidation($model) {
- if (!is_object($model)) {
- return false;
- }
- $fields = $model->schema();
-
- if (empty($fields)) {
- return false;
- }
- $validate = array();
- $this->initValidations();
- foreach ($fields as $fieldName => $field) {
- $validation = $this->fieldValidation($fieldName, $field, $model->primaryKey);
- if (!empty($validation)) {
- $validate[$fieldName] = $validation;
- }
- }
- return $validate;
- }
-
-/**
- * Populate the _validations array
- *
- * @return void
- */
- public function initValidations() {
- $options = $choices = array();
- if (class_exists('Validation')) {
- $options = get_class_methods('Validation');
- }
- sort($options);
- $default = 1;
- foreach ($options as $key => $option) {
- if ($option{0} != '_') {
- $choices[$default] = strtolower($option);
- $default++;
- }
- }
- $choices[$default] = 'none'; // Needed since index starts at 1
- $this->_validations = $choices;
- return $choices;
- }
-
-/**
- * Does individual field validation handling.
- *
- * @param string $fieldName Name of field to be validated.
- * @param array $metaData metadata for field
- * @param string $primaryKey
- * @return array Array of validation for the field.
- */
- public function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
- $defaultChoice = count($this->_validations);
- $validate = $alreadyChosen = array();
-
- $anotherValidator = 'y';
- while ($anotherValidator == 'y') {
- if ($this->interactive) {
- $this->out();
- $this->out(__d('cake_console', 'Field: %s', $fieldName));
- $this->out(__d('cake_console', 'Type: %s', $metaData['type']));
- $this->hr();
- $this->out(__d('cake_console', 'Please select one of the following validation options:'));
- $this->hr();
- }
-
- $prompt = '';
- for ($i = 1; $i < $defaultChoice; $i++) {
- $prompt .= $i . ' - ' . $this->_validations[$i] . "\n";
- }
- $prompt .= __d('cake_console', "%s - Do not do any validation on this field.\n", $defaultChoice);
- $prompt .= __d('cake_console', "... or enter in a valid regex validation string.\n");
-
- $methods = array_flip($this->_validations);
- $guess = $defaultChoice;
- if ($metaData['null'] != 1 && !in_array($fieldName, array($primaryKey, 'created', 'modified', 'updated'))) {
- if ($fieldName == 'email') {
- $guess = $methods['email'];
- } elseif ($metaData['type'] == 'string' && $metaData['length'] == 36) {
- $guess = $methods['uuid'];
- } elseif ($metaData['type'] == 'string') {
- $guess = $methods['notempty'];
- } elseif ($metaData['type'] == 'text') {
- $guess = $methods['notempty'];
- } elseif ($metaData['type'] == 'integer') {
- $guess = $methods['numeric'];
- } elseif ($metaData['type'] == 'boolean') {
- $guess = $methods['boolean'];
- } elseif ($metaData['type'] == 'date') {
- $guess = $methods['date'];
- } elseif ($metaData['type'] == 'time') {
- $guess = $methods['time'];
- } elseif ($metaData['type'] == 'inet') {
- $guess = $methods['ip'];
- }
- }
-
- if ($this->interactive === true) {
- $choice = $this->in($prompt, null, $guess);
- if (in_array($choice, $alreadyChosen)) {
- $this->out(__d('cake_console', "You have already chosen that validation rule,\nplease choose again"));
- continue;
- }
- if (!isset($this->_validations[$choice]) && is_numeric($choice)) {
- $this->out(__d('cake_console', 'Please make a valid selection.'));
- continue;
- }
- $alreadyChosen[] = $choice;
- } else {
- $choice = $guess;
- }
-
- if (isset($this->_validations[$choice])) {
- $validatorName = $this->_validations[$choice];
- } else {
- $validatorName = Inflector::slug($choice);
- }
-
- if ($choice != $defaultChoice) {
- if (is_numeric($choice) && isset($this->_validations[$choice])) {
- $validate[$validatorName] = $this->_validations[$choice];
- } else {
- $validate[$validatorName] = $choice;
- }
- }
- if ($this->interactive == true && $choice != $defaultChoice) {
- $anotherValidator = $this->in(__d('cake_console', 'Would you like to add another validation rule?'), array('y', 'n'), 'n');
- } else {
- $anotherValidator = 'n';
- }
- }
- return $validate;
- }
-
-/**
- * Handles associations
- *
- * @param Model $model
- * @return array $associations
- */
- public function doAssociations($model) {
- if (!is_object($model)) {
- return false;
- }
- if ($this->interactive === true) {
- $this->out(__d('cake_console', 'One moment while the associations are detected.'));
- }
-
- $fields = $model->schema(true);
- if (empty($fields)) {
- return array();
- }
-
- if (empty($this->_tables)) {
- $this->_tables = (array)$this->getAllTables();
- }
-
- $associations = array(
- 'belongsTo' => array(),
- 'hasMany' => array(),
- 'hasOne' => array(),
- 'hasAndBelongsToMany' => array()
- );
-
- $associations = $this->findBelongsTo($model, $associations);
- $associations = $this->findHasOneAndMany($model, $associations);
- $associations = $this->findHasAndBelongsToMany($model, $associations);
-
- if ($this->interactive !== true) {
- unset($associations['hasOne']);
- }
-
- if ($this->interactive === true) {
- $this->hr();
- if (empty($associations)) {
- $this->out(__d('cake_console', 'None found.'));
- } else {
- $this->out(__d('cake_console', 'Please confirm the following associations:'));
- $this->hr();
- $associations = $this->confirmAssociations($model, $associations);
- }
- $associations = $this->doMoreAssociations($model, $associations);
- }
- return $associations;
- }
-
-/**
- * Find belongsTo relations and add them to the associations list.
- *
- * @param Model $model Model instance of model being generated.
- * @param array $associations Array of in progress associations
- * @return array $associations with belongsTo added in.
- */
- public function findBelongsTo(Model $model, $associations) {
- $fields = $model->schema(true);
- foreach ($fields as $fieldName => $field) {
- $offset = strpos($fieldName, '_id');
- if ($fieldName != $model->primaryKey && $fieldName != 'parent_id' && $offset !== false) {
- $tmpModelName = $this->_modelNameFromKey($fieldName);
- $associations['belongsTo'][] = array(
- 'alias' => $tmpModelName,
- 'className' => $tmpModelName,
- 'foreignKey' => $fieldName,
- );
- } elseif ($fieldName == 'parent_id') {
- $associations['belongsTo'][] = array(
- 'alias' => 'Parent' . $model->name,
- 'className' => $model->name,
- 'foreignKey' => $fieldName,
- );
- }
- }
- return $associations;
- }
-
-/**
- * Find the hasOne and HasMany relations and add them to associations list
- *
- * @param Model $model Model instance being generated
- * @param array $associations Array of in progress associations
- * @return array $associations with hasOne and hasMany added in.
- */
- public function findHasOneAndMany(Model $model, $associations) {
- $foreignKey = $this->_modelKey($model->name);
- foreach ($this->_tables as $otherTable) {
- $tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
- $modelFieldsTemp = $tempOtherModel->schema(true);
-
- $pattern = '/_' . preg_quote($model->table, '/') . '|' . preg_quote($model->table, '/') . '_/';
- $possibleJoinTable = preg_match($pattern, $otherTable);
- if ($possibleJoinTable == true) {
- continue;
- }
- foreach ($modelFieldsTemp as $fieldName => $field) {
- $assoc = false;
- if ($fieldName != $model->primaryKey && $fieldName == $foreignKey) {
- $assoc = array(
- 'alias' => $tempOtherModel->name,
- 'className' => $tempOtherModel->name,
- 'foreignKey' => $fieldName
- );
- } elseif ($otherTable == $model->table && $fieldName == 'parent_id') {
- $assoc = array(
- 'alias' => 'Child' . $model->name,
- 'className' => $model->name,
- 'foreignKey' => $fieldName
- );
- }
- if ($assoc) {
- $associations['hasOne'][] = $assoc;
- $associations['hasMany'][] = $assoc;
- }
-
- }
- }
- return $associations;
- }
-
-/**
- * Find the hasAndBelongsToMany relations and add them to associations list
- *
- * @param Model $model Model instance being generated
- * @param array $associations Array of in-progress associations
- * @return array $associations with hasAndBelongsToMany added in.
- */
- public function findHasAndBelongsToMany(Model $model, $associations) {
- $foreignKey = $this->_modelKey($model->name);
- foreach ($this->_tables as $otherTable) {
- $tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
- $modelFieldsTemp = $tempOtherModel->schema(true);
-
- $offset = strpos($otherTable, $model->table . '_');
- $otherOffset = strpos($otherTable, '_' . $model->table);
-
- if ($offset !== false) {
- $offset = strlen($model->table . '_');
- $habtmName = $this->_modelName(substr($otherTable, $offset));
- $associations['hasAndBelongsToMany'][] = array(
- 'alias' => $habtmName,
- 'className' => $habtmName,
- 'foreignKey' => $foreignKey,
- 'associationForeignKey' => $this->_modelKey($habtmName),
- 'joinTable' => $otherTable
- );
- } elseif ($otherOffset !== false) {
- $habtmName = $this->_modelName(substr($otherTable, 0, $otherOffset));
- $associations['hasAndBelongsToMany'][] = array(
- 'alias' => $habtmName,
- 'className' => $habtmName,
- 'foreignKey' => $foreignKey,
- 'associationForeignKey' => $this->_modelKey($habtmName),
- 'joinTable' => $otherTable
- );
- }
- }
- return $associations;
- }
-
-/**
- * Interact with the user and confirm associations.
- *
- * @param array $model Temporary Model instance.
- * @param array $associations Array of associations to be confirmed.
- * @return array Array of confirmed associations
- */
- public function confirmAssociations(Model $model, $associations) {
- foreach ($associations as $type => $settings) {
- if (!empty($associations[$type])) {
- foreach ($associations[$type] as $i => $assoc) {
- $prompt = "{$model->name} {$type} {$assoc['alias']}?";
- $response = $this->in($prompt, array('y', 'n'), 'y');
-
- if ('n' == strtolower($response)) {
- unset($associations[$type][$i]);
- } elseif ($type == 'hasMany') {
- unset($associations['hasOne'][$i]);
- }
- }
- $associations[$type] = array_merge($associations[$type]);
- }
- }
- return $associations;
- }
-
-/**
- * Interact with the user and generate additional non-conventional associations
- *
- * @param Model $model Temporary model instance
- * @param array $associations Array of associations.
- * @return array Array of associations.
- */
- public function doMoreAssociations(Model $model, $associations) {
- $prompt = __d('cake_console', 'Would you like to define some additional model associations?');
- $wannaDoMoreAssoc = $this->in($prompt, array('y', 'n'), 'n');
- $possibleKeys = $this->_generatePossibleKeys();
- while (strtolower($wannaDoMoreAssoc) == 'y') {
- $assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
- $this->out(__d('cake_console', 'What is the association type?'));
- $assocType = intval($this->inOptions($assocs, __d('cake_console', 'Enter a number')));
-
- $this->out(__d('cake_console', "For the following options be very careful to match your setup exactly.\n" .
- "Any spelling mistakes will cause errors."));
- $this->hr();
-
- $alias = $this->in(__d('cake_console', 'What is the alias for this association?'));
- $className = $this->in(__d('cake_console', 'What className will %s use?', $alias), null, $alias );
-
- if ($assocType == 0) {
- if (!empty($possibleKeys[$model->table])) {
- $showKeys = $possibleKeys[$model->table];
- } else {
- $showKeys = null;
- }
- $suggestedForeignKey = $this->_modelKey($alias);
- } else {
- $otherTable = Inflector::tableize($className);
- if (in_array($otherTable, $this->_tables)) {
- if ($assocType < 3) {
- if (!empty($possibleKeys[$otherTable])) {
- $showKeys = $possibleKeys[$otherTable];
- } else {
- $showKeys = null;
- }
- } else {
- $showKeys = null;
- }
- } else {
- $otherTable = $this->in(__d('cake_console', 'What is the table for this model?'));
- $showKeys = $possibleKeys[$otherTable];
- }
- $suggestedForeignKey = $this->_modelKey($model->name);
- }
- if (!empty($showKeys)) {
- $this->out(__d('cake_console', 'A helpful List of possible keys'));
- $foreignKey = $this->inOptions($showKeys, __d('cake_console', 'What is the foreignKey?'));
- $foreignKey = $showKeys[intval($foreignKey)];
- }
- if (!isset($foreignKey)) {
- $foreignKey = $this->in(__d('cake_console', 'What is the foreignKey? Specify your own.'), null, $suggestedForeignKey);
- }
- if ($assocType == 3) {
- $associationForeignKey = $this->in(__d('cake_console', 'What is the associationForeignKey?'), null, $this->_modelKey($model->name));
- $joinTable = $this->in(__d('cake_console', 'What is the joinTable?'));
- }
- $associations[$assocs[$assocType]] = array_values((array)$associations[$assocs[$assocType]]);
- $count = count($associations[$assocs[$assocType]]);
- $i = ($count > 0) ? $count : 0;
- $associations[$assocs[$assocType]][$i]['alias'] = $alias;
- $associations[$assocs[$assocType]][$i]['className'] = $className;
- $associations[$assocs[$assocType]][$i]['foreignKey'] = $foreignKey;
- if ($assocType == 3) {
- $associations[$assocs[$assocType]][$i]['associationForeignKey'] = $associationForeignKey;
- $associations[$assocs[$assocType]][$i]['joinTable'] = $joinTable;
- }
- $wannaDoMoreAssoc = $this->in(__d('cake_console', 'Define another association?'), array('y', 'n'), 'y');
- }
- return $associations;
- }
-
-/**
- * Finds all possible keys to use on custom associations.
- *
- * @return array array of tables and possible keys
- */
- protected function _generatePossibleKeys() {
- $possible = array();
- foreach ($this->_tables as $otherTable) {
- $tempOtherModel = new Model(array('table' => $otherTable, 'ds' => $this->connection));
- $modelFieldsTemp = $tempOtherModel->schema(true);
- foreach ($modelFieldsTemp as $fieldName => $field) {
- if ($field['type'] == 'integer' || $field['type'] == 'string') {
- $possible[$otherTable][] = $fieldName;
- }
- }
- }
- return $possible;
- }
-
-/**
- * Assembles and writes a Model file.
- *
- * @param mixed $name Model name or object
- * @param mixed $data if array and $name is not an object assume bake data, otherwise boolean.
- * @return string
- */
- public function bake($name, $data = array()) {
- if (is_object($name)) {
- if ($data == false) {
- $data = array();
- $data['associations'] = $this->doAssociations($name);
- $data['validate'] = $this->doValidation($name);
- }
- $data['primaryKey'] = $name->primaryKey;
- $data['useTable'] = $name->table;
- $data['useDbConfig'] = $name->useDbConfig;
- $data['name'] = $name = $name->name;
- } else {
- $data['name'] = $name;
- }
- $defaults = array(
- 'associations' => array(),
- 'validate' => array(),
- 'primaryKey' => 'id',
- 'useTable' => null,
- 'useDbConfig' => 'default',
- 'displayField' => null
- );
- $data = array_merge($defaults, $data);
-
- $pluginPath = '';
- if ($this->plugin) {
- $pluginPath = $this->plugin . '.';
- }
-
- $this->Template->set($data);
- $this->Template->set(array(
- 'plugin' => $this->plugin,
- 'pluginPath' => $pluginPath
- ));
- $out = $this->Template->generate('classes', 'model');
-
- $path = $this->getPath();
- $filename = $path . $name . '.php';
- $this->out("\n" . __d('cake_console', 'Baking model class for %s...', $name), 1, Shell::QUIET);
- $this->createFile($filename, $out);
- ClassRegistry::flush();
- return $out;
- }
-
-/**
- * Assembles and writes a unit test file
- *
- * @param string $className Model class name
- * @return string
- */
- public function bakeTest($className) {
- $this->Test->interactive = $this->interactive;
- $this->Test->plugin = $this->plugin;
- $this->Test->connection = $this->connection;
- return $this->Test->bake('Model', $className);
- }
-
-/**
- * outputs the a list of possible models or controllers from database
- *
- * @param string $useDbConfig Database configuration name
- * @return array
- */
- public function listAll($useDbConfig = null) {
- $this->_tables = (array)$this->getAllTables($useDbConfig);
-
- $this->_modelNames = array();
- $count = count($this->_tables);
- for ($i = 0; $i < $count; $i++) {
- $this->_modelNames[] = $this->_modelName($this->_tables[$i]);
- }
- if ($this->interactive === true) {
- $this->out(__d('cake_console', 'Possible Models based on your current database:'));
- for ($i = 0; $i < $count; $i++) {
- $this->out($i + 1 . ". " . $this->_modelNames[$i]);
- }
- }
- return $this->_tables;
- }
-
-/**
- * Interact with the user to determine the table name of a particular model
- *
- * @param string $modelName Name of the model you want a table for.
- * @param string $useDbConfig Name of the database config you want to get tables from.
- * @return string Table name
- */
- public function getTable($modelName, $useDbConfig = null) {
- $useTable = Inflector::tableize($modelName);
- if (in_array($modelName, $this->_modelNames)) {
- $modelNames = array_flip($this->_modelNames);
- $useTable = $this->_tables[$modelNames[$modelName]];
- }
-
- if ($this->interactive === true) {
- if (!isset($useDbConfig)) {
- $useDbConfig = $this->connection;
- }
- $db = ConnectionManager::getDataSource($useDbConfig);
- $fullTableName = $db->fullTableName($useTable, false);
- $tableIsGood = false;
- if (array_search($useTable, $this->_tables) === false) {
- $this->out();
- $this->out(__d('cake_console', "Given your model named '%s',\nCake would expect a database table named '%s'", $modelName, $fullTableName));
- $tableIsGood = $this->in(__d('cake_console', 'Do you want to use this table?'), array('y', 'n'), 'y');
- }
- if (strtolower($tableIsGood) == 'n') {
- $useTable = $this->in(__d('cake_console', 'What is the name of the table?'));
- }
- }
- return $useTable;
- }
-
-/**
- * Get an Array of all the tables in the supplied connection
- * will halt the script if no tables are found.
- *
- * @param string $useDbConfig Connection name to scan.
- * @return array Array of tables in the database.
- */
- public function getAllTables($useDbConfig = null) {
- if (!isset($useDbConfig)) {
- $useDbConfig = $this->connection;
- }
-
- $tables = array();
- $db = ConnectionManager::getDataSource($useDbConfig);
- $db->cacheSources = false;
- $usePrefix = empty($db->config['prefix']) ? '' : $db->config['prefix'];
- if ($usePrefix) {
- foreach ($db->listSources() as $table) {
- if (!strncmp($table, $usePrefix, strlen($usePrefix))) {
- $tables[] = substr($table, strlen($usePrefix));
- }
- }
- } else {
- $tables = $db->listSources();
- }
- if (empty($tables)) {
- $this->err(__d('cake_console', 'Your database does not have any tables.'));
- $this->_stop();
- }
- return $tables;
- }
-
-/**
- * Forces the user to specify the model he wants to bake, and returns the selected model name.
- *
- * @param string $useDbConfig Database config name
- * @return string the model name
- */
- public function getName($useDbConfig = null) {
- $this->listAll($useDbConfig);
-
- $enteredModel = '';
-
- while ($enteredModel == '') {
- $enteredModel = $this->in(__d('cake_console', "Enter a number from the list above,\n" .
- "type in the name of another model, or 'q' to exit"), null, 'q');
-
- if ($enteredModel === 'q') {
- $this->out(__d('cake_console', 'Exit'));
- $this->_stop();
- }
-
- if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) {
- $this->err(__d('cake_console', "The model name you supplied was empty,\n" .
- "or the number you selected was not an option. Please try again."));
- $enteredModel = '';
- }
- }
- if (intval($enteredModel) > 0 && intval($enteredModel) <= count($this->_modelNames)) {
- $currentModelName = $this->_modelNames[intval($enteredModel) - 1];
- } else {
- $currentModelName = $enteredModel;
- }
- return $currentModelName;
- }
-
-/**
- * get the option parser.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(
- __d('cake_console', 'Bake models.')
- )->addArgument('name', array(
- 'help' => __d('cake_console', 'Name of the model to bake. Can use Plugin.name to bake plugin models.')
- ))->addSubcommand('all', array(
- 'help' => __d('cake_console', 'Bake all model files with associations and validation.')
- ))->addOption('plugin', array(
- 'short' => 'p',
- 'help' => __d('cake_console', 'Plugin to bake the model into.')
- ))->addOption('connection', array(
- 'short' => 'c',
- 'help' => __d('cake_console', 'The connection the model table is on.')
- ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.'));
- }
-
-/**
- * Interact with FixtureTask to automatically bake fixtures when baking models.
- *
- * @param string $className Name of class to bake fixture for
- * @param string $useTable Optional table name for fixture to use.
- * @return void
- * @see FixtureTask::bake
- */
- public function bakeFixture($className, $useTable = null) {
- $this->Fixture->interactive = $this->interactive;
- $this->Fixture->connection = $this->connection;
- $this->Fixture->plugin = $this->plugin;
- $this->Fixture->bake($className, $useTable);
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
deleted file mode 100644
index a10e072ce0d..00000000000
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ /dev/null
@@ -1,196 +0,0 @@
-path = current(App::path('plugins'));
- }
-
-/**
- * Execution method always used for tasks
- *
- * @return void
- */
- public function execute() {
- if (isset($this->args[0])) {
- $plugin = Inflector::camelize($this->args[0]);
- $pluginPath = $this->_pluginPath($plugin);
- if (is_dir($pluginPath)) {
- $this->out(__d('cake_console', 'Plugin: %s', $plugin));
- $this->out(__d('cake_console', 'Path: %s', $pluginPath));
- } else {
- $this->_interactive($plugin);
- }
- } else {
- return $this->_interactive();
- }
- }
-
-/**
- * Interactive interface
- *
- * @param string $plugin
- * @return void
- */
- protected function _interactive($plugin = null) {
- while ($plugin === null) {
- $plugin = $this->in(__d('cake_console', 'Enter the name of the plugin in CamelCase format'));
- }
-
- if (!$this->bake($plugin)) {
- $this->error(__d('cake_console', "An error occurred trying to bake: %s in %s", $plugin, $this->path . $plugin));
- }
- }
-
-/**
- * Bake the plugin, create directories and files
- *
- * @param string $plugin Name of the plugin in CamelCased format
- * @return boolean
- */
- public function bake($plugin) {
- $pathOptions = App::path('plugins');
- if (count($pathOptions) > 1) {
- $this->findPath($pathOptions);
- }
- $this->hr();
- $this->out(__d('cake_console', "Plugin Name: %s", $plugin));
- $this->out(__d('cake_console', "Plugin Directory: %s", $this->path . $plugin));
- $this->hr();
-
- $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n', 'q'), 'y');
-
- if (strtolower($looksGood) == 'y') {
- $Folder = new Folder($this->path . $plugin);
- $directories = array(
- 'Config' . DS . 'Schema',
- 'Model' . DS . 'Behavior',
- 'Model' . DS . 'Datasource',
- 'Console' . DS . 'Command' . DS . 'Task',
- 'Controller' . DS . 'Component',
- 'Lib',
- 'View' . DS . 'Helper',
- 'Test' . DS . 'Case' . DS . 'Controller' . DS . 'Component',
- 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
- 'Test' . DS . 'Case' . DS . 'Model' . DS . 'Behavior',
- 'Test' . DS . 'Fixture',
- 'Vendor',
- 'webroot'
- );
-
- foreach ($directories as $directory) {
- $dirPath = $this->path . $plugin . DS . $directory;
- $Folder->create($dirPath);
- $File = new File($dirPath . DS . 'empty', true);
- }
-
- foreach ($Folder->messages() as $message) {
- $this->out($message, 1, Shell::VERBOSE);
- }
-
- $errors = $Folder->errors();
- if (!empty($errors)) {
- return false;
- }
-
- $controllerFileName = $plugin . 'AppController.php';
-
- $out = "createFile($this->path . $plugin . DS . 'Controller' . DS . $controllerFileName, $out);
-
- $modelFileName = $plugin . 'AppModel.php';
-
- $out = "createFile($this->path . $plugin . DS . 'Model' . DS . $modelFileName, $out);
-
- $this->hr();
- $this->out(__d('cake_console', 'Created: %s in %s', $plugin, $this->path . $plugin), 2);
- }
-
- return true;
- }
-
-/**
- * find and change $this->path to the user selection
- *
- * @param array $pathOptions
- * @return string plugin path
- */
- public function findPath($pathOptions) {
- $valid = false;
- foreach ($pathOptions as $i => $path) {
- if (!is_dir($path)) {
- array_splice($pathOptions, $i, 1);
- }
- }
- $max = count($pathOptions);
- while (!$valid) {
- foreach ($pathOptions as $i => $option) {
- $this->out($i + 1 . '. ' . $option);
- }
- $prompt = __d('cake_console', 'Choose a plugin path from the paths above.');
- $choice = $this->in($prompt);
- if (intval($choice) > 0 && intval($choice) <= $max) {
- $valid = true;
- }
- }
- $this->path = $pathOptions[$choice - 1];
- }
-
-/**
- * get the option parser for the plugin task
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(__d('cake_console',
- 'Create the directory structure, AppModel and AppController classes for a new plugin. ' .
- 'Can create plugins in any of your bootstrapped plugin paths.'
- ))->addArgument('name', array(
- 'help' => __d('cake_console', 'CamelCased name of the plugin to create.')
- ));
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php
deleted file mode 100644
index 92135906a1d..00000000000
--- a/lib/Cake/Console/Command/Task/ProjectTask.php
+++ /dev/null
@@ -1,434 +0,0 @@
-args[0])) {
- $project = $this->args[0];
- }
-
- while (!$project) {
- $prompt = __d('cake_console', "What is the path to the project you want to bake?");
- $project = $this->in($prompt, null, APP . 'myapp');
- }
-
- if ($project && !Folder::isAbsolute($project) && isset($_SERVER['PWD'])) {
- $project = $_SERVER['PWD'] . DS . $project;
- }
-
- $response = false;
- while ($response == false && is_dir($project) === true && file_exists($project . 'Config' . 'core.php')) {
- $prompt = __d('cake_console', 'A project already exists in this location: %s Overwrite?', $project);
- $response = $this->in($prompt, array('y', 'n'), 'n');
- if (strtolower($response) === 'n') {
- $response = $project = false;
- }
- }
-
- $success = true;
- if ($this->bake($project)) {
- $path = Folder::slashTerm($project);
- if ($this->createHome($path)) {
- $this->out(__d('cake_console', ' * Welcome page created'));
- } else {
- $this->err(__d('cake_console', 'The Welcome page was NOT created'));
- $success = false;
- }
-
- if ($this->securitySalt($path) === true) {
- $this->out(__d('cake_console', ' * Random hash key created for \'Security.salt\''));
- } else {
- $this->err(__d('cake_console', 'Unable to generate random hash for \'Security.salt\', you should change it in %s', APP . 'Config' . DS . 'core.php'));
- $success = false;
- }
-
- if ($this->securityCipherSeed($path) === true) {
- $this->out(__d('cake_console', ' * Random seed created for \'Security.cipherSeed\''));
- } else {
- $this->err(__d('cake_console', 'Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s', APP . 'Config' . DS . 'core.php'));
- $success = false;
- }
-
- if ($this->consolePath($path) === true) {
- $this->out(__d('cake_console', ' * app/Console/cake.php path set.'));
- } else {
- $this->err(__d('cake_console', 'Unable to set console path for app/Console.'));
- $success = false;
- }
-
- $hardCode = false;
- if ($this->cakeOnIncludePath()) {
- $this->out(__d('cake_console', 'CakePHP is on your `include_path`. CAKE_CORE_INCLUDE_PATH will be set, but commented out. '));
- } else {
- $this->out(__d('cake_console', 'CakePHP is not on your `include_path`, CAKE_CORE_INCLUDE_PATH will be hard coded. '));
- $this->out(__d('cake_console', 'You can fix this by adding CakePHP to your `include_path`.'));
- $hardCode = true;
- }
- $success = $this->corePath($path, $hardCode) === true;
- if ($success) {
- $this->out(__d('cake_console', ' * CAKE_CORE_INCLUDE_PATH set to %s in webroot/index.php', CAKE_CORE_INCLUDE_PATH));
- $this->out(__d('cake_console', ' * CAKE_CORE_INCLUDE_PATH set to %s in webroot/test.php', CAKE_CORE_INCLUDE_PATH));
- } else {
- $this->err(__d('cake_console', 'Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s', $path . 'webroot' . DS . 'index.php'));
- $success = false;
- }
- if ($success && $hardCode) {
- $this->out(__d('cake_console', ' * Remember to check these values after moving to production server '));
- }
-
- $Folder = new Folder($path);
- if (!$Folder->chmod($path . 'tmp', 0777)) {
- $this->err(__d('cake_console', 'Could not set permissions on %s', $path . DS . 'tmp'));
- $this->out(__d('cake_console', 'chmod -R 0777 %s', $path . DS . 'tmp'));
- $success = false;
- }
- if ($success) {
- $this->out(__d('cake_console', 'Project baked successfully! '));
- } else {
- $this->out(__d('cake_console', 'Project baked but with some issues. .'));
- }
- return $path;
- }
- }
-
-/**
- * Checks PHP's include_path for CakePHP.
- *
- * @return boolean Indicates whether or not CakePHP exists on include_path
- */
- public function cakeOnIncludePath() {
- $paths = explode(PATH_SEPARATOR, ini_get('include_path'));
- foreach ($paths as $path) {
- if (file_exists($path . DS . 'Cake' . DS . 'bootstrap.php')) {
- return true;
- }
- }
- return false;
- }
-
-/**
- * Looks for a skeleton template of a Cake application,
- * and if not found asks the user for a path. When there is a path
- * this method will make a deep copy of the skeleton to the project directory.
- *
- * @param string $path Project path
- * @param string $skel Path to copy from
- * @param string $skip array of directories to skip when copying
- * @return mixed
- */
- public function bake($path, $skel = null, $skip = array('empty')) {
- if (!$skel && !empty($this->params['skel'])) {
- $skel = $this->params['skel'];
- }
- while (!$skel) {
- $skel = $this->in(
- __d('cake_console', "What is the path to the directory layout you wish to copy?"),
- null,
- CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
- );
- if (!$skel) {
- $this->err(__d('cake_console', 'The directory path you supplied was empty. Please try again.'));
- } else {
- while (is_dir($skel) === false) {
- $skel = $this->in(
- __d('cake_console', 'Directory path does not exist please choose another:'),
- null,
- CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
- );
- }
- }
- }
-
- $app = basename($path);
-
- $this->out(__d('cake_console', 'Skel Directory : ') . $skel);
- $this->out(__d('cake_console', 'Will be copied to : ') . $path);
- $this->hr();
-
- $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n', 'q'), 'y');
-
- switch (strtolower($looksGood)) {
- case 'y':
- $Folder = new Folder($skel);
- if (!empty($this->params['empty'])) {
- $skip = array();
- }
-
- if ($Folder->copy(array('to' => $path, 'skip' => $skip))) {
- $this->hr();
- $this->out(__d('cake_console', 'Created: %s in %s', $app, $path));
- $this->hr();
- } else {
- $this->err(__d('cake_console', "Could not create '%s' properly.", $app));
- return false;
- }
-
- foreach ($Folder->messages() as $message) {
- $this->out(String::wrap(' * ' . $message), 1, Shell::VERBOSE);
- }
-
- return true;
- case 'n':
- unset($this->args[0]);
- $this->execute();
- return false;
- case 'q':
- $this->out(__d('cake_console', 'Bake Aborted. '));
- return false;
- }
- }
-
-/**
- * Writes a file with a default home page to the project.
- *
- * @param string $dir Path to project
- * @return boolean Success
- */
- public function createHome($dir) {
- $app = basename($dir);
- $path = $dir . 'View' . DS . 'Pages' . DS;
- $source = CAKE . 'Console' . DS . 'Templates' . DS . 'default' . DS . 'views' . DS . 'home.ctp';
- include $source;
- return $this->createFile($path . 'home.ctp', $output);
- }
-
-/**
- * Generates the correct path to the CakePHP libs that are generating the project
- * and points app/console/cake.php to the right place
- *
- * @param string $path Project path.
- * @return boolean success
- */
- public function consolePath($path) {
- $File = new File($path . 'Console' . DS . 'cake.php');
- $contents = $File->read();
- if (preg_match('/(__CAKE_PATH__)/', $contents, $match)) {
- $root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " \$ds . '" : "'";
- $replacement = $root . str_replace(DS, "' . \$ds . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "'";
- $result = str_replace($match[0], $replacement, $contents);
- if ($File->write($result)) {
- return true;
- }
- return false;
- }
- return false;
- }
-
-/**
- * Generates and writes 'Security.salt'
- *
- * @param string $path Project path
- * @return boolean Success
- */
- public function securitySalt($path) {
- $File = new File($path . 'Config' . DS . 'core.php');
- $contents = $File->read();
- if (preg_match('/([\s]*Configure::write\(\'Security.salt\',[\s\'A-z0-9]*\);)/', $contents, $match)) {
- $string = Security::generateAuthKey();
- $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \'' . $string . '\');', $contents);
- if ($File->write($result)) {
- return true;
- }
- return false;
- }
- return false;
- }
-
-/**
- * Generates and writes 'Security.cipherSeed'
- *
- * @param string $path Project path
- * @return boolean Success
- */
- public function securityCipherSeed($path) {
- $File = new File($path . 'Config' . DS . 'core.php');
- $contents = $File->read();
- if (preg_match('/([\s]*Configure::write\(\'Security.cipherSeed\',[\s\'A-z0-9]*\);)/', $contents, $match)) {
- App::uses('Security', 'Utility');
- $string = substr(bin2hex(Security::generateAuthKey()), 0, 30);
- $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \'' . $string . '\');', $contents);
- if ($File->write($result)) {
- return true;
- }
- return false;
- }
- return false;
- }
-
-/**
- * Generates and writes CAKE_CORE_INCLUDE_PATH
- *
- * @param string $path Project path
- * @param boolean $hardCode Wether or not define calls should be hardcoded.
- * @return boolean Success
- */
- public function corePath($path, $hardCode = true) {
- if (dirname($path) !== CAKE_CORE_INCLUDE_PATH) {
- $filename = $path . 'webroot' . DS . 'index.php';
- if (!$this->_replaceCorePath($filename, $hardCode)) {
- return false;
- }
- $filename = $path . 'webroot' . DS . 'test.php';
- if (!$this->_replaceCorePath($filename, $hardCode)) {
- return false;
- }
- return true;
- }
- }
-
-/**
- * Replaces the __CAKE_PATH__ placeholder in the template files.
- *
- * @param string $filename The filename to operate on.
- * @param boolean $hardCode Whether or not the define should be uncommented.
- * @return boolean Success
- */
- protected function _replaceCorePath($filename, $hardCode) {
- $contents = file_get_contents($filename);
-
- $root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
- $corePath = $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "'";
-
- $result = str_replace('__CAKE_PATH__', $corePath, $contents, $count);
- if ($hardCode) {
- $result = str_replace('//define(\'CAKE_CORE', 'define(\'CAKE_CORE', $result);
- }
- if (!file_put_contents($filename, $result)) {
- return false;
- }
- if ($count == 0) {
- return false;
- }
- return true;
- }
-
-/**
- * Enables Configure::read('Routing.prefixes') in /app/Config/core.php
- *
- * @param string $name Name to use as admin routing
- * @return boolean Success
- */
- public function cakeAdmin($name) {
- $path = (empty($this->configPath)) ? APP . 'Config' . DS : $this->configPath;
- $File = new File($path . 'core.php');
- $contents = $File->read();
- if (preg_match('%(\s*[/]*Configure::write\(\'Routing.prefixes\',[\s\'a-z,\)\(]*\);)%', $contents, $match)) {
- $result = str_replace($match[0], "\n" . 'Configure::write(\'Routing.prefixes\', array(\'' . $name . '\'));', $contents);
- if ($File->write($result)) {
- Configure::write('Routing.prefixes', array($name));
- return true;
- } else {
- return false;
- }
- } else {
- return false;
- }
- }
-
-/**
- * Checks for Configure::read('Routing.prefixes') and forces user to input it if not enabled
- *
- * @return string Admin route to use
- */
- public function getPrefix() {
- $admin = '';
- $prefixes = Configure::read('Routing.prefixes');
- if (!empty($prefixes)) {
- if (count($prefixes) == 1) {
- return $prefixes[0] . '_';
- }
- if ($this->interactive) {
- $this->out();
- $this->out(__d('cake_console', 'You have more than one routing prefix configured'));
- }
- $options = array();
- foreach ($prefixes as $i => $prefix) {
- $options[] = $i + 1;
- if ($this->interactive) {
- $this->out($i + 1 . '. ' . $prefix);
- }
- }
- $selection = $this->in(__d('cake_console', 'Please choose a prefix to bake with.'), $options, 1);
- return $prefixes[$selection - 1] . '_';
- }
- if ($this->interactive) {
- $this->hr();
- $this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/Config/core.php to use prefix routing.'));
- $this->out(__d('cake_console', 'What would you like the prefix route to be?'));
- $this->out(__d('cake_console', 'Example: www.example.com/admin/controller'));
- while ($admin == '') {
- $admin = $this->in(__d('cake_console', 'Enter a routing prefix:'), null, 'admin');
- }
- if ($this->cakeAdmin($admin) !== true) {
- $this->out(__d('cake_console', 'Unable to write to /app/Config/core.php.'));
- $this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/Config/core.php to use prefix routing.'));
- $this->_stop();
- }
- return $admin . '_';
- }
- return '';
- }
-
-/**
- * get the option parser.
- *
- * @return ConsoleOptionParser
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(
- __d('cake_console', 'Generate a new CakePHP project skeleton.')
- )->addArgument('name', array(
- 'help' => __d('cake_console', 'Application directory to make, if it starts with "/" the path is absolute.')
- ))->addOption('empty', array(
- 'boolean' => true,
- 'help' => __d('cake_console', 'Create empty files in each of the directories. Good if you are using git')
- ))->addOption('skel', array(
- 'default' => current(App::core('Console')) . 'Templates' . DS . 'skel',
- 'help' => __d('cake_console', 'The directory layout to use for the new application skeleton. Defaults to cake/Console/Templates/skel of CakePHP used to create the project.')
- ));
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/TemplateTask.php b/lib/Cake/Console/Command/Task/TemplateTask.php
deleted file mode 100644
index d9a0e3f4378..00000000000
--- a/lib/Cake/Console/Command/Task/TemplateTask.php
+++ /dev/null
@@ -1,218 +0,0 @@
- $path
- *
- * @var array
- */
- public $templatePaths = array();
-
-/**
- * Initialize callback. Setup paths for the template task.
- *
- * @return void
- */
- public function initialize() {
- $this->templatePaths = $this->_findThemes();
- }
-
-/**
- * Find the paths to all the installed shell themes in the app.
- *
- * Bake themes are directories not named `skel` inside a `Console/Templates` path.
- *
- * @return array Array of bake themes that are installed.
- */
- protected function _findThemes() {
- $paths = array();
- $core = current(App::core('Console'));
- $separator = DS === '/' ? '/' : '\\\\';
- $core = preg_replace('#shells' . $separator . '$#', '', $core);
-
- $Folder = new Folder($core . 'Templates' . DS . 'default');
-
- $contents = $Folder->read();
- $themeFolders = $contents[0];
-
- $plugins = App::objects('plugin');
- $paths[] = $core;
- foreach ($plugins as $plugin) {
- $paths[] = $this->_pluginPath($plugin) . 'Console' . DS;
- }
-
- $paths = array_merge($paths, App::path('Console'));
-
- // TEMPORARY TODO remove when all paths are DS terminated
- foreach ($paths as $i => $path) {
- $paths[$i] = rtrim($path, DS) . DS;
- }
-
- $themes = array();
- foreach ($paths as $path) {
- $Folder = new Folder($path . 'Templates', false);
- $contents = $Folder->read();
- $subDirs = $contents[0];
- foreach ($subDirs as $dir) {
- if (empty($dir) || preg_match('@^skel$|_skel$@', $dir)) {
- continue;
- }
- $Folder = new Folder($path . 'Templates' . DS . $dir);
- $contents = $Folder->read();
- $subDirs = $contents[0];
- if (array_intersect($contents[0], $themeFolders)) {
- $templateDir = $path . 'Templates' . DS . $dir . DS;
- $themes[$dir] = $templateDir;
- }
- }
- }
- return $themes;
- }
-
-/**
- * Set variable values to the template scope
- *
- * @param string|array $one A string or an array of data.
- * @param mixed $two Value in case $one is a string (which then works as the key).
- * Unused if $one is an associative array, otherwise serves as the values to $one's keys.
- * @return void
- */
- public function set($one, $two = null) {
- if (is_array($one)) {
- if (is_array($two)) {
- $data = array_combine($one, $two);
- } else {
- $data = $one;
- }
- } else {
- $data = array($one => $two);
- }
-
- if ($data == null) {
- return false;
- }
- $this->templateVars = $data + $this->templateVars;
- }
-
-/**
- * Runs the template
- *
- * @param string $directory directory / type of thing you want
- * @param string $filename template name
- * @param array $vars Additional vars to set to template scope.
- * @return string contents of generated code template
- */
- public function generate($directory, $filename, $vars = null) {
- if ($vars !== null) {
- $this->set($vars);
- }
- if (empty($this->templatePaths)) {
- $this->initialize();
- }
- $themePath = $this->getThemePath();
- $templateFile = $this->_findTemplate($themePath, $directory, $filename);
- if ($templateFile) {
- extract($this->templateVars);
- ob_start();
- ob_implicit_flush(0);
- include $templateFile;
- $content = ob_get_clean();
- return $content;
- }
- return '';
- }
-
-/**
- * Find the theme name for the current operation.
- * If there is only one theme in $templatePaths it will be used.
- * If there is a -theme param in the cli args, it will be used.
- * If there is more than one installed theme user interaction will happen
- *
- * @return string returns the path to the selected theme.
- */
- public function getThemePath() {
- if (count($this->templatePaths) == 1) {
- $paths = array_values($this->templatePaths);
- return $paths[0];
- }
- if (!empty($this->params['theme']) && isset($this->templatePaths[$this->params['theme']])) {
- return $this->templatePaths[$this->params['theme']];
- }
-
- $this->hr();
- $this->out(__d('cake_console', 'You have more than one set of templates installed.'));
- $this->out(__d('cake_console', 'Please choose the template set you wish to use:'));
- $this->hr();
-
- $i = 1;
- $indexedPaths = array();
- foreach ($this->templatePaths as $key => $path) {
- $this->out($i . '. ' . $key);
- $indexedPaths[$i] = $path;
- $i++;
- }
- $index = $this->in(__d('cake_console', 'Which bake theme would you like to use?'), range(1, $i - 1), 1);
- $themeNames = array_keys($this->templatePaths);
- $this->params['theme'] = $themeNames[$index - 1];
- return $indexedPaths[$index];
- }
-
-/**
- * Find a template inside a directory inside a path.
- * Will scan all other theme dirs if the template is not found in the first directory.
- *
- * @param string $path The initial path to look for the file on. If it is not found fallbacks will be used.
- * @param string $directory Subdirectory to look for ie. 'views', 'objects'
- * @param string $filename lower_case_underscored filename you want.
- * @return string filename will exit program if template is not found.
- */
- protected function _findTemplate($path, $directory, $filename) {
- $themeFile = $path . $directory . DS . $filename . '.ctp';
- if (file_exists($themeFile)) {
- return $themeFile;
- }
- foreach ($this->templatePaths as $path) {
- $templatePath = $path . $directory . DS . $filename . '.ctp';
- if (file_exists($templatePath)) {
- return $templatePath;
- }
- }
- $this->err(__d('cake_console', 'Could not find template for %s', $filename));
- return false;
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php
deleted file mode 100644
index e90239e0107..00000000000
--- a/lib/Cake/Console/Command/Task/TestTask.php
+++ /dev/null
@@ -1,535 +0,0 @@
- 'Model',
- 'Controller' => 'Controller',
- 'Component' => 'Controller/Component',
- 'Behavior' => 'Model/Behavior',
- 'Helper' => 'View/Helper'
- );
-
-/**
- * Internal list of fixtures that have been added so far.
- *
- * @var array
- */
- protected $_fixtures = array();
-
-/**
- * Execution method always used for tasks
- *
- * @return void
- */
- public function execute() {
- parent::execute();
- if (empty($this->args)) {
- $this->_interactive();
- }
-
- if (count($this->args) == 1) {
- $this->_interactive($this->args[0]);
- }
-
- if (count($this->args) > 1) {
- $type = Inflector::underscore($this->args[0]);
- if ($this->bake($type, $this->args[1])) {
- $this->out('Done ');
- }
- }
- }
-
-/**
- * Handles interactive baking
- *
- * @param string $type
- * @return string|boolean
- */
- protected function _interactive($type = null) {
- $this->interactive = true;
- $this->hr();
- $this->out(__d('cake_console', 'Bake Tests'));
- $this->out(__d('cake_console', 'Path: %s', $this->getPath()));
- $this->hr();
-
- if ($type) {
- $type = Inflector::camelize($type);
- if (!isset($this->classTypes[$type])) {
- $this->error(__d('cake_console', 'Incorrect type provided. Please choose one of %s', implode(', ', array_keys($this->classTypes))));
- }
- } else {
- $type = $this->getObjectType();
- }
- $className = $this->getClassName($type);
- return $this->bake($type, $className);
- }
-
-/**
- * Completes final steps for generating data to create test case.
- *
- * @param string $type Type of object to bake test case for ie. Model, Controller
- * @param string $className the 'cake name' for the class ie. Posts for the PostsController
- * @return string|boolean
- */
- public function bake($type, $className) {
- $plugin = null;
- if ($this->plugin) {
- $plugin = $this->plugin . '.';
- }
-
- $realType = $this->mapType($type, $plugin);
- $fullClassName = $this->getRealClassName($type, $className);
-
- if ($this->typeCanDetectFixtures($type) && $this->isLoadableClass($realType, $fullClassName)) {
- $this->out(__d('cake_console', 'Bake is detecting possible fixtures...'));
- $testSubject = $this->buildTestSubject($type, $className);
- $this->generateFixtureList($testSubject);
- } elseif ($this->interactive) {
- $this->getUserFixtures();
- }
- App::uses($fullClassName, $realType);
-
- $methods = array();
- if (class_exists($fullClassName)) {
- $methods = $this->getTestableMethods($fullClassName);
- }
- $mock = $this->hasMockClass($type, $fullClassName);
- list($preConstruct, $construction, $postConstruct) = $this->generateConstructor($type, $fullClassName);
- $uses = $this->generateUses($type, $realType, $fullClassName);
-
- $this->out("\n" . __d('cake_console', 'Baking test case for %s %s ...', $className, $type), 1, Shell::QUIET);
-
- $this->Template->set('fixtures', $this->_fixtures);
- $this->Template->set('plugin', $plugin);
- $this->Template->set(compact(
- 'className', 'methods', 'type', 'fullClassName', 'mock',
- 'realType', 'preConstruct', 'postConstruct', 'construction',
- 'uses'
- ));
- $out = $this->Template->generate('classes', 'test');
-
- $filename = $this->testCaseFileName($type, $className);
- $made = $this->createFile($filename, $out);
- if ($made) {
- return $out;
- }
- return false;
- }
-
-/**
- * Interact with the user and get their chosen type. Can exit the script.
- *
- * @return string Users chosen type.
- */
- public function getObjectType() {
- $this->hr();
- $this->out(__d('cake_console', 'Select an object type:'));
- $this->hr();
-
- $keys = array();
- $i = 0;
- foreach ($this->classTypes as $option => $package) {
- $this->out(++$i . '. ' . $option);
- $keys[] = $i;
- }
- $keys[] = 'q';
- $selection = $this->in(__d('cake_console', 'Enter the type of object to bake a test for or (q)uit'), $keys, 'q');
- if ($selection == 'q') {
- return $this->_stop();
- }
- $types = array_keys($this->classTypes);
- return $types[$selection - 1];
- }
-
-/**
- * Get the user chosen Class name for the chosen type
- *
- * @param string $objectType Type of object to list classes for i.e. Model, Controller.
- * @return string Class name the user chose.
- */
- public function getClassName($objectType) {
- $type = ucfirst(strtolower($objectType));
- $typeLength = strlen($type);
- $type = $this->classTypes[$type];
- if ($this->plugin) {
- $plugin = $this->plugin . '.';
- $options = App::objects($plugin . $type);
- } else {
- $options = App::objects($type);
- }
- $this->out(__d('cake_console', 'Choose a %s class', $objectType));
- $keys = array();
- foreach ($options as $key => $option) {
- $this->out(++$key . '. ' . $option);
- $keys[] = $key;
- }
- while (empty($selection)) {
- $selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
- if (is_numeric($selection) && isset($options[$selection - 1])) {
- $selection = $options[$selection - 1];
- }
- if ($type !== 'Model') {
- $selection = substr($selection, 0, $typeLength * - 1);
- }
- }
- return $selection;
- }
-
-/**
- * Checks whether the chosen type can find its own fixtures.
- * Currently only model, and controller are supported
- *
- * @param string $type The Type of object you are generating tests for eg. controller
- * @return boolean
- */
- public function typeCanDetectFixtures($type) {
- $type = strtolower($type);
- return in_array($type, array('controller', 'model'));
- }
-
-/**
- * Check if a class with the given package is loaded or can be loaded.
- *
- * @param string $package The package of object you are generating tests for eg. controller
- * @param string $class the Classname of the class the test is being generated for.
- * @return boolean
- */
- public function isLoadableClass($package, $class) {
- App::uses($class, $package);
- return class_exists($class);
- }
-
-/**
- * Construct an instance of the class to be tested.
- * So that fixtures can be detected
- *
- * @param string $type The Type of object you are generating tests for eg. controller
- * @param string $class the Classname of the class the test is being generated for.
- * @return object And instance of the class that is going to be tested.
- */
- public function &buildTestSubject($type, $class) {
- ClassRegistry::flush();
- App::import($type, $class);
- $class = $this->getRealClassName($type, $class);
- if (strtolower($type) == 'model') {
- $instance = ClassRegistry::init($class);
- } else {
- $instance = new $class();
- }
- return $instance;
- }
-
-/**
- * Gets the real class name from the cake short form. If the class name is already
- * suffixed with the type, the type will not be duplicated.
- *
- * @param string $type The Type of object you are generating tests for eg. controller
- * @param string $class the Classname of the class the test is being generated for.
- * @return string Real classname
- */
- public function getRealClassName($type, $class) {
- if (strtolower($type) == 'model' || empty($this->classTypes[$type])) {
- return $class;
- }
-
- $position = strpos($class, $type);
-
- if ($position !== false && strlen($class) - $position == strlen($type)) {
- return $class;
- }
- return $class . $type;
- }
-
-/**
- * Map the types that TestTask uses to concrete types that App::uses can use.
- *
- * @param string $type The type of thing having a test generated.
- * @param string $plugin The plugin name.
- * @return string
- * @throws CakeException When invalid object types are requested.
- */
- public function mapType($type, $plugin) {
- $type = ucfirst($type);
- if (empty($this->classTypes[$type])) {
- throw new CakeException(__d('cake_dev', 'Invalid object type.'));
- }
- $real = $this->classTypes[$type];
- if ($plugin) {
- $real = trim($plugin, '.') . '.' . $real;
- }
- return $real;
- }
-
-/**
- * Get methods declared in the class given.
- * No parent methods will be returned
- *
- * @param string $className Name of class to look at.
- * @return array Array of method names.
- */
- public function getTestableMethods($className) {
- $classMethods = get_class_methods($className);
- $parentMethods = get_class_methods(get_parent_class($className));
- $thisMethods = array_diff($classMethods, $parentMethods);
- $out = array();
- foreach ($thisMethods as $method) {
- if (substr($method, 0, 1) != '_' && $method != strtolower($className)) {
- $out[] = $method;
- }
- }
- return $out;
- }
-
-/**
- * Generate the list of fixtures that will be required to run this test based on
- * loaded models.
- *
- * @param object $subject The object you want to generate fixtures for.
- * @return array Array of fixtures to be included in the test.
- */
- public function generateFixtureList($subject) {
- $this->_fixtures = array();
- if (is_a($subject, 'Model')) {
- $this->_processModel($subject);
- } elseif (is_a($subject, 'Controller')) {
- $this->_processController($subject);
- }
- return array_values($this->_fixtures);
- }
-
-/**
- * Process a model recursively and pull out all the
- * model names converting them to fixture names.
- *
- * @param Model $subject A Model class to scan for associations and pull fixtures off of.
- * @return void
- */
- protected function _processModel($subject) {
- $this->_addFixture($subject->name);
- $associated = $subject->getAssociated();
- foreach ($associated as $alias => $type) {
- $className = $subject->{$alias}->name;
- if (!isset($this->_fixtures[$className])) {
- $this->_processModel($subject->{$alias});
- }
- if ($type == 'hasAndBelongsToMany') {
- if (!empty($subject->hasAndBelongsToMany[$alias]['with'])) {
- list($plugin, $joinModel) = pluginSplit($subject->hasAndBelongsToMany[$alias]['with']);
- } else {
- $joinModel = Inflector::classify($subject->hasAndBelongsToMany[$alias]['joinTable']);
- }
- if (!isset($this->_fixtures[$joinModel])) {
- $this->_processModel($subject->{$joinModel});
- }
- }
- }
- }
-
-/**
- * Process all the models attached to a controller
- * and generate a fixture list.
- *
- * @param Controller $subject A controller to pull model names off of.
- * @return void
- */
- protected function _processController($subject) {
- $subject->constructClasses();
- $models = array(Inflector::classify($subject->name));
- if (!empty($subject->uses)) {
- $models = $subject->uses;
- }
- foreach ($models as $model) {
- $this->_processModel($subject->{$model});
- }
- }
-
-/**
- * Add classname to the fixture list.
- * Sets the app. or plugin.plugin_name. prefix.
- *
- * @param string $name Name of the Model class that a fixture might be required for.
- * @return void
- */
- protected function _addFixture($name) {
- $parent = get_parent_class($name);
- $prefix = 'app.';
- if (strtolower($parent) != 'appmodel' && strtolower(substr($parent, - 8)) == 'appmodel') {
- $pluginName = substr($parent, 0, strlen($parent) - 8);
- $prefix = 'plugin.' . Inflector::underscore($pluginName) . '.';
- }
- $fixture = $prefix . Inflector::underscore($name);
- $this->_fixtures[$name] = $fixture;
- }
-
-/**
- * Interact with the user to get additional fixtures they want to use.
- *
- * @return array Array of fixtures the user wants to add.
- */
- public function getUserFixtures() {
- $proceed = $this->in(__d('cake_console', 'Bake could not detect fixtures, would you like to add some?'), array('y', 'n'), 'n');
- $fixtures = array();
- if (strtolower($proceed) == 'y') {
- $fixtureList = $this->in(__d('cake_console', "Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'"));
- $fixtureListTrimmed = str_replace(' ', '', $fixtureList);
- $fixtures = explode(',', $fixtureListTrimmed);
- }
- $this->_fixtures = array_merge($this->_fixtures, $fixtures);
- return $fixtures;
- }
-
-/**
- * Is a mock class required for this type of test?
- * Controllers require a mock class.
- *
- * @param string $type The type of object tests are being generated for eg. controller.
- * @return boolean
- */
- public function hasMockClass($type) {
- $type = strtolower($type);
- return $type == 'controller';
- }
-
-/**
- * Generate a constructor code snippet for the type and classname
- *
- * @param string $type The Type of object you are generating tests for eg. controller
- * @param string $fullClassName The Classname of the class the test is being generated for.
- * @return array Constructor snippets for the thing you are building.
- */
- public function generateConstructor($type, $fullClassName) {
- $type = strtolower($type);
- $pre = $post = '';
- if ($type == 'model') {
- $construct = "ClassRegistry::init('$fullClassName');\n";
- }
- if ($type == 'behavior') {
- $construct = "new $fullClassName();\n";
- }
- if ($type == 'controller') {
- $className = substr($fullClassName, 0, strlen($fullClassName) - 10);
- $construct = "new Test$fullClassName();\n";
- $post = "\$this->{$className}->constructClasses();\n";
- }
- if ($type == 'helper') {
- $pre = "\$View = new View();\n";
- $construct = "new {$fullClassName}(\$View);\n";
- }
- if ($type == 'component') {
- $pre = "\$Collection = new ComponentCollection();\n";
- $construct = "new {$fullClassName}(\$Collection);\n";
- }
- return array($pre, $construct, $post);
- }
-
-/**
- * Generate the uses() calls for a type & classname
- *
- * @param string $type The Type of object you are generating tests for eg. controller
- * @param string $realType The package name for the class.
- * @param string $className The Classname of the class the test is being generated for.
- * @return array An array containing used classes
- */
- public function generateUses($type, $realType, $className) {
- $uses = array();
- if ($type == 'component') {
- $uses[] = array('ComponentCollection', 'Controller');
- $uses[] = array('Component', 'Controller');
- }
- if ($type == 'helper') {
- $uses[] = array('View', 'View');
- $uses[] = array('Helper', 'View');
- }
- $uses[] = array($className, $realType);
- return $uses;
- }
-
-/**
- * Make the filename for the test case. resolve the suffixes for controllers
- * and get the plugin path if needed.
- *
- * @param string $type The Type of object you are generating tests for eg. controller
- * @param string $className the Classname of the class the test is being generated for.
- * @return string filename the test should be created on.
- */
- public function testCaseFileName($type, $className) {
- $path = $this->getPath() . 'Case' . DS;
- $type = Inflector::camelize($type);
- if (isset($this->classTypes[$type])) {
- $path .= $this->classTypes[$type] . DS;
- }
- $className = $this->getRealClassName($type, $className);
- return str_replace('/', DS, $path) . Inflector::camelize($className) . 'Test.php';
- }
-
-/**
- * get the option parser.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(__d('cake_console', 'Bake test case skeletons for classes.'))
- ->addArgument('type', array(
- 'help' => __d('cake_console', 'Type of class to bake, can be any of the following: controller, model, helper, component or behavior.'),
- 'choices' => array(
- 'Controller', 'controller',
- 'Model', 'model',
- 'Helper', 'helper',
- 'Component', 'component',
- 'Behavior', 'behavior'
- )
- ))->addArgument('name', array(
- 'help' => __d('cake_console', 'An existing class to bake tests for.')
- ))->addOption('plugin', array(
- 'short' => 'p',
- 'help' => __d('cake_console', 'CamelCased name of the plugin to bake tests for.')
- ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.'));
- }
-
-}
diff --git a/lib/Cake/Console/Command/Task/ViewTask.php b/lib/Cake/Console/Command/Task/ViewTask.php
deleted file mode 100644
index 8baf4263e24..00000000000
--- a/lib/Cake/Console/Command/Task/ViewTask.php
+++ /dev/null
@@ -1,468 +0,0 @@
-path = current(App::path('View'));
- }
-
-/**
- * Execution method always used for tasks
- *
- * @return mixed
- */
- public function execute() {
- parent::execute();
- if (empty($this->args)) {
- $this->_interactive();
- }
- if (empty($this->args[0])) {
- return;
- }
- if (!isset($this->connection)) {
- $this->connection = 'default';
- }
- $action = null;
- $this->controllerName = $this->_controllerName($this->args[0]);
-
- $this->Project->interactive = false;
- if (strtolower($this->args[0]) == 'all') {
- return $this->all();
- }
-
- if (isset($this->args[1])) {
- $this->template = $this->args[1];
- }
- if (isset($this->args[2])) {
- $action = $this->args[2];
- }
- if (!$action) {
- $action = $this->template;
- }
- if ($action) {
- return $this->bake($action, true);
- }
-
- $vars = $this->_loadController();
- $methods = $this->_methodsToBake();
-
- foreach ($methods as $method) {
- $content = $this->getContent($method, $vars);
- if ($content) {
- $this->bake($method, $content);
- }
- }
- }
-
-/**
- * Get a list of actions that can / should have views baked for them.
- *
- * @return array Array of action names that should be baked
- */
- protected function _methodsToBake() {
- $methods = array_diff(
- array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
- array_map('strtolower', get_class_methods('AppController'))
- );
- $scaffoldActions = false;
- if (empty($methods)) {
- $scaffoldActions = true;
- $methods = $this->scaffoldActions;
- }
- $adminRoute = $this->Project->getPrefix();
- foreach ($methods as $i => $method) {
- if ($adminRoute && !empty($this->params['admin'])) {
- if ($scaffoldActions) {
- $methods[$i] = $adminRoute . $method;
- continue;
- } elseif (strpos($method, $adminRoute) === false) {
- unset($methods[$i]);
- }
- }
- if ($method[0] === '_' || $method == strtolower($this->controllerName . 'Controller')) {
- unset($methods[$i]);
- }
- }
- return $methods;
- }
-
-/**
- * Bake All views for All controllers.
- *
- * @return void
- */
- public function all() {
- $this->Controller->interactive = false;
- $tables = $this->Controller->listAll($this->connection, false);
-
- $actions = null;
- if (isset($this->args[1])) {
- $actions = array($this->args[1]);
- }
- $this->interactive = false;
- foreach ($tables as $table) {
- $model = $this->_modelName($table);
- $this->controllerName = $this->_controllerName($model);
- App::uses($model, 'Model');
- if (class_exists($model)) {
- $vars = $this->_loadController();
- if (!$actions) {
- $actions = $this->_methodsToBake();
- }
- $this->bakeActions($actions, $vars);
- $actions = null;
- }
- }
- }
-
-/**
- * Handles interactive baking
- *
- * @return void
- */
- protected function _interactive() {
- $this->hr();
- $this->out(sprintf("Bake View\nPath: %s", $this->getPath()));
- $this->hr();
-
- $this->DbConfig->interactive = $this->Controller->interactive = $this->interactive = true;
-
- if (empty($this->connection)) {
- $this->connection = $this->DbConfig->getConfig();
- }
-
- $this->Controller->connection = $this->connection;
- $this->controllerName = $this->Controller->getName();
-
- $prompt = __d('cake_console', "Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", $this->controllerName);
- $interactive = $this->in($prompt, array('y', 'n'), 'n');
-
- if (strtolower($interactive) == 'n') {
- $this->interactive = false;
- }
-
- $prompt = __d('cake_console', "Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models).");
- $wannaDoScaffold = $this->in($prompt, array('y', 'n'), 'y');
-
- $wannaDoAdmin = $this->in(__d('cake_console', "Would you like to create the views for admin routing?"), array('y', 'n'), 'n');
-
- if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') {
- $vars = $this->_loadController();
- if (strtolower($wannaDoScaffold) == 'y') {
- $actions = $this->scaffoldActions;
- $this->bakeActions($actions, $vars);
- }
- if (strtolower($wannaDoAdmin) == 'y') {
- $admin = $this->Project->getPrefix();
- $regularActions = $this->scaffoldActions;
- $adminActions = array();
- foreach ($regularActions as $action) {
- $adminActions[] = $admin . $action;
- }
- $this->bakeActions($adminActions, $vars);
- }
- $this->hr();
- $this->out();
- $this->out(__d('cake_console', "View Scaffolding Complete.\n"));
- } else {
- $this->customAction();
- }
- }
-
-/**
- * Loads Controller and sets variables for the template
- * Available template variables
- * 'modelClass', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
- * 'singularHumanName', 'pluralHumanName', 'fields', 'foreignKeys',
- * 'belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'
- *
- * @return array Returns an variables to be made available to a view template
- */
- protected function _loadController() {
- if (!$this->controllerName) {
- $this->err(__d('cake_console', 'Controller not found'));
- }
-
- $plugin = null;
- if ($this->plugin) {
- $plugin = $this->plugin . '.';
- }
-
- $controllerClassName = $this->controllerName . 'Controller';
- App::uses($controllerClassName, $plugin . 'Controller');
- if (!class_exists($controllerClassName)) {
- $file = $controllerClassName . '.php';
- $this->err(__d('cake_console', "The file '%s' could not be found.\nIn order to bake a view, you'll need to first create the controller.", $file));
- $this->_stop();
- }
- $controllerObj = new $controllerClassName();
- $controllerObj->plugin = $this->plugin;
- $controllerObj->constructClasses();
- $modelClass = $controllerObj->modelClass;
- $modelObj = $controllerObj->{$controllerObj->modelClass};
-
- if ($modelObj) {
- $primaryKey = $modelObj->primaryKey;
- $displayField = $modelObj->displayField;
- $singularVar = Inflector::variable($modelClass);
- $singularHumanName = $this->_singularHumanName($this->controllerName);
- $schema = $modelObj->schema(true);
- $fields = array_keys($schema);
- $associations = $this->_associations($modelObj);
- } else {
- $primaryKey = $displayField = null;
- $singularVar = Inflector::variable(Inflector::singularize($this->controllerName));
- $singularHumanName = $this->_singularHumanName($this->controllerName);
- $fields = $schema = $associations = array();
- }
- $pluralVar = Inflector::variable($this->controllerName);
- $pluralHumanName = $this->_pluralHumanName($this->controllerName);
-
- return compact('modelClass', 'schema', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
- 'singularHumanName', 'pluralHumanName', 'fields', 'associations');
- }
-
-/**
- * Bake a view file for each of the supplied actions
- *
- * @param array $actions Array of actions to make files for.
- * @param array $vars
- * @return void
- */
- public function bakeActions($actions, $vars) {
- foreach ($actions as $action) {
- $content = $this->getContent($action, $vars);
- $this->bake($action, $content);
- }
- }
-
-/**
- * handle creation of baking a custom action view file
- *
- * @return void
- */
- public function customAction() {
- $action = '';
- while ($action == '') {
- $action = $this->in(__d('cake_console', 'Action Name? (use lowercase_underscored function name)'));
- if ($action == '') {
- $this->out(__d('cake_console', 'The action name you supplied was empty. Please try again.'));
- }
- }
- $this->out();
- $this->hr();
- $this->out(__d('cake_console', 'The following view will be created:'));
- $this->hr();
- $this->out(__d('cake_console', 'Controller Name: %s', $this->controllerName));
- $this->out(__d('cake_console', 'Action Name: %s', $action));
- $this->out(__d('cake_console', 'Path: %s', $this->getPath() . $this->controllerName . DS . Inflector::underscore($action) . ".ctp"));
- $this->hr();
- $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
- if (strtolower($looksGood) == 'y') {
- $this->bake($action, ' ');
- $this->_stop();
- } else {
- $this->out(__d('cake_console', 'Bake Aborted.'));
- }
- }
-
-/**
- * Assembles and writes bakes the view file.
- *
- * @param string $action Action to bake
- * @param string $content Content to write
- * @return boolean Success
- */
- public function bake($action, $content = '') {
- if ($content === true) {
- $content = $this->getContent($action);
- }
- if (empty($content)) {
- return false;
- }
- $this->out("\n" . __d('cake_console', 'Baking `%s` view file...', $action), 1, Shell::QUIET);
- $path = $this->getPath();
- $filename = $path . $this->controllerName . DS . Inflector::underscore($action) . '.ctp';
- return $this->createFile($filename, $content);
- }
-
-/**
- * Builds content from template and variables
- *
- * @param string $action name to generate content to
- * @param array $vars passed for use in templates
- * @return string content from template
- */
- public function getContent($action, $vars = null) {
- if (!$vars) {
- $vars = $this->_loadController();
- }
-
- $this->Template->set('action', $action);
- $this->Template->set('plugin', $this->plugin);
- $this->Template->set($vars);
- $template = $this->getTemplate($action);
- if ($template) {
- return $this->Template->generate('views', $template);
- }
- return false;
- }
-
-/**
- * Gets the template name based on the action name
- *
- * @param string $action name
- * @return string template name
- */
- public function getTemplate($action) {
- if ($action != $this->template && in_array($action, $this->noTemplateActions)) {
- return false;
- }
- if (!empty($this->template) && $action != $this->template) {
- return $this->template;
- }
- $themePath = $this->Template->getThemePath();
- if (file_exists($themePath . 'views' . DS . $action . '.ctp')) {
- return $action;
- }
- $template = $action;
- $prefixes = Configure::read('Routing.prefixes');
- foreach ((array)$prefixes as $prefix) {
- if (strpos($template, $prefix) !== false) {
- $template = str_replace($prefix . '_', '', $template);
- }
- }
- if (in_array($template, array('add', 'edit'))) {
- $template = 'form';
- } elseif (preg_match('@(_add|_edit)$@', $template)) {
- $template = str_replace(array('_add', '_edit'), '_form', $template);
- }
- return $template;
- }
-
-/**
- * get the option parser for this task
- *
- * @return ConsoleOptionParser
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- return $parser->description(
- __d('cake_console', 'Bake views for a controller, using built-in or custom templates.')
- )->addArgument('controller', array(
- 'help' => __d('cake_console', 'Name of the controller views to bake. Can be Plugin.name as a shortcut for plugin baking.')
- ))->addArgument('action', array(
- 'help' => __d('cake_console', "Will bake a single action's file. core templates are (index, add, edit, view)")
- ))->addArgument('alias', array(
- 'help' => __d('cake_console', 'Will bake the template in but create the filename after .')
- ))->addOption('plugin', array(
- 'short' => 'p',
- 'help' => __d('cake_console', 'Plugin to bake the view into.')
- ))->addOption('admin', array(
- 'help' => __d('cake_console', 'Set to only bake views for a prefix in Routing.prefixes'),
- 'boolean' => true
- ))->addOption('connection', array(
- 'short' => 'c',
- 'help' => __d('cake_console', 'The connection the connected model is on.')
- ))->addSubcommand('all', array(
- 'help' => __d('cake_console', 'Bake all CRUD action views for all controllers. Requires models and controllers to exist.')
- ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.'));
- }
-
-/**
- * Returns associations for controllers models.
- *
- * @param Model $model
- * @return array $associations
- */
- protected function _associations(Model $model) {
- $keys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
- $associations = array();
-
- foreach ($keys as $key => $type) {
- foreach ($model->{$type} as $assocKey => $assocData) {
- list($plugin, $modelClass) = pluginSplit($assocData['className']);
- $associations[$type][$assocKey]['primaryKey'] = $model->{$assocKey}->primaryKey;
- $associations[$type][$assocKey]['displayField'] = $model->{$assocKey}->displayField;
- $associations[$type][$assocKey]['foreignKey'] = $assocData['foreignKey'];
- $associations[$type][$assocKey]['controller'] = Inflector::pluralize(Inflector::underscore($modelClass));
- $associations[$type][$assocKey]['fields'] = array_keys($model->{$assocKey}->schema(true));
- }
- }
- return $associations;
- }
-
-}
diff --git a/lib/Cake/Console/Command/TestShell.php b/lib/Cake/Console/Command/TestShell.php
deleted file mode 100644
index a3b410ba09c..00000000000
--- a/lib/Cake/Console/Command/TestShell.php
+++ /dev/null
@@ -1,434 +0,0 @@
-
- * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice
- *
- * @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @since CakePHP(tm) v 1.2.0.4433
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-
-App::uses('Shell', 'Console');
-App::uses('CakeTestSuiteDispatcher', 'TestSuite');
-App::uses('CakeTestSuiteCommand', 'TestSuite');
-App::uses('CakeTestLoader', 'TestSuite');
-
-/**
- * Provides a CakePHP wrapper around PHPUnit.
- * Adds in CakePHP's fixtures and gives access to plugin, app and core test cases
- *
- * @package Cake.Console.Command
- */
-class TestShell extends Shell {
-
-/**
- * Dispatcher object for the run.
- *
- * @var CakeTestDispatcher
- */
- protected $_dispatcher = null;
-
-/**
- * get the option parser for the test suite.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = new ConsoleOptionParser($this->name);
- $parser->description(array(
- __d('cake_console', 'The CakePHP Testsuite allows you to run test cases from the command line'),
- ))->addArgument('category', array(
- 'help' => __d('cake_console', 'The category for the test, or test file, to test.'),
- 'required' => false,
- ))->addArgument('file', array(
- 'help' => __d('cake_console', 'The path to the file, or test file, to test.'),
- 'required' => false,
- ))->addOption('log-junit', array(
- 'help' => __d('cake_console', ' Log test execution in JUnit XML format to file.'),
- 'default' => false
- ))->addOption('log-json', array(
- 'help' => __d('cake_console', ' Log test execution in TAP format to file.'),
- 'default' => false
- ))->addOption('log-tap', array(
- 'help' => __d('cake_console', ' Log test execution in TAP format to file.'),
- 'default' => false
- ))->addOption('log-dbus', array(
- 'help' => __d('cake_console', 'Log test execution to DBUS.'),
- 'default' => false
- ))->addOption('coverage-html', array(
- 'help' => __d('cake_console', ' Generate code coverage report in HTML format.'),
- 'default' => false
- ))->addOption('coverage-clover', array(
- 'help' => __d('cake_console', ' Write code coverage data in Clover XML format.'),
- 'default' => false
- ))->addOption('testdox-html', array(
- 'help' => __d('cake_console', ' Write agile documentation in HTML format to file.'),
- 'default' => false
- ))->addOption('testdox-text', array(
- 'help' => __d('cake_console', ' Write agile documentation in Text format to file.'),
- 'default' => false
- ))->addOption('filter', array(
- 'help' => __d('cake_console', ' Filter which tests to run.'),
- 'default' => false
- ))->addOption('group', array(
- 'help' => __d('cake_console', ' Only runs tests from the specified group(s).'),
- 'default' => false
- ))->addOption('exclude-group', array(
- 'help' => __d('cake_console', ' Exclude tests from the specified group(s).'),
- 'default' => false
- ))->addOption('list-groups', array(
- 'help' => __d('cake_console', 'List available test groups.'),
- 'boolean' => true
- ))->addOption('loader', array(
- 'help' => __d('cake_console', 'TestSuiteLoader implementation to use.'),
- 'default' => false
- ))->addOption('repeat', array(
- 'help' => __d('cake_console', ' Runs the test(s) repeatedly.'),
- 'default' => false
- ))->addOption('tap', array(
- 'help' => __d('cake_console', 'Report test execution progress in TAP format.'),
- 'boolean' => true
- ))->addOption('testdox', array(
- 'help' => __d('cake_console', 'Report test execution progress in TestDox format.'),
- 'default' => false,
- 'boolean' => true
- ))->addOption('no-colors', array(
- 'help' => __d('cake_console', 'Do not use colors in output.'),
- 'boolean' => true
- ))->addOption('stderr', array(
- 'help' => __d('cake_console', 'Write to STDERR instead of STDOUT.'),
- 'boolean' => true
- ))->addOption('stop-on-error', array(
- 'help' => __d('cake_console', 'Stop execution upon first error or failure.'),
- 'boolean' => true
- ))->addOption('stop-on-failure', array(
- 'help' => __d('cake_console', 'Stop execution upon first failure.'),
- 'boolean' => true
- ))->addOption('stop-on-skipped ', array(
- 'help' => __d('cake_console', 'Stop execution upon first skipped test.'),
- 'boolean' => true
- ))->addOption('stop-on-incomplete', array(
- 'help' => __d('cake_console', 'Stop execution upon first incomplete test.'),
- 'boolean' => true
- ))->addOption('strict', array(
- 'help' => __d('cake_console', 'Mark a test as incomplete if no assertions are made.'),
- 'boolean' => true
- ))->addOption('wait', array(
- 'help' => __d('cake_console', 'Waits for a keystroke after each test.'),
- 'boolean' => true
- ))->addOption('process-isolation', array(
- 'help' => __d('cake_console', 'Run each test in a separate PHP process.'),
- 'boolean' => true
- ))->addOption('no-globals-backup', array(
- 'help' => __d('cake_console', 'Do not backup and restore $GLOBALS for each test.'),
- 'boolean' => true
- ))->addOption('static-backup ', array(
- 'help' => __d('cake_console', 'Backup and restore static attributes for each test.'),
- 'boolean' => true
- ))->addOption('syntax-check', array(
- 'help' => __d('cake_console', 'Try to check source files for syntax errors.'),
- 'boolean' => true
- ))->addOption('bootstrap', array(
- 'help' => __d('cake_console', ' A "bootstrap" PHP file that is run before the tests.'),
- 'default' => false
- ))->addOption('configuration', array(
- 'help' => __d('cake_console', ' Read configuration from XML file.'),
- 'default' => false
- ))->addOption('no-configuration', array(
- 'help' => __d('cake_console', 'Ignore default configuration file (phpunit.xml).'),
- 'boolean' => true
- ))->addOption('include-path', array(
- 'help' => __d('cake_console', ' Prepend PHP include_path with given path(s).'),
- 'default' => false
- ))->addOption('directive', array(
- 'help' => __d('cake_console', 'key[=value] Sets a php.ini value.'),
- 'default' => false
- ))->addOption('fixture', array(
- 'help' => __d('cake_console', 'Choose a custom fixture manager.'),
- ))->addOption('debug', array(
- 'help' => __d('cake_console', 'More verbose output.'),
- ));
-
- return $parser;
- }
-
-/**
- * Initialization method installs PHPUnit and loads all plugins
- *
- * @return void
- * @throws Exception
- */
- public function initialize() {
- $this->_dispatcher = new CakeTestSuiteDispatcher();
- $sucess = $this->_dispatcher->loadTestFramework();
- if (!$sucess) {
- throw new Exception(__d('cake_dev', 'Please install PHPUnit framework (http://www.phpunit.de) '));
- }
- }
-
-/**
- * Parse the CLI options into an array CakeTestDispatcher can use.
- *
- * @return array Array of params for CakeTestDispatcher
- */
- protected function _parseArgs() {
- if (empty($this->args)) {
- return;
- }
- $params = array(
- 'core' => false,
- 'app' => false,
- 'plugin' => null,
- 'output' => 'text',
- );
-
- if (strpos($this->args[0], '.php')) {
- $category = $this->_mapFileToCategory($this->args[0]);
- $params['case'] = $this->_mapFileToCase($this->args[0], $category);
- } else {
- $category = $this->args[0];
- if (isset($this->args[1])) {
- $params['case'] = $this->args[1];
- }
- }
-
- if ($category === 'core') {
- $params['core'] = true;
- } elseif ($category === 'app') {
- $params['app'] = true;
- } else {
- $params['plugin'] = $category;
- }
-
- return $params;
- }
-
-/**
- * Converts the options passed to the shell as options for the PHPUnit cli runner
- *
- * @return array Array of params for CakeTestDispatcher
- */
- protected function _runnerOptions() {
- $options = array();
- $params = $this->params;
- unset($params['help']);
-
- if (!empty($params['no-colors'])) {
- unset($params['no-colors'], $params['colors']);
- } else {
- $params['colors'] = true;
- }
-
- foreach ($params as $param => $value) {
- if ($value === false) {
- continue;
- }
- $options[] = '--' . $param;
- if (is_string($value)) {
- $options[] = $value;
- }
- }
- return $options;
- }
-
-/**
- * Main entry point to this shell
- *
- * @return void
- */
- public function main() {
- $this->out(__d('cake_console', 'CakePHP Test Shell'));
- $this->hr();
-
- $args = $this->_parseArgs();
-
- if (empty($args['case'])) {
- return $this->available();
- }
-
- $this->_run($args, $this->_runnerOptions());
- }
-
-/**
- * Runs the test case from $runnerArgs
- *
- * @param array $runnerArgs list of arguments as obtained from _parseArgs()
- * @param array $options list of options as constructed by _runnerOptions()
- * @return void
- */
- protected function _run($runnerArgs, $options = array()) {
- restore_error_handler();
- restore_error_handler();
-
- $testCli = new CakeTestSuiteCommand('CakeTestLoader', $runnerArgs);
- $testCli->run($options);
- }
-
-/**
- * Shows a list of available test cases and gives the option to run one of them
- *
- * @return void
- */
- public function available() {
- $params = $this->_parseArgs();
- $testCases = CakeTestLoader::generateTestList($params);
- $app = $params['app'];
- $plugin = $params['plugin'];
-
- $title = "Core Test Cases:";
- $category = 'core';
- if ($app) {
- $title = "App Test Cases:";
- $category = 'app';
- } elseif ($plugin) {
- $title = Inflector::humanize($plugin) . " Test Cases:";
- $category = $plugin;
- }
-
- if (empty($testCases)) {
- $this->out(__d('cake_console', "No test cases available \n\n"));
- return $this->out($this->OptionParser->help());
- }
-
- $this->out($title);
- $i = 1;
- $cases = array();
- foreach ($testCases as $testCaseFile => $testCase) {
- $case = str_replace('Test.php', '', $testCase);
- $this->out("[$i] $case");
- $cases[$i] = $case;
- $i++;
- }
-
- while ($choice = $this->in(__d('cake_console', 'What test case would you like to run?'), null, 'q')) {
- if (is_numeric($choice) && isset($cases[$choice])) {
- $this->args[0] = $category;
- $this->args[1] = $cases[$choice];
- $this->_run($this->_parseArgs(), $this->_runnerOptions());
- break;
- }
-
- if (is_string($choice) && in_array($choice, $cases)) {
- $this->args[0] = $category;
- $this->args[1] = $choice;
- $this->_run($this->_parseArgs(), $this->_runnerOptions());
- break;
- }
-
- if ($choice == 'q') {
- break;
- }
- }
- }
-
-/**
- * Find the test case for the passed file. The file could itself be a test.
- *
- * @param mixed $file
- * @param mixed $category
- * @param mixed $throwOnMissingFile
- * @access protected
- * @return array(type, case)
- * @throws Exception
- */
- protected function _mapFileToCase($file, $category, $throwOnMissingFile = true) {
- if (!$category || (substr($file, -4) !== '.php')) {
- return false;
- }
-
- $_file = realpath($file);
- if ($_file) {
- $file = $_file;
- }
-
- $testFile = $testCase = null;
-
- if (preg_match('@Test[\\\/]@', $file)) {
-
- if (substr($file, -8) === 'Test.php') {
-
- $testCase = substr($file, 0, -8);
- $testCase = str_replace(DS, '/', $testCase);
-
- if ($testCase = preg_replace('@.*Test\/Case\/@', '', $testCase)) {
-
- if ($category === 'core') {
- $testCase = str_replace('lib/Cake', '', $testCase);
- }
-
- return $testCase;
- }
-
- throw new Exception(__d('cake_dev', 'Test case %s cannot be run via this shell', $testFile));
- }
- }
-
- $file = substr($file, 0, -4);
- if ($category === 'core') {
-
- $testCase = str_replace(DS, '/', $file);
- $testCase = preg_replace('@.*lib/Cake/@', '', $file);
- $testCase[0] = strtoupper($testCase[0]);
- $testFile = CAKE . 'Test/Case/' . $testCase . 'Test.php';
-
- if (!file_exists($testFile) && $throwOnMissingFile) {
- throw new Exception(__d('cake_dev', 'Test case %s not found', $testFile));
- }
-
- return $testCase;
- }
-
- if ($category === 'app') {
- $testFile = str_replace(APP, APP . 'Test/Case/', $file) . 'Test.php';
- } else {
- $testFile = preg_replace(
- "@((?:plugins|Plugin)[\\/]{$category}[\\/])(.*)$@",
- '\1Test/Case/\2Test.php',
- $file
- );
- }
-
- if (!file_exists($testFile) && $throwOnMissingFile) {
- throw new Exception(__d('cake_dev', 'Test case %s not found', $testFile));
- }
-
- $testCase = substr($testFile, 0, -8);
- $testCase = str_replace(DS, '/', $testCase);
- $testCase = preg_replace('@.*Test/Case/@', '', $testCase);
-
- return $testCase;
- }
-
-/**
- * For the given file, what category of test is it? returns app, core or the name of the plugin
- *
- * @param mixed $file
- * @access protected
- * @return string
- */
- protected function _mapFileToCategory($file) {
- $_file = realpath($file);
- if ($_file) {
- $file = $_file;
- }
-
- $file = str_replace(DS, '/', $file);
- if (strpos($file, 'lib/Cake/') !== false) {
- return 'core';
- } elseif (preg_match('@(?:plugins|Plugin)/([^/]*)@', $file, $match)) {
- return $match[1];
- }
- return 'app';
- }
-
-}
diff --git a/lib/Cake/Console/Command/TestsuiteShell.php b/lib/Cake/Console/Command/TestsuiteShell.php
deleted file mode 100644
index 71decbeff27..00000000000
--- a/lib/Cake/Console/Command/TestsuiteShell.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice
- *
- * @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @since CakePHP(tm) v 1.2.0.4433
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-
-App::uses('TestShell', 'Console/Command');
-App::uses('AppShell', 'Console/Command');
-App::uses('CakeTestSuiteDispatcher', 'TestSuite');
-App::uses('CakeTestSuiteCommand', 'TestSuite');
-App::uses('CakeTestLoader', 'TestSuite');
-
-/**
- * Provides a CakePHP wrapper around PHPUnit.
- * Adds in CakePHP's fixtures and gives access to plugin, app and core test cases
- *
- * @package Cake.Console.Command
- */
-class TestsuiteShell extends TestShell {
-
-/**
- * get the option parser for the test suite.
- *
- * @return void
- */
- public function getOptionParser() {
- $parser = parent::getOptionParser();
- $parser->description(array(
- __d('cake_console', 'The CakePHP Testsuite allows you to run test cases from the command line'),
- __d('cake_console', 'This shell is for backwards-compatibility only '),
- __d('cake_console', 'use the test shell instead')
- ));
-
- return $parser;
- }
-
-/**
- * Parse the CLI options into an array CakeTestDispatcher can use.
- *
- * @return array Array of params for CakeTestDispatcher
- */
- protected function _parseArgs() {
- if (empty($this->args)) {
- return;
- }
- $params = array(
- 'core' => false,
- 'app' => false,
- 'plugin' => null,
- 'output' => 'text',
- );
-
- $category = $this->args[0];
-
- if ($category == 'core') {
- $params['core'] = true;
- } elseif ($category == 'app') {
- $params['app'] = true;
- } elseif ($category != 'core') {
- $params['plugin'] = $category;
- }
-
- if (isset($this->args[1])) {
- $params['case'] = $this->args[1];
- }
- return $params;
- }
-
-/**
- * Main entry point to this shell
- *
- * @return void
- */
- public function main() {
- $this->out(__d('cake_console', 'CakePHP Test Shell'));
- $this->hr();
-
- $args = $this->_parseArgs();
-
- if (empty($args['case'])) {
- return $this->available();
- }
-
- $this->_run($args, $this->_runnerOptions());
- }
-
-}
diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php
deleted file mode 100644
index a7e8e10a040..00000000000
--- a/lib/Cake/Console/Command/UpgradeShell.php
+++ /dev/null
@@ -1,858 +0,0 @@
- 'Controller',
- 'Component' => 'Controller/Component',
- 'Model' => 'Model',
- 'Behavior' => 'Model/Behavior',
- 'Datasource' => 'Model/Datasource',
- 'Dbo' => 'Model/Datasource/Database',
- 'View' => 'View',
- 'Helper' => 'View/Helper',
- 'Shell' => 'Console/Command',
- 'Task' => 'Console/Command/Task',
- 'Case' => 'Test/Case',
- 'Fixture' => 'Test/Fixture',
- 'Error' => 'Lib/Error',
- );
-
-/**
- * Shell startup, prints info message about dry run.
- *
- * @return void
- */
- public function startup() {
- parent::startup();
- if ($this->params['dry-run']) {
- $this->out(__d('cake_console', 'Dry-run mode enabled! '), 1, Shell::QUIET);
- }
- if ($this->params['git'] && !is_dir('.git')) {
- $this->out(__d('cake_console', 'No git repository detected! '), 1, Shell::QUIET);
- }
- }
-
-/**
- * Run all upgrade steps one at a time
- *
- * @return void
- */
- public function all() {
- foreach ($this->OptionParser->subcommands() as $command) {
- $name = $command->name();
- if ($name === 'all') {
- continue;
- }
- $this->out(__d('cake_console', 'Running %s', $name));
- $this->$name();
- }
- }
-
-/**
- * Update tests.
- *
- * - Update tests class names to FooTest rather than FooTestCase.
- *
- * @return void
- */
- public function tests() {
- $this->_paths = array(APP . 'tests' . DS);
- if (!empty($this->params['plugin'])) {
- $this->_paths = array(App::pluginPath($this->params['plugin']) . 'tests' . DS);
- }
- $patterns = array(
- array(
- '*TestCase extends CakeTestCase to *Test extends CakeTestCase',
- '/([a-zA-Z]*Test)Case extends CakeTestCase/',
- '\1 extends CakeTestCase'
- ),
- );
-
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * Move files and folders to their new homes
- *
- * Moves folders containing files which cannot necessarily be auto-detected (libs and templates)
- * and then looks for all php files except vendors, and moves them to where Cake 2.0 expects
- * to find them.
- *
- * @return void
- */
- public function locations() {
- $cwd = getcwd();
-
- if (!empty($this->params['plugin'])) {
- chdir(App::pluginPath($this->params['plugin']));
- }
-
- if (is_dir('plugins')) {
- $Folder = new Folder('plugins');
- list($plugins) = $Folder->read();
- foreach ($plugins as $plugin) {
- chdir($cwd . DS . 'plugins' . DS . $plugin);
- $this->locations();
- }
- $this->_files = array();
- chdir($cwd);
- }
- $moves = array(
- 'config' => 'Config',
- 'Config' . DS . 'schema' => 'Config' . DS . 'Schema',
- 'libs' => 'Lib',
- 'tests' => 'Test',
- 'views' => 'View',
- 'models' => 'Model',
- 'Model' . DS . 'behaviors' => 'Model' . DS . 'Behavior',
- 'Model' . DS . 'datasources' => 'Model' . DS . 'Datasource',
- 'Test' . DS . 'cases' => 'Test' . DS . 'Case',
- 'Test' . DS . 'fixtures' => 'Test' . DS . 'Fixture',
- 'vendors' . DS . 'shells' . DS . 'templates' => 'Console' . DS . 'Templates',
- );
- foreach ($moves as $old => $new) {
- if (is_dir($old)) {
- $this->out(__d('cake_console', 'Moving %s to %s', $old, $new));
- if (!$this->params['dry-run']) {
- if ($this->params['git']) {
- exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
- exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
- } else {
- $Folder = new Folder($old);
- $Folder->move($new);
- }
- }
- }
- }
-
- $this->_moveViewFiles();
- $this->_moveAppClasses();
-
- $sourceDirs = array(
- '.' => array('recursive' => false),
- 'Console',
- 'controllers',
- 'Controller',
- 'Lib' => array('checkFolder' => false),
- 'models',
- 'Model',
- 'tests',
- 'Test' => array('regex' => '@class (\S*Test) extends CakeTestCase@'),
- 'views',
- 'View',
- 'vendors/shells',
- );
-
- $defaultOptions = array(
- 'recursive' => true,
- 'checkFolder' => true,
- 'regex' => '@class (\S*) .*(\s|\v)*{@i'
- );
- foreach ($sourceDirs as $dir => $options) {
- if (is_numeric($dir)) {
- $dir = $options;
- $options = array();
- }
- $options = array_merge($defaultOptions, $options);
- $this->_movePhpFiles($dir, $options);
- }
- }
-
-/**
- * Update helpers.
- *
- * - Converts helpers usage to new format.
- *
- * @return void
- */
- public function helpers() {
- $this->_paths = array_diff(App::path('views'), App::core('views'));
-
- if (!empty($this->params['plugin'])) {
- $this->_paths = array(App::pluginPath($this->params['plugin']) . 'views' . DS);
- }
-
- $patterns = array();
- App::build(array(
- 'View/Helper' => App::core('View/Helper'),
- ), App::APPEND);
- $helpers = App::objects('helper');
- $plugins = App::objects('plugin');
- $pluginHelpers = array();
- foreach ($plugins as $plugin) {
- CakePlugin::load($plugin);
- $pluginHelpers = array_merge(
- $pluginHelpers,
- App::objects('helper', App::pluginPath($plugin) . DS . 'views' . DS . 'helpers' . DS, false)
- );
- }
- $helpers = array_merge($pluginHelpers, $helpers);
- foreach ($helpers as $helper) {
- $helper = preg_replace('/Helper$/', '', $helper);
- $oldHelper = strtolower(substr($helper, 0, 1)) . substr($helper, 1);
- $patterns[] = array(
- "\${$oldHelper} to \$this->{$helper}",
- "/\\\${$oldHelper}->/",
- "\\\$this->{$helper}->"
- );
- }
-
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * Update i18n.
- *
- * - Removes extra true param.
- * - Add the echo to __*() calls that didn't need them before.
- *
- * @return void
- */
- public function i18n() {
- $this->_paths = array(
- APP
- );
- if (!empty($this->params['plugin'])) {
- $this->_paths = array(App::pluginPath($this->params['plugin']));
- }
-
- $patterns = array(
- array(
- '_filesRegexpUpdate($patterns);
- }
-
-/**
- * Upgrade the removed basics functions.
- *
- * - a(*) -> array(*)
- * - e(*) -> echo *
- * - ife(*, *, *) -> !empty(*) ? * : *
- * - a(*) -> array(*)
- * - r(*, *, *) -> str_replace(*, *, *)
- * - up(*) -> strtoupper(*)
- * - low(*, *, *) -> strtolower(*)
- * - getMicrotime() -> microtime(true)
- *
- * @return void
- */
- public function basics() {
- $this->_paths = array(
- APP
- );
- if (!empty($this->params['plugin'])) {
- $this->_paths = array(App::pluginPath($this->params['plugin']));
- }
- $patterns = array(
- array(
- 'a(*) -> array(*)',
- '/\ba\((.*)\)/',
- 'array(\1)'
- ),
- array(
- 'e(*) -> echo *',
- '/\be\((.*)\)/',
- 'echo \1'
- ),
- array(
- 'ife(*, *, *) -> !empty(*) ? * : *',
- '/ife\((.*), (.*), (.*)\)/',
- '!empty(\1) ? \2 : \3'
- ),
- array(
- 'r(*, *, *) -> str_replace(*, *, *)',
- '/\br\(/',
- 'str_replace('
- ),
- array(
- 'up(*) -> strtoupper(*)',
- '/\bup\(/',
- 'strtoupper('
- ),
- array(
- 'low(*) -> strtolower(*)',
- '/\blow\(/',
- 'strtolower('
- ),
- array(
- 'getMicrotime() -> microtime(true)',
- '/getMicrotime\(\)/',
- 'microtime(true)'
- ),
- );
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * Update the properties moved to CakeRequest.
- *
- * @return void
- */
- public function request() {
- $views = array_diff(App::path('views'), App::core('views'));
- $controllers = array_diff(App::path('controllers'), App::core('controllers'), array(APP));
- $components = array_diff(App::path('components'), App::core('components'));
-
- $this->_paths = array_merge($views, $controllers, $components);
-
- if (!empty($this->params['plugin'])) {
- $pluginPath = App::pluginPath($this->params['plugin']);
- $this->_paths = array(
- $pluginPath . 'controllers' . DS,
- $pluginPath . 'controllers' . DS . 'components' . DS,
- $pluginPath . 'views' . DS,
- );
- }
- $patterns = array(
- array(
- '$this->data -> $this->request->data',
- '/(\$this->data\b(?!\())/',
- '$this->request->data'
- ),
- array(
- '$this->params -> $this->request->params',
- '/(\$this->params\b(?!\())/',
- '$this->request->params'
- ),
- array(
- '$this->webroot -> $this->request->webroot',
- '/(\$this->webroot\b(?!\())/',
- '$this->request->webroot'
- ),
- array(
- '$this->base -> $this->request->base',
- '/(\$this->base\b(?!\())/',
- '$this->request->base'
- ),
- array(
- '$this->here -> $this->request->here',
- '/(\$this->here\b(?!\())/',
- '$this->request->here'
- ),
- array(
- '$this->action -> $this->request->action',
- '/(\$this->action\b(?!\())/',
- '$this->request->action'
- ),
- );
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * Update Configure::read() calls with no params.
- *
- * @return void
- */
- public function configure() {
- $this->_paths = array(
- APP
- );
- if (!empty($this->params['plugin'])) {
- $this->_paths = array(App::pluginPath($this->params['plugin']));
- }
- $patterns = array(
- array(
- "Configure::read() -> Configure::read('debug')",
- '/Configure::read\(\)/',
- 'Configure::read(\'debug\')'
- ),
- );
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * constants
- *
- * @return void
- */
- public function constants() {
- $this->_paths = array(
- APP
- );
- if (!empty($this->params['plugin'])) {
- $this->_paths = array(App::pluginPath($this->params['plugin']));
- }
- $patterns = array(
- array(
- "LIBS -> CAKE",
- '/\bLIBS\b/',
- 'CAKE'
- ),
- array(
- "CONFIGS -> APP . 'Config' . DS",
- '/\bCONFIGS\b/',
- 'APP . \'Config\' . DS'
- ),
- array(
- "CONTROLLERS -> APP . 'Controller' . DS",
- '/\bCONTROLLERS\b/',
- 'APP . \'Controller\' . DS'
- ),
- array(
- "COMPONENTS -> APP . 'Controller' . DS . 'Component' . DS",
- '/\bCOMPONENTS\b/',
- 'APP . \'Controller\' . DS . \'Component\''
- ),
- array(
- "MODELS -> APP . 'Model' . DS",
- '/\bMODELS\b/',
- 'APP . \'Model\' . DS'
- ),
- array(
- "BEHAVIORS -> APP . 'Model' . DS . 'Behavior' . DS",
- '/\bBEHAVIORS\b/',
- 'APP . \'Model\' . DS . \'Behavior\' . DS'
- ),
- array(
- "VIEWS -> APP . 'View' . DS",
- '/\bVIEWS\b/',
- 'APP . \'View\' . DS'
- ),
- array(
- "HELPERS -> APP . 'View' . DS . 'Helper' . DS",
- '/\bHELPERS\b/',
- 'APP . \'View\' . DS . \'Helper\' . DS'
- ),
- array(
- "LAYOUTS -> APP . 'View' . DS . 'Layouts' . DS",
- '/\bLAYOUTS\b/',
- 'APP . \'View\' . DS . \'Layouts\' . DS'
- ),
- array(
- "ELEMENTS -> APP . 'View' . DS . 'Elements' . DS",
- '/\bELEMENTS\b/',
- 'APP . \'View\' . DS . \'Elements\' . DS'
- ),
- array(
- "CONSOLE_LIBS -> CAKE . 'Console' . DS",
- '/\bCONSOLE_LIBS\b/',
- 'CAKE . \'Console\' . DS'
- ),
- array(
- "CAKE_TESTS_LIB -> CAKE . 'TestSuite' . DS",
- '/\bCAKE_TESTS_LIB\b/',
- 'CAKE . \'TestSuite\' . DS'
- ),
- array(
- "CAKE_TESTS -> CAKE . 'Test' . DS",
- '/\bCAKE_TESTS\b/',
- 'CAKE . \'Test\' . DS'
- )
- );
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * Update components.
- *
- * - Make components that extend Object to extend Component.
- *
- * @return void
- */
- public function components() {
- $this->_paths = App::Path('Controller/Component');
- if (!empty($this->params['plugin'])) {
- $this->_paths = App::Path('Controller/Component', $this->params['plugin']);
- }
- $patterns = array(
- array(
- '*Component extends Object to *Component extends Component',
- '/([a-zA-Z]*Component extends) Object/',
- '\1 Component'
- ),
- );
-
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * Replace cakeError with built-in exceptions.
- * NOTE: this ignores calls where you've passed your own secondary parameters to cakeError().
- * @return void
- */
- public function exceptions() {
- $controllers = array_diff(App::path('controllers'), App::core('controllers'), array(APP));
- $components = array_diff(App::path('components'), App::core('components'));
-
- $this->_paths = array_merge($controllers, $components);
-
- if (!empty($this->params['plugin'])) {
- $pluginPath = App::pluginPath($this->params['plugin']);
- $this->_paths = array(
- $pluginPath . 'controllers' . DS,
- $pluginPath . 'controllers' . DS . 'components' . DS,
- );
- }
- $patterns = array(
- array(
- '$this->cakeError("error400") -> throw new BadRequestException()',
- '/(\$this->cakeError\(["\']error400["\']\));/',
- 'throw new BadRequestException();'
- ),
- array(
- '$this->cakeError("error404") -> throw new NotFoundException()',
- '/(\$this->cakeError\(["\']error404["\']\));/',
- 'throw new NotFoundException();'
- ),
- array(
- '$this->cakeError("error500") -> throw new InternalErrorException()',
- '/(\$this->cakeError\(["\']error500["\']\));/',
- 'throw new InternalErrorException();'
- ),
- );
- $this->_filesRegexpUpdate($patterns);
- }
-
-/**
- * Move application views files to where they now should be
- *
- * Find all view files in the folder and determine where cake expects the file to be
- *
- * @return void
- */
- protected function _moveViewFiles() {
- if (!is_dir('View')) {
- return;
- }
-
- $dirs = scandir('View');
- foreach ($dirs as $old) {
- if (!is_dir('View' . DS . $old) || $old === '.' || $old === '..') {
- continue;
- }
-
- $new = 'View' . DS . Inflector::camelize($old);
- $old = 'View' . DS . $old;
- if ($new == $old) {
- continue;
- }
-
- $this->out(__d('cake_console', 'Moving %s to %s', $old, $new));
- if (!$this->params['dry-run']) {
- if ($this->params['git']) {
- exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
- exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
- } else {
- $Folder = new Folder($old);
- $Folder->move($new);
- }
- }
- }
- }
-
-/**
- * Move the AppController, and AppModel classes.
- *
- * @return void
- */
- protected function _moveAppClasses() {
- $files = array(
- APP . 'app_controller.php' => APP . 'Controller' . DS . 'AppController.php',
- APP . 'controllers' . DS . 'app_controller.php' => APP . 'Controller' . DS . 'AppController.php',
- APP . 'app_model.php' => APP . 'Model' . DS . 'AppModel.php',
- APP . 'models' . DS . 'app_model.php' => APP . 'Model' . DS . 'AppModel.php',
- );
- foreach ($files as $old => $new) {
- if (file_exists($old)) {
- $this->out(__d('cake_console', 'Moving %s to %s', $old, $new));
-
- if ($this->params['dry-run']) {
- continue;
- }
- if ($this->params['git']) {
- exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
- exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
- } else {
- rename($old, $new);
- }
- }
- }
- }
-
-/**
- * Move application php files to where they now should be
- *
- * Find all php files in the folder (honoring recursive) and determine where cake expects the file to be
- * If the file is not exactly where cake expects it - move it.
- *
- * @param mixed $path
- * @param mixed $options array(recursive, checkFolder)
- * @return void
- */
- protected function _movePhpFiles($path, $options) {
- if (!is_dir($path)) {
- return;
- }
-
- $paths = $this->_paths;
-
- $this->_paths = array($path);
- $this->_files = array();
- if ($options['recursive']) {
- $this->_findFiles('php');
- } else {
- $this->_files = scandir($path);
- foreach ($this->_files as $i => $file) {
- if (strlen($file) < 5 || substr($file, -4) !== '.php') {
- unset($this->_files[$i]);
- }
- }
- }
-
- $cwd = getcwd();
- foreach ($this->_files as &$file) {
- $file = $cwd . DS . $file;
-
- $contents = file_get_contents($file);
- preg_match($options['regex'], $contents, $match);
- if (!$match) {
- continue;
- }
-
- $class = $match[1];
-
- if (substr($class, 0, 3) === 'Dbo') {
- $type = 'Dbo';
- } else {
- preg_match('@([A-Z][^A-Z]*)$@', $class, $match);
- if ($match) {
- $type = $match[1];
- } else {
- $type = 'unknown';
- }
- }
-
- preg_match('@^.*[\\\/]plugins[\\\/](.*?)[\\\/]@', $file, $match);
- $base = $cwd . DS;
- $plugin = false;
- if ($match) {
- $base = $match[0];
- $plugin = $match[1];
- }
-
- if ($options['checkFolder'] && !empty($this->_map[$type])) {
- $folder = str_replace('/', DS, $this->_map[$type]);
- $new = $base . $folder . DS . $class . '.php';
- } else {
- $new = dirname($file) . DS . $class . '.php';
- }
-
- if ($file === $new) {
- continue;
- }
-
- $dir = dirname($new);
- if (!is_dir($dir)) {
- new Folder($dir, true);
- }
-
- $this->out(__d('cake_console', 'Moving %s to %s', $file, $new), 1, Shell::VERBOSE);
- if (!$this->params['dry-run']) {
- if ($this->params['git']) {
- exec('git mv -f ' . escapeshellarg($file) . ' ' . escapeshellarg($file . '__'));
- exec('git mv -f ' . escapeshellarg($file . '__') . ' ' . escapeshellarg($new));
- } else {
- rename($file, $new);
- }
- }
- }
-
- $this->_paths = $paths;
- }
-
-/**
- * Updates files based on regular expressions.
- *
- * @param array $patterns Array of search and replacement patterns.
- * @return void
- */
- protected function _filesRegexpUpdate($patterns) {
- $this->_findFiles($this->params['ext']);
- foreach ($this->_files as $file) {
- $this->out(__d('cake_console', 'Updating %s...', $file), 1, Shell::VERBOSE);
- $this->_updateFile($file, $patterns);
- }
- }
-
-/**
- * Searches the paths and finds files based on extension.
- *
- * @param string $extensions
- * @return void
- */
- protected function _findFiles($extensions = '') {
- $this->_files = array();
- foreach ($this->_paths as $path) {
- if (!is_dir($path)) {
- continue;
- }
- $Iterator = new RegexIterator(
- new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)),
- '/^.+\.(' . $extensions . ')$/i',
- RegexIterator::MATCH
- );
- foreach ($Iterator as $file) {
- if ($file->isFile()) {
- $this->_files[] = $file->getPathname();
- }
- }
- }
- }
-
-/**
- * Update a single file.
- *
- * @param string $file The file to update
- * @param array $patterns The replacement patterns to run.
- * @return void
- */
- protected function _updateFile($file, $patterns) {
- $contents = file_get_contents($file);
-
- foreach ($patterns as $pattern) {
- $this->out(__d('cake_console', ' * Updating %s', $pattern[0]), 1, Shell::VERBOSE);
- $contents = preg_replace($pattern[1], $pattern[2], $contents);
- }
-
- $this->out(__d('cake_console', 'Done updating %s', $file), 1);
- if (!$this->params['dry-run']) {
- file_put_contents($file, $contents);
- }
- }
-
-/**
- * get the option parser
- *
- * @return ConsoleOptionParser
- */
- public function getOptionParser() {
- $subcommandParser = array(
- 'options' => array(
- 'plugin' => array(
- 'short' => 'p',
- 'help' => __d('cake_console', 'The plugin to update. Only the specified plugin will be updated.')
- ),
- 'ext' => array(
- 'short' => 'e',
- 'help' => __d('cake_console', 'The extension(s) to search. A pipe delimited list, or a preg_match compatible subpattern'),
- 'default' => 'php|ctp|thtml|inc|tpl'
- ),
- 'git' => array(
- 'short' => 'g',
- 'help' => __d('cake_console', 'Use git command for moving files around.'),
- 'boolean' => true
- ),
- 'dry-run' => array(
- 'short' => 'd',
- 'help' => __d('cake_console', 'Dry run the update, no files will actually be modified.'),
- 'boolean' => true
- )
- )
- );
-
- return parent::getOptionParser()
- ->description(__d('cake_console', "A shell to help automate upgrading from CakePHP 1.3 to 2.0. \n" .
- "Be sure to have a backup of your application before running these commands."))
- ->addSubcommand('all', array(
- 'help' => __d('cake_console', 'Run all upgrade commands.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('tests', array(
- 'help' => __d('cake_console', 'Update tests class names to FooTest rather than FooTestCase.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('locations', array(
- 'help' => __d('cake_console', 'Move files and folders to their new homes.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('i18n', array(
- 'help' => __d('cake_console', 'Update the i18n translation method calls.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('helpers', array(
- 'help' => __d('cake_console', 'Update calls to helpers.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('basics', array(
- 'help' => __d('cake_console', 'Update removed basics functions to PHP native functions.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('request', array(
- 'help' => __d('cake_console', 'Update removed request access, and replace with $this->request.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('configure', array(
- 'help' => __d('cake_console', "Update Configure::read() to Configure::read('debug')"),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('constants', array(
- 'help' => __d('cake_console', "Replace Obsolete constants"),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('components', array(
- 'help' => __d('cake_console', 'Update components to extend Component class.'),
- 'parser' => $subcommandParser
- ))
- ->addSubcommand('exceptions', array(
- 'help' => __d('cake_console', 'Replace use of cakeError with exceptions.'),
- 'parser' => $subcommandParser
- ));
- }
-
-}
diff --git a/lib/Cake/Console/ConsoleErrorHandler.php b/lib/Cake/Console/ConsoleErrorHandler.php
deleted file mode 100644
index 043c621256d..00000000000
--- a/lib/Cake/Console/ConsoleErrorHandler.php
+++ /dev/null
@@ -1,98 +0,0 @@
-write(__d('cake_console', "Error: %s\n%s",
- $exception->getMessage(),
- $exception->getTraceAsString()
- ));
- $this->_stop($exception->getCode() ? $exception->getCode() : 1);
- }
-
-/**
- * Handle errors in the console environment. Writes errors to stderr,
- * and logs messages if Configure::read('debug') is 0.
- *
- * @param integer $code Error code
- * @param string $description Description of the error.
- * @param string $file The file the error occurred in.
- * @param integer $line The line the error occurred on.
- * @param array $context The backtrace of the error.
- * @return void
- */
- public function handleError($code, $description, $file = null, $line = null, $context = null) {
- if (error_reporting() === 0) {
- return;
- }
- $stderr = self::getStderr();
- list($name, $log) = ErrorHandler::mapErrorCode($code);
- $message = __d('cake_console', '%s in [%s, line %s]', $description, $file, $line);
- $stderr->write(__d('cake_console', "%s Error: %s\n", $name, $message));
-
- if (Configure::read('debug') == 0) {
- CakeLog::write($log, $message);
- }
- }
-
-/**
- * Wrapper for exit(), used for testing.
- *
- * @param $code int The exit code.
- */
- protected function _stop($code = 0) {
- exit($code);
- }
-
-}
diff --git a/lib/Cake/Console/ConsoleInput.php b/lib/Cake/Console/ConsoleInput.php
deleted file mode 100644
index eb4928b3807..00000000000
--- a/lib/Cake/Console/ConsoleInput.php
+++ /dev/null
@@ -1,51 +0,0 @@
-_input = fopen($handle, 'r');
- }
-
-/**
- * Read a value from the stream
- *
- * @return mixed The value of the stream
- */
- public function read() {
- return fgets($this->_input);
- }
-
-}
diff --git a/lib/Cake/Console/ConsoleInputArgument.php b/lib/Cake/Console/ConsoleInputArgument.php
deleted file mode 100644
index ef40e0a942f..00000000000
--- a/lib/Cake/Console/ConsoleInputArgument.php
+++ /dev/null
@@ -1,170 +0,0 @@
- $value) {
- $this->{'_' . $key} = $value;
- }
- } else {
- $this->_name = $name;
- $this->_help = $help;
- $this->_required = $required;
- $this->_choices = $choices;
- }
- }
-
-/**
- * Get the value of the name attribute.
- *
- * @return string Value of this->_name.
- */
- public function name() {
- return $this->_name;
- }
-
-/**
- * Generate the help for this argument.
- *
- * @param integer $width The width to make the name of the option.
- * @return string
- */
- public function help($width = 0) {
- $name = $this->_name;
- if (strlen($name) < $width) {
- $name = str_pad($name, $width, ' ');
- }
- $optional = '';
- if (!$this->isRequired()) {
- $optional = __d('cake_console', ' (optional) ');
- }
- if (!empty($this->_choices)) {
- $optional .= __d('cake_console', ' (choices: %s) ', implode('|', $this->_choices));
- }
- return sprintf('%s%s%s', $name, $this->_help, $optional);
- }
-
-/**
- * Get the usage value for this argument
- *
- * @return string
- */
- public function usage() {
- $name = $this->_name;
- if (!empty($this->_choices)) {
- $name = implode('|', $this->_choices);
- }
- $name = '<' . $name . '>';
- if (!$this->isRequired()) {
- $name = '[' . $name . ']';
- }
- return $name;
- }
-
-/**
- * Check if this argument is a required argument
- *
- * @return boolean
- */
- public function isRequired() {
- return (bool)$this->_required;
- }
-
-/**
- * Check that $value is a valid choice for this argument.
- *
- * @param string $value
- * @return boolean
- * @throws ConsoleException
- */
- public function validChoice($value) {
- if (empty($this->_choices)) {
- return true;
- }
- if (!in_array($value, $this->_choices)) {
- throw new ConsoleException(
- __d('cake_console', '"%s" is not a valid value for %s. Please use one of "%s"',
- $value, $this->_name, implode(', ', $this->_choices)
- ));
- }
- return true;
- }
-
-/**
- * Append this arguments XML representation to the passed in SimpleXml object.
- *
- * @param SimpleXmlElement $parent The parent element.
- * @return SimpleXmlElement The parent with this argument appended.
- */
- public function xml(SimpleXmlElement $parent) {
- $option = $parent->addChild('argument');
- $option->addAttribute('name', $this->_name);
- $option->addAttribute('help', $this->_help);
- $option->addAttribute('required', $this->isRequired());
- $choices = $option->addChild('choices');
- foreach ($this->_choices as $valid) {
- $choices->addChild('choice', $valid);
- }
- return $parent;
- }
-
-}
diff --git a/lib/Cake/Console/ConsoleInputOption.php b/lib/Cake/Console/ConsoleInputOption.php
deleted file mode 100644
index 889166be7d6..00000000000
--- a/lib/Cake/Console/ConsoleInputOption.php
+++ /dev/null
@@ -1,221 +0,0 @@
- $value) {
- $this->{'_' . $key} = $value;
- }
- } else {
- $this->_name = $name;
- $this->_short = $short;
- $this->_help = $help;
- $this->_boolean = $boolean;
- $this->_default = $default;
- $this->_choices = $choices;
- }
- if (strlen($this->_short) > 1) {
- throw new ConsoleException(
- __d('cake_console', 'Short options must be one letter.')
- );
- }
- }
-
-/**
- * Get the value of the name attribute.
- *
- * @return string Value of this->_name.
- */
- public function name() {
- return $this->_name;
- }
-
-/**
- * Get the value of the short attribute.
- *
- * @return string Value of this->_short.
- */
- public function short() {
- return $this->_short;
- }
-
-/**
- * Generate the help for this this option.
- *
- * @param integer $width The width to make the name of the option.
- * @return string
- */
- public function help($width = 0) {
- $default = $short = '';
- if (!empty($this->_default) && $this->_default !== true) {
- $default = __d('cake_console', ' (default: %s) ', $this->_default);
- }
- if (!empty($this->_choices)) {
- $default .= __d('cake_console', ' (choices: %s) ', implode('|', $this->_choices));
- }
- if (!empty($this->_short)) {
- $short = ', -' . $this->_short;
- }
- $name = sprintf('--%s%s', $this->_name, $short);
- if (strlen($name) < $width) {
- $name = str_pad($name, $width, ' ');
- }
- return sprintf('%s%s%s', $name, $this->_help, $default);
- }
-
-/**
- * Get the usage value for this option
- *
- * @return string
- */
- public function usage() {
- $name = empty($this->_short) ? '--' . $this->_name : '-' . $this->_short;
- $default = '';
- if (!empty($this->_default) && $this->_default !== true) {
- $default = ' ' . $this->_default;
- }
- if (!empty($this->_choices)) {
- $default = ' ' . implode('|', $this->_choices);
- }
- return sprintf('[%s%s]', $name, $default);
- }
-
-/**
- * Get the default value for this option
- *
- * @return mixed
- */
- public function defaultValue() {
- return $this->_default;
- }
-
-/**
- * Check if this option is a boolean option
- *
- * @return boolean
- */
- public function isBoolean() {
- return (bool)$this->_boolean;
- }
-
-/**
- * Check that a value is a valid choice for this option.
- *
- * @param string $value
- * @return boolean
- * @throws ConsoleException
- */
- public function validChoice($value) {
- if (empty($this->_choices)) {
- return true;
- }
- if (!in_array($value, $this->_choices)) {
- throw new ConsoleException(
- __d('cake_console', '"%s" is not a valid value for --%s. Please use one of "%s"',
- $value, $this->_name, implode(', ', $this->_choices)
- ));
- }
- return true;
- }
-
-/**
- * Append the option's xml into the parent.
- *
- * @param SimpleXmlElement $parent The parent element.
- * @return SimpleXmlElement The parent with this option appended.
- */
- public function xml(SimpleXmlElement $parent) {
- $option = $parent->addChild('option');
- $option->addAttribute('name', '--' . $this->_name);
- $short = '';
- if (strlen($this->_short)) {
- $short = $this->_short;
- }
- $option->addAttribute('short', '-' . $short);
- $option->addAttribute('boolean', $this->_boolean);
- $option->addChild('default', $this->_default);
- $choices = $option->addChild('choices');
- foreach ($this->_choices as $valid) {
- $choices->addChild('choice', $valid);
- }
- return $parent;
- }
-
-}
diff --git a/lib/Cake/Console/ConsoleInputSubcommand.php b/lib/Cake/Console/ConsoleInputSubcommand.php
deleted file mode 100644
index b9520644f52..00000000000
--- a/lib/Cake/Console/ConsoleInputSubcommand.php
+++ /dev/null
@@ -1,121 +0,0 @@
- $value) {
- $this->{'_' . $key} = $value;
- }
- } else {
- $this->_name = $name;
- $this->_help = $help;
- $this->_parser = $parser;
- }
- if (is_array($this->_parser)) {
- $this->_parser['command'] = $this->_name;
- $this->_parser = ConsoleOptionParser::buildFromArray($this->_parser);
- }
- }
-
-/**
- * Get the value of the name attribute.
- *
- * @return string Value of this->_name.
- */
- public function name() {
- return $this->_name;
- }
-
-/**
- * Generate the help for this this subcommand.
- *
- * @param integer $width The width to make the name of the subcommand.
- * @return string
- */
- public function help($width = 0) {
- $name = $this->_name;
- if (strlen($name) < $width) {
- $name = str_pad($name, $width, ' ');
- }
- return $name . $this->_help;
- }
-
-/**
- * Get the usage value for this option
- *
- * @return mixed Either false or a ConsoleOptionParser
- */
- public function parser() {
- if ($this->_parser instanceof ConsoleOptionParser) {
- return $this->_parser;
- }
- return false;
- }
-
-/**
- * Append this subcommand to the Parent element
- *
- * @param SimpleXmlElement $parent The parent element.
- * @return SimpleXmlElement The parent with this subcommand appended.
- */
- public function xml(SimpleXmlElement $parent) {
- $command = $parent->addChild('command');
- $command->addAttribute('name', $this->_name);
- $command->addAttribute('help', $this->_help);
- return $parent;
- }
-
-}
diff --git a/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php
deleted file mode 100644
index 703023c7d4f..00000000000
--- a/lib/Cake/Console/ConsoleOptionParser.php
+++ /dev/null
@@ -1,651 +0,0 @@
-addOption()`
- * you can define new options. The name of the option is used as its long form, and you
- * can supply an additional short form, with the `short` option. Short options should
- * only be one letter long. Using more than one letter for a short option will raise an exception.
- *
- * Calling options can be done using syntax similar to most *nix command line tools. Long options
- * cane either include an `=` or leave it out.
- *
- * `cake myshell command --connection default --name=something`
- *
- * Short options can be defined signally or in groups.
- *
- * `cake myshell command -cn`
- *
- * Short options can be combined into groups as seen above. Each letter in a group
- * will be treated as a separate option. The previous example is equivalent to:
- *
- * `cake myshell command -c -n`
- *
- * Short options can also accept values:
- *
- * `cake myshell command -c default`
- *
- * ### Positional arguments
- *
- * If no positional arguments are defined, all of them will be parsed. If you define positional
- * arguments any arguments greater than those defined will cause exceptions. Additionally you can
- * declare arguments as optional, by setting the required param to false.
- *
- * `$parser->addArgument('model', array('required' => false));`
- *
- * ### Providing Help text
- *
- * By providing help text for your positional arguments and named arguments, the ConsoleOptionParser
- * can generate a help display for you. You can view the help for shells by using the `--help` or `-h` switch.
- *
- * @package Cake.Console
- */
-class ConsoleOptionParser {
-
-/**
- * Description text - displays before options when help is generated
- *
- * @see ConsoleOptionParser::description()
- * @var string
- */
- protected $_description = null;
-
-/**
- * Epilog text - displays after options when help is generated
- *
- * @see ConsoleOptionParser::epilog()
- * @var string
- */
- protected $_epilog = null;
-
-/**
- * Option definitions.
- *
- * @see ConsoleOptionParser::addOption()
- * @var array
- */
- protected $_options = array();
-
-/**
- * Map of short -> long options, generated when using addOption()
- *
- * @var string
- */
- protected $_shortOptions = array();
-
-/**
- * Positional argument definitions.
- *
- * @see ConsoleOptionParser::addArgument()
- * @var array
- */
- protected $_args = array();
-
-/**
- * Subcommands for this Shell.
- *
- * @see ConsoleOptionParser::addSubcommand()
- * @var array
- */
- protected $_subcommands = array();
-
-/**
- * Command name.
- *
- * @var string
- */
- protected $_command = '';
-
-/**
- * Construct an OptionParser so you can define its behavior
- *
- * @param string $command The command name this parser is for. The command name is used for generating help.
- * @param boolean $defaultOptions Whether you want the verbose and quiet options set. Setting
- * this to false will prevent the addition of `--verbose` & `--quiet` options.
- */
- public function __construct($command = null, $defaultOptions = true) {
- $this->command($command);
-
- $this->addOption('help', array(
- 'short' => 'h',
- 'help' => __d('cake_console', 'Display this help.'),
- 'boolean' => true
- ));
-
- if ($defaultOptions) {
- $this->addOption('verbose', array(
- 'short' => 'v',
- 'help' => __d('cake_console', 'Enable verbose output.'),
- 'boolean' => true
- ))->addOption('quiet', array(
- 'short' => 'q',
- 'help' => __d('cake_console', 'Enable quiet output.'),
- 'boolean' => true
- ));
- }
- }
-
-/**
- * Static factory method for creating new OptionParsers so you can chain methods off of them.
- *
- * @param string $command The command name this parser is for. The command name is used for generating help.
- * @param boolean $defaultOptions Whether you want the verbose and quiet options set.
- * @return ConsoleOptionParser
- */
- public static function create($command, $defaultOptions = true) {
- return new ConsoleOptionParser($command, $defaultOptions);
- }
-
-/**
- * Build a parser from an array. Uses an array like
- *
- * {{{
- * $spec = array(
- * 'description' => 'text',
- * 'epilog' => 'text',
- * 'arguments' => array(
- * // list of arguments compatible with addArguments.
- * ),
- * 'options' => array(
- * // list of options compatible with addOptions
- * ),
- * 'subcommands' => array(
- * // list of subcommands to add.
- * )
- * );
- * }}}
- *
- * @param array $spec The spec to build the OptionParser with.
- * @return ConsoleOptionParser
- */
- public static function buildFromArray($spec) {
- $parser = new ConsoleOptionParser($spec['command']);
- if (!empty($spec['arguments'])) {
- $parser->addArguments($spec['arguments']);
- }
- if (!empty($spec['options'])) {
- $parser->addOptions($spec['options']);
- }
- if (!empty($spec['subcommands'])) {
- $parser->addSubcommands($spec['subcommands']);
- }
- if (!empty($spec['description'])) {
- $parser->description($spec['description']);
- }
- if (!empty($spec['epilog'])) {
- $parser->epilog($spec['epilog']);
- }
- return $parser;
- }
-
-/**
- * Get or set the command name for shell/task.
- *
- * @param string $text The text to set, or null if you want to read
- * @return mixed If reading, the value of the command. If setting $this will be returned
- */
- public function command($text = null) {
- if ($text !== null) {
- $this->_command = Inflector::underscore($text);
- return $this;
- }
- return $this->_command;
- }
-
-/**
- * Get or set the description text for shell/task.
- *
- * @param mixed $text The text to set, or null if you want to read. If an array the
- * text will be imploded with "\n"
- * @return mixed If reading, the value of the description. If setting $this will be returned
- */
- public function description($text = null) {
- if ($text !== null) {
- if (is_array($text)) {
- $text = implode("\n", $text);
- }
- $this->_description = $text;
- return $this;
- }
- return $this->_description;
- }
-
-/**
- * Get or set an epilog to the parser. The epilog is added to the end of
- * the options and arguments listing when help is generated.
- *
- * @param mixed $text Text when setting or null when reading. If an array the text will be imploded with "\n"
- * @return mixed If reading, the value of the epilog. If setting $this will be returned.
- */
- public function epilog($text = null) {
- if ($text !== null) {
- if (is_array($text)) {
- $text = implode("\n", $text);
- }
- $this->_epilog = $text;
- return $this;
- }
- return $this->_epilog;
- }
-
-/**
- * Add an option to the option parser. Options allow you to define optional or required
- * parameters for your console application. Options are defined by the parameters they use.
- *
- * ### Options
- *
- * - `short` - The single letter variant for this option, leave undefined for none.
- * - `help` - Help text for this option. Used when generating help for the option.
- * - `default` - The default value for this option. Defaults are added into the parsed params when the
- * attached option is not provided or has no value. Using default and boolean together will not work.
- * are added into the parsed parameters when the option is undefined. Defaults to null.
- * - `boolean` - The option uses no value, its just a boolean switch. Defaults to false.
- * If an option is defined as boolean, it will always be added to the parsed params. If no present
- * it will be false, if present it will be true.
- * - `choices` A list of valid choices for this option. If left empty all values are valid..
- * An exception will be raised when parse() encounters an invalid value.
- *
- * @param mixed $name The long name you want to the value to be parsed out as when options are parsed.
- * Will also accept an instance of ConsoleInputOption
- * @param array $options An array of parameters that define the behavior of the option
- * @return ConsoleOptionParser $this.
- */
- public function addOption($name, $options = array()) {
- if (is_object($name) && $name instanceof ConsoleInputOption) {
- $option = $name;
- $name = $option->name();
- } else {
- $defaults = array(
- 'name' => $name,
- 'short' => null,
- 'help' => '',
- 'default' => null,
- 'boolean' => false,
- 'choices' => array()
- );
- $options = array_merge($defaults, $options);
- $option = new ConsoleInputOption($options);
- }
- $this->_options[$name] = $option;
- if ($option->short() !== null) {
- $this->_shortOptions[$option->short()] = $name;
- }
- return $this;
- }
-
-/**
- * Add a positional argument to the option parser.
- *
- * ### Params
- *
- * - `help` The help text to display for this argument.
- * - `required` Whether this parameter is required.
- * - `index` The index for the arg, if left undefined the argument will be put
- * onto the end of the arguments. If you define the same index twice the first
- * option will be overwritten.
- * - `choices` A list of valid choices for this argument. If left empty all values are valid..
- * An exception will be raised when parse() encounters an invalid value.
- *
- * @param mixed $name The name of the argument. Will also accept an instance of ConsoleInputArgument
- * @param array $params Parameters for the argument, see above.
- * @return ConsoleOptionParser $this.
- */
- public function addArgument($name, $params = array()) {
- if (is_object($name) && $name instanceof ConsoleInputArgument) {
- $arg = $name;
- $index = count($this->_args);
- } else {
- $defaults = array(
- 'name' => $name,
- 'help' => '',
- 'index' => count($this->_args),
- 'required' => false,
- 'choices' => array()
- );
- $options = array_merge($defaults, $params);
- $index = $options['index'];
- unset($options['index']);
- $arg = new ConsoleInputArgument($options);
- }
- $this->_args[$index] = $arg;
- return $this;
- }
-
-/**
- * Add multiple arguments at once. Take an array of argument definitions.
- * The keys are used as the argument names, and the values as params for the argument.
- *
- * @param array $args Array of arguments to add.
- * @see ConsoleOptionParser::addArgument()
- * @return ConsoleOptionParser $this
- */
- public function addArguments(array $args) {
- foreach ($args as $name => $params) {
- $this->addArgument($name, $params);
- }
- return $this;
- }
-
-/**
- * Add multiple options at once. Takes an array of option definitions.
- * The keys are used as option names, and the values as params for the option.
- *
- * @param array $options Array of options to add.
- * @see ConsoleOptionParser::addOption()
- * @return ConsoleOptionParser $this
- */
- public function addOptions(array $options) {
- foreach ($options as $name => $params) {
- $this->addOption($name, $params);
- }
- return $this;
- }
-
-/**
- * Append a subcommand to the subcommand list.
- * Subcommands are usually methods on your Shell, but can also be used to document Tasks.
- *
- * ### Options
- *
- * - `help` - Help text for the subcommand.
- * - `parser` - A ConsoleOptionParser for the subcommand. This allows you to create method
- * specific option parsers. When help is generated for a subcommand, if a parser is present
- * it will be used.
- *
- * @param mixed $name Name of the subcommand. Will also accept an instance of ConsoleInputSubcommand
- * @param array $options Array of params, see above.
- * @return ConsoleOptionParser $this.
- */
- public function addSubcommand($name, $options = array()) {
- if (is_object($name) && $name instanceof ConsoleInputSubcommand) {
- $command = $name;
- $name = $command->name();
- } else {
- $defaults = array(
- 'name' => $name,
- 'help' => '',
- 'parser' => null
- );
- $options = array_merge($defaults, $options);
- $command = new ConsoleInputSubcommand($options);
- }
- $this->_subcommands[$name] = $command;
- return $this;
- }
-
-/**
- * Add multiple subcommands at once.
- *
- * @param array $commands Array of subcommands.
- * @return ConsoleOptionParser $this
- */
- public function addSubcommands(array $commands) {
- foreach ($commands as $name => $params) {
- $this->addSubcommand($name, $params);
- }
- return $this;
- }
-
-/**
- * Gets the arguments defined in the parser.
- *
- * @return array Array of argument descriptions
- */
- public function arguments() {
- return $this->_args;
- }
-
-/**
- * Get the defined options in the parser.
- *
- * @return array
- */
- public function options() {
- return $this->_options;
- }
-
-/**
- * Get the array of defined subcommands
- *
- * @return array
- */
- public function subcommands() {
- return $this->_subcommands;
- }
-
-/**
- * Parse the argv array into a set of params and args. If $command is not null
- * and $command is equal to a subcommand that has a parser, that parser will be used
- * to parse the $argv
- *
- * @param array $argv Array of args (argv) to parse.
- * @param string $command The subcommand to use. If this parameter is a subcommand, that has a parser,
- * That parser will be used to parse $argv instead.
- * @return Array array($params, $args)
- * @throws ConsoleException When an invalid parameter is encountered.
- */
- public function parse($argv, $command = null) {
- if (isset($this->_subcommands[$command]) && $this->_subcommands[$command]->parser()) {
- return $this->_subcommands[$command]->parser()->parse($argv);
- }
- $params = $args = array();
- $this->_tokens = $argv;
- while (($token = array_shift($this->_tokens)) !== null) {
- if (substr($token, 0, 2) == '--') {
- $params = $this->_parseLongOption($token, $params);
- } elseif (substr($token, 0, 1) == '-') {
- $params = $this->_parseShortOption($token, $params);
- } else {
- $args = $this->_parseArg($token, $args);
- }
- }
- foreach ($this->_args as $i => $arg) {
- if ($arg->isRequired() && !isset($args[$i]) && empty($params['help'])) {
- throw new ConsoleException(
- __d('cake_console', 'Missing required arguments. %s is required.', $arg->name())
- );
- }
- }
- foreach ($this->_options as $option) {
- $name = $option->name();
- $isBoolean = $option->isBoolean();
- $default = $option->defaultValue();
-
- if ($default !== null && !isset($params[$name]) && !$isBoolean) {
- $params[$name] = $default;
- }
- if ($isBoolean && !isset($params[$name])) {
- $params[$name] = false;
- }
- }
- return array($params, $args);
- }
-
-/**
- * Gets formatted help for this parser object.
- * Generates help text based on the description, options, arguments, subcommands and epilog
- * in the parser.
- *
- * @param string $subcommand If present and a valid subcommand that has a linked parser.
- * That subcommands help will be shown instead.
- * @param string $format Define the output format, can be text or xml
- * @param integer $width The width to format user content to. Defaults to 72
- * @return string Generated help.
- */
- public function help($subcommand = null, $format = 'text', $width = 72) {
- if (
- isset($this->_subcommands[$subcommand]) &&
- $this->_subcommands[$subcommand]->parser() instanceof self
- ) {
- $subparser = $this->_subcommands[$subcommand]->parser();
- $subparser->command($this->command() . ' ' . $subparser->command());
- return $subparser->help(null, $format, $width);
- }
- $formatter = new HelpFormatter($this);
- if ($format == 'text' || $format === true) {
- return $formatter->text($width);
- } elseif ($format == 'xml') {
- return $formatter->xml();
- }
- }
-
-/**
- * Parse the value for a long option out of $this->_tokens. Will handle
- * options with an `=` in them.
- *
- * @param string $option The option to parse.
- * @param array $params The params to append the parsed value into
- * @return array Params with $option added in.
- */
- protected function _parseLongOption($option, $params) {
- $name = substr($option, 2);
- if (strpos($name, '=') !== false) {
- list($name, $value) = explode('=', $name, 2);
- array_unshift($this->_tokens, $value);
- }
- return $this->_parseOption($name, $params);
- }
-
-/**
- * Parse the value for a short option out of $this->_tokens
- * If the $option is a combination of multiple shortcuts like -otf
- * they will be shifted onto the token stack and parsed individually.
- *
- * @param string $option The option to parse.
- * @param array $params The params to append the parsed value into
- * @return array Params with $option added in.
- * @throws ConsoleException When unknown short options are encountered.
- */
- protected function _parseShortOption($option, $params) {
- $key = substr($option, 1);
- if (strlen($key) > 1) {
- $flags = str_split($key);
- $key = $flags[0];
- for ($i = 1, $len = count($flags); $i < $len; $i++) {
- array_unshift($this->_tokens, '-' . $flags[$i]);
- }
- }
- if (!isset($this->_shortOptions[$key])) {
- throw new ConsoleException(__d('cake_console', 'Unknown short option `%s`', $key));
- }
- $name = $this->_shortOptions[$key];
- return $this->_parseOption($name, $params);
- }
-
-/**
- * Parse an option by its name index.
- *
- * @param string $name The name to parse.
- * @param array $params The params to append the parsed value into
- * @return array Params with $option added in.
- * @throws ConsoleException
- */
- protected function _parseOption($name, $params) {
- if (!isset($this->_options[$name])) {
- throw new ConsoleException(__d('cake_console', 'Unknown option `%s`', $name));
- }
- $option = $this->_options[$name];
- $isBoolean = $option->isBoolean();
- $nextValue = $this->_nextToken();
- if (!$isBoolean && !empty($nextValue) && !$this->_optionExists($nextValue)) {
- array_shift($this->_tokens);
- $value = $nextValue;
- } elseif ($isBoolean) {
- $value = true;
- } else {
- $value = $option->defaultValue();
- }
- if ($option->validChoice($value)) {
- $params[$name] = $value;
- return $params;
- }
- }
-
-/**
- * Check to see if $name has an option (short/long) defined for it.
- *
- * @param string $name The name of the option.
- * @return boolean
- */
- protected function _optionExists($name) {
- if (substr($name, 0, 2) === '--') {
- return isset($this->_options[substr($name, 2)]);
- }
- if ($name{0} === '-' && $name{1} !== '-') {
- return isset($this->_shortOptions[$name{1}]);
- }
- return false;
- }
-
-/**
- * Parse an argument, and ensure that the argument doesn't exceed the number of arguments
- * and that the argument is a valid choice.
- *
- * @param string $argument The argument to append
- * @param array $args The array of parsed args to append to.
- * @return array Args
- * @throws ConsoleException
- */
- protected function _parseArg($argument, $args) {
- if (empty($this->_args)) {
- array_push($args, $argument);
- return $args;
- }
- $next = count($args);
- if (!isset($this->_args[$next])) {
- throw new ConsoleException(__d('cake_console', 'Too many arguments.'));
- }
-
- if ($this->_args[$next]->validChoice($argument)) {
- array_push($args, $argument);
- return $args;
- }
- }
-
-/**
- * Find the next token in the argv set.
- *
- * @return string next token or ''
- */
- protected function _nextToken() {
- return isset($this->_tokens[0]) ? $this->_tokens[0] : '';
- }
-
-}
diff --git a/lib/Cake/Console/ConsoleOutput.php b/lib/Cake/Console/ConsoleOutput.php
deleted file mode 100644
index 9b0bd3a963c..00000000000
--- a/lib/Cake/Console/ConsoleOutput.php
+++ /dev/null
@@ -1,288 +0,0 @@
-out('Overwrite: foo.php was overwritten.');`
- *
- * This would create orange 'Overwrite:' text, while the rest of the text would remain the normal color.
- * See ConsoleOutput::styles() to learn more about defining your own styles. Nested styles are not supported
- * at this time.
- *
- * @package Cake.Console
- */
-class ConsoleOutput {
-/**
- * Raw output constant - no modification of output text.
- */
- const RAW = 0;
-
-/**
- * Plain output - tags will be stripped.
- */
- const PLAIN = 1;
-
-/**
- * Color output - Convert known tags in to ANSI color escape codes.
- */
- const COLOR = 2;
-
-/**
- * Constant for a newline.
- */
- const LF = PHP_EOL;
-
-/**
- * File handle for output.
- *
- * @var resource
- */
- protected $_output;
-
-/**
- * The current output type. Manipulated with ConsoleOutput::outputAs();
- *
- * @var integer.
- */
- protected $_outputAs = self::COLOR;
-
-/**
- * text colors used in colored output.
- *
- * @var array
- */
- protected static $_foregroundColors = array(
- 'black' => 30,
- 'red' => 31,
- 'green' => 32,
- 'yellow' => 33,
- 'blue' => 34,
- 'magenta' => 35,
- 'cyan' => 36,
- 'white' => 37
- );
-
-/**
- * background colors used in colored output.
- *
- * @var array
- */
- protected static $_backgroundColors = array(
- 'black' => 40,
- 'red' => 41,
- 'green' => 42,
- 'yellow' => 43,
- 'blue' => 44,
- 'magenta' => 45,
- 'cyan' => 46,
- 'white' => 47
- );
-
-/**
- * formatting options for colored output
- *
- * @var string
- */
- protected static $_options = array(
- 'bold' => 1,
- 'underline' => 4,
- 'blink' => 5,
- 'reverse' => 7,
- );
-
-/**
- * Styles that are available as tags in console output.
- * You can modify these styles with ConsoleOutput::styles()
- *
- * @var array
- */
- protected static $_styles = array(
- 'error' => array('text' => 'red', 'underline' => true),
- 'warning' => array('text' => 'yellow'),
- 'info' => array('text' => 'cyan'),
- 'success' => array('text' => 'green'),
- 'comment' => array('text' => 'blue'),
- 'question' => array('text' => "magenta"),
- );
-
-/**
- * Construct the output object.
- *
- * Checks for a pretty console environment. Ansicon allows pretty consoles
- * on windows, and is supported.
- *
- * @param string $stream The identifier of the stream to write output to.
- */
- public function __construct($stream = 'php://stdout') {
- $this->_output = fopen($stream, 'w');
-
- if (DS == '\\' && !(bool)env('ANSICON')) {
- $this->_outputAs = self::PLAIN;
- }
- }
-
-/**
- * Outputs a single or multiple messages to stdout. If no parameters
- * are passed, outputs just a newline.
- *
- * @param mixed $message A string or a an array of strings to output
- * @param integer $newlines Number of newlines to append
- * @return integer Returns the number of bytes returned from writing to stdout.
- */
- public function write($message, $newlines = 1) {
- if (is_array($message)) {
- $message = implode(self::LF, $message);
- }
- return $this->_write($this->styleText($message . str_repeat(self::LF, $newlines)));
- }
-
-/**
- * Apply styling to text.
- *
- * @param string $text Text with styling tags.
- * @return string String with color codes added.
- */
- public function styleText($text) {
- if ($this->_outputAs == self::RAW) {
- return $text;
- }
- if ($this->_outputAs == self::PLAIN) {
- $tags = implode('|', array_keys(self::$_styles));
- return preg_replace('##', '', $text);
- }
- return preg_replace_callback(
- '/<(?[a-z0-9-_]+)>(?.*?)<\/(\1)>/ims', array($this, '_replaceTags'), $text
- );
- }
-
-/**
- * Replace tags with color codes.
- *
- * @param array $matches.
- * @return string
- */
- protected function _replaceTags($matches) {
- $style = $this->styles($matches['tag']);
- if (empty($style)) {
- return '<' . $matches['tag'] . '>' . $matches['text'] . '';
- }
-
- $styleInfo = array();
- if (!empty($style['text']) && isset(self::$_foregroundColors[$style['text']])) {
- $styleInfo[] = self::$_foregroundColors[$style['text']];
- }
- if (!empty($style['background']) && isset(self::$_backgroundColors[$style['background']])) {
- $styleInfo[] = self::$_backgroundColors[$style['background']];
- }
- unset($style['text'], $style['background']);
- foreach ($style as $option => $value) {
- if ($value) {
- $styleInfo[] = self::$_options[$option];
- }
- }
- return "\033[" . implode($styleInfo, ';') . 'm' . $matches['text'] . "\033[0m";
- }
-
-/**
- * Writes a message to the output stream.
- *
- * @param string $message Message to write.
- * @return boolean success
- */
- protected function _write($message) {
- return fwrite($this->_output, $message);
- }
-
-/**
- * Get the current styles offered, or append new ones in.
- *
- * ### Get a style definition
- *
- * `$this->output->styles('error');`
- *
- * ### Get all the style definitions
- *
- * `$this->output->styles();`
- *
- * ### Create or modify an existing style
- *
- * `$this->output->styles('annoy', array('text' => 'purple', 'background' => 'yellow', 'blink' => true));`
- *
- * ### Remove a style
- *
- * `$this->output->styles('annoy', false);`
- *
- * @param string $style The style to get or create.
- * @param mixed $definition The array definition of the style to change or create a style
- * or false to remove a style.
- * @return mixed If you are getting styles, the style or null will be returned. If you are creating/modifying
- * styles true will be returned.
- */
- public function styles($style = null, $definition = null) {
- if ($style === null && $definition === null) {
- return self::$_styles;
- }
- if (is_string($style) && $definition === null) {
- return isset(self::$_styles[$style]) ? self::$_styles[$style] : null;
- }
- if ($definition === false) {
- unset(self::$_styles[$style]);
- return true;
- }
- self::$_styles[$style] = $definition;
- return true;
- }
-
-/**
- * Get/Set the output type to use. The output type how formatting tags are treated.
- *
- * @param integer $type The output type to use. Should be one of the class constants.
- * @return mixed Either null or the value if getting.
- */
- public function outputAs($type = null) {
- if ($type === null) {
- return $this->_outputAs;
- }
- $this->_outputAs = $type;
- }
-
-/**
- * clean up and close handles
- *
- */
- public function __destruct() {
- fclose($this->_output);
- }
-
-}
diff --git a/lib/Cake/Console/HelpFormatter.php b/lib/Cake/Console/HelpFormatter.php
deleted file mode 100644
index 2b495b9e170..00000000000
--- a/lib/Cake/Console/HelpFormatter.php
+++ /dev/null
@@ -1,201 +0,0 @@
-help($command, 'xml'); is usually
- * how you would access help. Or via the `--help=xml` option on the command line.
- *
- * Xml output is useful for integration with other tools like IDE's or other build tools.
- *
- * @package Cake.Console
- * @since CakePHP(tm) v 2.0
- */
-class HelpFormatter {
-
-/**
- * The maximum number of arguments shown when generating usage.
- *
- * @var integer
- */
- protected $_maxArgs = 6;
-
-/**
- * The maximum number of options shown when generating usage.
- *
- * @var integer
- */
- protected $_maxOptions = 6;
-
-/**
- * Build the help formatter for a an OptionParser
- *
- * @param ConsoleOptionParser $parser The option parser help is being generated for.
- */
- public function __construct(ConsoleOptionParser $parser) {
- $this->_parser = $parser;
- }
-
-/**
- * Get the help as formatted text suitable for output on the command line.
- *
- * @param integer $width The width of the help output.
- * @return string
- */
- public function text($width = 72) {
- $parser = $this->_parser;
- $out = array();
- $description = $parser->description();
- if (!empty($description)) {
- $out[] = String::wrap($description, $width);
- $out[] = '';
- }
- $out[] = __d('cake_console', 'Usage: ');
- $out[] = $this->_generateUsage();
- $out[] = '';
- $subcommands = $parser->subcommands();
- if (!empty($subcommands)) {
- $out[] = __d('cake_console', 'Subcommands: ');
- $out[] = '';
- $max = $this->_getMaxLength($subcommands) + 2;
- foreach ($subcommands as $command) {
- $out[] = String::wrap($command->help($max), array(
- 'width' => $width,
- 'indent' => str_repeat(' ', $max),
- 'indentAt' => 1
- ));
- }
- $out[] = '';
- $out[] = __d('cake_console', 'To see help on a subcommand use `cake %s [subcommand] --help` ', $parser->command());
- $out[] = '';
- }
-
- $options = $parser->options();
- if (!empty($options)) {
- $max = $this->_getMaxLength($options) + 8;
- $out[] = __d('cake_console', 'Options: ');
- $out[] = '';
- foreach ($options as $option) {
- $out[] = String::wrap($option->help($max), array(
- 'width' => $width,
- 'indent' => str_repeat(' ', $max),
- 'indentAt' => 1
- ));
- }
- $out[] = '';
- }
-
- $arguments = $parser->arguments();
- if (!empty($arguments)) {
- $max = $this->_getMaxLength($arguments) + 2;
- $out[] = __d('cake_console', 'Arguments: ');
- $out[] = '';
- foreach ($arguments as $argument) {
- $out[] = String::wrap($argument->help($max), array(
- 'width' => $width,
- 'indent' => str_repeat(' ', $max),
- 'indentAt' => 1
- ));
- }
- $out[] = '';
- }
- $epilog = $parser->epilog();
- if (!empty($epilog)) {
- $out[] = String::wrap($epilog, $width);
- $out[] = '';
- }
- return implode("\n", $out);
- }
-
-/**
- * Generate the usage for a shell based on its arguments and options.
- * Usage strings favor short options over the long ones. and optional args will
- * be indicated with []
- *
- * @return string
- */
- protected function _generateUsage() {
- $usage = array('cake ' . $this->_parser->command());
- $subcommands = $this->_parser->subcommands();
- if (!empty($subcommands)) {
- $usage[] = '[subcommand]';
- }
- $options = array();
- foreach ($this->_parser->options() as $option) {
- $options[] = $option->usage();
- }
- if (count($options) > $this->_maxOptions) {
- $options = array('[options]');
- }
- $usage = array_merge($usage, $options);
- $args = array();
- foreach ($this->_parser->arguments() as $argument) {
- $args[] = $argument->usage();
- }
- if (count($args) > $this->_maxArgs) {
- $args = array('[arguments]');
- }
- $usage = array_merge($usage, $args);
- return implode(' ', $usage);
- }
-
-/**
- * Iterate over a collection and find the longest named thing.
- *
- * @param array $collection
- * @return integer
- */
- protected function _getMaxLength($collection) {
- $max = 0;
- foreach ($collection as $item) {
- $max = (strlen($item->name()) > $max) ? strlen($item->name()) : $max;
- }
- return $max;
- }
-
-/**
- * Get the help as an xml string.
- *
- * @param boolean $string Return the SimpleXml object or a string. Defaults to true.
- * @return mixed. See $string
- */
- public function xml($string = true) {
- $parser = $this->_parser;
- $xml = new SimpleXmlElement('Welcome to CakePHP %s Console ', 'v' . Configure::version()));
- $this->hr();
- $this->out(__d('cake_console', 'App : %s', APP_DIR));
- $this->out(__d('cake_console', 'Path: %s', APP));
- $this->hr();
- }
-
-/**
- * If $uses = true
- * Loads AppModel file and constructs AppModel class
- * makes $this->AppModel available to subclasses
- * If public $uses is an array of models will load those models
- *
- * @return boolean
- */
- protected function _loadModels() {
- if ($this->uses === null || $this->uses === false) {
- return;
- }
- App::uses('ClassRegistry', 'Utility');
-
- if ($this->uses !== true && !empty($this->uses)) {
- $uses = is_array($this->uses) ? $this->uses : array($this->uses);
-
- $modelClassName = $uses[0];
- if (strpos($uses[0], '.') !== false) {
- list($plugin, $modelClassName) = explode('.', $uses[0]);
- }
- $this->modelClass = $modelClassName;
-
- foreach ($uses as $modelClass) {
- list($plugin, $modelClass) = pluginSplit($modelClass, true);
- $this->{$modelClass} = ClassRegistry::init($plugin . $modelClass);
- }
- return true;
- }
- return false;
- }
-
-/**
- * Loads tasks defined in public $tasks
- *
- * @return boolean
- */
- public function loadTasks() {
- if ($this->tasks === true || empty($this->tasks) || empty($this->Tasks)) {
- return true;
- }
- $this->_taskMap = TaskCollection::normalizeObjectArray((array)$this->tasks);
- foreach ($this->_taskMap as $task => $properties) {
- $this->taskNames[] = $task;
- }
- return true;
- }
-
-/**
- * Check to see if this shell has a task with the provided name.
- *
- * @param string $task The task name to check.
- * @return boolean Success
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hasTask
- */
- public function hasTask($task) {
- return isset($this->_taskMap[Inflector::camelize($task)]);
- }
-
-/**
- * Check to see if this shell has a callable method by the given name.
- *
- * @param string $name The method name to check.
- * @return boolean
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hasMethod
- */
- public function hasMethod($name) {
- try {
- $method = new ReflectionMethod($this, $name);
- if (!$method->isPublic() || substr($name, 0, 1) === '_') {
- return false;
- }
- if ($method->getDeclaringClass()->name == 'Shell') {
- return false;
- }
- return true;
- } catch (ReflectionException $e) {
- return false;
- }
- }
-
-/**
- * Dispatch a command to another Shell. Similar to Object::requestAction()
- * but intended for running shells from other shells.
- *
- * ### Usage:
- *
- * With a string command:
- *
- * `return $this->dispatchShell('schema create DbAcl');`
- *
- * Avoid using this form if you have string arguments, with spaces in them.
- * The dispatched will be invoked incorrectly. Only use this form for simple
- * command dispatching.
- *
- * With an array command:
- *
- * `return $this->dispatchShell('schema', 'create', 'i18n', '--dry');`
- *
- * @return mixed The return of the other shell.
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::dispatchShell
- */
- public function dispatchShell() {
- $args = func_get_args();
- if (is_string($args[0]) && count($args) == 1) {
- $args = explode(' ', $args[0]);
- }
-
- $Dispatcher = new ShellDispatcher($args, false);
- return $Dispatcher->dispatch();
- }
-
-/**
- * Runs the Shell with the provided argv.
- *
- * Delegates calls to Tasks and resolves methods inside the class. Commands are looked
- * up with the following order:
- *
- * - Method on the shell.
- * - Matching task name.
- * - `main()` method.
- *
- * If a shell implements a `main()` method, all missing method calls will be sent to
- * `main()` with the original method name in the argv.
- *
- * @param string $command The command name to run on this shell. If this argument is empty,
- * and the shell has a `main()` method, that will be called instead.
- * @param array $argv Array of arguments to run the shell with. This array should be missing the shell name.
- * @return void
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::runCommand
- */
- public function runCommand($command, $argv) {
- $isTask = $this->hasTask($command);
- $isMethod = $this->hasMethod($command);
- $isMain = $this->hasMethod('main');
-
- if ($isTask || $isMethod && $command !== 'execute') {
- array_shift($argv);
- }
-
- try {
- $this->OptionParser = $this->getOptionParser();
- list($this->params, $this->args) = $this->OptionParser->parse($argv, $command);
- } catch (ConsoleException $e) {
- $this->out($this->OptionParser->help($command));
- return false;
- }
-
- $this->command = $command;
- if (!empty($this->params['help'])) {
- return $this->_displayHelp($command);
- }
-
- if (($isTask || $isMethod || $isMain) && $command !== 'execute') {
- $this->startup();
- }
-
- if ($isTask) {
- $command = Inflector::camelize($command);
- return $this->{$command}->runCommand('execute', $argv);
- }
- if ($isMethod) {
- return $this->{$command}();
- }
- if ($isMain) {
- return $this->main();
- }
- $this->out($this->OptionParser->help($command));
- return false;
- }
-
-/**
- * Display the help in the correct format
- *
- * @param string $command
- * @return void
- */
- protected function _displayHelp($command) {
- $format = 'text';
- if (!empty($this->args[0]) && $this->args[0] == 'xml') {
- $format = 'xml';
- $this->stdout->outputAs(ConsoleOutput::RAW);
- } else {
- $this->_welcome();
- }
- return $this->out($this->OptionParser->help($command, $format));
- }
-
-/**
- * Gets the option parser instance and configures it.
- * By overriding this method you can configure the ConsoleOptionParser before returning it.
- *
- * @return ConsoleOptionParser
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::getOptionParser
- */
- public function getOptionParser() {
- $name = ($this->plugin ? $this->plugin . '.' : '') . $this->name;
- $parser = new ConsoleOptionParser($name);
- return $parser;
- }
-
-/**
- * Overload get for lazy building of tasks
- *
- * @param string $name
- * @return Shell Object of Task
- */
- public function __get($name) {
- if (empty($this->{$name}) && in_array($name, $this->taskNames)) {
- $properties = $this->_taskMap[$name];
- $this->{$name} = $this->Tasks->load($properties['class'], $properties['settings']);
- $this->{$name}->args =& $this->args;
- $this->{$name}->params =& $this->params;
- $this->{$name}->initialize();
- $this->{$name}->loadTasks();
- }
- return $this->{$name};
- }
-
-/**
- * Prompts the user for input, and returns it.
- *
- * @param string $prompt Prompt text.
- * @param mixed $options Array or string of options.
- * @param string $default Default input value.
- * @return mixed Either the default value, or the user-provided input.
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::in
- */
- public function in($prompt, $options = null, $default = null) {
- if (!$this->interactive) {
- return $default;
- }
- $originalOptions = $options;
- $in = $this->_getInput($prompt, $originalOptions, $default);
-
- if ($options && is_string($options)) {
- if (strpos($options, ',')) {
- $options = explode(',', $options);
- } elseif (strpos($options, '/')) {
- $options = explode('/', $options);
- } else {
- $options = array($options);
- }
- }
- if (is_array($options)) {
- $options = array_merge(
- array_map('strtolower', $options),
- array_map('strtoupper', $options),
- $options
- );
- while ($in === '' || !in_array($in, $options)) {
- $in = $this->_getInput($prompt, $originalOptions, $default);
- }
- }
- return $in;
- }
-
-/**
- * Prompts the user for input, and returns it.
- *
- * @param string $prompt Prompt text.
- * @param mixed $options Array or string of options.
- * @param string $default Default input value.
- * @return Either the default value, or the user-provided input.
- */
- protected function _getInput($prompt, $options, $default) {
- if (!is_array($options)) {
- $printOptions = '';
- } else {
- $printOptions = '(' . implode('/', $options) . ')';
- }
-
- if ($default === null) {
- $this->stdout->write('' . $prompt . ' ' . " $printOptions \n" . '> ', 0);
- } else {
- $this->stdout->write('' . $prompt . ' ' . " $printOptions \n" . "[$default] > ", 0);
- }
- $result = $this->stdin->read();
-
- if ($result === false) {
- $this->_stop(1);
- }
- $result = trim($result);
-
- if ($default !== null && ($result === '' || $result === null)) {
- return $default;
- }
- return $result;
- }
-
-/**
- * Wrap a block of text.
- * Allows you to set the width, and indenting on a block of text.
- *
- * ### Options
- *
- * - `width` The width to wrap to. Defaults to 72
- * - `wordWrap` Only wrap on words breaks (spaces) Defaults to true.
- * - `indent` Indent the text with the string provided. Defaults to null.
- *
- * @param string $text Text the text to format.
- * @param mixed $options Array of options to use, or an integer to wrap the text to.
- * @return string Wrapped / indented text
- * @see String::wrap()
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::wrapText
- */
- public function wrapText($text, $options = array()) {
- return String::wrap($text, $options);
- }
-
-/**
- * Outputs a single or multiple messages to stdout. If no parameters
- * are passed outputs just a newline.
- *
- * ### Output levels
- *
- * There are 3 built-in output level. Shell::QUIET, Shell::NORMAL, Shell::VERBOSE.
- * The verbose and quiet output levels, map to the `verbose` and `quiet` output switches
- * present in most shells. Using Shell::QUIET for a message means it will always display.
- * While using Shell::VERBOSE means it will only display when verbose output is toggled.
- *
- * @param mixed $message A string or a an array of strings to output
- * @param integer $newlines Number of newlines to append
- * @param integer $level The message's output level, see above.
- * @return integer|boolean Returns the number of bytes returned from writing to stdout.
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::out
- */
- public function out($message = null, $newlines = 1, $level = Shell::NORMAL) {
- $currentLevel = Shell::NORMAL;
- if (!empty($this->params['verbose'])) {
- $currentLevel = Shell::VERBOSE;
- }
- if (!empty($this->params['quiet'])) {
- $currentLevel = Shell::QUIET;
- }
- if ($level <= $currentLevel) {
- return $this->stdout->write($message, $newlines);
- }
- return true;
- }
-
-/**
- * Outputs a single or multiple error messages to stderr. If no parameters
- * are passed outputs just a newline.
- *
- * @param mixed $message A string or a an array of strings to output
- * @param integer $newlines Number of newlines to append
- * @return void
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::err
- */
- public function err($message = null, $newlines = 1) {
- $this->stderr->write($message, $newlines);
- }
-
-/**
- * Returns a single or multiple linefeeds sequences.
- *
- * @param integer $multiplier Number of times the linefeed sequence should be repeated
- * @return string
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::nl
- */
- public function nl($multiplier = 1) {
- return str_repeat(ConsoleOutput::LF, $multiplier);
- }
-
-/**
- * Outputs a series of minus characters to the standard output, acts as a visual separator.
- *
- * @param integer $newlines Number of newlines to pre- and append
- * @param integer $width Width of the line, defaults to 63
- * @return void
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hr
- */
- public function hr($newlines = 0, $width = 63) {
- $this->out(null, $newlines);
- $this->out(str_repeat('-', $width));
- $this->out(null, $newlines);
- }
-
-/**
- * Displays a formatted error message
- * and exits the application with status code 1
- *
- * @param string $title Title of the error
- * @param string $message An optional error message
- * @return void
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::error
- */
- public function error($title, $message = null) {
- $this->err(__d('cake_console', 'Error: %s', $title));
-
- if (!empty($message)) {
- $this->err($message);
- }
- $this->_stop(1);
- }
-
-/**
- * Clear the console
- *
- * @return void
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::clear
- */
- public function clear() {
- if (empty($this->params['noclear'])) {
- if (DS === '/') {
- passthru('clear');
- } else {
- passthru('cls');
- }
- }
- }
-
-/**
- * Creates a file at given path
- *
- * @param string $path Where to put the file.
- * @param string $contents Content to put in the file.
- * @return boolean Success
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::createFile
- */
- public function createFile($path, $contents) {
- $path = str_replace(DS . DS, DS, $path);
-
- $this->out();
-
- if (is_file($path) && $this->interactive === true) {
- $this->out(__d('cake_console', 'File `%s` exists ', $path));
- $key = $this->in(__d('cake_console', 'Do you want to overwrite?'), array('y', 'n', 'q'), 'n');
-
- if (strtolower($key) == 'q') {
- $this->out(__d('cake_console', 'Quitting .'), 2);
- $this->_stop();
- } elseif (strtolower($key) != 'y') {
- $this->out(__d('cake_console', 'Skip `%s`', $path), 2);
- return false;
- }
- } else {
- $this->out(__d('cake_console', 'Creating file %s', $path));
- }
-
- $File = new File($path, true);
- if ($File->exists() && $File->writable()) {
- $data = $File->prepare($contents);
- $File->write($data);
- $this->out(__d('cake_console', 'Wrote `%s`', $path));
- return true;
- } else {
- $this->err(__d('cake_console', 'Could not write to `%s` .', $path), 2);
- return false;
- }
- }
-
-/**
- * Action to create a Unit Test
- *
- * @return boolean Success
- */
- protected function _checkUnitTest() {
- if (App::import('Vendor', 'phpunit', array('file' => 'PHPUnit' . DS . 'Autoload.php'))) {
- return true;
- }
- if (@include 'PHPUnit' . DS . 'Autoload.php') {
- return true;
- }
- $prompt = __d('cake_console', 'PHPUnit is not installed. Do you want to bake unit test files anyway?');
- $unitTest = $this->in($prompt, array('y', 'n'), 'y');
- $result = strtolower($unitTest) == 'y' || strtolower($unitTest) == 'yes';
-
- if ($result) {
- $this->out();
- $this->out(__d('cake_console', 'You can download PHPUnit from %s', 'http://phpunit.de'));
- }
- return $result;
- }
-
-/**
- * Makes absolute file path easier to read
- *
- * @param string $file Absolute file path
- * @return string short path
- * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::shortPath
- */
- public function shortPath($file) {
- $shortPath = str_replace(ROOT, null, $file);
- $shortPath = str_replace('..' . DS, '', $shortPath);
- return str_replace(DS . DS, DS, $shortPath);
- }
-
-/**
- * Creates the proper controller path for the specified controller class name
- *
- * @param string $name Controller class name
- * @return string Path to controller
- */
- protected function _controllerPath($name) {
- return Inflector::underscore($name);
- }
-
-/**
- * Creates the proper controller plural name for the specified controller class name
- *
- * @param string $name Controller class name
- * @return string Controller plural name
- */
- protected function _controllerName($name) {
- return Inflector::pluralize(Inflector::camelize($name));
- }
-
-/**
- * Creates the proper model camelized name (singularized) for the specified name
- *
- * @param string $name Name
- * @return string Camelized and singularized model name
- */
- protected function _modelName($name) {
- return Inflector::camelize(Inflector::singularize($name));
- }
-
-/**
- * Creates the proper underscored model key for associations
- *
- * @param string $name Model class name
- * @return string Singular model key
- */
- protected function _modelKey($name) {
- return Inflector::underscore($name) . '_id';
- }
-
-/**
- * Creates the proper model name from a foreign key
- *
- * @param string $key Foreign key
- * @return string Model name
- */
- protected function _modelNameFromKey($key) {
- return Inflector::camelize(str_replace('_id', '', $key));
- }
-
-/**
- * creates the singular name for use in views.
- *
- * @param string $name
- * @return string $name
- */
- protected function _singularName($name) {
- return Inflector::variable(Inflector::singularize($name));
- }
-
-/**
- * Creates the plural name for views
- *
- * @param string $name Name to use
- * @return string Plural name for views
- */
- protected function _pluralName($name) {
- return Inflector::variable(Inflector::pluralize($name));
- }
-
-/**
- * Creates the singular human name used in views
- *
- * @param string $name Controller name
- * @return string Singular human name
- */
- protected function _singularHumanName($name) {
- return Inflector::humanize(Inflector::underscore(Inflector::singularize($name)));
- }
-
-/**
- * Creates the plural human name used in views
- *
- * @param string $name Controller name
- * @return string Plural human name
- */
- protected function _pluralHumanName($name) {
- return Inflector::humanize(Inflector::underscore($name));
- }
-
-/**
- * Find the correct path for a plugin. Scans $pluginPaths for the plugin you want.
- *
- * @param string $pluginName Name of the plugin you want ie. DebugKit
- * @return string $path path to the correct plugin.
- */
- protected function _pluginPath($pluginName) {
- if (CakePlugin::loaded($pluginName)) {
- return CakePlugin::path($pluginName);
- }
- return current(App::path('plugins')) . $pluginName . DS;
- }
-
-}
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
deleted file mode 100644
index 5f2f5a6aa5d..00000000000
--- a/lib/Cake/Console/ShellDispatcher.php
+++ /dev/null
@@ -1,332 +0,0 @@
-_initConstants();
- }
- $this->parseParams($args);
- if ($bootstrap) {
- $this->_initEnvironment();
- }
- }
-
-/**
- * Run the dispatcher
- *
- * @param array $argv The argv from PHP
- * @return void
- */
- public static function run($argv) {
- $dispatcher = new ShellDispatcher($argv);
- $dispatcher->_stop($dispatcher->dispatch() === false ? 1 : 0);
- }
-
-/**
- * Defines core configuration.
- *
- * @return void
- */
- protected function _initConstants() {
- if (function_exists('ini_set')) {
- ini_set('html_errors', false);
- ini_set('implicit_flush', true);
- ini_set('max_execution_time', 0);
- }
-
- if (!defined('CAKE_CORE_INCLUDE_PATH')) {
- define('DS', DIRECTORY_SEPARATOR);
- define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(dirname(__FILE__))));
- define('CAKEPHP_SHELL', true);
- if (!defined('CORE_PATH')) {
- define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
- }
- }
- }
-
-/**
- * Defines current working environment.
- *
- * @return void
- * @throws CakeException
- */
- protected function _initEnvironment() {
- if (!$this->_bootstrap()) {
- $message = "Unable to load CakePHP core.\nMake sure " . DS . 'lib' . DS . 'Cake exists in ' . CAKE_CORE_INCLUDE_PATH;
- throw new CakeException($message);
- }
-
- if (!isset($this->args[0]) || !isset($this->params['working'])) {
- $message = "This file has been loaded incorrectly and cannot continue.\n" .
- "Please make sure that " . DS . 'lib' . DS . 'Cake' . DS . "Console is in your system path,\n" .
- "and check the cookbook for the correct usage of this command.\n" .
- "(http://book.cakephp.org/)";
- throw new CakeException($message);
- }
-
- $this->shiftArgs();
- }
-
-/**
- * Initializes the environment and loads the Cake core.
- *
- * @return boolean Success.
- */
- protected function _bootstrap() {
- define('ROOT', $this->params['root']);
- define('APP_DIR', $this->params['app']);
- define('APP', $this->params['working'] . DS);
- define('WWW_ROOT', APP . $this->params['webroot'] . DS);
- if (!is_dir(ROOT . DS . APP_DIR . DS . 'tmp')) {
- define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'tmp' . DS);
- }
- $boot = file_exists(ROOT . DS . APP_DIR . DS . 'Config' . DS . 'bootstrap.php');
- require CORE_PATH . 'Cake' . DS . 'bootstrap.php';
-
- if (!file_exists(APP . 'Config' . DS . 'core.php')) {
- include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
- App::build();
- }
- require_once CAKE . 'Console' . DS . 'ConsoleErrorHandler.php';
- $ErrorHandler = new ConsoleErrorHandler();
- set_exception_handler(array($ErrorHandler, 'handleException'));
- set_error_handler(array($ErrorHandler, 'handleError'), Configure::read('Error.level'));
-
- if (!defined('FULL_BASE_URL')) {
- define('FULL_BASE_URL', 'http://localhost');
- }
-
- return true;
- }
-
-/**
- * Dispatches a CLI request
- *
- * @return boolean
- * @throws MissingShellMethodException
- */
- public function dispatch() {
- $shell = $this->shiftArgs();
-
- if (!$shell) {
- $this->help();
- return false;
- }
- if (in_array($shell, array('help', '--help', '-h'))) {
- $this->help();
- return true;
- }
-
- $Shell = $this->_getShell($shell);
-
- $command = null;
- if (isset($this->args[0])) {
- $command = $this->args[0];
- }
-
- if ($Shell instanceof Shell) {
- $Shell->initialize();
- $Shell->loadTasks();
- return $Shell->runCommand($command, $this->args);
- }
- $methods = array_diff(get_class_methods($Shell), get_class_methods('Shell'));
- $added = in_array($command, $methods);
- $private = $command[0] == '_' && method_exists($Shell, $command);
-
- if (!$private) {
- if ($added) {
- $this->shiftArgs();
- $Shell->startup();
- return $Shell->{$command}();
- }
- if (method_exists($Shell, 'main')) {
- $Shell->startup();
- return $Shell->main();
- }
- }
- throw new MissingShellMethodException(array('shell' => $shell, 'method' => $arg));
- }
-
-/**
- * Get shell to use, either plugin shell or application shell
- *
- * All paths in the loaded shell paths are searched.
- *
- * @param string $shell Optionally the name of a plugin
- * @return mixed An object
- * @throws MissingShellException when errors are encountered.
- */
- protected function _getShell($shell) {
- list($plugin, $shell) = pluginSplit($shell, true);
-
- $plugin = Inflector::camelize($plugin);
- $class = Inflector::camelize($shell) . 'Shell';
-
- App::uses('Shell', 'Console');
- App::uses('AppShell', 'Console/Command');
- App::uses($class, $plugin . 'Console/Command');
-
- if (!class_exists($class)) {
- throw new MissingShellException(array(
- 'class' => $class
- ));
- }
- $Shell = new $class();
- $Shell->plugin = trim($plugin, '.');
- return $Shell;
- }
-
-/**
- * Parses command line options and extracts the directory paths from $params
- *
- * @param array $args Parameters to parse
- * @return void
- */
- public function parseParams($args) {
- $this->_parsePaths($args);
-
- $defaults = array(
- 'app' => 'app',
- 'root' => dirname(dirname(dirname(dirname(__FILE__)))),
- 'working' => null,
- 'webroot' => 'webroot'
- );
- $params = array_merge($defaults, array_intersect_key($this->params, $defaults));
- $isWin = false;
- foreach ($defaults as $default => $value) {
- if (strpos($params[$default], '\\') !== false) {
- $isWin = true;
- break;
- }
- }
- $params = str_replace('\\', '/', $params);
-
- if (isset($params['working'])) {
- $params['working'] = trim($params['working']);
- }
- if (!empty($params['working']) && (!isset($this->args[0]) || isset($this->args[0]) && $this->args[0]{0} !== '.')) {
- if (empty($this->params['app']) && $params['working'] != $params['root']) {
- $params['root'] = dirname($params['working']);
- $params['app'] = basename($params['working']);
- } else {
- $params['root'] = $params['working'];
- }
- }
-
- if ($params['app'][0] == '/' || preg_match('/([a-z])(:)/i', $params['app'], $matches)) {
- $params['root'] = dirname($params['app']);
- } elseif (strpos($params['app'], '/')) {
- $params['root'] .= '/' . dirname($params['app']);
- }
-
- $params['app'] = basename($params['app']);
- $params['working'] = rtrim($params['root'], '/');
- if (!$isWin || !preg_match('/^[A-Z]:$/i', $params['app'])) {
- $params['working'] .= '/' . $params['app'];
- }
-
- if (!empty($matches[0]) || !empty($isWin)) {
- $params = str_replace('/', '\\', $params);
- }
-
- $this->params = array_merge($this->params, $params);
- }
-
-/**
- * Parses out the paths from from the argv
- *
- * @param array $args
- * @return void
- */
- protected function _parsePaths($args) {
- $parsed = array();
- $keys = array('-working', '--working', '-app', '--app', '-root', '--root');
- foreach ($keys as $key) {
- while (($index = array_search($key, $args)) !== false) {
- $keyname = str_replace('-', '', $key);
- $valueIndex = $index + 1;
- $parsed[$keyname] = $args[$valueIndex];
- array_splice($args, $index, 2);
- }
- }
- $this->args = $args;
- $this->params = $parsed;
- }
-
-/**
- * Removes first argument and shifts other arguments up
- *
- * @return mixed Null if there are no arguments otherwise the shifted argument
- */
- public function shiftArgs() {
- return array_shift($this->args);
- }
-
-/**
- * Shows console help. Performs an internal dispatch to the CommandList Shell
- *
- * @return void
- */
- public function help() {
- $this->args = array_merge(array('command_list'), $this->args);
- $this->dispatch();
- }
-
-/**
- * Stop execution of the current script
- *
- * @param integer|string $status see http://php.net/exit for values
- * @return void
- */
- protected function _stop($status = 0) {
- exit($status);
- }
-
-}
diff --git a/lib/Cake/Console/TaskCollection.php b/lib/Cake/Console/TaskCollection.php
deleted file mode 100644
index 35f21eecf68..00000000000
--- a/lib/Cake/Console/TaskCollection.php
+++ /dev/null
@@ -1,82 +0,0 @@
-_Shell = $Shell;
- }
-
-/**
- * Loads/constructs a task. Will return the instance in the collection
- * if it already exists.
- *
- * @param string $task Task name to load
- * @param array $settings Settings for the task.
- * @return Task A task object, Either the existing loaded task or a new one.
- * @throws MissingTaskException when the task could not be found
- */
- public function load($task, $settings = array()) {
- list($plugin, $name) = pluginSplit($task, true);
-
- if (isset($this->_loaded[$name])) {
- return $this->_loaded[$name];
- }
- $taskClass = $name . 'Task';
- App::uses($taskClass, $plugin . 'Console/Command/Task');
- if (!class_exists($taskClass)) {
- if (!class_exists($taskClass)) {
- throw new MissingTaskException(array(
- 'class' => $taskClass
- ));
- }
- }
-
- $this->_loaded[$name] = new $taskClass(
- $this->_Shell->stdout, $this->_Shell->stderr, $this->_Shell->stdin
- );
- return $this->_loaded[$name];
- }
-
-}
diff --git a/lib/Cake/Console/Templates/default/actions/controller_actions.ctp b/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
deleted file mode 100644
index c0921c2c4ac..00000000000
--- a/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-/**
- * index method
- *
- * @return void
- */
- public function index() {
- $this->->recursive = 0;
- $this->set('', $this->paginate());
- }
-
-/**
- * view method
- *
- * @param string $id
- * @return void
- */
- public function view($id = null) {
- $this->->id = $id;
- if (!$this->->exists()) {
- throw new NotFoundException(__('Invalid '));
- }
- $this->set('', $this->->read(null, $id));
- }
-
-
-/**
- * add method
- *
- * @return void
- */
- public function add() {
- if ($this->request->is('post')) {
- $this->->create();
- if ($this->->save($this->request->data)) {
-
- $this->Session->setFlash(__('The has been saved'));
- $this->redirect(array('action' => 'index'));
-
- $this->flash(__(' saved.'), array('action' => 'index'));
-
- } else {
-
- $this->Session->setFlash(__('The could not be saved. Please, try again.'));
-
- }
- }
-{$assoc} as $associationName => $relation):
- if (!empty($associationName)):
- $otherModelName = $this->_modelName($associationName);
- $otherPluralName = $this->_pluralName($associationName);
- echo "\t\t\${$otherPluralName} = \$this->{$currentModelName}->{$otherModelName}->find('list');\n";
- $compact[] = "'{$otherPluralName}'";
- endif;
- endforeach;
- endforeach;
- if (!empty($compact)):
- echo "\t\t\$this->set(compact(".join(', ', $compact)."));\n";
- endif;
-?>
- }
-
-
-/**
- * edit method
- *
- * @param string $id
- * @return void
- */
- public function edit($id = null) {
- $this->->id = $id;
- if (!$this->->exists()) {
- throw new NotFoundException(__('Invalid '));
- }
- if ($this->request->is('post') || $this->request->is('put')) {
- if ($this->->save($this->request->data)) {
-
- $this->Session->setFlash(__('The has been saved'));
- $this->redirect(array('action' => 'index'));
-
- $this->flash(__('The has been saved.'), array('action' => 'index'));
-
- } else {
-
- $this->Session->setFlash(__('The could not be saved. Please, try again.'));
-
- }
- } else {
- $this->request->data = $this->->read(null, $id);
- }
-{$assoc} as $associationName => $relation):
- if (!empty($associationName)):
- $otherModelName = $this->_modelName($associationName);
- $otherPluralName = $this->_pluralName($associationName);
- echo "\t\t\${$otherPluralName} = \$this->{$currentModelName}->{$otherModelName}->find('list');\n";
- $compact[] = "'{$otherPluralName}'";
- endif;
- endforeach;
- endforeach;
- if (!empty($compact)):
- echo "\t\t\$this->set(compact(".join(', ', $compact)."));\n";
- endif;
- ?>
- }
-
-/**
- * delete method
- *
- * @param string $id
- * @return void
- */
- public function delete($id = null) {
- if (!$this->request->is('post')) {
- throw new MethodNotAllowedException();
- }
- $this->->id = $id;
- if (!$this->->exists()) {
- throw new NotFoundException(__('Invalid '));
- }
- if ($this->->delete()) {
-
- $this->Session->setFlash(__(' deleted'));
- $this->redirect(array('action' => 'index'));
-
- $this->flash(__(' deleted'), array('action' => 'index'));
-
- }
-
- $this->Session->setFlash(__(' was not deleted'));
-
- $this->flash(__(' was not deleted'), array('action' => 'index'));
-
- $this->redirect(array('action' => 'index'));
- }
\ No newline at end of file
diff --git a/lib/Cake/Console/Templates/default/classes/controller.ctp b/lib/Cake/Console/Templates/default/classes/controller.ctp
deleted file mode 100644
index 741e06b0079..00000000000
--- a/lib/Cake/Console/Templates/default/classes/controller.ctp
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/**
- * Controller
- *
-
- */
-class Controller extends AppController {
-
-
-/**
- * Scaffold
- *
- * @var mixed
- */
- public $scaffold;
-
-
-
-}
diff --git a/lib/Cake/Console/Templates/default/classes/fixture.ctp b/lib/Cake/Console/Templates/default/classes/fixture.ctp
deleted file mode 100644
index 48f6c78345a..00000000000
--- a/lib/Cake/Console/Templates/default/classes/fixture.ctp
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-/**
- * Fixture
- *
- */
-class Fixture extends CakeTestFixture {
-
-/**
- * Table name
- *
- * @var string
- */
- public $table = '';
-
-
-/**
- * Import
- *
- * @var array
- */
- public $import = ;
-
-
-
-/**
- * Fields
- *
- * @var array
- */
- public $fields = ;
-
-
-
-/**
- * Records
- *
- * @var array
- */
- public $records = ;
-
-}
diff --git a/lib/Cake/Console/Templates/default/classes/model.ctp b/lib/Cake/Console/Templates/default/classes/model.ctp
deleted file mode 100644
index 3634b802ff5..00000000000
--- a/lib/Cake/Console/Templates/default/classes/model.ctp
+++ /dev/null
@@ -1,175 +0,0 @@
-
-/**
- * Model
- *
-
- */
-class extends AppModel {
-
-/**
- * Use database config
- *
- * @var string
- */
- public $useDbConfig = '';
-
-
-/**
- * Primary key field
- *
- * @var string
- */
- public $primaryKey = '';
-
-/**
- * Display field
- *
- * @var string
- */
- public $displayField = '';
- $validations):
- echo "\t\t'$field' => array(\n";
- foreach ($validations as $key => $validator):
- echo "\t\t\t'$key' => array(\n";
- echo "\t\t\t\t'rule' => array('$validator'),\n";
- echo "\t\t\t\t//'message' => 'Your custom message here',\n";
- echo "\t\t\t\t//'allowEmpty' => false,\n";
- echo "\t\t\t\t//'required' => false,\n";
- echo "\t\t\t\t//'last' => false, // Stop validation after this rule\n";
- echo "\t\t\t\t//'on' => 'create', // Limit validation to 'create' or 'update' operations\n";
- echo "\t\t\t),\n";
- endforeach;
- echo "\t\t),\n";
- endforeach;
- echo "\t);\n";
-endif;
-
-foreach ($associations as $assoc):
- if (!empty($assoc)):
-?>
-
- //The Associations below have been created with all possible keys, those that are not needed can be removed
- $relation):
- $out = "\n\t\t'{$relation['alias']}' => array(\n";
- $out .= "\t\t\t'className' => '{$relation['className']}',\n";
- $out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
- $out .= "\t\t\t'conditions' => '',\n";
- $out .= "\t\t\t'fields' => '',\n";
- $out .= "\t\t\t'order' => ''\n";
- $out .= "\t\t)";
- if ($i + 1 < $typeCount) {
- $out .= ",";
- }
- echo $out;
- endforeach;
- echo "\n\t);\n";
- endif;
-endforeach;
-
-if (!empty($associations['hasMany'])):
- $belongsToCount = count($associations['hasMany']);
- echo "\n/**\n * hasMany associations\n *\n * @var array\n */";
- echo "\n\tpublic \$hasMany = array(";
- foreach ($associations['hasMany'] as $i => $relation):
- $out = "\n\t\t'{$relation['alias']}' => array(\n";
- $out .= "\t\t\t'className' => '{$relation['className']}',\n";
- $out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
- $out .= "\t\t\t'dependent' => false,\n";
- $out .= "\t\t\t'conditions' => '',\n";
- $out .= "\t\t\t'fields' => '',\n";
- $out .= "\t\t\t'order' => '',\n";
- $out .= "\t\t\t'limit' => '',\n";
- $out .= "\t\t\t'offset' => '',\n";
- $out .= "\t\t\t'exclusive' => '',\n";
- $out .= "\t\t\t'finderQuery' => '',\n";
- $out .= "\t\t\t'counterQuery' => ''\n";
- $out .= "\t\t)";
- if ($i + 1 < $belongsToCount) {
- $out .= ",";
- }
- echo $out;
- endforeach;
- echo "\n\t);\n\n";
-endif;
-
-if (!empty($associations['hasAndBelongsToMany'])):
- $habtmCount = count($associations['hasAndBelongsToMany']);
- echo "\n/**\n * hasAndBelongsToMany associations\n *\n * @var array\n */";
- echo "\n\tpublic \$hasAndBelongsToMany = array(";
- foreach ($associations['hasAndBelongsToMany'] as $i => $relation):
- $out = "\n\t\t'{$relation['alias']}' => array(\n";
- $out .= "\t\t\t'className' => '{$relation['className']}',\n";
- $out .= "\t\t\t'joinTable' => '{$relation['joinTable']}',\n";
- $out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
- $out .= "\t\t\t'associationForeignKey' => '{$relation['associationForeignKey']}',\n";
- $out .= "\t\t\t'unique' => 'keepExisting',\n";
- $out .= "\t\t\t'conditions' => '',\n";
- $out .= "\t\t\t'fields' => '',\n";
- $out .= "\t\t\t'order' => '',\n";
- $out .= "\t\t\t'limit' => '',\n";
- $out .= "\t\t\t'offset' => '',\n";
- $out .= "\t\t\t'finderQuery' => '',\n";
- $out .= "\t\t\t'deleteQuery' => '',\n";
- $out .= "\t\t\t'insertQuery' => ''\n";
- $out .= "\t\t)";
- if ($i + 1 < $habtmCount) {
- $out .= ",";
- }
- echo $out;
- endforeach;
- echo "\n\t);\n\n";
-endif;
-?>
-}
diff --git a/lib/Cake/Console/Templates/default/classes/test.ctp b/lib/Cake/Console/Templates/default/classes/test.ctp
deleted file mode 100644
index ecf8ea8a5d1..00000000000
--- a/lib/Cake/Console/Templates/default/classes/test.ctp
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-App::uses('', '');
-
-
-
-/**
- * Test
- *
- */
-class Test extends {
-/**
- * Auto render
- *
- * @var boolean
- */
- public $autoRender = false;
-
-/**
- * Redirect action
- *
- * @param mixed $url
- * @param mixed $status
- * @param boolean $exit
- * @return void
- */
- public function redirect($url, $status = null, $exit = true) {
- $this->redirectUrl = $url;
- }
-}
-
-
-/**
- * Test Case
- *
- */
-class TestCase extends CakeTestCase {
-
-/**
- * Fixtures
- *
- * @var array
- */
- public $fixtures = array('');
-
-
-/**
- * setUp method
- *
- * @return void
- */
- public function setUp() {
- parent::setUp();
-
- $this->
-
- }
-
-/**
- * tearDown method
- *
- * @return void
- */
- public function tearDown() {
- unset($this->);
-
- parent::tearDown();
- }
-
-
-/**
- * test method
- *
- * @return void
- */
- public function test() {
-
- }
-
-}
diff --git a/lib/Cake/Console/Templates/default/views/form.ctp b/lib/Cake/Console/Templates/default/views/form.ctp
deleted file mode 100644
index aaf3c23d7cf..00000000000
--- a/lib/Cake/Console/Templates/default/views/form.ctp
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-Form->create('{$modelClass}');?>\n";?>
-
- ", Inflector::humanize($action), $singularHumanName); ?>
-Form->input('{$field}');\n";
- }
- }
- if (!empty($associations['hasAndBelongsToMany'])) {
- foreach ($associations['hasAndBelongsToMany'] as $assocName => $assocData) {
- echo "\t\techo \$this->Form->input('{$assocName}');\n";
- }
- }
- echo "\t?>\n";
-?>
-
-Form->end(__('Submit'));?>\n";
-?>
-
-
-
"; ?>
-
-
-
- Form->postLink(__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?>
-
- Html->link(__('List " . $pluralHumanName . "'), array('action' => 'index'));?>";?>
- $data) {
- foreach ($data as $alias => $details) {
- if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
- echo "\t\tHtml->link(__('List " . Inflector::humanize($details['controller']) . "'), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> \n";
- echo "\t\tHtml->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "'), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> \n";
- $done[] = $details['controller'];
- }
- }
- }
-?>
-
-
For updates and important announcements, visit http://cakefest.org
-\n";
-$output .= "Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP! \n";
-$output .="
- 0):
- Debugger::checkSecurityKeys();
-endif;
-?>
-
-=')):
- echo '';
- echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
- echo ' ';
- else:
- echo '';
- echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
- echo ' ';
- endif;
-?>
-
-
-';
- echo __d('cake_dev', 'Your tmp directory is writable.');
- echo '';
- else:
- echo '';
- echo __d('cake_dev', 'Your tmp directory is NOT writable.');
- echo ' ';
- endif;
-?>
-
-
-';
- echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit APP/Config/core.php ', ''. \$settings['engine'] . 'Engine ');
- echo '';
- else:
- echo '';
- echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in APP/Config/core.php');
- echo ' ';
- endif;
-?>
-
-
-';
- echo __d('cake_dev', 'Your database configuration file is present.');
- \$filePresent = true;
- echo '';
- else:
- echo '';
- echo __d('cake_dev', 'Your database configuration file is NOT present.');
- echo ' ';
- endif;
-?>
-
-
-
- isConnected()):
- echo '';
- echo __d('cake_dev', 'Cake is able to connect to the database.');
- echo ' ';
- else:
- echo '';
- echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
- echo ' ';
- endif;
- ?>
-
-
-';
- __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
- echo '--enable-unicode-properties when configuring');
- echo ' ';
- }
-?>\n";
-$output .= "\n";
-$output .= "', APP . 'View' . DS . 'Layouts' . DS . 'default.ctp.
\n";
-?>
diff --git a/lib/Cake/Console/Templates/default/views/index.ctp b/lib/Cake/Console/Templates/default/views/index.ctp
deleted file mode 100644
index ded100e8e67..00000000000
--- a/lib/Cake/Console/Templates/default/views/index.ctp
+++ /dev/null
@@ -1,93 +0,0 @@
-
- 
+
+
+
+
+ 
+
+
+ 
+
+
+ 
+
+
+ 
+
+