Skip to content

Commit 495ee37

Browse files
committed
Drop support for PHP 7.2 and 7.3
#241
1 parent 7692a62 commit 495ee37

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

.github/workflows/CI.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
# Includes php7.1-8.0, composer 2, php-xdebug, and more
14-
# https://github.com/actions/virtual-environments/blob/ubuntu18/20210318.0/images/linux/Ubuntu1804-README.md#php
15-
- os: ubuntu-18.04
16-
php: "7.2"
17-
- os: ubuntu-18.04
18-
php: "7.3"
1913
# Includes php7.4-8.x, composer 2, php-xdebug, and more
2014
# https://github.com/actions/virtual-environments/blob/ubuntu20/20210318.0/images/linux/Ubuntu2004-README.md#php
2115
- os: ubuntu-20.04
@@ -64,16 +58,16 @@ jobs:
6458
- run: composer phan
6559

6660
ocular-push:
67-
runs-on: ubuntu-18.04
61+
runs-on: ubuntu-20.04
6862
if: ${{ success() }} && github.repository == 'wikimedia/composer-merge-plugin'
6963
needs: [run]
7064

7165
steps:
7266
- name: Checkout
7367
uses: actions/checkout@v2
7468

75-
- name: Use PHP 7.2
76-
run: sudo update-alternatives --set php /usr/bin/php7.2
69+
- name: Use PHP 7.4
70+
run: sudo update-alternatives --set php /usr/bin/php7.4
7771

7872
- name: Install dependencies
7973
run: composer install --prefer-dist --no-progress

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
"minimum-stability": "dev",
1313
"prefer-stable": true,
1414
"require": {
15-
"php": ">=7.2.0",
15+
"php": ">=7.4.0",
1616
"composer-plugin-api": "^1.1||^2.0"
1717
},
1818
"require-dev": {
1919
"ext-json": "*",
2020
"composer/composer": "^1.1||^2.0",
2121
"mediawiki/mediawiki-phan-config": "0.11.1",
2222
"php-parallel-lint/php-parallel-lint": "~1.3.1",
23-
"phpspec/prophecy": "~1.15.0",
24-
"phpunit/phpunit": "^8.5||^9.0",
23+
"phpspec/prophecy-phpunit": "~2.0.1",
24+
"phpunit/phpunit": "^9.5",
2525
"squizlabs/php_codesniffer": "~3.7.1"
2626
},
2727
"autoload": {

tests/phpunit/LoggerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
use Composer\IO\IOInterface;
1414
use Prophecy\Argument;
1515
use PHPUnit\Framework\TestCase;
16+
use Prophecy\PhpUnit\ProphecyTrait;
1617

1718
/**
1819
* @covers \Wikimedia\Composer\Merge\V2\Logger
1920
*/
2021
class LoggerTest extends TestCase
2122
{
23+
use ProphecyTrait;
2224

2325
public function testVeryVerboseDebug()
2426
{

tests/phpunit/MergePluginTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
use Composer\Util\HttpDownloader;
3535
use Prophecy\Argument;
3636
use PHPUnit\Framework\TestCase;
37+
use Prophecy\PhpUnit\ProphecyTrait;
3738
use Prophecy\Prophecy\ObjectProphecy;
3839
use ReflectionClass;
3940
use ReflectionProperty;
@@ -48,6 +49,7 @@
4849
*/
4950
class MergePluginTest extends TestCase
5051
{
52+
use ProphecyTrait;
5153

5254
/**
5355
* @var Composer

tests/phpunit/PluginStateTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212

1313
use Composer\Composer;
1414
use PHPUnit\Framework\TestCase;
15+
use Prophecy\PhpUnit\ProphecyTrait;
1516

1617
/**
1718
* @covers \Wikimedia\Composer\Merge\V2\PluginState
1819
*/
1920
class PluginStateTest extends TestCase
2021
{
22+
use ProphecyTrait;
2123

2224
public function testLocked()
2325
{

tests/phpunit/StabilityFlagsTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
use Composer\Package\BasePackage;
1414
use Composer\Package\Link;
1515
use PHPUnit\Framework\TestCase;
16+
use Prophecy\PhpUnit\ProphecyTrait;
1617

1718
/**
1819
* @covers \Wikimedia\Composer\Merge\V2\StabilityFlags
1920
*/
2021
class StabilityFlagsTest extends TestCase
2122
{
23+
use ProphecyTrait;
2224

2325
/**
2426
* @dataProvider provideExplicitStability

0 commit comments

Comments
 (0)