Pimcore 11

.github/workflows/php.yml

@@ -12,16 +12,14 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-latest ]
-        php: [ "8.0", "8.1" ]
-        pimcore: [ '^10.0' ]
+        php: [ "8.1", "8.2" ]
+        pimcore: [ '^11.0' ]
         stability: [ prefer-lowest, prefer-stable ]
-        exclude:
-          - stability: prefer-lowest # TODO: remove ASAP
 
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
@@ -54,7 +52,7 @@ jobs:
         operating-system: [ ubuntu-latest ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

composer.json

@@ -4,12 +4,12 @@
   "description": "Forms for Pimcore",
   "type": "pimcore-bundle",
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "ext-json": "*",
-    "limenius/liform": "dev-master#28828461425acfb9d30ae02f554055be17ca5530",
-    "pimcore/pimcore": "^10.0",
+    "limenius/liform": "^0.19",
+    "pimcore/pimcore": "^11.0",
     "ramsey/uuid": "^4.0",
-    "symfony/form": "^5.0",
+    "symfony/form": "^6.0",
     "voku/portable-ascii": "^1.5 || ^2.0"
   },
   "require-dev": {
@@ -18,12 +18,6 @@
     "phpstan/phpstan-deprecation-rules": "^1.1.4",
     "phpstan/extension-installer": "^1.3.1"
   },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/phpwutz/Liform"
-    }
-  ],
   "autoload": {
     "psr-4": {
       "Valantic\\PimcoreFormsBundle\\": "src/"

phpstan-baseline.neon

@@ -55,14 +55,6 @@ parameters:
 			count: 1
 			path: src/Form/FormErrorNormalizer.php
 
-		-
-			message: """
-				#^Call to deprecated method setSubject\\(\\) of class Pimcore\\\\Mail\\:
-				use subject\\(\\) instead\\. Will be removed in Pimcore 11$#
-			"""
-			count: 1
-			path: src/Form/Output/EmailOutput.php
-
 		-
 			message: "#^Method Valantic\\\\PimcoreFormsBundle\\\\Form\\\\Transformer\\\\ButtonTransformer\\:\\:transform\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -73,11 +65,6 @@ parameters:
 			count: 1
 			path: src/Form/Transformer/ChoiceTransformer.php
 
-		-
-			message: "#^Method Valantic\\\\PimcoreFormsBundle\\\\Form\\\\Transformer\\\\ChoiceTransformer\\:\\:transformMultiple\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/Form/Transformer/ChoiceTransformer.php
-
 		-
 			message: "#^Method Valantic\\\\PimcoreFormsBundle\\\\Form\\\\Transformer\\\\ChoiceTransformer\\:\\:transformMultiple\\(\\) has parameter \\$choices with no type specified\\.$#"
 			count: 1
@@ -88,11 +75,6 @@ parameters:
 			count: 1
 			path: src/Form/Transformer/ChoiceTransformer.php
 
-		-
-			message: "#^Method Valantic\\\\PimcoreFormsBundle\\\\Form\\\\Transformer\\\\ChoiceTransformer\\:\\:transformSingle\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/Form/Transformer/ChoiceTransformer.php
-
 		-
 			message: "#^Method Valantic\\\\PimcoreFormsBundle\\\\Form\\\\Transformer\\\\ChoiceTransformer\\:\\:transformSingle\\(\\) has parameter \\$choices with no type specified\\.$#"
 			count: 1

rector.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
+use Rector\Config\RectorConfig;
+use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+    ]);
+
+    $rectorConfig->skip([
+    ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_81,
+        SetList::CODE_QUALITY,
+    ]);
+};

src/Controller/FormController.php

@@ -65,7 +65,7 @@ public function apiAction(string $name, FormService $formService, Request $reque
         $form = $formService->buildForm($name);
         $form->handleRequest($request);
 
-        if (!$form->isSubmitted() && $request->getContentType() === 'json') {
+        if (!$form->isSubmitted() && $request->getContentTypeFormat() === 'json') {
             $content = (string) $request->getContent();
             $data = json_decode($content, true, flags: \JSON_THROW_ON_ERROR);
 

src/Form/Output/EmailOutput.php

@@ -25,7 +25,7 @@ public function handle(OutputResponse $outputResponse): OutputResponse
         $subject = $this->getSubject();
 
         if ($subject !== null) {
-            $mail->setSubject($subject);
+            $mail->subject($subject);
         }
 
         $from = $this->getFrom();

src/Form/Transformer/ButtonTransformer.php

@@ -11,7 +11,7 @@ class ButtonTransformer extends AbstractTransformer
 {
     use OverwriteAbstractTransformerTrait;
 
-    public function transform(FormInterface $form, array $extensions = [], $widget = null)
+    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
     {
         $schema = ['type' => 'string'];
 

src/Form/Transformer/ChoiceTransformer.php

@@ -20,7 +20,7 @@ class ChoiceTransformer extends \Limenius\Liform\Transformer\ChoiceTransformer
     /**
      * {@inheritDoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null)
+    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
     {
         $formView = $form->createView();
 
@@ -47,7 +47,10 @@ public function transform(FormInterface $form, array $extensions = [], $widget =
         return $this->addCommonSpecs($form, $schema, $extensions, $widget);
     }
 
-    private function transformSingle(FormInterface $form, $choices, $titles)
+    /**
+     * @return array<string,mixed>
+     */
+    private function transformSingle(FormInterface $form, $choices, $titles): array
     {
         $formView = $form->createView();
 
@@ -67,7 +70,10 @@ private function transformSingle(FormInterface $form, $choices, $titles)
         return $schema;
     }
 
-    private function transformMultiple(FormInterface $form, $choices, $titles)
+    /**
+     * @return array<string,mixed>
+     */
+    private function transformMultiple(FormInterface $form, $choices, $titles): array
     {
         $formView = $form->createView();
 

src/Form/Transformer/FileTransformer.php

@@ -11,7 +11,7 @@ class FileTransformer extends StringTransformer
     /**
      * {@inheritDoc}
      */
-    public function transform(FormInterface $form, array $extensions = [], $widget = null)
+    public function transform(FormInterface $form, array $extensions = [], $widget = null): array
     {
         $schema = ['type' => 'file'];
 

src/ValanticPimcoreFormsBundle.php

@@ -22,13 +22,6 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new ExtensionCompilerPass());
     }
 
-    public function getJsPaths(): array
-    {
-        return [
-            '/bundles/valanticpimcoreforms/js/pimcore/startup.js',
-        ];
-    }
-
     protected function getComposerPackageName(): string
     {
         $composer = file_get_contents(__DIR__ . '/../composer.json');

vendor-bin/phpcs/composer.json

@@ -1,5 +1,5 @@
 {
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.34.0"
+        "friendsofphp/php-cs-fixer": "^3.34.1"
     }
 }