Update package versions (#39)

Author: frankdekker

.gitattributes

@@ -53,3 +53,12 @@
 *.ttf     -text diff
 *.woff    -text diff
 *.woff2   -text diff
+
+# Exclude directories/files from composer vendor package
+/tests export-ignore
+/.* export-ignore
+/php*.json export-ignore
+/php*.xml export-ignore
+/php*.dist export-ignore
+/php*.neon export-ignore
+/renovate.json export-ignore

.github/workflows/test.yml

@@ -11,12 +11,18 @@ permissions:
 
 jobs:
   test:
-    name: PHP ${{ matrix.php-versions }} Test ${{ matrix.composer-flags }}
+    name: PHP ${{ matrix.php-versions }} - Symfony ${{ matrix.symfony }} - Test ${{ matrix.composer-flags }}
+    env:
+      SYMFONY_REQUIRE: ${{ matrix.symfony }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0', '8.1', '8.2']
-        composer-flags: ['', '--prefer-lowest']
+        php-versions: [ '8.1', '8.2', '8.3' ]
+        symfony: [ '^6.2', '^7.0' ]
+        composer-flags: [ '', '--prefer-lowest' ]
+        exclude:
+          - php-versions: 8.1
+            symfony: '^7.0'
     steps:
       - uses: actions/checkout@v4
 
@@ -26,6 +32,9 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           coverage: none
 
+      - name: Add symfony flex
+        run: composer global config --no-interaction allow-plugins.symfony/flex true && composer global require symfony/flex
+
       - name: Validate composer.json and composer.lock
         run: composer validate
 
@@ -44,7 +53,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           coverage: pcov
 
       - name: Install dependencies
@@ -54,7 +63,7 @@ jobs:
         run: php -dpcov.enabled=1 -dpcov.exclude="~vendor~" vendor/bin/phpunit --testsuite unit --coverage-clover ./.coverage/coverage.xml
 
       - name: Check coverage
-        run: php vendor/bin/phpfci inspect ./.coverage/coverage.xml ./.coverage/phpfci.xml --exit-code-on-failure
+        run: test ! -f ./.coverage/coverage.xml || php vendor/bin/phpfci inspect ./.coverage/coverage.xml --exit-code-on-failure --reportText
 
   quality:
     name: Quality checks
@@ -65,7 +74,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           coverage: none
 
       - name: Install dependencies

README.md

@@ -1,6 +1,6 @@
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF)](https://php.net/)
-[![Minimum Symfony Version](https://img.shields.io/badge/symfony-%3E%3D%204.4-brightgreen)](https://symfony.com/doc/current/validation.html)
-![Run tests](https://github.com/123inkt/symfony-request-validation/workflows/Run%20tests/badge.svg)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF)](https://php.net/)
+[![Minimum Symfony Version](https://img.shields.io/badge/symfony-%3E%3D%206.2-brightgreen)](https://symfony.com/doc/current/validation.html)
+![Run tests](https://github.com/123inkt/symfony-request-validation/actions/workflows/test.yml/badge.svg)
 
 # Symfony Request Validation
 A request validation component for Symfony. Ease the validation of request properties without the need for an entire Symfony Form.

composer.json

@@ -11,25 +11,25 @@
         }
     },
     "require": {
-        "php": ">=7.4",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0",
-        "digitalrevolution/symfony-validation-shorthand": "^1.0.4"
+        "php": ">=8.1",
+        "symfony/config": "^6.2 || ^7.0",
+        "symfony/dependency-injection": "^6.2 || ^7.0",
+        "symfony/http-foundation": "^6.2 || ^7.0",
+        "symfony/http-kernel": "^6.2 || ^7.0",
+        "symfony/validator": "^6.2 || ^7.0",
+        "digitalrevolution/symfony-validation-shorthand": "^1.2"
     },
     "require-dev": {
-        "digitalrevolution/phpunit-file-coverage-inspection": "^v1.0",
+        "digitalrevolution/phpunit-file-coverage-inspection": "^v2.0.0",
         "roave/security-advisories": "dev-latest",
         "squizlabs/php_codesniffer": "^3.6",
-        "phpmd/phpmd": "@stable",
-        "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "^1.4",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.1",
-        "phpstan/phpstan-symfony": "^1.2",
-        "phpstan/extension-installer": "^1.1"
+        "phpmd/phpmd": "^2.14",
+        "phpunit/phpunit": "^9.6",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-strict-rules": "^1.5",
+        "phpstan/phpstan-symfony": "^1.3",
+        "phpstan/extension-installer": "^1.3"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,7 @@
     "scripts": {
         "check": ["@check:phpstan", "@check:phpmd", "@check:phpcs"],
         "check:phpstan": "phpstan analyse",
-        "check:phpmd": "phpmd src,tests text phpmd.xml.dist --suffixes=php",
+        "check:phpmd": "phpmd src,tests text phpmd.xml.dist --suffixes php",
         "check:phpcs": "phpcs src tests",
         "fix": "@fix:phpcbf",
         "fix:phpcbf": "phpcbf src tests",

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          forceCoversAnnotation="true"
          failOnRisky="true"

src/Constraint/RequestConstraint.php

@@ -13,33 +13,28 @@ class RequestConstraint extends Constraint
     public const INVALID_BODY_CONTENT       = '3b41f393-5f46-471e-8a2e-c4035d5fb3cb';
 
     /** @var array<string, string> */
-    protected static $errorNames = [
+    protected const ERROR_NAMES = [
         self::WRONG_VALUE_TYPE           => 'WRONG_VALUE_TYPE',
         self::MISSING_QUERY_CONSTRAINT   => 'MISSING_QUERY_CONSTRAINT',
         self::MISSING_REQUEST_CONSTRAINT => 'MISSING_REQUEST_CONSTRAINT',
         self::INVALID_BODY_CONTENT       => 'INVALID_BODY_CONTENT',
     ];
 
-    /** @var string */
-    public $wrongTypeMessage = 'Expect value to be of type Symfony\Component\HttpFoundation\Request';
-    /** @var string */
-    public $queryMessage = 'Request::query is not empty, but there is no constraint configured.';
-    /** @var string */
-    public $requestMessage = 'Request::request is not empty, but there is no constraint configured.';
-    /** @var string */
-    public $invalidBodyMessage = 'Request::content cant be decoded';
+    public string $wrongTypeMessage = 'Expect value to be of type Symfony\Component\HttpFoundation\Request';
+    public string $queryMessage = 'Request::query is not empty, but there is no constraint configured.';
+    public string $requestMessage = 'Request::request is not empty, but there is no constraint configured.';
+    public string $invalidBodyMessage = 'Request::content cant be decoded';
 
     /** @var Constraint|Constraint[]|null */
-    public $query;
+    public Constraint|array|null $query = null;
 
     /** @var Constraint|Constraint[]|null */
-    public $request;
+    public Constraint|array|null $request = null;
 
     /** @var Constraint|Constraint[]|null */
-    public $attributes;
+    public Constraint|array|null $attributes = null;
 
-    /** @var bool */
-    public $allowExtraFields;
+    public bool $allowExtraFields = false;
 
     /**
      * @param array{
@@ -49,7 +44,7 @@ class RequestConstraint extends Constraint
      *     allowExtraFields?: bool
      *     }|null $options
      */
-    public function __construct($options = null)
+    public function __construct(?array $options = null)
     {
         // make sure defaults are set
         $options                     = $options ?? [];

src/Constraint/RequestConstraintValidator.php

@@ -68,9 +68,7 @@ private function validateRequest(RequestConstraint $constraint, Request $request
             return;
         }
 
-        // `getContentType` deprecated since symfony 6.2
-        $contentType = method_exists($request, 'getContentTypeFormat') ? $request->getContentTypeFormat() : $request->getContentType();
-
+        $contentType = $request->getContentTypeFormat();
         if (in_array($contentType, ['json', 'jsonld'], true)) {
             $data = $this->validateAndGetJsonBody($constraint, $request);
             if ($data === null) {

src/ValidationRules.php

@@ -8,7 +8,7 @@
 
 /**
  * @phpstan-type ConstraintList array<string, string|Constraint|array<string|Constraint>>|array<int, Constraint>
- * @phpstan-type DefinitionCollection array{query?: ConstraintList, request?: ConstraintList, attributes?: ConstraintList }
+ * @phpstan-type DefinitionCollection array{query?: ConstraintList, request?: ConstraintList, attributes?: ConstraintList}
  */
 class ValidationRules
 {