From d1d8ac6899937bd9f78cc3f190934b229dce1f3b Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Wed, 8 Oct 2025 15:17:55 +0100 Subject: [PATCH 1/3] Upgrade to Lumberjack 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2bd7c6b..e4ea559 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "rareloop/lumberjack-validation", "require": { "rakit/validation": "^0.13.1", - "rareloop/lumberjack-core": "^5.0.0||^6.0.0||^7.0.0" + "rareloop/lumberjack-core": "^5.0.0||^6.0.0||^7.0.0||^8.0.0" }, "require-dev": { "phpunit/phpunit": "^6.0", From 05ca5014704a65b398eda6bdfd83759092cbcd80 Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Tue, 14 Oct 2025 16:47:06 +0100 Subject: [PATCH 2/3] Update codebase --- .github/workflows/ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++ composer.json | 19 ++++++++++------- phpunit.xml | 32 ++++++++++------------------ 3 files changed, 68 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..7208d53 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,46 @@ +name: CI + +on: [push, pull_request] + +jobs: + build-test: + runs-on: ubuntu-latest + strategy: + matrix: + php_version: [8.1, 8.2, 8.3, 8.4] + composer_flags: ['', '--prefer-lowest'] + + steps: + - uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: xdebug + + - name: Install dependencies + uses: php-actions/composer@v5 + with: + php_version: ${{ matrix.php_version }} + args: ${{ matrix.composer_flags }} + command: update + + - name: Run tests + run: ./vendor/bin/phpunit --coverage-clover ./tests/logs/clover.xml + env: + XDEBUG_MODE: coverage + + - name: Run Codesniffer + run: vendor/bin/phpcs --standard=PSR2 ./src + + # - name: Submit coverage to Coveralls + # # We use php-coveralls library for this, as the official Coveralls GitHub Action lacks support for clover reports: + # # https://github.com/coverallsapp/github-action/issues/15 + # env: + # COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # COVERALLS_PARALLEL: true + # COVERALLS_FLAG_NAME: ${{ github.job }}-PHP-${{ matrix.php_version }} ${{ matrix.composer_flags }} + # run: | + # composer global require php-coveralls/php-coveralls + # ~/.composer/vendor/bin/php-coveralls -v diff --git a/composer.json b/composer.json index e4ea559..3f85fa1 100644 --- a/composer.json +++ b/composer.json @@ -2,16 +2,14 @@ "name": "rareloop/lumberjack-validation", "require": { "rakit/validation": "^0.13.1", - "rareloop/lumberjack-core": "^5.0.0||^6.0.0||^7.0.0||^8.0.0" + "rareloop/lumberjack-core": "^6.0.0||^7.0.0||^8.0.0" }, "require-dev": { - "phpunit/phpunit": "^6.0", - "satooshi/php-coveralls": "^1.0", - "mockery/mockery": "^1.0.0", + "phpunit/phpunit": "^9.6.29", + "php-coveralls/php-coveralls": "^2.8", + "mockery/mockery": "^1.6.12", "brain/monkey": "^2.0.2", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "^3.2", - "codedungeon/phpunit-result-printer": "^0.4.4" + "squizlabs/php_codesniffer": "^3.2" }, "autoload": { "psr-4": { @@ -22,5 +20,10 @@ "psr-4": { "Rareloop\\Lumberjack\\Validation\\Test\\": "tests" } + }, + "config": { + "allow-plugins": { + "composer/installers": true + } } -} \ No newline at end of file +} diff --git a/phpunit.xml b/phpunit.xml index 2ebc93b..ed28d0e 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,23 +1,13 @@ - - - - tests - - - - - src/ - - + + + + src/ + + + + + tests + + From fdf6f28bc90a224a5e7610adabd70fdf97f9e878 Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Wed, 15 Oct 2025 12:26:16 +0100 Subject: [PATCH 3/3] Fix dev dependencies --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3f85fa1..9b57dd2 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,9 @@ "phpunit/phpunit": "^9.6.29", "php-coveralls/php-coveralls": "^2.8", "mockery/mockery": "^1.6.12", - "brain/monkey": "^2.0.2", - "squizlabs/php_codesniffer": "^3.2" + "brain/monkey": "^2.6.2", + "antecedent/patchwork": "^2.2.3", + "squizlabs/php_codesniffer": "^3.13.4" }, "autoload": { "psr-4": {