Trigger autoload for deprecated types

By loading the deprecated types, we make sure the class alias they contain exist, so that code type hinting against the old type accepts the new. This is necessary because type hinting does not trigger autoload, since it usually does not need to. Also, we conditionally wrap the deprecation in an if statement checking whether the new type already is loaded. That way we get the deprecation only when really necessary.
sonata-project · Dec 16, 2018 · cfdcb1d · cfdcb1d
1 parent 34fa80b
commit cfdcb1d
Show file tree

Hide file tree

Showing 69 changed files with 338 additions and 200 deletions.
diff --git a/src/CoreBundle/Component/Status/StatusClassRendererInterface.php b/src/CoreBundle/Component/Status/StatusClassRendererInterface.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Component\Status;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\StatusClassRendererInterface class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Twig\Status\StatusClassRendererInterface instead.',
-    E_USER_DEPRECATED
-);
+if (!interface_exists('\Sonata\Twig\Status\StatusClassRendererInterface', false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\StatusClassRendererInterface class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Twig\Status\StatusClassRendererInterface instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     '\Sonata\Twig\Status\StatusClassRendererInterface',

diff --git a/src/CoreBundle/Date/MomentFormatConverter.php b/src/CoreBundle/Date/MomentFormatConverter.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Date;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\MomentFormatConverter class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Date\MomentFormatConverter instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Date\MomentFormatConverter::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\MomentFormatConverter class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Date\MomentFormatConverter instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Date\MomentFormatConverter::class,

diff --git a/src/CoreBundle/FlashMessage/FlashManager.php b/src/CoreBundle/FlashMessage/FlashManager.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\FlashMessage;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\FlashManager class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Twig\FlashMessage\FlashManager instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Twig\FlashMessage\FlashManager::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\FlashManager class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Twig\FlashMessage\FlashManager instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Twig\FlashMessage\FlashManager::class,

diff --git a/src/CoreBundle/Form/DataTransformer/BooleanTypeToBooleanTransformer.php b/src/CoreBundle/Form/DataTransformer/BooleanTypeToBooleanTransformer.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\DataTransformer;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\BooleanTypeToBooleanTransformer class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\DataTransformer\BooleanTypeToBooleanTransformer instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\DataTransformer\BooleanTypeToBooleanTransformer::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\BooleanTypeToBooleanTransformer class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\DataTransformer\BooleanTypeToBooleanTransformer instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\DataTransformer\BooleanTypeToBooleanTransformer::class,

diff --git a/src/CoreBundle/Form/Type/BaseDoctrineORMSerializationType.php b/src/CoreBundle/Form/Type/BaseDoctrineORMSerializationType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\BaseDoctrineORMSerializationType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\BaseDoctrineORMSerializationType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\BaseDoctrineORMSerializationType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\BaseDoctrineORMSerializationType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\BaseDoctrineORMSerializationType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\BaseDoctrineORMSerializationType::class,

diff --git a/src/CoreBundle/Form/Type/BasePickerType.php b/src/CoreBundle/Form/Type/BasePickerType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\BasePickerType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\BasePickerType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\BasePickerType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\BasePickerType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\BasePickerType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\BasePickerType::class,

diff --git a/src/CoreBundle/Form/Type/BaseStatusType.php b/src/CoreBundle/Form/Type/BaseStatusType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\BaseStatusType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\BaseStatusType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\BaseStatusType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\BaseStatusType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\BaseStatusType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\BaseStatusType::class,

diff --git a/src/CoreBundle/Form/Type/BooleanType.php b/src/CoreBundle/Form/Type/BooleanType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\BooleanType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\BooleanType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\BooleanType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\BooleanType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\BooleanType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\BooleanType::class,

diff --git a/src/CoreBundle/Form/Type/CollectionType.php b/src/CoreBundle/Form/Type/CollectionType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\CollectionType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\CollectionType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\CollectionType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\CollectionType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\CollectionType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\CollectionType::class,

diff --git a/src/CoreBundle/Form/Type/DateRangePickerType.php b/src/CoreBundle/Form/Type/DateRangePickerType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\DateRangePickerType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\DateRangePickerType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\DateRangePickerType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\DateRangePickerType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\DateRangePickerType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\DateRangePickerType::class,

diff --git a/src/CoreBundle/Form/Type/DateRangeType.php b/src/CoreBundle/Form/Type/DateRangeType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\DateRangeType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\DateRangeType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\DateRangeType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\DateRangeType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\DateRangeType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\DateRangeType::class,

diff --git a/src/CoreBundle/Form/Type/DateTimeRangePickerType.php b/src/CoreBundle/Form/Type/DateTimeRangePickerType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\DateTimeRangePickerType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\DateTimeRangePickerType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\DateTimeRangePickerType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\DateTimeRangePickerType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\DateTimeRangePickerType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\DateTimeRangePickerType::class,

diff --git a/src/CoreBundle/Form/Type/DateTimeRangeType.php b/src/CoreBundle/Form/Type/DateTimeRangeType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\DateTimeRangeType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\DateTimeRangeType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\DateTimeRangeType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\DateTimeRangeType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\DateTimeRangeType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\DateTimeRangeType::class,

diff --git a/src/CoreBundle/Form/Type/EqualType.php b/src/CoreBundle/Form/Type/EqualType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\EqualType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\EqualType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\EqualType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\EqualType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\EqualType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\EqualType::class,

diff --git a/src/CoreBundle/Form/Type/ImmutableArrayType.php b/src/CoreBundle/Form/Type/ImmutableArrayType.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\ImmutableArrayType class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Form\Type\ImmutableArrayType instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Form\Type\ImmutableArrayType::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\ImmutableArrayType class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Form\Type\ImmutableArrayType instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Form\Type\ImmutableArrayType::class,

diff --git a/src/CoreBundle/Model/Adapter/AdapterChain.php b/src/CoreBundle/Model/Adapter/AdapterChain.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Model\Adapter;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\AdapterInterface class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Doctrine\Adapter\AdapterChain instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Doctrine\Adapter\AdapterChain::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\AdapterChain class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Doctrine\Adapter\AdapterChain instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Doctrine\Adapter\AdapterChain::class,

diff --git a/src/CoreBundle/Model/Adapter/AdapterInterface.php b/src/CoreBundle/Model/Adapter/AdapterInterface.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Model\Adapter;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\AdapterInterface class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Doctrine\Adapter\AdapterInterface instead.',
-    E_USER_DEPRECATED
-);
+if (!interface_exists(\Sonata\Doctrine\Adapter\AdapterInterface::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\AdapterInterface class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Doctrine\Adapter\AdapterInterface instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Doctrine\Adapter\AdapterInterface::class,

diff --git a/src/CoreBundle/Model/Adapter/DoctrineORMAdapter.php b/src/CoreBundle/Model/Adapter/DoctrineORMAdapter.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Model\Adapter;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\AdapterInterface class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Doctrine\Adapter\ORM\DoctrineORMAdapter instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Doctrine\Adapter\ORM\DoctrineORMAdapter::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\DoctrineORMAdapter class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Doctrine\Adapter\ORM\DoctrineORMAdapter instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Doctrine\Adapter\ORM\DoctrineORMAdapter::class,

diff --git a/src/CoreBundle/Model/Adapter/DoctrinePHPCRAdapter.php b/src/CoreBundle/Model/Adapter/DoctrinePHPCRAdapter.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Model\Adapter;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\AdapterInterface class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Doctrine\Adapter\PHPCR\DoctrinePHPCRAdapter instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Doctrine\Adapter\PHPCR\DoctrinePHPCRAdapter::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\DoctrinePHPCRAdapter class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Doctrine\Adapter\PHPCR\DoctrinePHPCRAdapter instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Doctrine\Adapter\PHPCR\DoctrinePHPCRAdapter::class,

diff --git a/src/CoreBundle/Model/BaseDocumentManager.php b/src/CoreBundle/Model/BaseDocumentManager.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Model;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\BaseDocumentManager class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Doctrine\Document\BaseDocumentManager instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Doctrine\Document\BaseDocumentManager::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\BaseDocumentManager class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Doctrine\Document\BaseDocumentManager instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Doctrine\Document\BaseDocumentManager::class,

diff --git a/src/CoreBundle/Model/BaseEntityManager.php b/src/CoreBundle/Model/BaseEntityManager.php
@@ -11,11 +11,13 @@
 
 namespace Sonata\CoreBundle\Model;
 
-@trigger_error(
-    'The '.__NAMESPACE__.'\BaseEntityManager class is deprecated since version 3.x and will be removed in 4.0.'
-    .' Use Sonata\Doctrine\Entity\BaseEntityManager instead.',
-    E_USER_DEPRECATED
-);
+if (!class_exists(\Sonata\Doctrine\Entity\BaseEntityManager::class, false)) {
+    @trigger_error(
+        'The '.__NAMESPACE__.'\BaseEntityManager class is deprecated since version 3.x and will be removed in 4.0.'
+        .' Use Sonata\Doctrine\Entity\BaseEntityManager instead.',
+        E_USER_DEPRECATED
+    );
+}
 
 class_alias(
     \Sonata\Doctrine\Entity\BaseEntityManager::class,