Merge pull request #77 from survos/tac

add php 8.4 compatibility, CI
Limenius · Nov 29, 2024 · 1b77257 · 1b77257
2 parents c364314 + 3c02c26
commit 1b77257
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 14 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -0,0 +1,20 @@
+name: phpstan-CI
+on:
+  [push, pull_request]
+jobs:
+  phpstan:
+    runs-on: ubuntu-latest
+    name: PHPStan
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.4
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: composer install
+        run: composer install
+      - name: PHPStan
+        run: vendor/bin/phpstan
+        env:
+          REQUIRE_DEV: true
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -13,6 +13,7 @@ jobs:
                 php-version:
                     - "8.2"
                     - "8.3"
+                    - "8.4"
                 deps:
                     - "normal"
                 include:
@@ -21,7 +22,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: "actions/checkout@v2"
+              uses: "actions/checkout@v4"
               with:
                   fetch-depth: 2
 

diff --git a/src/Limenius/Liform/FormUtil.php b/src/Limenius/Liform/FormUtil.php
@@ -38,7 +38,7 @@ public static function typeAncestry(FormInterface $form)
      *
      * @return void
      */
-    public static function typeAncestryForType(array &$types, ResolvedFormTypeInterface $formType = null): void
+    public static function typeAncestryForType(array &$types, ?ResolvedFormTypeInterface $formType = null): void
     {
         if (!($formType instanceof ResolvedFormTypeInterface)) {
             return;

diff --git a/src/Limenius/Liform/Resolver.php b/src/Limenius/Liform/Resolver.php
@@ -30,7 +30,7 @@ class Resolver implements ResolverInterface
      * @param TransformerInterface $transformer
      * @param string|null          $widget
      */
-    public function setTransformer($formType, TransformerInterface $transformer, $widget = null): void
+    public function setTransformer($formType, TransformerInterface $transformer, ?string $widget = null): void
     {
         $this->transformers[$formType] = [
             'transformer' => $transformer,

diff --git a/src/Limenius/Liform/ResolverInterface.php b/src/Limenius/Liform/ResolverInterface.php
@@ -24,7 +24,7 @@ interface ResolverInterface
      * @param TransformerInterface $transformer
      * @param string|null          $widget
      */
-    public function setTransformer($formType, TransformerInterface $transformer, $widget = null);
+    public function setTransformer($formType, TransformerInterface $transformer, ?string $widget = null);
 
     /**
      * @param FormInterface $form

diff --git a/src/Limenius/Liform/Transformer/AbstractTransformer.php b/src/Limenius/Liform/Transformer/AbstractTransformer.php
@@ -59,7 +59,7 @@ protected function applyExtensions(array $extensions, FormInterface $form, array
      *
      * @return array
      */
-    protected function addCommonSpecs(FormInterface $form, array $schema, array $extensions = [], $widget = null)
+    protected function addCommonSpecs(FormInterface $form, array $schema, array $extensions = [], ?string $widget = null)
     {
         $schema = $this->addLabel($form, $schema);
         $schema = $this->addAttr($form, $schema);

diff --git a/src/Limenius/Liform/Transformer/ArrayTransformer.php b/src/Limenius/Liform/Transformer/ArrayTransformer.php
@@ -32,7 +32,7 @@ class ArrayTransformer extends AbstractTransformer
      * @param FormTypeGuesserInterface|null $validatorGuesser
      * @param ResolverInterface             $resolver
      */
-    public function __construct(TranslatorInterface $translator, ResolverInterface $resolver, FormTypeGuesserInterface $validatorGuesser = null)
+    public function __construct(TranslatorInterface $translator, ResolverInterface $resolver, ?FormTypeGuesserInterface $validatorGuesser = null)
     {
         parent::__construct($translator, $validatorGuesser);
         $this->resolver = $resolver;
@@ -41,7 +41,7 @@ public function __construct(TranslatorInterface $translator, ResolverInterface $
     /**
      * {@inheritdoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
+    public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array
     {
         $children = [];
 

diff --git a/src/Limenius/Liform/Transformer/BooleanTransformer.php b/src/Limenius/Liform/Transformer/BooleanTransformer.php
@@ -21,7 +21,7 @@ class BooleanTransformer extends AbstractTransformer
     /**
      * {@inheritdoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
+    public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array
     {
         $schema = ['type' => 'boolean'];
         $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget);

diff --git a/src/Limenius/Liform/Transformer/ChoiceTransformer.php b/src/Limenius/Liform/Transformer/ChoiceTransformer.php
@@ -22,7 +22,7 @@ class ChoiceTransformer extends AbstractTransformer
     /**
      * {@inheritdoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
+    public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array
     {
         $formView = $form->createView();
 

diff --git a/src/Limenius/Liform/Transformer/CompoundTransformer.php b/src/Limenius/Liform/Transformer/CompoundTransformer.php
@@ -31,7 +31,7 @@ class CompoundTransformer extends AbstractTransformer
      * @param ResolverInterface             $resolver
      * @param FormTypeGuesserInterface|null $validatorGuesser
      */
-    public function __construct(TranslatorInterface $translator, ResolverInterface $resolver, FormTypeGuesserInterface $validatorGuesser = null)
+    public function __construct(TranslatorInterface $translator, ResolverInterface $resolver, ?FormTypeGuesserInterface $validatorGuesser = null)
     {
         parent::__construct($translator, $validatorGuesser);
         $this->resolver = $resolver;
@@ -40,7 +40,7 @@ public function __construct(TranslatorInterface $translator, ResolverInterface $
     /**
      * {@inheritdoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
+    public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array
     {
         $data = [];
         $order = 1;

diff --git a/src/Limenius/Liform/Transformer/IntegerTransformer.php b/src/Limenius/Liform/Transformer/IntegerTransformer.php
@@ -21,7 +21,7 @@ class IntegerTransformer extends AbstractTransformer
     /**
      * {@inheritdoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
+    public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array
     {
         $schema = ['type' => 'integer'];
         $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget);

diff --git a/src/Limenius/Liform/Transformer/NumberTransformer.php b/src/Limenius/Liform/Transformer/NumberTransformer.php
@@ -21,7 +21,7 @@ class NumberTransformer extends AbstractTransformer
     /**
      * {@inheritdoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
+    public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array
     {
         $schema = ['type' => 'number'];
         $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget);

diff --git a/src/Limenius/Liform/Transformer/StringTransformer.php b/src/Limenius/Liform/Transformer/StringTransformer.php
@@ -23,7 +23,7 @@ class StringTransformer extends AbstractTransformer
     /**
      * {@inheritdoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
+    public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array
     {
         $schema = ['type' => 'string'];
         $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget);