Compatibility - Provide separate testsuite for PHP 7.1+

.drone.jsonnet

@@ -19,15 +19,12 @@ local composer(phpversion, params) = {
     commands: [
         "php -v",
         "composer update " + params,
-        if phpversion == "8.0" then "wget https://ci.joomla.org/artifacts/phpunit8_php8_match.patch",
-        if phpversion == "8.0" then "patch -N -p0 < phpunit8_php8_match.patch"
     ]
 };
 
 local phpunit(phpversion) = {
     name: "PHPUnit",
     image: "joomlaprojects/docker-images:php" + phpversion,
-    [if phpversion == "8.0" then "failure"]: "ignore",
     commands: ["vendor/bin/phpunit"]
 };
 
@@ -127,13 +124,12 @@ local pipeline(name, phpversion, params) = {
         ]
     },
     pipeline("5.3", "5.3", "--prefer-stable"),
-    pipeline("5.4", "5.4", "--prefer-stable"),
-    pipeline("5.5", "5.5", "--prefer-stable"),
     pipeline("5.6", "5.6", "--prefer-stable"),
     pipeline("7.0", "7.0", "--prefer-stable"),
     pipeline("7.1", "7.1", "--prefer-stable"),
     pipeline("7.2", "7.2", "--prefer-stable"),
     pipeline("7.3", "7.3", "--prefer-stable"),
     pipeline("7.4", "7.4", "--prefer-stable"),
-    pipeline("8.0", "8.0", "--ignore-platform-reqs --prefer-stable")
+    pipeline("8.0", "8.0", "--prefer-stable"),
+    pipeline("8.1", "8.1", "--prefer-stable")
 ]

.drone.yml

@@ -99,8 +99,6 @@ steps:
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
@@ -117,26 +115,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 5.4
+name: PHP 5.6
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php5.4
+  image: joomlaprojects/docker-images:php5.6
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php5.4
+  image: joomlaprojects/docker-images:php5.6
   commands:
   - vendor/bin/phpunit
 
@@ -147,26 +143,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 5.5
+name: PHP 7.0
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php5.5
+  image: joomlaprojects/docker-images:php7.0
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php5.5
+  image: joomlaprojects/docker-images:php7.0
   commands:
   - vendor/bin/phpunit
 
@@ -177,26 +171,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 5.6
+name: PHP 7.1
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php5.6
+  image: joomlaprojects/docker-images:php7.1
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php5.6
+  image: joomlaprojects/docker-images:php7.1
   commands:
   - vendor/bin/phpunit
 
@@ -207,26 +199,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 7.0
+name: PHP 7.2
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php7.0
+  image: joomlaprojects/docker-images:php7.2
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php7.0
+  image: joomlaprojects/docker-images:php7.2
   commands:
   - vendor/bin/phpunit
 
@@ -237,26 +227,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 7.1
+name: PHP 7.3
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php7.1
+  image: joomlaprojects/docker-images:php7.3
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php7.1
+  image: joomlaprojects/docker-images:php7.3
   commands:
   - vendor/bin/phpunit
 
@@ -267,26 +255,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 7.2
+name: PHP 7.4
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php7.2
+  image: joomlaprojects/docker-images:php7.4
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php7.2
+  image: joomlaprojects/docker-images:php7.4
   commands:
   - vendor/bin/phpunit
 
@@ -297,26 +283,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 7.3
+name: PHP 8.0
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php7.3
+  image: joomlaprojects/docker-images:php8.0
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php7.3
+  image: joomlaprojects/docker-images:php8.0
   commands:
   - vendor/bin/phpunit
 
@@ -327,26 +311,24 @@ volumes:
 
 ---
 kind: pipeline
-name: PHP 7.4
+name: PHP 8.1
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: composer
-  image: joomlaprojects/docker-images:php7.4
+  image: joomlaprojects/docker-images:php8.1
   commands:
   - php -v
   - composer update --prefer-stable
-  - ""
-  - ""
   volumes:
   - name: composer-cache
     path: /tmp/composer-cache
 
 - name: PHPUnit
-  image: joomlaprojects/docker-images:php7.4
+  image: joomlaprojects/docker-images:php8.1
   commands:
   - vendor/bin/phpunit
 
@@ -355,39 +337,8 @@ volumes:
   host:
     path: /tmp/composer-cache
 
----
-kind: pipeline
-name: PHP 8.0
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: composer
-  image: joomlaprojects/docker-images:php8.0
-  commands:
-  - php -v
-  - composer update --ignore-platform-reqs --prefer-stable
-  - wget https://ci.joomla.org/artifacts/phpunit8_php8_match.patch
-  - patch -N -p0 < phpunit8_php8_match.patch
-  volumes:
-  - name: composer-cache
-    path: /tmp/composer-cache
-
-- name: PHPUnit
-  image: joomlaprojects/docker-images:php8.0
-  commands:
-  - vendor/bin/phpunit
-  failure: ignore
-
-volumes:
-- name: composer-cache
-  host:
-    path: /tmp/composer-cache
-
 ---
 kind: signature
-hmac: d21b6b782f740c9a4fdab2c148f95508a27917023b8c7c8741719e92f362cca8
+hmac: a001e7574875aa67206e82d45858a1f9aaca2ebbd32328123000bd06c1b0ec2d
 
 ...

Tests/UriHelperTest.php → Tests/php53/UriHelperTest.php

@@ -4,7 +4,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-namespace Joomla\Uri\Tests;
+namespace Joomla\Uri\Tests\php53;
 
 use Joomla\Uri\UriHelper;
 use PHPUnit\Framework\TestCase;

Tests/UriImmutableTest.php → Tests/php53/UriImmutableTest.php

@@ -4,7 +4,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-namespace Joomla\Uri\Tests;
+namespace Joomla\Uri\Tests\php53;
 
 use Joomla\Uri\UriImmutable;
 use PHPUnit\Framework\TestCase;
@@ -343,14 +343,12 @@ public function testisSsl()
     /**
      * @testdox Calling the constructor of an instantiated UriImmutable object throws an exception.
      *
-     * @since __DEPLOY_VERSION__
+     * @expectedException \BadMethodCallException
      */
 	public function testReconstruction()
 	{
 		$uri = new UriImmutable();
 
-		$this->expectException('BadMethodCallException');
-
 		$uri->__construct();
 	}
 }

Tests/UriTest.php → Tests/php53/UriTest.php

@@ -4,7 +4,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-namespace Joomla\Uri\Tests;
+namespace Joomla\Uri\Tests\php53;
 
 use Joomla\Uri\Uri;
 use Joomla\Test\TestHelper;