Skip to content

Commit 61c0a19

Browse files
authored
Merge pull request #116 from samsonasik/allow-webmozart-assert
Allow webmozart/assert ^2.1
2 parents 24af153 + 0f94d84 commit 61c0a19

2 files changed

Lines changed: 32 additions & 22 deletions

File tree

.github/workflows/ci_build.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ on:
88

99
jobs:
1010
build:
11-
name: PHP ${{ matrix.php-versions }}
11+
name: PHP ${{ matrix.php-versions }} (${{ matrix.dependency-versions }})
1212
runs-on: ubuntu-latest
1313
strategy:
1414
fail-fast: false
1515
matrix:
1616
php-versions: ['8.3', '8.4', '8.5']
17+
dependency-versions: ['lowest', 'latest']
1718
steps:
1819
- name: Setup PHP Action
1920
uses: shivammathur/setup-php@v2
@@ -27,33 +28,38 @@ jobs:
2728
mysql-version: '8.0'
2829
- run: mysql -uroot -h127.0.0.1 -e 'SELECT version()'
2930
- name: Checkout
30-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3132
- name: Import DB
3233
run: "mysql -u root -h 127.0.0.1 -e 'create database errorheromodule' && mysql -u root -h 127.0.0.1 errorheromodule < spec/Fixture/data/sql.sql"
3334
- name: "Validate composer.json"
3435
run: "composer validate"
35-
- name: "Install dependencies"
36-
run: "composer install --ignore-platform-reqs"
36+
- name: "Install dependencies (${{ matrix.dependency-versions }})"
37+
run: |
38+
if [ "${{ matrix.dependency-versions }}" = "lowest" ]; then
39+
composer update --prefer-lowest --prefer-stable --no-interaction --no-progress --ignore-platform-reqs
40+
else
41+
composer update --no-interaction --no-progress --ignore-platform-reqs
42+
fi
3743
- name: "CS Check"
3844
run: "composer cs-check"
3945
- name: "Code analyze"
4046
run: |
4147
composer phpstan
4248
bin/rector process --dry-run
4349
- name: "Run test suite (no coverage)"
44-
if: matrix.php-versions != '8.4'
50+
if: matrix.php-versions != '8.4' || matrix.dependency-versions != 'latest'
4551
run: |
4652
composer dump-autoload -o
4753
bin/kahlan
4854
4955
- name: "Run test suite (with coverage)"
50-
if: matrix.php-versions == '8.4'
56+
if: matrix.php-versions == '8.4' && matrix.dependency-versions == 'latest'
5157
run: |
5258
composer dump-autoload -o
5359
mkdir -p build/logs && bin/kahlan --coverage=4 --reporter=verbose --clover=build/logs/clover.xml
5460
5561
- name: Upload coverage to Codecov
56-
if: matrix.php-versions == '8.4'
62+
if: matrix.php-versions == '8.4' && matrix.dependency-versions == 'latest'
5763
uses: codecov/codecov-action@v1
5864
with:
5965
token: ${{ secrets.CODECOV_TOKEN }}

composer.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
"laminas/laminas-diactoros": "^3.8",
4141
"laminas/laminas-log": "^2.17.1",
4242
"laminas/laminas-mail": "^2.25.1",
43-
"laminas/laminas-psr7bridge": "^1.11",
44-
"laminas/laminas-uri": "^2.13",
43+
"laminas/laminas-psr7bridge": "^1.12",
44+
"laminas/laminas-uri": "^2.14",
4545
"psr/container": "^1.1.2 || 2.0",
46-
"samsonasik/array-lookup": "^2.0",
46+
"samsonasik/array-lookup": "^2.3",
4747
"seld/jsonlint": "^1.11",
48-
"webmozart/assert": "^1.11"
48+
"webmozart/assert": "^1.12.1 || ^2.1"
4949
},
5050
"conflict": {
5151
"doctrine/dbal": "<3.0",
@@ -56,22 +56,26 @@
5656
"laminas/laminas-mvc-console": "*"
5757
},
5858
"require-dev": {
59-
"doctrine/dbal": "^3.9.3",
59+
"doctrine/dbal": "^3.10.4",
6060
"doctrine/doctrine-orm-module": "^6.3.0",
61+
"guzzlehttp/promises": "^2.3",
6162
"kahlan/kahlan": "^6.1",
62-
"laminas/laminas-cli": "^1.11",
63-
"laminas/laminas-coding-standard": "^3.0",
64-
"laminas/laminas-form": "^2.16 || ^3.21",
63+
"laminas/laminas-cli": "^1.13",
64+
"laminas/laminas-coding-standard": "^3.1",
65+
"laminas/laminas-form": "^2.16 || ^3.24.2",
6566
"laminas/laminas-mvc": "^3.8",
66-
"laminas/laminas-servicemanager": "^3.23",
67-
"mezzio/mezzio": "^3.20.1",
68-
"mezzio/mezzio-laminasviewrenderer": "^2.16",
69-
"php-coveralls/php-coveralls": "^2.7.0",
70-
"phpstan/phpstan": "^2.0.4",
67+
"laminas/laminas-servicemanager": "^3.24",
68+
"laminas/laminas-stdlib": "^3.21",
69+
"mezzio/mezzio": "^3.27.0",
70+
"mezzio/mezzio-laminasviewrenderer": "^2.19",
71+
"php-coveralls/php-coveralls": "^2.9.1",
72+
"phpstan/phpstan": "^2.1.37",
7173
"phpstan/phpstan-webmozart-assert": "^2.0",
72-
"pimple/pimple": "^3.5",
74+
"pimple/pimple": "^3.6.1",
7375
"rector/rector": "dev-main",
74-
"symfony/dependency-injection": "^5.4.48"
76+
"symfony/console": "^6.4.32",
77+
"symfony/dependency-injection": "^5.4.48",
78+
"symfony/string": "^7.4.4"
7579
},
7680
"suggest": {
7781
"mezzio/mezzio-laminasviewrenderer": "^2.0 to be able to use laminas-view template engine in mezzio ^3.0",

0 commit comments

Comments
 (0)