Require PHP 8.4, replace Psalm with PHPStan, upgrade Valinor to 2.x, remove PSL

.github/workflows/build.yaml

@@ -15,7 +15,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
+                    - "8.4"
 
                 dependencies:
                     - "highest"
@@ -53,10 +53,8 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
-                    - "8.2"
-                    - "8.3"
                     - "8.4"
+                    - "8.5"
 
                 dependencies:
                     - "lowest"
@@ -89,10 +87,8 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
-                    - "8.2"
-                    - "8.3"
                     - "8.4"
+                    - "8.5"
 
                 dependencies:
                     - "lowest"
@@ -125,10 +121,8 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1"
-                    - "8.2"
-                    - "8.3"
                     - "8.4"
+                    - "8.5"
 
                 dependencies:
                     - "lowest"

composer-dependency-analyser.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
+
+return (new Configuration())
+    ->addPathToExclude(__DIR__ . '/tests')
+;

composer.json

@@ -10,20 +10,14 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
-        "azjezz/psl": "^2.9 || ^3.2",
-        "cuyz/valinor": "^1.9",
+        "php": ">=8.4",
+        "cuyz/valinor": "^2.0",
         "psr/log": "^1.1 || ^2.0 || ^3.0",
         "setono/html-element": "^1.0",
-        "symfony/options-resolver": "^4.4 || ^5.4 || ^6.0 || ^7.0 || ^8.0"
+        "symfony/options-resolver": "^6.4 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "infection/infection": "^0.28.1",
-        "php-standard-library/psalm-plugin": "^2.3",
-        "phpunit/phpunit": "^9.6",
-        "psalm/plugin-phpunit": "^0.19.5",
-        "setono/code-quality-pack": "^2.6",
-        "shipmonk/composer-dependency-analyser": "^1.8.2"
+        "setono/code-quality-pack": "^3.4"
     },
     "prefer-stable": true,
     "autoload": {
@@ -40,12 +34,13 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": false,
             "ergebnis/composer-normalize": true,
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "phpstan/extension-installer": true
         },
         "sort-packages": true
     },
     "scripts": {
-        "analyse": "psalm",
+        "analyse": "phpstan",
         "check-style": "ecs check",
         "fix-style": "ecs check --fix",
         "phpunit": "phpunit",

phpstan.dist.neon

@@ -0,0 +1,9 @@
+includes:
+    - vendor/cuyz/valinor/qa/PHPStan/valinor-phpstan-configuration.php
+
+parameters:
+    level: max
+    paths:
+        - src
+        - tests
+    tmpDir: .build/phpstan

phpunit.xml.dist

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php"
-         colors="true" verbose="true">
-    <coverage includeUncoveredFiles="true" processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".build/phpunit"
+         colors="true">
     <testsuites>
         <testsuite name="EditorJS Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
 </phpunit>

rector.php

@@ -4,18 +4,17 @@
 
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
 use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\LevelSetList;
+use Rector\PHPUnit\Set\PHPUnitSetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->cacheClass(FileCacheStorage::class);
-    $rectorConfig->cacheDirectory('./.build/rector');
-
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withCache('./.build/rector', FileCacheStorage::class)
+    ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
+    ])
+    ->withPhpSets(php84: true)
+    ->withAttributesSets(phpunit: true)
+    ->withSets([
+        PHPUnitSetList::PHPUNIT_100,
+        PHPUnitSetList::PHPUNIT_110,
     ]);
-
-    $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81
-    ]);
-};

src/Block/Image/File.php

@@ -5,9 +5,9 @@
 namespace Setono\EditorJS\Block\Image;
 
 // todo right now it doesn't support the extra data you can set on the File object (see https://github.com/editor-js/image#providing-custom-uploading-methods)
-final class File
+final readonly class File
 {
-    public function __construct(public readonly string $url)
+    public function __construct(public string $url)
     {
     }
 }

src/Block/ImageBlock.php

