Remove php 7.4 and 8.0 from CI

Author: SerafimArts

composer.json

@@ -28,7 +28,6 @@
     "require-dev": {
         "phpunit/phpunit": "^10.5|^11.0",
         "psr/http-message": "^1.0|^2.0",
-        "httpsoft/http-message": "^1.1",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^1.11",
         "phpstan/phpstan-strict-rules": "^1.6"

src/Exception/NotCreatableException.php

@@ -22,7 +22,7 @@ public static function fromInvalidType(mixed $source): self
     {
         $message = \vsprintf('Cannot create %s instance from %s', [
             ReadableInterface::class,
-            \get_debug_type($source)
+            \get_debug_type($source),
         ]);
 
         return new static($message, self::CODE_INVALID_TYPE);

src/MemoizableInterface.php

@@ -10,15 +10,9 @@
 
 final class PsrStreamSourceProvider implements SourceProviderInterface
 {
-    /**
-     * @readonly
-     */
-    private SourceFactory $parent;
-
-    public function __construct(SourceFactory $parent)
-    {
-        $this->parent = $parent;
-    }
+    public function __construct(
+        private readonly SourceFactory $parent,
+    ) {}
 
     public function create(mixed $source): ?ReadableInterface
     {

src/Provider/PsrStreamSourceProvider.php

@@ -9,15 +9,9 @@
 
 final class SplFileInfoSourceProvider implements SourceProviderInterface
 {
-    /**
-     * @readonly
-     */
-    private SourceFactory $parent;
-
-    public function __construct(SourceFactory $parent)
-    {
-        $this->parent = $parent;
-    }
+    public function __construct(
+        private readonly SourceFactory $parent,
+    ) {}
 
     public function create(mixed $source): ?ReadableInterface
     {

src/Provider/SplFileInfoSourceProvider.php

@@ -9,15 +9,9 @@
 
 final class StreamSourceProvider implements SourceProviderInterface
 {
-    /**
-     * @readonly
-     */
-    private SourceFactory $parent;
-
-    public function __construct(SourceFactory $parent)
-    {
-        $this->parent = $parent;
-    }
+    public function __construct(
+        private readonly SourceFactory $parent,
+    ) {}
 
     public function create(mixed $source): ?ReadableInterface
     {

src/Provider/StreamSourceProvider.php

@@ -9,15 +9,9 @@
 
 final class TextSourceProvider implements SourceProviderInterface
 {
-    /**
-     * @readonly
-     */
-    private SourceFactory $parent;
-
-    public function __construct(SourceFactory $parent)
-    {
-        $this->parent = $parent;
-    }
+    public function __construct(
+        private readonly SourceFactory $parent,
+    ) {}
 
     public function create(mixed $source): ?ReadableInterface
     {

src/Provider/TextSourceProvider.php

@@ -21,11 +21,6 @@ class Source extends Readable implements PreferContentReadingInterface
      */
     private $stream;
 
-    /**
-     * @psalm-readonly-allow-private-mutation
-     */
-    private string $content;
-
     /**
      * @var non-empty-string
      *
@@ -47,7 +42,10 @@ class Source extends Readable implements PreferContentReadingInterface
      *        used as a resource during the reading of the source
      */
     public function __construct(
-        string $content,
+        /**
+         * @psalm-readonly-allow-private-mutation
+         */
+        private string $content,
         string $algo = SourceFactory::DEFAULT_HASH_ALGO,
         string $temp = SourceFactory::DEFAULT_TEMP_STREAM
     ) {
@@ -56,7 +54,6 @@ public function __construct(
 
         $this->temp = $temp;
         $this->algo = $algo;
-        $this->content = $content;
     }
 
     public function getContents(): string

src/Source.php

@@ -8,7 +8,6 @@
 use Phplrt\Contracts\Source\ReadableInterface;
 use Phplrt\Contracts\Source\SourceExceptionInterface;
 use Phplrt\Contracts\Source\SourceFactoryInterface;
-use Psr\Http\Message\StreamInterface;
 
 trait SourceFactoryTrait
 {
@@ -37,10 +36,6 @@ public static function getSourceFactory(): SourceFactoryInterface
      */
     public static function new(mixed $source): ReadableInterface
     {
-        if ($source instanceof StreamInterface) {
-            return static::fromPsrStream($source);
-        }
-
         $factory = self::getSourceFactory();
 
         return $factory->create($source);
@@ -51,7 +46,6 @@ public static function new(mixed $source): ReadableInterface
      * @param non-empty-string|null $pathname
      *
      * @return ($pathname is null ? ReadableInterface : FileInterface)
-     * @throws SourceExceptionInterface
      */
     public static function empty(?string $pathname = null): ReadableInterface
     {
@@ -63,7 +57,6 @@ public static function empty(?string $pathname = null): ReadableInterface
      * @param non-empty-string|null $pathname
      *
      * @return ($pathname is null ? ReadableInterface : FileInterface)
-     * @throws SourceExceptionInterface
      */
     public static function fromSources(string $sources, ?string $pathname = null): ReadableInterface
     {
@@ -104,24 +97,6 @@ public static function fromPathname(string $pathname): FileInterface
         return new File($pathname);
     }
 
-    /**
-     * @param non-empty-string|null $pathname
-     *
-     * @return ($pathname is null ? ReadableInterface : FileInterface)
-     * @throws SourceExceptionInterface
-     *
-     * @deprecated since phplrt 3.4 and will be removed in 4.0, use {@see fromResource()} instead.
-     */
-    public static function fromPsrStream(StreamInterface $stream, ?string $pathname = null): ReadableInterface
-    {
-        trigger_deprecation('phplrt/source', '3.4', <<<'MSG'
-            Using "%s::fromPsrStream($stream)" with %s argument is deprecated,
-            use "%1$s::fromResource($stream->detach())" instead.
-            MSG, static::class, \get_class($stream));
-
-        return static::fromResource($stream->detach(), $pathname);
-    }
-
     /**
      * @param resource $resource
      * @param non-empty-string|null $pathname

src/SourceFactoryTrait.php

@@ -4,16 +4,13 @@
 
 namespace Phplrt\Source\Tests\Unit;
 
-use HttpSoft\Message\StreamFactory;
 use Phplrt\Source\File;
 use Phplrt\Source\Tests\TestCase as UnitTestCase;
 
 abstract class TestCase extends UnitTestCase
 {
     public static function provider(): array
     {
-        $factory = new StreamFactory();
-
         return [
             'File::fromSources + filename' => [
                 function () {
@@ -35,20 +32,6 @@ function () {
                     return File::fromSplFileInfo(new \SplFileInfo(static::getPathname()));
                 },
             ],
-            'File::fromPsrStream + filename' => [
-                function () use ($factory) {
-                    $stream = $factory->createStreamFromFile(static::getPathname());
-
-                    return File::fromPsrStream($stream, static::getPathname());
-                },
-            ],
-            'File::fromPsrStream' => [
-                function () use ($factory) {
-                    $stream = $factory->createStreamFromFile(static::getPathname());
-
-                    return File::fromPsrStream($stream);
-                },
-            ],
             'File::fromResource + filename' => [
                 function () {
                     $resource = \fopen(static::getPathname(), 'rb');