diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3635cf9f..3ab4917e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -20,6 +20,7 @@ jobs: - '8.2' - '8.3' - '8.4' + - '8.5' steps: - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -53,6 +54,7 @@ jobs: - '8.2' - '8.3' - '8.4' + - '8.5' steps: - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/composer.json b/composer.json index 79ba3f28..9c7ff07d 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ } ], "require": { - "php": "8.1.*||8.2.*||8.3.*||8.4.*", + "php": "8.1.*||8.2.*||8.3.*||8.4.*||8.5.*", "composer/composer": "^2.8.9", "composer/pcre": "^3.3.2", "composer/semver": "^3.4.3", diff --git a/features/install-extensions.feature b/features/install-extensions.feature index 20422ed7..667ce5db 100644 --- a/features/install-extensions.feature +++ b/features/install-extensions.feature @@ -10,8 +10,8 @@ Feature: Extensions can be installed with PIE Examples: | constraint | version | - | 2.0.2 | 2.0.2 | - | ^2.0 | 2.0.2 | + | 2.0.3 | 2.0.3 | + | ^2.0 | 2.0.3 | @non-windows Example: An in-development version can be downloaded on non-Windows systems diff --git a/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.5-ts-vs16-x86_64.dll b/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.5-ts-vs16-x86_64.dll new file mode 100644 index 00000000..c78b62b1 --- /dev/null +++ b/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.5-ts-vs16-x86_64.dll @@ -0,0 +1 @@ +only a test file diff --git a/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.5-ts-vs16-x86_64.pdb b/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.5-ts-vs16-x86_64.pdb new file mode 100644 index 00000000..c78b62b1 --- /dev/null +++ b/test/assets/pie_test_ext_win/php_pie_test_ext-1.2.3-8.5-ts-vs16-x86_64.pdb @@ -0,0 +1 @@ +only a test file diff --git a/test/integration/Command/DownloadCommandTest.php b/test/integration/Command/DownloadCommandTest.php index e892ce4d..bd4cca02 100644 --- a/test/integration/Command/DownloadCommandTest.php +++ b/test/integration/Command/DownloadCommandTest.php @@ -25,7 +25,8 @@ #[CoversClass(DownloadCommand::class)] class DownloadCommandTest extends TestCase { - private const TEST_PACKAGE = 'asgrim/example-pie-extension'; + private const TEST_PACKAGE_LATEST = '2.0.3'; + private const TEST_PACKAGE = 'asgrim/example-pie-extension'; private CommandTester $commandTester; @@ -45,9 +46,9 @@ public function setUp(): void public static function validVersionsList(): array { $versionsAndExpected = [ - [self::TEST_PACKAGE, self::TEST_PACKAGE . ':2.0.2'], - [self::TEST_PACKAGE . ':*', self::TEST_PACKAGE . ':2.0.2'], - [self::TEST_PACKAGE . ':^2.0', self::TEST_PACKAGE . ':2.0.2'], + [self::TEST_PACKAGE, self::TEST_PACKAGE . ':' . self::TEST_PACKAGE_LATEST], + [self::TEST_PACKAGE . ':*', self::TEST_PACKAGE . ':' . self::TEST_PACKAGE_LATEST], + [self::TEST_PACKAGE . ':^2.0', self::TEST_PACKAGE . ':' . self::TEST_PACKAGE_LATEST], ]; if (PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400) { diff --git a/test/integration/DependencyResolver/ResolveDependencyWithComposerTest.php b/test/integration/DependencyResolver/ResolveDependencyWithComposerTest.php index 2e252d99..f3a71305 100644 --- a/test/integration/DependencyResolver/ResolveDependencyWithComposerTest.php +++ b/test/integration/DependencyResolver/ResolveDependencyWithComposerTest.php @@ -26,6 +26,7 @@ #[CoversClass(ResolveDependencyWithComposer::class)] final class ResolveDependencyWithComposerTest extends TestCase { + private const TEST_PACKAGE_LATEST = '2.0.3'; private const DOWNLOAD_URL_ANY = 'https://api.github.com/repos/asgrim/example-pie-extension/zipball/%s'; private const DOWNLOAD_URL_1_0_1_ALPHA_3 = 'https://api.github.com/repos/asgrim/example-pie-extension/zipball/115f8f8e01ee098a18ec2f47af4852be51ebece7'; private const DOWNLOAD_URL_1_0_1 = 'https://api.github.com/repos/asgrim/example-pie-extension/zipball/769f906413d6d1e12152f6d34134cbcd347ca253'; @@ -35,8 +36,8 @@ final class ResolveDependencyWithComposerTest extends TestCase public static function validVersionsList(): array { $versionsAndExpected = [ - [null, '2.0.2', self::DOWNLOAD_URL_ANY], - ['*', '2.0.2', self::DOWNLOAD_URL_ANY], + [null, self::TEST_PACKAGE_LATEST, self::DOWNLOAD_URL_ANY], + ['*', self::TEST_PACKAGE_LATEST, self::DOWNLOAD_URL_ANY], ['dev-main', 'dev-main', self::DOWNLOAD_URL_ANY], ['dev-main#769f906413d6d1e12152f6d34134cbcd347ca253', 'dev-main', self::DOWNLOAD_URL_1_0_1], ];