massive update from php >=5.5.9 TO php >=8.1

Symftony · Feb 5, 2024 · 3829c61 · 3829c61
1 parent a80cc2f
commit 3829c61
Show file tree

Hide file tree

Showing 25 changed files with 321 additions and 369 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor
 composer.lock
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -10,18 +10,27 @@
     ],
     "homepage": "https://github.com/symftony/form-handler",
     "require": {
-        "php": ">=5.5.9",
-        "symfony/form": ">=2.8 <4.0"
+        "php": ">=8.1",
+        "symfony/form": "^6.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0",
-        "symfony/dependency-injection": ">=2.8",
-        "symfony/http-kernel": ">=2.8",
-        "symfony/validator": ">=2.8"
+        "phpunit/phpunit": "^9.1",
+        "symfony/dependency-injection": "^6.1",
+        "symfony/config": "^6.1",
+        "symfony/http-kernel": "^6.1",
+        "symfony/serializer": "^6.1",
+        "phpspec/prophecy": "^1.0@dev",
+        "phpspec/prophecy-phpunit": "^2.1",
+        "symfony/translation": "^6.1",
+        "symfony/contracts": "^3.5@dev",
+        "symfony/validator": "^6.1"
     },
     "suggest": {
-        "symfony/validator": ">=2.8",
-        "symfony/serializer": ">=2.8"
+        "symfony/dependency-injection": "^6.1",
+        "symfony/config": "^6.1",
+        "symfony/http-kernel": "^6.1",
+        "symfony/serializer": "^6.1",
+        "symfony/translation": "^6.1"
     },
     "license": "MIT",
     "authors": [

diff --git a/examples/custom-form-web.php b/examples/custom-form-web.php
@@ -68,7 +68,7 @@
 
         <div class="formdebug">
             <code>$form->isSubmitted() : <?= var_export($form->isSubmitted()) ?></code>
-            <code>$form->isValid() : <?= var_export($form->isValid()) ?></code>
+            <code>$form->isValid() : <?= $form->isSubmitted() &&var_export($form->isValid()) ?></code>
             <code>$form->getTransformationFailure() :
                 <?php if ($form->getTransformationFailure()): ?>
                     <span class="warning"><?= $form->getTransformationFailure()->getMessage(); ?></span>

diff --git a/examples/default-return.php b/examples/default-return.php
@@ -86,7 +86,7 @@
 
         <div class="formdebug">
             <code>$form->isSubmitted() : <?= var_export($form->isSubmitted()) ?></code>
-            <code>$form->isValid() : <?= var_export($form->isValid()) ?></code>
+            <code>$form->isValid() : <?= $form->isSubmitted() && var_export($form->isValid()) ?></code>
             <code>$form->getTransformationFailure() :
                 <?php if ($form->getTransformationFailure()): ?>
                     <span class="warning"><?= $form->getTransformationFailure()->getMessage(); ?></span>

diff --git a/examples/exception-with-validator.php b/examples/exception-with-validator.php
@@ -84,7 +84,7 @@
 
         <div class="formdebug">
             <code>$form->isSubmitted() : <?= var_export($form->isSubmitted()) ?></code>
-            <code>$form->isValid() : <?= var_export($form->isValid()) ?></code>
+            <code>$form->isValid() : <?= $form->isSubmitted() && var_export($form->isValid()) ?></code>
             <code>$form->getTransformationFailure() :
                 <?php if ($form->getTransformationFailure()): ?>
                     <span class="warning"><?= $form->getTransformationFailure()->getMessage(); ?></span>

diff --git a/examples/exception.php b/examples/exception.php
@@ -68,7 +68,7 @@
 
         <div class="formdebug">
             <code>$form->isSubmitted() : <?= var_export($form->isSubmitted()) ?></code>
-            <code>$form->isValid() : <?= var_export($form->isValid()) ?></code>
+            <code>$form->isValid() : <?= $form->isSubmitted() && var_export($form->isValid()) ?></code>
             <code>$form->getTransformationFailure() :
                 <?php if ($form->getTransformationFailure()): ?>
                     <span class="warning"><?= $form->getTransformationFailure()->getMessage(); ?></span>

diff --git a/examples/index.php b/examples/index.php
@@ -31,11 +31,11 @@
             <label>My value
                 <input name="my-value"/></label>
             <input type="submit">
-            <a href="basic.php">Reset form</a>
+            <a href="index.php">Reset form</a>
         </form>
         <div class="formdebug">
             <code>$form->isSubmitted() : <?= var_export($form->isSubmitted()) ?></code>
-            <code>$form->isValid() : <?= var_export($form->isValid()) ?></code>
+            <code>$form->isValid() : <?= $form->isSubmitted() && var_export($form->isValid()) ?></code>
             <code>$form->getData() : <?= var_export($form->getData()); ?></code>
             <code>$formHandler->handleRequest($form) : <?= var_export($result); ?></code>
         </div>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,30 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         convertNoticesToExceptions="true"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="FormHandler Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-            <exclude>
-                <directory>src/Exception</directory>
-                <directory>src/*Bundle/Resources</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" convertNoticesToExceptions="true">
+  <coverage>
+    <include>
+      <directory>src</directory>
+    </include>
+    <exclude>
+      <directory>src/Exception</directory>
+      <directory>src/*Bundle/Resources</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="FormHandler Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Exception/FormException.php b/src/Exception/FormException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\Exception;
 
@@ -10,27 +11,17 @@
  */
 class FormException extends \RuntimeException
 {
-    /**
-     * @var FormInterface
-     */
-    protected $form;
-
-    /**
-     * @param FormInterface $form
-     * @param string $message
-     * @param int $code
-     * @param \Exception|null $previous
-     */
-    public function __construct(FormInterface $form, $message = 'Form exception.', $code = 0, \Exception $previous = null)
+    public function __construct(
+        protected FormInterface $form,
+        string                  $message = 'Form exception.',
+        int                     $code = 0,
+        \Exception              $previous = null,
+    )
     {
-        $this->form = $form;
         parent::__construct($message, $code, $previous);
     }
 
-    /**
-     * @return FormInterface
-     */
-    public function getForm()
+    public function getForm(): FormInterface
     {
         return $this->form;
     }

diff --git a/src/Exception/InvalidFormException.php b/src/Exception/InvalidFormException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\Exception;
 
@@ -10,13 +11,7 @@
  */
 class InvalidFormException extends FormException
 {
-    /**
-     * @param FormInterface $form
-     * @param string $message
-     * @param int $code
-     * @param \Exception|null $previous
-     */
-    public function __construct(FormInterface $form, $message = 'Invalid form.', $code = 0, \Exception $previous = null)
+    public function __construct(FormInterface $form, string $message = 'Invalid form.', int $code = 0, \Exception $previous = null)
     {
         parent::__construct($form, $message, $code, $previous);
     }

diff --git a/src/Exception/NotSubmittedFormException.php b/src/Exception/NotSubmittedFormException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\Exception;
 
@@ -10,13 +11,7 @@
  */
 class NotSubmittedFormException extends FormException
 {
-    /**
-     * @param FormInterface $form
-     * @param string $message
-     * @param int $code
-     * @param \Exception|null $previous
-     */
-    public function __construct(FormInterface $form, $message = 'Not submitted form.', $code = 0, \Exception $previous = null)
+    public function __construct(FormInterface $form, string $message = 'Not submitted form.', int $code = 0, \Exception $previous = null)
     {
         parent::__construct($form, $message, $code, $previous);
     }

diff --git a/src/Exception/TransformationFailedFormException.php b/src/Exception/TransformationFailedFormException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\Exception;
 
@@ -10,13 +11,7 @@
  */
 class TransformationFailedFormException extends FormException
 {
-    /**
-     * @param FormInterface $form
-     * @param string $message
-     * @param int $code
-     * @param \Exception|null $previous
-     */
-    public function __construct(FormInterface $form, $message = 'Transformation form failed.', $code = 0, \Exception $previous = null)
+    public function __construct(FormInterface $form, string $message = 'Transformation form failed.', int $code = 0, \Exception $previous = null)
     {
         parent::__construct($form, $message, $code, $previous);
     }

diff --git a/src/Form/Extension/Invalid/Type/InvalidTypeExtension.php b/src/Form/Extension/Invalid/Type/InvalidTypeExtension.php
@@ -1,28 +1,25 @@
 <?php
-
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\Form\Extension\Invalid\Type;
 
 use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class InvalidTypeExtension extends AbstractTypeExtension
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'handler_invalid' => false,
-        ));
+        ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return 'Symfony\Component\Form\Extension\Core\Type\FormType';
+        return [
+            FormType::class
+        ];
     }
 }
diff --git a/src/Form/Extension/NotSubmitted/Type/NotSubmittedTypeExtension.php b/src/Form/Extension/NotSubmitted/Type/NotSubmittedTypeExtension.php
@@ -1,27 +1,25 @@
 <?php
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\Form\Extension\NotSubmitted\Type;
 
 use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class NotSubmittedTypeExtension extends AbstractTypeExtension
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'handler_not_submitted' => false,
-        ));
+        ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return 'Symfony\Component\Form\Extension\Core\Type\FormType';
+        return [
+            FormType::class
+        ];
     }
 }
