php85

Author: dominikzogg

.github/workflows/ci.yml

@@ -6,36 +6,36 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  php82:
-    name: PHP 8.2
+  php83:
+    name: PHP 8.3
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php82:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php83:
-    name: PHP 8.3
+  php84:
+    name: PHP 8.4
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php83:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  php84:
-    name: PHP 8.4
+  php85:
+    name: PHP 8.5
     runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
       - name: composer test
-        uses: docker://ghcr.io/chubbyphp/ci-php84:latest
+        uses: docker://ghcr.io/chubbyphp/ci-php85:latest
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.php-cs-fixer.php

@@ -12,13 +12,8 @@
 /** @var array $config */
 $config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
 
-// drop onces code is >= 8.0
-unset($config['rules']['phpdoc_to_return_type']);
-
-// drop once DateTimeFieldDenormalizer gets dropped
-unset($config['rules']['date_time_immutable']);
-
 return (new PhpCsFixer\Config)
+    ->setUnsupportedPhpVersionAllowed(true)
     ->setIndent($config['indent'])
     ->setLineEnding($config['lineEnding'])
     ->setRules($config['rules'])

README.md

@@ -25,7 +25,7 @@ A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.
 
 ## Requirements
 
- * php: ^8.2
+ * php: ^8.3
  * symfony/yaml: ^5.4.45|^6.4.18|^7.2
 
 ## Suggest
@@ -38,7 +38,7 @@ A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.
 Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-decode-encode][1].
 
 ```sh
-composer require chubbyphp/chubbyphp-decode-encode "^1.2"
+composer require chubbyphp/chubbyphp-decode-encode "^1.3"
 ```
 
 ## Usage

composer.json

@@ -19,22 +19,22 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "symfony/yaml": "^5.4.45|^6.4.18|^7.2"
+        "symfony/yaml": "^5.4.45|^6.4.26|^7.4"
     },
     "require-dev": {
         "chubbyphp/chubbyphp-container": "^2.2",
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
         "chubbyphp/chubbyphp-laminas-config-factory": "^1.4",
-        "chubbyphp/chubbyphp-mock": "^2.0",
-        "infection/infection": "^0.29.13",
-        "php-coveralls/php-coveralls": "^2.7.0",
+        "chubbyphp/chubbyphp-mock": "^2.0.1",
+        "infection/infection": "^0.31.9",
+        "php-coveralls/php-coveralls": "^2.9",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.6",
-        "phpunit/phpunit": "^11.5.10",
+        "phpstan/phpstan": "^2.1.32",
+        "phpunit/phpunit": "^12.4.5",
         "psr/container": "^2.0.2"
     },
     "autoload": {
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "1.3-dev"
         }
     },
     "scripts": {

src/Decoder/JsonxTypeDecoder.php

@@ -11,12 +11,12 @@
  */
 final class JsonxTypeDecoder implements TypeDecoderInterface
 {
-    private const DATATYPE_OBJECT = 'object';
-    private const DATATYPE_ARRAY = 'array';
-    private const DATATYPE_BOOLEAN = 'boolean';
-    private const DATATYPE_STRING = 'string';
-    private const DATATYPE_NUMBER = 'number';
-    private const DATATYPE_NULL = 'null';
+    private const string DATATYPE_OBJECT = 'object';
+    private const string DATATYPE_ARRAY = 'array';
+    private const string DATATYPE_BOOLEAN = 'boolean';
+    private const string DATATYPE_STRING = 'string';
+    private const string DATATYPE_NUMBER = 'number';
+    private const string DATATYPE_NULL = 'null';
 
     public function getContentType(): string
     {
@@ -39,10 +39,7 @@ public function decode(string $data): array
         return $this->decodeNode($document->documentElement);
     }
 
-    /**
-     * @return null|array|bool|float|int|string
-     */
-    private function decodeNode(\DOMNode $node)
+    private function decodeNode(\DOMNode $node): array|bool|float|int|string|null
     {
         $nodeName = $node->nodeName;
 
@@ -69,7 +66,7 @@ private function decodeNode(\DOMNode $node)
         }
 
         if (self::DATATYPE_NULL === $nodeType) {
-            return;
+            return null;
         }
 
         throw RuntimeException::createNotParsable($this->getContentType());

src/Decoder/UrlEncodedTypeDecoder.php

@@ -45,15 +45,8 @@ private function fixValues(array $rawData): array
         return $data;
     }
 
-    /**
-     * @return null|bool|float|int|string
-     */
-    private function fixValue(string $value)
+    private function fixValue(string $value): bool|float|int|string|null
     {
-        if ('' === $value) {
-            return;
-        }
-
         if ('true' === $value) {
             return true;
         }

src/Encoder/JsonxTypeEncoder.php

@@ -9,12 +9,12 @@
  */
 final class JsonxTypeEncoder implements TypeEncoderInterface
 {
-    public const DATATYPE_OBJECT = 'object';
-    public const DATATYPE_ARRAY = 'array';
-    public const DATATYPE_BOOLEAN = 'boolean';
-    public const DATATYPE_STRING = 'string';
-    public const DATATYPE_NUMBER = 'number';
-    public const DATATYPE_NULL = 'null';
+    public const string DATATYPE_OBJECT = 'object';
+    public const string DATATYPE_ARRAY = 'array';
+    public const string DATATYPE_BOOLEAN = 'boolean';
+    public const string DATATYPE_STRING = 'string';
+    public const string DATATYPE_NUMBER = 'number';
+    public const string DATATYPE_NULL = 'null';
 
     public function __construct(private bool $prettyPrint = false) {}