Update to laravel 12 and PHP 8.5 (#10)

Lotykun-Softonic · web-flow · commit e967980391fd · 2026-01-12T16:10:51.000+01:00
* first version of updating to laravel 12 and php 8.5

* fixing last comments
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,46 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master, main ]
+  pull_request:
+    branches: [ master, main ]
+
+jobs:
+  test:
+    name: PHP 8.5 - Laravel 12
+    runs-on: ubuntu-latest
+        
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.5'
+          extensions: dom, curl, libxml, mbstring, zip, pcov
+          coverage: pcov
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: composer run phpunit
+
+      - name: Check code style
+        run: composer run phpcs
+
+      - name: Run static analysis
+        run: composer run phpstan
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 /vendor/
 composer.lock
 .php_cs.cache
+.php-cs-fixer.cache
+.phpunit.cache
 .phpunit.result.cache
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -1,37 +1,36 @@
 <?php
+
 $finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__.'/src')
-    ->in(__DIR__.'/tests')
-;
-return PhpCsFixer\Config::create()
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests');
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
     ->setRules([
-        '@PSR2' => true,
+        '@PSR12' => true,
         'array_syntax' => ['syntax' => 'short'],
         'concat_space' => ['spacing' => 'one'],
-        'new_with_braces' => true,
+        'new_with_parentheses' => true,
         'no_blank_lines_after_phpdoc' => true,
         'no_empty_phpdoc' => true,
         'no_empty_comment' => true,
         'no_leading_import_slash' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_unused_imports' => true,
-        'ordered_imports' => ['importsOrder' => null, 'sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'phpdoc_add_missing_param_annotation' => ['only_untyped' => true],
-        'phpdoc_align' => true,
+        'phpdoc_align' => ['align' => 'left'],
         'phpdoc_no_empty_return' => true,
         'phpdoc_order' => true,
         'phpdoc_scalar' => true,
         'phpdoc_to_comment' => true,
-        'psr0' => false,
-        'psr4' => true,
+        'psr_autoloading' => true,
         'return_type_declaration' => ['space_before' => 'none'],
-        'single_blank_line_before_namespace' => true,
         'single_quote' => true,
         'space_after_semicolon' => true,
         'ternary_operator_spaces' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
         'trim_array_spaces' => true,
         'whitespace_after_comma_in_array' => true,
     ])
-    ->setFinder($finder)
-;
+    ->setFinder($finder);
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,27 @@
+FROM composer:2
+
+# Install build dependencies
+RUN apk add --no-cache $PHPIZE_DEPS linux-headers
+
+# Install PCOV (for fast code coverage)
+RUN pecl install pcov && docker-php-ext-enable pcov
+
+# Install Xdebug (for debugging when needed)
+RUN pecl install xdebug && docker-php-ext-enable xdebug
+
+# Clean up
+RUN apk del $PHPIZE_DEPS linux-headers
+
+# Configure PCOV (enabled by default for tests)
+RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+
+# Configure Xdebug (disabled by default, enable when debugging)
+RUN echo "xdebug.mode=off" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.client_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.client_port=9003" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+# Disable Xdebug by default to use PCOV for coverage
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini.disabled
+
+WORKDIR /app
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Laravel request accept json middleware
 
 [![Latest Version](https://img.shields.io/github/release/softonic/laravel-request-accept-json-middleware.svg?style=flat-square)](https://github.com/softonic/laravel-request-accept-json-middleware/releases)
 [![Software License](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat-square)](LICENSE.md)
-[![Build Status](https://img.shields.io/travis/softonic/laravel-request-accept-json-middleware/master.svg?style=flat-square)](https://travis-ci.org/softonic/laravel-request-accept-json-middleware)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/softonic/laravel-request-accept-json-middleware/tests.yml?branch=master&style=flat-square)](https://github.com/softonic/laravel-request-accept-json-middleware/actions)
 [![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/softonic/laravel-request-accept-json-middleware.svg?style=flat-square)](https://scrutinizer-ci.com/g/softonic/laravel-request-accept-json-middleware/code-structure)
 [![Quality Score](https://img.shields.io/scrutinizer/g/softonic/laravel-request-accept-json-middleware.svg?style=flat-square)](https://scrutinizer-ci.com/g/softonic/laravel-request-accept-json-middleware)
 [![Total Downloads](https://img.shields.io/packagist/dt/softonic/laravel-request-accept-json-middleware.svg?style=flat-square)](https://packagist.org/packages/softonic/laravel-request-accept-json-middleware)
@@ -12,6 +12,11 @@ Laravel request accept json middleware
 
 This middleware adds the ability to automatically add the Accept application/json header to every request if it was not provided.
 
+## Requirements
+
+- PHP >= 8.5
+- Laravel 12.x
+
 Installation
 -------
 
@@ -39,18 +44,42 @@ From now on the header `Accept: application/json` will be automatically added to
 Testing
 -------
 
-`softonic/laravel-request-accept-json-middleware` has a [PHPUnit](https://phpunit.de) test suite and a coding style compliance test suite using [PHP CS Fixer](http://cs.sensiolabs.org/).
+`softonic/laravel-request-accept-json-middleware` has a [PHPUnit](https://phpunit.de) test suite, code style compliance check using [PHP CS Fixer](https://cs.symfony.com/), and static analysis using [PHPStan](https://phpstan.org/).
+
+To run the tests, run the following command from the project folder:
+
+``` bash
+$ docker compose run --rm test
+```
+
+To run PHPUnit only:
+
+``` bash
+$ docker compose run --rm phpunit
+```
+
+To check code style:
+
+``` bash
+$ docker compose run --rm php composer run phpcs
+```
+
+To fix code style issues:
+
+``` bash
+$ docker compose run --rm fixcs
+```
 
-To run the tests, run the following command from the project folder.
+To run static analysis:
 
 ``` bash
-$ docker-compose run test
+$ docker compose run --rm php composer run phpstan
 ```
 
 License
 -------
 
 The Apache 2.0 license. Please see [LICENSE](LICENSE) for more information.
 
-[PSR-2]: http://www.php-fig.org/psr/psr-2/
-[PSR-4]: http://www.php-fig.org/psr/psr-4/
+[PSR-12]: https://www.php-fig.org/psr/psr-12/
+[PSR-4]: https://www.php-fig.org/psr/psr-4/
diff --git a/composer.json b/composer.json
@@ -9,14 +9,15 @@
         "issues": "https://github.com/softonic/laravel-request-accept-json-middleware/issues"
     },
     "require": {
-        "php": ">=8.2",
-        "illuminate/http": "^11.0",
-        "illuminate/contracts": "^11.0"
+        "php": ">=8.5",
+        "illuminate/http": "^12.0",
+        "illuminate/contracts": "^12.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.68",
         "mockery/mockery": "^1.2",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^12.0",
+        "phpstan/phpstan": "^1.8"
     },
     "autoload": {
         "psr-4": {
@@ -29,10 +30,11 @@
         }
     },
     "scripts": {
-        "tests": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
+        "tests": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes; phpstan analyse",
         "phpunit": "phpunit --coverage-text",
         "phpcs": "php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
-        "fix-cs": "php-cs-fixer fix -v --diff --allow-risky=yes;"
+        "fix-cs": "php-cs-fixer fix -v --diff --allow-risky=yes;",
+        "phpstan": "phpstan analyse"
     }
 }
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,29 +1,35 @@
 services:
   php:
+    build: .
     volumes:
     - ./:/app
-    image: composer:2.2
 
   install:
+    build: .
     volumes:
     - ./:/app
-    image: composer:2.2
-    command: composer install
+    command: sh -c "git config --global --add safe.directory /app && composer install"
 
   phpunit:
+    build: .
     volumes:
     - ./:/app
-    image: composer:2.2
-    command: composer phpunit
+    command: sh -c "git config --global --add safe.directory /app && composer run phpunit"
 
   test:
+    build: .
     volumes:
     - ./:/app
-    image: composer:2.2
-    command: composer run tests
+    command: sh -c "git config --global --add safe.directory /app && composer run tests"
 
   fixcs:
+    build: .
     volumes:
     - ./:/app
-    image: composer:2.2
-    command: composer run fix-cs
+    command: sh -c "git config --global --add safe.directory /app && composer run fix-cs"
+
+  debug:
+    build: .
+    volumes:
+    - ./:/app
+    command: sh -c "mv /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini.disabled /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini 2>/dev/null || true; php -dxdebug.mode=debug -dpcov.enabled=0 $@"
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,4 @@
+parameters:
+	level: 7
+	paths:
+		- src
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-
+         failOnRisky="true"
+         failOnWarning="true"
+         cacheDirectory=".phpunit.cache">
     <testsuites>
         <testsuite name="All">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
+    <source>
+        <include>
             <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <log type="junit" target="build/report.junit.xml" />
-        <log type="coverage-html" target="build/coverage" />
-        <log type="coverage-text" target="build/coverage.txt" />
-        <log type="coverage-clover" target="build/clover.xml" />
-    </logging>
-
+        </include>
+    </source>
+    <coverage>
+        <report>
+            <clover outputFile="build/clover.xml"/>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/src/Middleware/RequestAcceptJson.php b/src/Middleware/RequestAcceptJson.php
@@ -7,7 +7,7 @@
 
 class RequestAcceptJson
 {
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): mixed
     {
         $accept = $request->headers->get('Accept');
 
diff --git a/tests/Middleware/RequestAcceptJsonTest.php b/tests/Middleware/RequestAcceptJsonTest.php

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +parameters:
 +	level: 7
 +	paths:
 +		- src