Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into j…

…4finder_commonwords # Conflicts: # installation/sql/mysql/joomla.sql # installation/sql/postgresql/joomla.sql
joomla · Jun 20, 2018 · 753788e · 753788e
2 parents 6b416a6 + 6e949df
commit 753788e
Show file tree

Hide file tree

Showing 273 changed files with 22,472 additions and 2,730 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -7,7 +7,7 @@ pipeline:
     image: joomlaprojects/docker-phpcs
     commands:
       - echo $(date)
-      - /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .
+      - /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --encoding=utf-8 --standard=build/phpcs/Joomla .
       - echo $(date)
 
   initdb:

diff --git a/.gitignore b/.gitignore
@@ -31,9 +31,6 @@ node_modules/
 /build/assets_tmp
 /scss-lint-report.xml
 /dev/assets/packages.json
-# We are ignoring this as a temporary measure until Node 8 and npm5 become the LTS release
-# and we can require it.
-package-lock.json
 yarn.lock
 
 # Removed in Joomla 4 #
@@ -221,6 +218,11 @@ Desktop.ini
 /libraries/vendor/simplepie/simplepie/build
 /libraries/vendor/simplepie/simplepie/idn/ReadMe.txt
 /libraries/vendor/simplepie/simplepie/composer.json
+/libraries/vendor/wamania/php-stemmer/.gitignore
+/libraries/vendor/wamania/php-stemmer/README.md
+/libraries/vendor/wamania/php-stemmer/composer.json
+/libraries/vendor/wamania/php-stemmer/phpunit.xml.dist
+/libraries/vendor/wamania/php-stemmer/test
 /libraries/vendor/zendframework/zend-diactoros/.coveralls.yml
 /libraries/vendor/zendframework/zend-diactoros/CHANGELOG.md
 /libraries/vendor/zendframework/zend-diactoros/composer.json

diff --git a/administrator/components/com_admin/Model/SysinfoModel.php b/administrator/components/com_admin/Model/SysinfoModel.php
@@ -242,7 +242,6 @@ public function &getPhpSettings()
 		}
 
 		$this->php_settings = array(
-			'safe_mode'          => ini_get('safe_mode') == '1',
 			'display_errors'     => ini_get('display_errors') == '1',
 			'short_open_tag'     => ini_get('short_open_tag') == '1',
 			'file_uploads'       => ini_get('file_uploads') == '1',

diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-16.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-16.sql
@@ -1,4 +1,4 @@
-INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `namespace`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES (489, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `namespace`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES (490, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
 DROP TABLE IF EXISTS `#__finder_terms_common`;
 CREATE TABLE `#__finder_terms_common` (
   `term` varchar(75) NOT NULL DEFAULT '',

diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-16.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-16.sql
@@ -1,4 +1,4 @@
-INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "namespace", "checked_out", "checked_out_time", "ordering", "state") VALUES (489, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "namespace", "checked_out", "checked_out_time", "ordering", "state") VALUES (490, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
 DROP TABLE IF EXISTS "#__finder_terms_common";
 CREATE TABLE "#__finder_terms_common" (
   "term" varchar(75) NOT NULL,

diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php b/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
@@ -29,14 +29,6 @@
 			</tr>
 		</tfoot>
 		<tbody>
-			<tr>
-				<td>
-					<?php echo JText::_('COM_ADMIN_SAFE_MODE'); ?>
-				</td>
-				<td>
-					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['safe_mode']); ?>
-				</td>
-			</tr>
 			<tr>
 				<td>
 					<?php echo JText::_('COM_ADMIN_OPEN_BASEDIR'); ?>

diff --git a/administrator/components/com_finder/Field/BranchesField.php b/administrator/components/com_finder/Field/BranchesField.php
@@ -10,16 +10,14 @@
 
 defined('JPATH_BASE') or die();
 
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
+use Joomla\CMS\Form\Field\ListField;
 
 /**
  * Search Branches field for the Finder package.
  *
  * @since  3.5
  */
-class BranchesField extends \JFormFieldList
+class BranchesField extends ListField
 {
 	/**
 	 * The form field type.

diff --git a/administrator/components/com_finder/Field/ContentmapField.php b/administrator/components/com_finder/Field/ContentmapField.php
@@ -11,17 +11,15 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\GroupedlistField;
 use Joomla\Component\Finder\Administrator\Helper\FinderHelperLanguage;
 
-FormHelper::loadFieldClass('groupedlist');
-
 /**
  * Supports a select grouped list of finder content map.
  *
  * @since  3.6.0
  */
-class ContentmapField extends \JFormFieldGroupedList
+class ContentmapField extends GroupedlistField
 {
 	/**
 	 * The form field type.

diff --git a/administrator/components/com_finder/Field/ContenttypesField.php b/administrator/components/com_finder/Field/ContenttypesField.php
@@ -11,18 +11,16 @@
 defined('JPATH_BASE') or die();
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\Utilities\ArrayHelper;
 use Joomla\Component\Finder\Administrator\Helper\FinderHelperLanguage;
 
-FormHelper::loadFieldClass('list');
-
 /**
  * Content Types Filter field for the Finder package.
  *
  * @since  3.6.0
  */
-class ContenttypesField extends \JFormFieldList
+class ContenttypesField extends ListField
 {
 	/**
 	 * The form field type.

diff --git a/administrator/components/com_finder/Field/DirectoriesField.php b/administrator/components/com_finder/Field/DirectoriesField.php
diff --git a/administrator/components/com_finder/Field/SearchfilterField.php b/administrator/components/com_finder/Field/SearchfilterField.php
@@ -6,21 +6,20 @@
  * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
+
 namespace Joomla\Component\Finder\Administrator\Field;
 
 defined('JPATH_BASE') or die();
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
-
-FormHelper::loadFieldClass('list');
+use Joomla\CMS\Form\Field\ListField;
 
 /**
  * Search Filter field for the Finder package.
  *
  * @since  2.5
  */
-class SearchfilterField extends \JFormFieldList
+class SearchfilterField extends ListField
 {
 	/**
 	 * The form field type.

diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml
@@ -269,29 +269,6 @@
 			default="0.3"
 		/>
 
-		<field
-			name="stem"
-			type="radio"
-			label="COM_FINDER_CONFIG_STEMMER_ENABLE_LABEL"
-			class="switcher"
-			default="1"
-			>
-			<option value="0">JNO</option>
-			<option value="1">JYES</option>
-		</field>
-
-		<field
-			name="stemmer"
-			type="list"
-			label="COM_FINDER_CONFIG_STEMMER_LABEL"
-			default="snowball"
-			showon="stem:1" 
-			>
-			<option value="porter_en">COM_FINDER_CONFIG_STEMMER_PORTER_EN</option>
-			<option value="fr">COM_FINDER_CONFIG_STEMMER_FR</option>
-			<option value="snowball">COM_FINDER_CONFIG_STEMMER_SNOWBALL</option>
-		</field>
-
 		<field
 			name="enable_logging"
 			type="radio"