Skip to content

Commit 0b2c1c1

Browse files
authored
build(deps): Bump PHP and dependency versions (#39)
- Update PHP requirement to 8.2 and Docker image to PHP 8.4. - Upgrade `jbzoo` packages to their latest stable versions. - Adjust `composer/semver` and `composer/composer` requirements to stable branches. - Make `testGithubActionsWorkflow` static for PHPUnit compatibility. - Apply minor code style fixes and README updates.
1 parent ba56dd1 commit 0b2c1c1

File tree

8 files changed

+2986
-1566
lines changed

8 files changed

+2986
-1566
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#
1212

1313
name: CI
14+
permissions:
15+
contents: read
1416

1517
on:
1618
pull_request:
@@ -19,8 +21,6 @@ on:
1921
push:
2022
branches:
2123
- 'master'
22-
schedule:
23-
- cron: '39 */8 * * *'
2424

2525
env:
2626
COLUMNS: 120
@@ -34,10 +34,9 @@ jobs:
3434
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
3535
strategy:
3636
matrix:
37-
php-version: [ 8.1, 8.2, 8.3 ]
37+
php-version: [ 8.2, 8.3, 8.4 ]
3838
coverage: [ xdebug, none ]
3939
composer_flags: [ "--prefer-lowest", "" ]
40-
build-action: [ "update" ]
4140
steps:
4241
- name: Checkout code
4342
uses: actions/checkout@v3
@@ -53,7 +52,7 @@ jobs:
5352
extensions: ast
5453

5554
- name: Build the Project
56-
run: make ${{ matrix.build-action }} --no-print-directory
55+
run: make update --no-print-directory
5756

5857
- name: 🧪 PHPUnit Tests
5958
run: make test --no-print-directory
@@ -66,10 +65,10 @@ jobs:
6665
run: make report-coveralls --no-print-directory || true
6766

6867
- name: Upload Artifacts
69-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@v4
7069
continue-on-error: true
7170
with:
72-
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }} - ${{ matrix.build-action }}
71+
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
7372
path: build/
7473

7574

@@ -78,7 +77,7 @@ jobs:
7877
runs-on: ubuntu-latest
7978
strategy:
8079
matrix:
81-
php-version: [ 8.1, 8.2, 8.3 ]
80+
php-version: [ 8.2, 8.3, 8.4 ]
8281
steps:
8382
- name: Checkout code
8483
uses: actions/checkout@v3
@@ -100,7 +99,7 @@ jobs:
10099
run: make codestyle --no-print-directory
101100

102101
- name: Upload Artifacts
103-
uses: actions/upload-artifact@v3
102+
uses: actions/upload-artifact@v4
104103
continue-on-error: true
105104
with:
106105
name: Linters - ${{ matrix.php-version }}
@@ -112,7 +111,7 @@ jobs:
112111
runs-on: ubuntu-latest
113112
strategy:
114113
matrix:
115-
php-version: [ 8.1, 8.2, 8.3 ]
114+
php-version: [ 8.2, 8.3, 8.4 ]
116115
steps:
117116
- name: Checkout code
118117
uses: actions/checkout@v3
@@ -134,7 +133,7 @@ jobs:
134133
run: make report-all --no-print-directory
135134

136135
- name: Upload Artifacts
137-
uses: actions/upload-artifact@v3
136+
uses: actions/upload-artifact@v4
138137
continue-on-error: true
139138
with:
140139
name: Reports - ${{ matrix.php-version }}
@@ -143,10 +142,9 @@ jobs:
143142
phar:
144143
name: Phar
145144
runs-on: ubuntu-latest
146-
needs: [ phpunit, linters, report ]
147145
strategy:
148146
matrix:
149-
php-version: [ 8.1, 8.2, 8.3 ]
147+
php-version: [ 8.2, 8.3, 8.4 ]
150148
steps:
151149
- name: Checkout code
152150
uses: actions/checkout@v3
@@ -171,7 +169,7 @@ jobs:
171169
run: ./build/composer-diff.phar diff --help
172170