diff --git a/src/Form/Extension/TransformationFailed/Type/TransformationFailedTypeExtension.php b/src/Form/Extension/TransformationFailed/Type/TransformationFailedTypeExtension.php
@@ -1,27 +1,25 @@
 <?php
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\Form\Extension\TransformationFailed\Type;
 
 use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TransformationFailedTypeExtension extends AbstractTypeExtension
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'handler_transformation_failed' => false,
-        ));
+        ]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return 'Symfony\Component\Form\Extension\Core\Type\FormType';
+        return [
+            FormType::class
+        ];
     }
 }
diff --git a/src/FormBundle/DependencyInjection/FormHandlerExtension.php b/src/FormBundle/DependencyInjection/FormHandlerExtension.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Symftony\FormHandler\FormBundle\DependencyInjection;
 
@@ -10,15 +11,13 @@
 /**
  * Class FormExtension
  * @package Symftony\FormHandler\FormBundle\DependencyInjection
- *
- * @codeCoverageIgnore
  */
 class FormHandlerExtension extends Extension
 {
     /**
      * {@inheritDoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');

diff --git a/src/FormBundle/FormHandlerBundle.php b/src/FormBundle/FormHandlerBundle.php
@@ -15,7 +15,7 @@ class FormHandlerBundle extends Bundle
     /**
      * @param ContainerBuilder $container
      */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new FormHandlerCompilerPass());
     }