@@ -22,7 +22,7 @@ public function __construct(
     /**
      * Returns true if the caption is not empty, i.e. $this->caption !== ''
      *
-     * @psalm-assert-if-true non-empty-string $this->caption
+     * @phpstan-assert-if-true non-empty-string $this->caption
      */
     public function hasCaption(): bool
     {

src/Block/ListBlock.php

@@ -6,9 +6,9 @@
 
 final class ListBlock extends Block
 {
-    public const STYLE_ORDERED = 'ordered';
+    public const string STYLE_ORDERED = 'ordered';
 
-    public const STYLE_UNORDERED = 'unordered';
+    public const string STYLE_UNORDERED = 'unordered';
 
     /**
      * This is a helper property containing the html tag for the list (i.e. ol/ul)

src/BlockRenderer/DelimiterBlockRenderer.php

@@ -16,17 +16,20 @@ public function render(Block $block): HtmlElement
     {
         UnsupportedBlockException::assert($this->supports($block), $block, $this);
 
-        return (new HtmlElement($this->getOption('tag')))->withClass($this->getClassOption('class'));
+        $tag = $this->getOption('tag');
+
+        return new HtmlElement(is_string($tag) ? $tag : 'hr')->withClass($this->getClassOption('class'));
     }
 
     /**
-     * @psalm-assert-if-true DelimiterBlock $block
+     * @phpstan-assert-if-true DelimiterBlock $block
      */
     public function supports(Block $block): bool
     {
         return $block instanceof DelimiterBlock;
     }
 
+    #[\Override]
     protected function configureOptions(OptionsResolver $optionsResolver): void
     {
         parent::configureOptions($optionsResolver);

src/BlockRenderer/EmbedBlockRenderer.php

@@ -31,6 +31,7 @@ public function render(Block $block): HtmlElement
         )->withClass($this->getClassOption('containerClass'));
     }
 
+    #[\Override]
     protected function configureOptions(OptionsResolver $optionsResolver): void
     {
         parent::configureOptions($optionsResolver);
@@ -41,7 +42,7 @@ protected function configureOptions(OptionsResolver $optionsResolver): void
     }
 
     /**
-     * @psalm-assert-if-true EmbedBlock $block
+     * @phpstan-assert-if-true EmbedBlock $block
      */
     public function supports(Block $block): bool
     {

src/BlockRenderer/GenericBlockRenderer.php

@@ -11,15 +11,21 @@
 
 abstract class GenericBlockRenderer implements BlockRendererInterface
 {
+    /** @var array<string, mixed> */
     private array $options;
 
+    /**
+     * @param array<string, mixed> $options
+     */
     public function __construct(array $options = [])
     {
         $resolver = new OptionsResolver();
         $this->configureOptions($resolver);
 
         try {
-            $this->options = $resolver->resolve($options);
+            /** @var array<string, mixed> $resolvedOptions */
+            $resolvedOptions = $resolver->resolve($options);
+            $this->options = $resolvedOptions;
         } catch (ExceptionInterface $e) {
             throw new OptionsResolverException($e, $this);
         }
@@ -34,9 +40,6 @@
         ;
     }
 
-    /**
-     * @psalm-assert-if-true mixed $this->options[$option]
-     */
     protected function hasOption(string $option): bool
     {
         return isset($this->options[$option]);
@@ -45,7 +48,7 @@
     protected function getOption(string $option): mixed
     {
         if (!$this->hasOption($option)) {
             throw new UndefinedOptionException($option, array_keys($this->options));
         }
 
         return $this->options[$option];
@@ -63,7 +66,8 @@
             return '';
         }
 
-        /** @psalm-suppress MixedArgument */
-        return sprintf('%s%s', $this->getOption('classPrefix'), $option);
+        $prefix = $this->getOption('classPrefix');
+
+        return sprintf('%s%s', is_string($prefix) ? $prefix : '', $option);
     }
 }

src/BlockRenderer/HeaderBlockRenderer.php

@@ -18,13 +18,13 @@ public function render(Block $block): HtmlElement
     {
         UnsupportedBlockException::assert($this->supports($block), $block, $this);
 
-        return (new HtmlElement(sprintf('h%d', $block->level), $block->text))
+        return new HtmlElement(sprintf('h%d', $block->level), $block->text)
             ->withClass($this->getClassOption('class'))
         ;
     }
 
     /**
-     * @psalm-assert-if-true HeaderBlock $block
+     * @phpstan-assert-if-true HeaderBlock $block
      */
     public function supports(Block $block): bool
     {

src/BlockRenderer/ImageBlockRenderer.php

@@ -48,6 +48,7 @@ public function render(Block $block): HtmlElement
         return $container;
     }
 
+    #[\Override]
     protected function configureOptions(OptionsResolver $optionsResolver): void
     {
         parent::configureOptions($optionsResolver);
@@ -70,7 +71,7 @@ protected function configureOptions(OptionsResolver $optionsResolver): void
     }
 
     /**
-     * @psalm-assert-if-true ImageBlock $block
+     * @phpstan-assert-if-true ImageBlock $block
      */
     public function supports(Block $block): bool
     {

src/BlockRenderer/ListBlockRenderer.php

@@ -19,14 +19,15 @@ public function render(Block $block): HtmlElement
     {
         UnsupportedBlockException::assert($this->supports($block), $block, $this);
 
-        return (new HtmlElement($block->tag, ...array_map(
+        return new HtmlElement($block->tag, ...array_map(
             fn (string $item) => HtmlElement::li($item)->withClass($this->getClassOption('itemClass')),
             $block->items,
-        )))
+        ))
             ->withClass($this->getClassOption('class'))
         ;
     }
 
+    #[\Override]
     protected function configureOptions(OptionsResolver $optionsResolver): void
     {
         parent::configureOptions($optionsResolver);
@@ -37,7 +38,7 @@ protected function configureOptions(OptionsResolver $optionsResolver): void
     }
 
     /**
-     * @psalm-assert-if-true ListBlock $block
+     * @phpstan-assert-if-true ListBlock $block
      */
     public function supports(Block $block): bool
     {

src/BlockRenderer/ParagraphBlockRenderer.php

@@ -22,7 +22,7 @@ public function render(Block $block): HtmlElement
     }
 
     /**
-     * @psalm-assert-if-true ParagraphBlock $block
+     * @phpstan-assert-if-true ParagraphBlock $block
      */
     public function supports(Block $block): bool
     {

src/BlockRenderer/QuoteBlockRenderer.php

@@ -30,7 +30,7 @@ public function render(Block $block): HtmlElement
     }
 
     /**
-     * @psalm-assert-if-true QuoteBlock $block
+     * @phpstan-assert-if-true QuoteBlock $block
      */
     public function supports(Block $block): bool
     {

src/BlockRenderer/RawBlockRenderer.php

@@ -22,7 +22,7 @@ public function render(Block $block): HtmlElement
     }
 
     /**
-     * @psalm-assert-if-true RawBlock $block
+     * @phpstan-assert-if-true RawBlock $block
      */
     public function supports(Block $block): bool
     {