DevKit updates for 4.x branch (#660)

* DevKit updates

* DevKit updates

* Fix build

Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>

.php-cs-fixer.dist.php

@@ -1,5 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /*
  * DO NOT EDIT THIS FILE!
  *

composer.json

@@ -44,6 +44,7 @@
         "twig/twig": "^2.12.1"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.4",
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpstan/extension-installer": "^1.0",

docs/requirements.txt

@@ -6,3 +6,4 @@ Pygments==2.9.0
 sphinx==1.8.5
 git+https://github.com/fabpot/sphinx-php.git@v2.0.2#egg_name=sphinx-php
 sphinx_rtd_theme==0.5.2
+jinja2==3.0.3

psalm.xml

@@ -11,4 +11,15 @@
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
+    <issueHandlers>
+        <!-- Psalm equivalent of PHPStan config `treatPhpDocTypesAsCertain: false` -->
+        <DocblockTypeContradiction errorLevel="suppress"/>
+        <RedundantConditionGivenDocblockType errorLevel="suppress"/>
+        <UndefinedDocblockClass>
+            <errorLevel type="suppress">
+                <!-- https://github.com/symfony/symfony/issues/45609 -->
+                <referencedClass name="UnitEnum"/>
+            </errorLevel>
+        </UndefinedDocblockClass>
+    </issueHandlers>
 </psalm>

src/DependencyInjection/SonataFormatterExtension.php

@@ -51,7 +51,7 @@ public function load(array $configs, ContainerBuilder $container): void
         if (isset($bundles['FOSCKEditorBundle'])) {
             if (interface_exists(CKEditorConfigurationInterface::class)) {
                 $loader->load('form.xml');
-            } else {//NEXT_MAJOR: Remove this case
+            } else {// NEXT_MAJOR: Remove this case
                 $loader->load('form_fcke1.xml');
             }
         }

src/Form/Type/FormatterType.php

@@ -196,7 +196,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         if (null !== $this->ckEditorConfiguration) {
             $defaultConfig = $this->ckEditorConfiguration->getDefaultConfig();
             $ckeditorConfiguration = $this->ckEditorConfiguration->getConfig($defaultConfig);
-        } else {//NEXT_MAJOR: Remove this case
+        } else {// NEXT_MAJOR: Remove this case
             $defaultConfig = $this->configManager->getDefaultConfig();
 
             if ($this->configManager->hasConfig($defaultConfig)) {
@@ -211,7 +211,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         }
 
         if ($options['ckeditor_context']) {
-            if (null !== $this->configManager) {//NEXT_MAJOR: Remove this case
+            if (null !== $this->configManager) {// NEXT_MAJOR: Remove this case
                 $contextConfig = $this->configManager->getConfig($options['ckeditor_context']);
             } else {
                 $contextConfig = $this->ckEditorConfiguration->getConfig($options['ckeditor_context']);
@@ -230,7 +230,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
             if (\is_string($ckeditorConfiguration['toolbar'])) {
                 $ckeditorConfiguration['toolbar'] = $this->ckEditorConfiguration->getToolbar($ckeditorConfiguration['toolbar']);
             }
-        } else {//NEXT_MAJOR: Remove this case
+        } else {// NEXT_MAJOR: Remove this case
             if ($this->pluginManager->hasPlugins()) {
                 $options['ckeditor_plugins'] = $this->pluginManager->getPlugins();
             }

src/Form/Type/SimpleFormatterType.php

@@ -106,7 +106,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         if (null !== $this->ckEditorConfiguration) {
             $defaultConfig = $this->ckEditorConfiguration->getDefaultConfig();
             $ckeditorConfiguration = $this->ckEditorConfiguration->getConfig($defaultConfig);
-        } else {//NEXT_MAJOR: Remove this case
+        } else {// NEXT_MAJOR: Remove this case
             $defaultConfig = $this->configManager->getDefaultConfig();
 
             if ($this->configManager->hasConfig($defaultConfig)) {
@@ -121,7 +121,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         }
 
         if ($options['ckeditor_context']) {
-            if (null !== $this->configManager) {//NEXT_MAJOR: Remove this case
+            if (null !== $this->configManager) {// NEXT_MAJOR: Remove this case
                 $contextConfig = $this->configManager->getConfig($options['ckeditor_context']);
             } else {
                 $contextConfig = $this->ckEditorConfiguration->getConfig($options['ckeditor_context']);
@@ -142,7 +142,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
             if (\is_string($ckeditorConfiguration['toolbar'])) {
                 $ckeditorConfiguration['toolbar'] = $this->ckEditorConfiguration->getToolbar($ckeditorConfiguration['toolbar']);
             }
-        } else {//NEXT_MAJOR: Remove this case
+        } else {// NEXT_MAJOR: Remove this case
             if ($this->pluginManager->hasPlugins()) {
                 $options['ckeditor_plugins'] = $this->pluginManager->getPlugins();
             }

tests/bootstrap.php

@@ -11,14 +11,14 @@
  * file that was distributed with this source code.
  */
 
-use Doctrine\Deprecations\Deprecation;
-
 /*
  * DO NOT EDIT THIS FILE!
  *
  * It's auto-generated by sonata-project/dev-kit package.
  */
 
+use Doctrine\Deprecations\Deprecation;
+
 /*
  * fix encoding issue while running text on different host with different locale configuration
  */