Merge branch '4.0-dev' into patch-117

.appveyor.yml

@@ -112,4 +112,4 @@ before_test:
 
 test_script:
   - cd C:\projects\joomla-cms
-  - libraries/vendor/bin/phpunit
+  - libraries/vendor/bin/phpunit --testsuite Unit

.drone.yml

@@ -23,21 +23,25 @@ steps:
     image: joomlaprojects/docker-tools:develop
     depends_on: [ restore-cache ]
     commands:
+      - composer validate --no-check-all --strict
       - composer install --no-progress --no-suggest
 
   - name: phpcs
-    image: php:7.2
+    image: joomlaprojects/docker-images:php7.2
     depends_on: [ composer ]
     commands:
       - echo $(date)
-      - ./libraries/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla .
+      - ./libraries/vendor/bin/phpcs --config-set installed_paths ../../joomla/cms-coding-standards/lib,../../joomla/coding-standards/Joomla/ExampleRulesets,../../joomla/coding-standards
+      - ./libraries/vendor/bin/phpcs --config-set colors 1
+      - ./libraries/vendor/bin/phpcs --config-set php_version 70200
+      - ./libraries/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php --ignore=libraries/vendor/*,tests/*,build/*,node_modules/*,media/*,libraries/autoload_psr4.php,installation/template/error.php -p --standard=libraries/vendor/joomla/cms-coding-standards/lib/Joomla-CMS .
       - echo $(date)
 
   - name: npm
     image: joomlaprojects/docker-tools:develop
     depends_on: [ phpcs ]
     commands:
-      - npm install --unsafe-perm
+      - npm ci --unsafe-perm
 
   - name: rebuild-cache
     image: drillster/drone-volume-cache
@@ -58,30 +62,90 @@ steps:
     image: php:7.2
     commands:
       - php -v
-      - ./libraries/vendor/bin/phpunit
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php73-unit
     depends_on: [ phpcs ]
     image: php:7.3
     commands:
       - php -v
-      - ./libraries/vendor/bin/phpunit
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php74-unit
     depends_on: [ phpcs ]
     image: phpdaily/php:7.4-dev
     failure: ignore
     commands:
       - php -v
-      - ./libraries/vendor/bin/phpunit
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php80-unit
     depends_on: [ phpcs ]
     image: phpdaily/php:8.0-dev
     failure: ignore
     commands:
       - php -v
-      - ./libraries/vendor/bin/phpunit
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
+
+  - name: php72-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php7.2
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
+  - name: php73-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php7.3
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
+  - name: php74-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php7.4
+    failure: ignore
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
+  - name: php80-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.0
+    failure: ignore
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
+  - name: php72-integration-pgsql
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php7.2
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
+
+#  - name: php73-integration-pgsql
+#    depends_on: [ npm ]
+#    image: joomlaprojects/docker-images:php7.3
+#    commands:
+#      - php -v
+#      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
+
+#  - name: php74-integration-pgsql
+#    depends_on: [ npm ]
+#    image: joomlaprojects/docker-images:php7.4
+#    failure: ignore
+#    commands:
+#      - php -v
+#      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
+
+#  - name: php80-integration-pgsql
+#    depends_on: [ npm ]
+#    image: joomlaprojects/docker-images:php8.0
+#    failure: ignore
+#    commands:
+#      - php -v
+#      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
 
   - name: javascript-cs
     depends_on: [ npm ]
@@ -193,6 +257,6 @@ services:
 
 ---
 kind: signature
-hmac: b3723ea069a4139d4b9aef660f8fa5e01cc0c59017a77438a7245e0d552ef72a
+hmac: 25e452206bc4a115142bddb1758d1dfb6c056977ffbabc7d0b87afa432d60d28
 
 ...

.github/CODEOWNERS

@@ -35,22 +35,22 @@ libraries/src/Updater/*  @rdeutz @wilsonge @zero-24
 build/jenkins/*  @rdeutz
 build/travis/*  @rdeutz
 tests/codeception/*  @rdeutz
-tests/javascript/*  @dgrammatiko @rdeutz
+tests/javascript/*  @wilsonge @rdeutz
 tests/unit/*  @rdeutz
 .appveyor.yml  @rdeutz
 .drone.yml  @rdeutz
 .hound.yml  @wilsonge
 .travis.yml  @rdeutz
 appveyor-phpunit.xml  @rdeutz
 codeception.yml  @rdeutz
-karma.conf.js  @dgrammatiko @rdeutz
+karma.conf.js  @wilsonge @rdeutz
 phpunit.xml.dist  @rdeutz
 RoboFile.dist.ini  @rdeutz
 RoboFile.php  @rdeutz
 travis-phpunit.xml  @rdeutz
 
 # Core JS
-media/*/js/*  @dgrammatiko
+media/*/js/*  @wilsonge
 
 # CSP Tooling
 plugins/system/httpheaders/*  @zero-24

administrator/components/com_actionlogs/Helper/ActionlogsHelper.php

@@ -183,6 +183,18 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 			$messageData['extension_name'] = Text::_($messageData['extension_name']);
 		}
 
+		// Translating application
+		if (isset($messageData['app']))
+		{
+			$messageData['app'] = Text::_($messageData['app']);
+		}
+
+		// Translating type
+		if (isset($messageData['type']))
+		{
+			$messageData['type'] = Text::_($messageData['type']);
+		}
+
 		$linkMode = Factory::getApplication()->get('force_ssl', 0) >= 1 ? 1 : -1;
 
 		foreach ($messageData as $key => $value)
@@ -198,7 +210,7 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 				$value = $links[$value];
 			}
 
-			$message = str_replace('{' . $key . '}', Text::_($value), $message);
+			$message = str_replace('{' . $key . '}', $value, $message);
 		}
 
 		return $message;

administrator/components/com_actionlogs/Libraries/ActionLogPlugin.php → administrator/components/com_actionlogs/Plugin/ActionLogPlugin.php

@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\Component\Actionlogs\Administrator\Libraries;
+namespace Joomla\Component\Actionlogs\Administrator\Plugin;
 
 defined('_JEXEC') or die;
 

administrator/components/com_actionlogs/tmpl/actionlogs/default.php

@@ -103,7 +103,7 @@
 							</td>
 							<th scope="row">
 								<?php echo ActionlogsHelper::getHumanReadableLogMessage($item); ?>
-							</td>
+							</th>
 							<td>
 								<?php echo $this->escape(Text::_($extension)); ?>
 							</td>

administrator/components/com_admin/Model/SysinfoModel.php

@@ -24,7 +24,7 @@
  *
  * @since  1.6
  */
