Merge pull request #17 from WoltLab/php-8.2

Add support for PHP 8.2 to composer.json

Author: Ocramius

.laminas-ci.json

@@ -0,0 +1,5 @@
+{
+    "ignore_php_platform_requirements": {
+        "8.2": true
+    }
+}

composer.json

@@ -19,17 +19,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.0.0 || ~8.1.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "laminas/laminas-stdlib": "^3.2.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-json": "^3.3",
         "laminas/laminas-session": "^2.13",
         "phpunit/phpunit": "^9.5.25"
     },
     "suggest": {
-        "laminas/laminas-json": "Laminas\\Json component",
         "laminas/laminas-session": "To support progressbar persistent"
     },
     "autoload": {

composer.lock

@@ -2,7 +2,9 @@
 
 namespace Laminas\ProgressBar\Adapter;
 
-use Laminas\Json\Json;
+use function json_encode;
+
+use const JSON_THROW_ON_ERROR;
 
 /**
  * Laminas\ProgressBar\Adapter\JsPull offers a simple method for updating a
@@ -51,7 +53,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
             'finished'      => false
         ];
 
-        $data = Json::encode($arguments);
+        $data = json_encode($arguments, JSON_THROW_ON_ERROR);
 
         // Output the data
         $this->_outputData($data);
@@ -64,7 +66,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
      */
     public function finish()
     {
-        $data = Json::encode(['finished' => true]);
+        $data = json_encode(['finished' => true], JSON_THROW_ON_ERROR);
 
         $this->_outputData($data);
     }

src/Adapter/JsPull.php

@@ -2,7 +2,9 @@
 
 namespace Laminas\ProgressBar\Adapter;
 
-use Laminas\Json\Json;
+use function json_encode;
+
+use const JSON_THROW_ON_ERROR;
 
 /**
  * Laminas\ProgressBar\Adapter\JsPush offers a simple method for updating a
@@ -73,7 +75,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
         ];
 
         $data = '<script type="text/javascript">'
-              . 'parent.' . $this->updateMethodName . '(' . Json::encode($arguments) . ');'
+              . 'parent.' . $this->updateMethodName . '(' . json_encode($arguments, JSON_THROW_ON_ERROR) . ');'
               . '</script>';
 
         // Output the data

src/Adapter/JsPush.php

@@ -5,6 +5,8 @@
 use LaminasTest\ProgressBar\TestAsset\JsPullStub;
 use PHPUnit\Framework\TestCase;
 
+use const JSON_THROW_ON_ERROR;
+
 class JsPullTest extends TestCase
 {
     public function testJson()
@@ -13,7 +15,7 @@ public function testJson()
         $adapter->notify(0, 2, 0.5, 1, 1, 'status');
         $output = $adapter->getLastOutput();
 
-        $data = json_decode($output, true);
+        $data = json_decode($output, true, JSON_THROW_ON_ERROR);
 
         $this->assertEquals(0, $data['current']);
         $this->assertEquals(2, $data['max']);
@@ -26,7 +28,7 @@ public function testJson()
         $adapter->finish();
         $output = $adapter->getLastOutput();
 
-        $data = json_decode($output, true);
+        $data = json_decode($output, true, JSON_THROW_ON_ERROR);
 
         $this->assertTrue($data['finished']);
     }

test/Adapter/JsPullTest.php

@@ -5,6 +5,8 @@
 use LaminasTest\ProgressBar\TestAsset\JsPushStub;
 use PHPUnit\Framework\TestCase;
 
+use const JSON_THROW_ON_ERROR;
+
 class JsPushTest extends TestCase
 {
     public function testJson()
@@ -19,7 +21,7 @@ public function testJson()
             . preg_quote('Laminas\\ProgressBar\\ProgressBar\\Update') . '\((.*?)\);</script>#', $output, $result);
         $this->assertEquals(1, $matches);
 
-        $data = json_decode($result[1], true);
+        $data = json_decode($result[1], true, JSON_THROW_ON_ERROR);
 
         $this->assertEquals(0, $data['current']);
         $this->assertEquals(2, $data['max']);