Merge branch '4.0-dev' of github.com:joomla/joomla-cms into workflow-v3

# Conflicts:
#	installation/sql/postgresql/joomla.sql
#	plugins/content/pagenavigation/pagenavigation.php

.drone.yml

@@ -244,6 +244,32 @@ steps:
       status:
         - failure
 
+  - name: packager
+    image: joomlaprojects/docker-images:packager
+    environment:
+      FTP_USERNAME:
+        from_secret: ftpusername
+      FTP_PASSWORD:
+        from_secret: ftppassword
+      FTP_HOSTNAME: ci.joomla.org
+      FTP_PORT: "21"
+      FTP_DEST_DIR: /artifacts
+      FTP_VERIFY: "false"
+      FTP_SECURE: "true"
+      HTTP_ROOT: "https://ci.joomla.org:444/artifacts"
+      DRONE_PULL_REQUEST: DRONE_PULL_REQUEST
+      DRONE_COMMIT: DRONE_COMMIT
+      GITHUB_TOKEN:
+        from_secret: github_token
+    commands:
+      - /bin/drone_build.sh
+    volumes:
+      - name: reference
+        path: /reference
+    when:
+      branch:
+        - 4.0-dev
+
   - name: analysis4x
     image: rips/rips-cli:3.2.2
     depends_on: [ api-tests ]
@@ -308,6 +334,6 @@ services:
 
 ---
 kind: signature
-hmac: 7649a6f9d7d15da3d8723dd7cf2d8328edc5040fb53308e10c6f07b901f87b22
+hmac: f48ed8ebb03e09c20cc11438603de357c797c739962ce199cd49e929ff6886e2
 
 ...

.eslintignore

@@ -1,15 +1,17 @@
-# A list of files to ignore from linting
-*.js
-!*.es6.js
-administrator/components/com_media/node_modules/uri-js/node_modules/punycode/punycode.es6.js
-media
-*.vue
-# TODO: Fix the webcomponents codestyle then also allow linting on them
-joomla-editor-codemirror.w-c.es6.js
-joomla-field-fancy-select.w-c.es6.js
-joomla-field-module-order.w-c.es6.js
-joomla-field-permissions.w-c.es6.js
-joomla-field-send-test-mail.w-c.es6.js
-joomla-field-simple-color.w-c.es6.js
-joomla-field-subform.w-c.es6.js
-# End of TODO
+# A list of files to ignore from linting
+*.js
+!*.es6.js
+administrator/components/com_media/node_modules/uri-js/node_modules/punycode/punycode.es6.js
+media
+*.vue
+# Don't validate temporary build files
+build/tmp
+# TODO: Fix the webcomponents codestyle then also allow linting on them
+joomla-editor-codemirror.w-c.es6.js
+joomla-field-fancy-select.w-c.es6.js
+joomla-field-module-order.w-c.es6.js
+joomla-field-permissions.w-c.es6.js
+joomla-field-send-test-mail.w-c.es6.js
+joomla-field-simple-color.w-c.es6.js
+joomla-field-subform.w-c.es6.js
+# End of TODO

.gitignore

@@ -12,7 +12,6 @@
 /cache
 /installation/cache
 /installation/sessions
-/libraries/autoload_psr4.php
 /tmp
 /configuration.php
 /.htaccess
@@ -37,6 +36,8 @@ composer.phar
 /.phpunit.result.cache
 /tests/Codeception/acceptance.suite.yml
 /tests/Codeception/_output/
+/tests/Codeception/api.suite.yml
+
 
 # Vendor directory handeling
 /libraries/vendor

.hound.yml

@@ -8,7 +8,7 @@ scss-lint:
   version: 0.59.0
 
 eslint:
-  version: 5.16.0
+  version: 6.8.0
   enabled: true
   config_file: .eslintrc
   ignore_file: .eslintignore

README.md

@@ -58,6 +58,11 @@ composer install
 npm ci
 ```
 
+**Things to be aware of when pulling:**
+Joomla creates a cache of the namespaces of its extensions in `JOOMLA_ROOT/administrator/cache/autoload_psr4.php`. If
+extensions are created, deleted or removed in git then this file needs to be recreated. You can simply delete the file
+and it will be regenerated on the next call to Joomla.
+
 Do you want to improve Joomla?
 --------------------
 * Where to [request a feature](https://issues.joomla.org)?

administrator/components/com_actionlogs/config.xml

@@ -28,5 +28,31 @@
 			multiple="true"
 			default="com_banners,com_cache,com_categories,com_checkin,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_tags,com_templates,com_users"
 		/>
+		<field
+			name="loggable_api"
+			type="radio"
+			label="COM_ACTIONLOGS_API_LOGGING_LABEL"
+			layout="joomla.form.field.radio.switcher"
+			default="0"
+			filter="integer"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+		<field
+			name="loggable_verbs"
+			type="list"
+			label="COM_ACTIONLOGS_LOG_VERBS_LABEL"
+			multiple="true"
+			showon="loggable_api:1"
+			default="GET"
+			validate="options"
+			>
+			<option value="GET">COM_ACTIONLOGS_FIELD_VALUE_GET</option>
+			<option value="POST">COM_ACTIONLOGS_FIELD_VALUE_POST</option>
+			<option value="DELETE">COM_ACTIONLOGS_FIELD_VALUE_DELETE</option>
+			<option value="PUT">COM_ACTIONLOGS_FIELD_VALUE_PUT</option>
+			<option value="PATCH">COM_ACTIONLOGS_FIELD_VALUE_PATCH</option>
+		</field>
 	</fieldset>
 </config>

administrator/components/com_actionlogs/src/Controller/ActionlogsController.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Controller;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use DateTimeZone;
 use Exception;
@@ -40,7 +40,7 @@ class ActionlogsController extends AdminController
 	 *                                         Recognized key values include 'name', 'default_task', 'model_path', and
 	 *                                         'view_path' (this list is not meant to be comprehensive).
 	 * @param   MVCFactoryInterface  $factory  The factory.
-	 * @param   CmsApplication       $app      The JApplication for the dispatcher
+	 * @param   CMSApplication       $app      The JApplication for the dispatcher
 	 * @param   Input                $input    Input
 	 *
 	 * @since   3.9.0

administrator/components/com_actionlogs/src/Controller/DisplayController.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Controller;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\BaseController;
 

administrator/components/com_actionlogs/src/Field/ExtensionField.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Field;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;

administrator/components/com_actionlogs/src/Field/LogcreatorField.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Field;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\ListField;

administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Field;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Field\PredefinedlistField;

administrator/components/com_actionlogs/src/Field/LogtypeField.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Field;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;

administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Helper;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Generator;
 use Joomla\CMS\Date\Date;

administrator/components/com_actionlogs/src/Model/ActionlogModel.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Model;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;

administrator/components/com_actionlogs/src/Model/ActionlogsModel.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Model;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use DateTimeZone;
 use Exception;

administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\Plugin;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;

administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php

@@ -9,7 +9,7 @@
 
 namespace Joomla\Component\Actionlogs\Administrator\View\Actionlogs;
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Exception;
 use Joomla\CMS\Component\ComponentHelper;