3.5x (#3)

* 3.5: Bumped up php version to 8 + Updated test

* Removed deprecated libxml_* functions + Updated media parsers and tests

* Fixed HttpFactoryTest::testSkipsAndRemovesNonExistingFactory

* Updated version info in readme

Co-authored-by: Daniyal Hamid <danielli@daniellis-MacBook-Pro.local>
Co-authored-by: Daniyal Hamid <hello@designcise.com>

Author: 3 people

README.md

@@ -31,7 +31,7 @@ Install BitFrame and its required dependencies using composer:
 $ composer require "designcise/bitframe"
 ```
 
-Please note that BitFrame v2+ requires PHP 7.4.0 or newer.
+Please note that BitFrame v3+ requires PHP 8.0.0 or newer.
 
 ## Quickstart
 
@@ -139,7 +139,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ### Documentation
 
-Complete documentation for v2.0 will be released soon.
+Complete documentation for v3 will be released soon.
 
 ### License
 

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": ">=7.4",
+    "php": ">=8.0",
     "ext-json": "*",
     "psr/container": "^1.0",
     "psr/http-server-middleware": "~1.0"

src/Parser/DefaultMediaParser.php

@@ -25,7 +25,7 @@ class DefaultMediaParser implements MediaParserInterface
     /**
      * {@inheritdoc}
      */
-    public function parse(string $input)
+    public function parse(string $input): mixed
     {
         parse_str($input, $data);
         return $data;

src/Parser/JsonMediaParser.php

@@ -36,7 +36,7 @@ class JsonMediaParser implements MediaParserInterface
      *
      * @throws \JsonException
      */
-    public function parse(string $input)
+    public function parse(string $input): mixed
     {
         $result = json_decode($input, true, 512, self::OPTIONS);
         return ((is_array($result)) ? $result : null);

src/Parser/MediaParserInterface.php

@@ -24,5 +24,5 @@ interface MediaParserInterface
      *
      * @return mixed
      */
-    public function parse(string $input);
+    public function parse(string $input): mixed;
 }

src/Parser/MediaParserNegotiator.php

@@ -63,7 +63,7 @@ public function add(string $type, string $parser): void
     /**
      * {@inheritdoc}
      */
-    public function parse(string $input)
+    public function parse(string $input): mixed
     {
         return $this->getPreferredMediaParser()->parse($input);
     }

src/Parser/XmlMediaParser.php

@@ -12,10 +12,7 @@
 
 namespace BitFrame\Parser;
 
-use function libxml_clear_errors;
-use function libxml_disable_entity_loader;
-use function libxml_use_internal_errors;
-use function simplexml_load_string;
+use SimpleXMLElement;
 
 use const LIBXML_NOCDATA;
 
@@ -33,20 +30,8 @@ class XmlMediaParser implements MediaParserInterface
     /**
      * {@inheritdoc}
      */
-    public function parse(string $input)
+    public function parse(string $input): ?SimpleXMLElement
     {
-        $backup = libxml_disable_entity_loader(true);
-        $backupErrors = libxml_use_internal_errors(true);
-        $result = simplexml_load_string(
-            $input,
-            'SimpleXMLElement',
-            self::OPTIONS
-        );
-        
-        libxml_disable_entity_loader($backup);
-        libxml_clear_errors();
-        libxml_use_internal_errors($backupErrors);
-        
-        return $result ?: null;
+        return new SimpleXMLElement($input, self::OPTIONS) ?: null;
     }
 }

test/Emitter/SapiStreamEmitterTest.php

@@ -49,7 +49,7 @@ public function testEmitTextResponse()
     public function testReturnsBodyWhenNotReadableButIsSeekable(): void
     {
         $stream = HttpFactory::createStream('Hello world!');
-        $mockedStream = Mockery::mock($stream, StreamInterface::class)->makePartial();
+        $mockedStream = Mockery::mock($stream, $stream::class)->makePartial();
         $mockedStream->shouldReceive('isSeekable')->andReturn(true);
         $mockedStream->shouldReceive('isReadable')->andReturn(false);
 

test/Factory/HttpFactoryTest.php

@@ -122,14 +122,14 @@ public function testSkipsAndRemovesNonExistingFactory(): void
         $property->setAccessible(true);
         $property->setValue([
             '\Non\Existent\Factory',
-            ...$property->getValue('factoriesList'),
+            ...$property->getValue(),
         ]);
 
         HttpFactory::getFactory();
 
         $propertyAfter = $reflection->getProperty('factoriesList');
         $propertyAfter->setAccessible(true);
-        $activeFactoriesList = $propertyAfter->getValue('factoriesList');
+        $activeFactoriesList = $propertyAfter->getValue();
 
         $this->assertNotContains('\Non\Existent\Factory', $activeFactoriesList);
     }

test/Parser/MediaParserNegotiatorTest.php

@@ -58,7 +58,7 @@ public function testAddNewOrUpdateExistingParser(string $parserName): void
 
         $parser = new class implements MediaParserInterface {
             public const MIMES = ['text/made-up'];
-            public function parse(string $input)
+            public function parse(string $input): string
             {
                 return "foo({$input})";
             }
@@ -84,7 +84,7 @@ public function testParse(): void
 
         $parser = new class implements MediaParserInterface {
             public const MIMES = ['application/json'];
-            public function parse(string $input)
+            public function parse(string $input): mixed
             {
                 return json_decode('{"arg":"' . $input . '"}', true);
             }