Merge remote-tracking branch 'origin/4.0-dev' into 4.0-dev

.drone.yml

@@ -21,7 +21,17 @@ steps:
 
   - name: crowdin
     image: joomlaprojects/docker-images:php7.2
+    environment:
+      CROWDIN_API_KEY:
+        from_secret: CROWDIN_API_KEY
     commands:
       - echo $(date)
       - ./administrator/components/com_patchtester/vendor/bin/crowdin --upload
       - echo $(date)
+    when:
+      event: push
+---
+kind: signature
+hmac: db121d6418e6f0702b311cce34d0a0dd12a4b88814138a4d1d02c1e6189e9d43
+
+...

.travis.yml

@@ -1,25 +0,0 @@
-# Forces new Travis-CI Infrastructure
-sudo: false
-
-language: php
-
-env:
-  global:
-    - secure: DW+TBREK61G9CahBZ+3FoMD8GvsGyZHPNW0lTR0gpKmGvmjkJXWxgiB2ZlnBMIPTq3CTbV0vZa/XNHELlhjHLMUCz1aQJ+07JnNt+nVvhmpUgS1C2Nci8jpYP6hjDadOU+D4b90YclrrQDcYbeCHuoLW2kiqiuB+DXyoCWEJXls=
-    - RUN_PHPCS="no"
-    - UPDATE_CROWDIN="no"
-
-matrix:
-  include:
-    - php: 5.6
-      env: RUN_PHPCS="yes"
-    - php: 7.0
-      env: UPDATE_CROWDIN="yes"
-
-before_script:
-  # Make sure all dev dependencies are installed
-  - composer install
-
-script:
-  - if [[ $RUN_PHPCS == "yes" ]]; then administrator/components/com_patchtester/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla --ignore=./*tmpl/*,administrator/components/com_patchtester/vendor/* administrator/components/com_patchtester; fi
-  - if [[ $UPDATE_CROWDIN == "yes" && $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" ]]; then administrator/components/com_patchtester/vendor/bin/crowdin --upload; fi

administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php

@@ -114,12 +114,6 @@ class PullsHtmlView extends DefaultHtmlView
 		// Make text strings available in the JavaScript API
 		Text::script('COM_PATCHTESTER_CONFIRM_RESET');
 
-		// Set a warning on 4.0 branch
-		if (version_compare(JVERSION, '4.0', 'ge'))
-		{
-			Factory::getApplication()->enqueueMessage(Text::_('COM_PATCHTESTER_40_WARNING'), 'warning');
-		}
-
 		return parent::render();
 	}
 

administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini

@@ -4,7 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_PATCHTESTER="Joomla! Patch Tester"
-COM_PATCHTESTER_40_WARNING="While Joomla! 4.0 is in development, using the patch tester is considered experimental since breaking changes may be merged into Joomla, including the code contained in a patch."
 COM_PATCHTESTER_API_LIMIT_ACTION="The GitHub API rate limit has been reached for this resource, could not connect to GitHub to perform the requested action. The rate limit will reset at %s"
 COM_PATCHTESTER_API_LIMIT_LIST="The GitHub API rate limit has been reached for this resource, could not connect to GitHub for updated data. The rate limit will reset at %s"
 COM_PATCHTESTER_APPLIED="Applied"

composer.json

@@ -9,10 +9,9 @@
         "vendor-dir": "administrator/components/com_patchtester/vendor"
     },
     "require": {
-        "php": "^5.3.10|^7.0"
+        "php": "^7.2"
     },
     "require-dev": {
-        "php": "^5.6|^7.0",
         "joomla/crowdin-sync": "dev-master",
         "joomla/cms-coding-standards": "~2.0.0-alpha2@dev",
         "joomla/coding-standards": "~3.0@dev",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8d399762bedfc6b5beec9b2d9b469030",
+    "content-hash": "ea3333f86c6c0231db3f7c0611ade016",
     "packages": [],
     "packages-dev": [
         {
@@ -1147,9 +1147,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^5.3.10|^7.0"
+        "php": "^7.2"
     },
-    "platform-dev": {
+    "platform-dev": []
-        "php": "^5.6|^7.0"
-    }
 }