-class SysInfoModel extends BaseDatabaseModel
+class SysinfoModel extends BaseDatabaseModel
 {
 	/**
 	 * Some PHP settings

administrator/components/com_admin/View/Sysinfo/HtmlView.php

@@ -18,7 +18,7 @@
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Admin\Administrator\Model\SysInfoModel;
+use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
 /**
  * Sysinfo View class for the Admin component
@@ -86,7 +86,7 @@ public function display($tpl = null): void
 			throw new Notallowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
 		}
 
-		/** @var SysInfoModel $model */
+		/** @var SysinfoModel $model */
 		$model             = $this->getModel();
 		$this->phpSettings = $model->getPhpSettings();
 		$this->config      = $model->getconfig();

administrator/components/com_admin/View/Sysinfo/JsonView.php

@@ -16,7 +16,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\AbstractView;
-use Joomla\Component\Admin\Administrator\Model\SysInfoModel;
+use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
 /**
  * Sysinfo View class for the Admin component
@@ -64,7 +64,7 @@ public function display($tpl = null): void
 	 */
 	protected function getLayoutData(): array
 	{
-		/** @var SysInfoModel $model */
+		/** @var SysinfoModel $model */
 		$model = $this->getModel();
 
 		return [

administrator/components/com_admin/View/Sysinfo/TextView.php

@@ -16,7 +16,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\AbstractView;
-use Joomla\Component\Admin\Administrator\Model\SysInfoModel;
+use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
 
 /**
  * Sysinfo View class for the Admin component
@@ -81,7 +81,7 @@ public function display($tpl = null): void
 	 */
 	protected function getLayoutData(): array
 	{
-		/** @var SysInfoModel $model */
+		/** @var SysinfoModel $model */
 		$model = $this->getModel();
 
 		return [