Convert IDNA_Convert library to be Composer managed, update to 0.9

joomla · Oct 27, 2015 · f6a0cd5 · f6a0cd5
1 parent 5a20901
commit f6a0cd5
Show file tree

Hide file tree

Showing 26 changed files with 3,744 additions and 1,843 deletions.
diff --git a/.gitignore b/.gitignore
@@ -98,6 +98,9 @@ Desktop.ini
 /libraries/vendor/phpmailer/phpmailer/composer.json
 /libraries/vendor/phpmailer/phpmailer/README.md
 /libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
+/libraries/vendor/phpwhois/idna-convert/composer.json
+/libraries/vendor/phpwhois/idna-convert/example.php
+/libraries/vendor/phpwhois/idna-convert/README.md
 /libraries/vendor/psr/log/Psr/Log/Test
 /libraries/vendor/psr/log/.gitignore
 /libraries/vendor/psr/log/composer.json

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -175,11 +175,9 @@ protected function updateManifestCaches()
 			array('component', 'com_postinstall', '', 1),
 
 			// Libraries
-			array('library', 'phpmailer', '', 0),
 			array('library', 'simplepie', '', 0),
 			array('library', 'phputf8', '', 0),
 			array('library', 'joomla', '', 0),
-			array('library', 'idna_convert', '', 0),
 			array('library', 'fof', '', 0),
 			array('library', 'phpass', '', 0),
 
@@ -1307,6 +1305,13 @@ public function deleteUnexistingFiles()
 			// Joomla 3.4.6
 			'/components/com_wrapper/views/wrapper/metadata.xml',
 			// Joomla 3.5.0
+			'/administrator/manifests/libraries/idna_convert.xml',
+			'/language/en-GB/en-GB.lib_idna_convert.sys.ini',
+			'/libraries/idna_convert/idna_convert.class.php',
+			'/libraries/idna_convert/LICENCE',
+			'/libraries/idna_convert/ReadMe.txt',
+			'/libraries/idna_convert/transcode_wrapper.php',
+			'/libraries/idna_convert/uctc.php',
 			'/media/com_joomlaupdate/default.js',
 			'/media/com_joomlaupdate/encryption.js',
 			'/media/com_joomlaupdate/json2.js',
@@ -1414,6 +1419,7 @@ public function deleteUnexistingFiles()
 			'/libraries/vendor/symfony/yaml/Symfony/Component',
 			'/libraries/vendor/symfony/yaml/Symfony',
 			'/administrator/components/com_tags/helpers',
+			'/libraries/idna_convert',
 		);
 
 		jimport('joomla.filesystem.file');

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-26.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-26.sql
@@ -0,0 +1 @@
+DELETE FROM `#__extensions` WHERE `extension_id` = 104;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-26.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-07-26.sql
@@ -0,0 +1 @@
+DELETE FROM "#__extensions" WHERE "extension_id" = 104;
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-26.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-07-26.sql
@@ -0,0 +1 @@
+DELETE FROM [#__extensions] WHERE [extension_id] = 104;
diff --git a/administrator/manifests/libraries/idna_convert.xml b/administrator/manifests/libraries/idna_convert.xml
diff --git a/build.xml b/build.xml
@@ -74,7 +74,7 @@
 	<target name="phpdoc" description="Generate API documentation using phpDocumentor">
 		<exec executable="phpdoc">
 			<arg value="-i" />
-			<arg path="${basedir}/libraries/vendor/joomla/*/Tests/,${basedir}/libraries/vendor/joomla/string/src/phputf8/,${basedir}/libraries/vendor/composer/,${basedir}/libraries/vendor/joomla/event/vendor/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/_Tests/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/Tests/,${basedir}/libraries/idna_convert/" />
+			<arg path="${basedir}/libraries/vendor/joomla/*/Tests/,${basedir}/libraries/vendor/joomla/string/src/phputf8/,${basedir}/libraries/vendor/composer/,${basedir}/libraries/vendor/joomla/event/vendor/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/_Tests/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/Tests/,${basedir}/libraries/vendor/phpwhois/idna-convert/" />
 			<arg value="-d" />
 			<arg path="${basedir}/libraries/cms/,${basedir}/libraries/joomla/,${basedir}/libraries/legacy/,${basedir}/libraries/vendor/joomla/" />
 			<arg value="-f" />

diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml
@@ -13,7 +13,6 @@
  <!-- Exclude 3rd party libraries and Framework code. -->
  <exclude-pattern type="relative">libraries/compat/password/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/fof/*</exclude-pattern>
- <exclude-pattern type="relative">libraries/idna_convert/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/phputf8/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/simplepie/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/phpass/*</exclude-pattern>

diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "ircmaxell/password-compat": "1.*",
         "leafo/lessphp": "0.3.9",
         "phpmailer/phpmailer": "5.2.9",
+        "phpwhois/idna-convert": "~0.9",
         "symfony/yaml": "2.*"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
@@ -516,7 +516,6 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (101, 'SimplePie', 'library', 'simplepie', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (200, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),

diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
@@ -506,7 +506,6 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (101, 'SimplePie', 'library', 'simplepie', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
 

diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
@@ -810,8 +810,6 @@ SELECT 102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0,
 UNION ALL
 SELECT 103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
-SELECT 104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
-UNION ALL
 SELECT 105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
 SELECT 106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;

diff --git a/language/en-GB/en-GB.lib_idna_convert.sys.ini b/language/en-GB/en-GB.lib_idna_convert.sys.ini
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -30,7 +30,6 @@
 		<filename>en-GB.ini</filename>
 		<filename>en-GB.lib_fof.ini</filename>
 		<filename>en-GB.lib_fof.sys.ini</filename>
-		<filename>en-GB.lib_idna_convert.sys.ini</filename>
 		<filename>en-GB.lib_joomla.ini</filename>
 		<filename>en-GB.lib_joomla.sys.ini</filename>
 		<filename>en-GB.lib_phpass.sys.ini</filename>