173171
- name: Upload Artifacts
174-
uses: actions/upload-artifact@v3
172+
uses: actions/upload-artifact@v4
175173
continue-on-error: true
176174
with:
177175
name: Reports - ${{ matrix.php-version }}
@@ -181,7 +179,6 @@ jobs:
181179
docker:
182180
name: Docker
183181
runs-on: ubuntu-latest
184-
needs: [ phar ]
185182
steps:
186183
- name: Checkout code
187184
uses: actions/checkout@v3

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# @see https://github.com/JBZoo/Composer-Diff
1111
#
1212

13-
FROM php:8.1-cli-alpine
13+
FROM php:8.4-cli-alpine
1414
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
1515

1616
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

README.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
# JBZoo / Composer-Diff
22

3-
[![CI](https://github.com/JBZoo/Composer-Diff/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/JBZoo/Composer-Diff/actions/workflows/main.yml?query=branch%3Amaster) [![Coverage Status](https://coveralls.io/repos/github/JBZoo/Composer-Diff/badge.svg?branch=master)](https://coveralls.io/github/JBZoo/Composer-Diff?branch=master) [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Composer-Diff/coverage.svg)](https://shepherd.dev/github/JBZoo/Composer-Diff) [![Psalm Level](https://shepherd.dev/github/JBZoo/Composer-Diff/level.svg)](https://shepherd.dev/github/JBZoo/Composer-Diff) [![CodeFactor](https://www.codefactor.io/repository/github/jbzoo/composer-diff/badge)](https://www.codefactor.io/repository/github/jbzoo/composer-diff/issues)
4-
[![Stable Version](https://poser.pugx.org/jbzoo/composer-diff/version)](https://packagist.org/packages/jbzoo/composer-diff/) [![Total Downloads](https://poser.pugx.org/jbzoo/composer-diff/downloads)](https://packagist.org/packages/jbzoo/composer-diff/stats) [![Dependents](https://poser.pugx.org/jbzoo/composer-diff/dependents)](https://packagist.org/packages/jbzoo/composer-diff/dependents?order_by=downloads) [![GitHub License](https://img.shields.io/github/license/jbzoo/composer-diff)](https://github.com/JBZoo/Composer-Diff/blob/master/LICENSE)
3+
[![CI](https://github.com/JBZoo/Composer-Diff/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/JBZoo/Composer-Diff/actions/workflows/main.yml?query=branch%3Amaster)
4+
[![Coverage Status](https://coveralls.io/repos/github/JBZoo/Composer-Diff/badge.svg?branch=master)](https://coveralls.io/github/JBZoo/Composer-Diff?branch=master)
5+
[![Psalm Coverage](https://shepherd.dev/github/JBZoo/Composer-Diff/coverage.svg)](https://shepherd.dev/github/JBZoo/Composer-Diff)
6+
[![Psalm Level](https://shepherd.dev/github/JBZoo/Composer-Diff/level.svg)](https://shepherd.dev/github/JBZoo/Composer-Diff)
7+
[![CodeFactor](https://www.codefactor.io/repository/github/jbzoo/composer-diff/badge)](https://www.codefactor.io/repository/github/jbzoo/composer-diff/issues)
8+
9+
[![Stable Version](https://poser.pugx.org/jbzoo/composer-diff/version)](https://packagist.org/packages/jbzoo/composer-diff/)
10+
[![Total Downloads](https://poser.pugx.org/jbzoo/composer-diff/downloads)](https://packagist.org/packages/jbzoo/composer-diff/stats)
11+
[![Dependents](https://poser.pugx.org/jbzoo/composer-diff/dependents)](https://packagist.org/packages/jbzoo/composer-diff/dependents?order_by=downloads)
12+
[![GitHub License](https://img.shields.io/github/license/jbzoo/composer-diff)](https://github.com/JBZoo/Composer-Diff/blob/master/LICENSE)
513

614

715
<!--ts-->
@@ -83,7 +91,8 @@ Options:
8391
[default: "text"]
8492
--cron Alias for --output-mode=cron. Deprecated!
8593
-h, --help Display help for the given command. When no command is given display help for the diff command
86-
-q, --quiet Do not output any message
94+
--silent Do not output any message
95+
-q, --quiet Only errors are displayed. All other output is suppressed
8796
-V, --version Display this application version
8897
--ansi|--no-ansi Force (or disable --no-ansi) ANSI output
8998
-n, --no-interaction Do not ask any interactive question
@@ -213,7 +222,7 @@ Rendered in your readme or PR/MR description:
213222
* [ ] Fixes [the same issue](https://github.com/davidrjonas/composer-lock-diff/issues/26) with complex/custom name of tag.
214223
* [ ] Auto-detecting alias name of branch.
215224
* [ ] No warp links for Markdown format.
216-
* [ ] (?) Support MS Windows...
225+
* [ ] (?) Support MS Windows...
217226

218227

219228
## Unit tests and check code style
@@ -235,7 +244,7 @@ MIT
235244
- [Mermaid-PHP](https://github.com/JBZoo/Mermaid-PHP) - Generate diagrams and flowcharts with the help of the mermaid script language.
236245
- [Utils](https://github.com/JBZoo/Utils) - Collection of useful PHP functions, mini-classes, and snippets for every day.
237246
- [Image](https://github.com/JBZoo/Image) - Package provides object-oriented way to manipulate with images as simple as possible.
238-
- [Data](https://github.com/JBZoo/Data) - Extended implementation of ArrayObject. Use files as config/array.
247+
- [Data](https://github.com/JBZoo/Data) - Extended implementation of ArrayObject. Use files as config/array.
239248
- [Retry](https://github.com/JBZoo/Retry) - Tiny PHP library providing retry/backoff functionality with multiple backoff strategies and jitter support.
240249
- [SimpleTypes](https://github.com/JBZoo/SimpleTypes) - Converting any values and measures - money, weight, exchange rates, length, ...
241250

composer-diff.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
if (!\defined('JBZOO_AUTOLOAD_FILE')) {
3737
\fwrite(
3838
\STDERR,
39-
'You need to set up the project dependencies using Composer:' . \PHP_EOL . \PHP_EOL .
40-
' composer install' . \PHP_EOL . \PHP_EOL .
41-
'You can learn all about Composer on https://getcomposer.org/.' . \PHP_EOL,
39+
'You need to set up the project dependencies using Composer:' . \PHP_EOL . \PHP_EOL
40+
. ' composer install' . \PHP_EOL . \PHP_EOL
41+
. 'You can learn all about Composer on https://getcomposer.org/.' . \PHP_EOL,
4242
);
4343

4444
exit(1);

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828
"prefer-stable" : true,
2929

3030
"require" : {
31-
"php" : "^8.1",
31+
"php" : "^8.2",
3232
"ext-json" : "*",
3333
"ext-filter" : "*",
3434

35-
"jbzoo/data" : "^7.1",
36-
"jbzoo/markdown" : "^7.0",
37-
"jbzoo/cli" : "^7.1.1",
35+
"jbzoo/data" : "^7.2",
36+
"jbzoo/markdown" : "^7.0.2",
37+
"jbzoo/cli" : "^7.2.4",
3838

3939
"symfony/console" : ">=6.4",
4040
"symfony/process" : ">=6.4",
41-
"composer/semver" : ">=3.4"
41+
"composer/semver" : ">=1.0"
4242
},
4343

4444
"require-dev" : {
45-
"jbzoo/toolbox-dev" : "^7.1",
45+
"jbzoo/toolbox-dev" : "^7.3",
4646
"roave/security-advisories" : "dev-master",
47-
"composer/composer" : ">=2.7.7"
47+
"composer/composer" : ">=2.0"
4848
},
4949

5050
"autoload" : {

0 commit comments

Comments
 (0)