Merge branch 'staging' into improveReinstall

.travis.yml

@@ -15,19 +15,21 @@ env:
 matrix:
   fast_finish: true
   include:
-    - node_js: 6.1
-      sudo: true
-      env: RUN_JAVASCRIPT_TESTS="yes" RUN_UNIT_TESTS="no"
+    - php: 5.6
+      env: RUN_PHPCS="yes" RUN_UNIT_TESTS="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
     - php: 5.3
       env: INSTALL_APC="yes"
     - php: 5.4
       env: INSTALL_APC="yes"
     - php: 5.5
       env: INSTALL_APCU="yes"
     - php: 5.6
-      env: RUN_PHPCS="yes" INSTALL_APCU="yes"
+      env: INSTALL_APCU="yes"
     - php: 7.0
       env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
+    - node_js: 6.1
+      sudo: true
+      env: RUN_JAVASCRIPT_TESTS="yes" RUN_UNIT_TESTS="no"
     - php: 7.1
       env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
     - php: hhvm
@@ -58,11 +60,11 @@ before_script:
   # JavaScript tests
   - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then export DISPLAY=:99.0; bash build/travis/javascript-tests.sh $PWD; fi
   # Make sure all dev dependencies are installed
-  - if [[ $RUN_UNIT_TESTS == "yes" ]]; then bash build/travis/unit-tests.sh $PWD; fi
+  - if [[ ( $RUN_UNIT_TESTS == "yes" ) || ( $RUN_PHPCS == "yes" ) ]]; then bash build/travis/unit-tests.sh $PWD; fi
 
 script:
-  - if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi
   - if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
+  - if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi
   - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run ; fi
 
 branches:

README.txt

@@ -16,7 +16,7 @@
 	* Try out our online demo: https://demo.joomla.org/
 
 4- How to find a Joomla! translation?
-	* Repository of accredited language packs: http://community.joomla.org/translations.html
+	* Repository of accredited language packs: https://community.joomla.org/translations.html
 	* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site/Installing_New_Language
 	* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site
 

administrator/components/com_admin/script.php

@@ -1427,6 +1427,9 @@ public function deleteUnexistingFiles()
 			'/administrator/templates/isis/js/bootstrap.min.js',
 			'/media/system/js/permissions.min.js',
 			'/libraries/platform.php',
+			// Joomla! 3.6.3
+			'/media/editors/codemirror/mode/jade/jade.js',
+			'/media/editors/codemirror/mode/jade/jade.min.js',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -1523,6 +1526,8 @@ public function deleteUnexistingFiles()
 			// Joomla 3.6
 			'/libraries/simplepie/idn',
 			'/libraries/simplepie',
+			// Joomla! 3.6.3
+			'/media/editors/codemirror/mode/jade',
 		);
 
 		jimport('joomla.filesystem.file');

administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql

@@ -1,9 +1,9 @@
-SET IDENTITY_INSERT #__extensions  ON;
+SET IDENTITY_INSERT [#__extensions] ON;
 
-INSERT INTO #__extensions (extension_id, name, type, element, folder, client_id, enabled, access, protected, manifest_cache, params, custom_data, system_data, checked_out, checked_out_time, ordering, state)
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
 SELECT 28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0;
 
-SET IDENTITY_INSERT #__extensions  OFF;
+SET IDENTITY_INSERT [#__extensions] OFF;
 
-INSERT INTO #__menu (menutype, title, alias, note, path, link, type, published, parent_id, level, component_id, ordering, checked_out, checked_out_time, browserNav, access, img, template_style_id, params, lft, rgt, home, language, client_id)
+INSERT INTO [#__menu] ([menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [ordering], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id])
 SELECT 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 0, 1, 1, 28, 0, 0, '1900-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1;

administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-19.sql

@@ -2,6 +2,6 @@ ALTER TABLE [#__languages] ADD  [access] INTEGER CONSTRAINT DF_languages_access
 
 CREATE UNIQUE INDEX idx_access ON [#__languages] (access);
 
-UPDATE [#__categories] SET extension = 'com_users.notes' WHERE extension = 'com_users';
+UPDATE [#__categories] SET [extension] = 'com_users.notes' WHERE [extension] = 'com_users';
 
-UPDATE [#__extensions] SET enabled = '1' WHERE protected = '1' AND [type] <> 'plugin';
+UPDATE [#__extensions] SET [enabled] = '1' WHERE [protected] = '1' AND [type] <> 'plugin';

administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql

@@ -1 +1,8 @@
-INSERT INTO #__update_sites (name, type, location, enabled, last_check_timestamp) VALUES ('Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist.xml', 1, 0);INSERT INTO #__update_sites_extensions (update_site_id, extension_id) VALUES (SCOPE_IDENTITY(), 600);UPDATE  [#__assets] SET name=REPLACE( name, 'com_user.notes.category','com_users.category'  );UPDATE  [#__categories] SET extension=REPLACE( extension, 'com_user.notes.category','com_users.category'  );
+INSERT INTO [#__update_sites] ([name], [type], [location], [enabled], [last_check_timestamp])
+SELECT 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist.xml', 1, 0;
+
+INSERT INTO [#__update_sites_extensions] ([update_site_id], [extension_id])
+SELECT SCOPE_IDENTITY(), 600;
+
+UPDATE [#__assets] SET [name] = REPLACE([name], 'com_user.notes.category', 'com_users.category');
+UPDATE [#__categories] SET [extension] = REPLACE([extension], 'com_user.notes.category', 'com_users.category');

administrator/components/com_admin/sql/updates/sqlazure/3.0.3.sql

@@ -1 +1 @@
-ALTER TABLE #__associations ALTER COLUMN id INT;
+ALTER TABLE [#__associations] ALTER COLUMN [id] INT;