Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#

name: CI
permissions:
contents: read

on:
pull_request:
Expand All @@ -19,8 +21,6 @@ on:
push:
branches:
- 'master'
schedule:
- cron: '39 */8 * * *'

env:
COLUMNS: 120
Expand All @@ -34,10 +34,9 @@ jobs:
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
strategy:
matrix:
php-version: [ 8.1, 8.2, 8.3 ]
php-version: [ 8.2, 8.3, 8.4 ]
coverage: [ xdebug, none ]
composer_flags: [ "--prefer-lowest", "" ]
build-action: [ "update" ]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -53,7 +52,7 @@ jobs:
extensions: ast

- name: Build the Project
run: make ${{ matrix.build-action }} --no-print-directory
run: make update --no-print-directory

- name: 🧪 PHPUnit Tests
run: make test --no-print-directory
Expand All @@ -66,10 +65,10 @@ jobs:
run: make report-coveralls --no-print-directory || true

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
continue-on-error: true
with:
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }} - ${{ matrix.build-action }}
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
path: build/


Expand All @@ -78,7 +77,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 8.1, 8.2, 8.3 ]
php-version: [ 8.2, 8.3, 8.4 ]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -100,7 +99,7 @@ jobs:
run: make codestyle --no-print-directory

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
continue-on-error: true
with:
name: Linters - ${{ matrix.php-version }}
Expand All @@ -112,7 +111,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 8.1, 8.2, 8.3 ]
php-version: [ 8.2, 8.3, 8.4 ]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -134,7 +133,7 @@ jobs:
run: make report-all --no-print-directory

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
continue-on-error: true
with:
name: Reports - ${{ matrix.php-version }}
Expand All @@ -143,10 +142,9 @@ jobs:
phar:
name: Phar
runs-on: ubuntu-latest
needs: [ phpunit, linters, report ]
strategy:
matrix:
php-version: [ 8.1, 8.2, 8.3 ]
php-version: [ 8.2, 8.3, 8.4 ]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -171,7 +169,7 @@ jobs:
run: ./build/composer-diff.phar diff --help

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
continue-on-error: true
with:
name: Reports - ${{ matrix.php-version }}
Expand All @@ -181,7 +179,6 @@ jobs:
docker:
name: Docker
runs-on: ubuntu-latest
needs: [ phar ]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# @see https://github.com/JBZoo/Composer-Diff
#

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

ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
Expand Down
19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
# JBZoo / Composer-Diff

[![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)
[![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)
[![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)

[![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)


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


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

Expand Down
6 changes: 3 additions & 3 deletions composer-diff.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
if (!\defined('JBZOO_AUTOLOAD_FILE')) {
\fwrite(
\STDERR,
'You need to set up the project dependencies using Composer:' . \PHP_EOL . \PHP_EOL .
' composer install' . \PHP_EOL . \PHP_EOL .
'You can learn all about Composer on https://getcomposer.org/.' . \PHP_EOL,
'You need to set up the project dependencies using Composer:' . \PHP_EOL . \PHP_EOL
. ' composer install' . \PHP_EOL . \PHP_EOL
. 'You can learn all about Composer on https://getcomposer.org/.' . \PHP_EOL,
);

exit(1);
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@
"prefer-stable" : true,

"require" : {
"php" : "^8.1",
"php" : "^8.2",
"ext-json" : "*",
"ext-filter" : "*",

"jbzoo/data" : "^7.1",
"jbzoo/markdown" : "^7.0",
"jbzoo/cli" : "^7.1.1",
"jbzoo/data" : "^7.2",
"jbzoo/markdown" : "^7.0.2",
"jbzoo/cli" : "^7.2.4",

"symfony/console" : ">=6.4",
"symfony/process" : ">=6.4",
"composer/semver" : ">=3.4"
"composer/semver" : ">=1.0"
},

"require-dev" : {
"jbzoo/toolbox-dev" : "^7.1",
"jbzoo/toolbox-dev" : "^7.3",
"roave/security-advisories" : "dev-master",
"composer/composer" : ">=2.7.7"
"composer/composer" : ">=2.0"
},

"autoload" : {
Expand Down
Loading
Loading