Replace Platform Input package with Framework

joomla · May 19, 2014 · 57ea1c7 · 57ea1c7
1 parent 7c6f210
commit 57ea1c7
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 887 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1073,6 +1073,12 @@ public function deleteUnexistingFiles()
 			'/libraries/framework/Symfony/Component/Yaml/Parser.php',
 			'/libraries/framework/Symfony/Component/Yaml/Unescaper.php',
 			'/libraries/framework/Symfony/Component/Yaml/Yaml.php',
+			'/libraries/joomla/input/cli.php',
+			'/libraries/joomla/input/cookie.php',
+			'/libraries/joomla/input/files.php',
+			'/libraries/joomla/input/index.html',
+			'/libraries/joomla/input/input.php',
+			'/libraries/joomla/input/json.php',
 			'/libraries/phpmailer/language/index.html',
 			'/libraries/phpmailer/language/phpmailer.lang-joomla.php',
 			'/libraries/phpmailer/index.html',

diff --git a/build/build.php b/build/build.php
@@ -142,6 +142,10 @@
 	'libraries/vendor/joomla/di/composer.json',
 	'libraries/vendor/joomla/di/phpunit.xml.dist',
 	'libraries/vendor/joomla/di/README.md',
+	'libraries/vendor/joomla/input/Tests',
+	'libraries/vendor/joomla/input/composer.json',
+	'libraries/vendor/joomla/input/phpunit.xml.dist',
+	'libraries/vendor/joomla/input/README.md',
 	'libraries/vendor/joomla/registry/Tests',
 	'libraries/vendor/joomla/registry/composer.json',
 	'libraries/vendor/joomla/registry/phpunit.xml.dist',

diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
         "php": ">=5.3.10",
         "joomla/application": "~1.2",
 	    "joomla/di": "~1.2",
+	    "joomla/input": "~1.1",
 	    "joomla/registry": "~1.1",
 	    "ircmaxell/password-compat": "1.*",
 	    "phpmailer/phpmailer": "~5.2",

diff --git a/composer.lock b/composer.lock
diff --git a/libraries/classmap.php b/libraries/classmap.php
@@ -6,6 +6,11 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
+JLoader::registerAlias('JInput',              '\\Joomla\\Input\\Input');
+JLoader::registerAlias('JInputCli',           '\\Joomla\\Input\\Cli');
+JLoader::registerAlias('JInputCookie',        '\\Joomla\\Input\\Cookie');
+JLoader::registerAlias('JInputFiles',         '\\Joomla\\Input\\Files');
+JLoader::registerAlias('JInputJson',          '\\Joomla\\Input\\Json');
 JLoader::registerAlias('JRegistry',           '\\Joomla\\Registry\\Registry');
 JLoader::registerAlias('JRegistryFormat',     '\\Joomla\\Registry\\AbstractRegistryFormat');
 JLoader::registerAlias('JRegistryFormatINI',  '\\Joomla\\Registry\\Format\\Ini');

diff --git a/libraries/joomla/input/cli.php b/libraries/joomla/input/cli.php
diff --git a/libraries/joomla/input/cookie.php b/libraries/joomla/input/cookie.php