Merge pull request #3411 from acrobat/sf7-forward-compatibility

[AllBundles] Symfony 7 forward compatibility fixes
Kunstmaan · Apr 20, 2024 · b4ec0c5 · b4ec0c5
2 parents 78b67cb + 2696814
commit b4ec0c5
Show file tree

Hide file tree

Showing 27 changed files with 31 additions and 27 deletions.
diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php b/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php
@@ -11,9 +11,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Mailer\Mailer;
 
 class KunstmaanAdminExtension extends Extension

diff --git a/src/Kunstmaan/AdminListBundle/DependencyInjection/KunstmaanAdminListExtension.php b/src/Kunstmaan/AdminListBundle/DependencyInjection/KunstmaanAdminListExtension.php
@@ -4,9 +4,9 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanAdminListExtension extends Extension implements PrependExtensionInterface
 {

diff --git a/src/Kunstmaan/ArticleBundle/DependencyInjection/KunstmaanArticleExtension.php b/src/Kunstmaan/ArticleBundle/DependencyInjection/KunstmaanArticleExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanArticleExtension extends Extension
 {

diff --git a/src/Kunstmaan/CacheBundle/DependencyInjection/KunstmaanCacheExtension.php b/src/Kunstmaan/CacheBundle/DependencyInjection/KunstmaanCacheExtension.php
@@ -4,9 +4,9 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanCacheExtension extends Extension implements PrependExtensionInterface
 {

diff --git a/src/Kunstmaan/ConfigBundle/DependencyInjection/KunstmaanConfigExtension.php b/src/Kunstmaan/ConfigBundle/DependencyInjection/KunstmaanConfigExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanConfigExtension extends Extension
 {

diff --git a/src/Kunstmaan/CookieBundle/DependencyInjection/KunstmaanCookieExtension.php b/src/Kunstmaan/CookieBundle/DependencyInjection/KunstmaanCookieExtension.php
@@ -5,8 +5,8 @@
 use Kunstmaan\CookieBundle\Helper\LegalCookieHelper;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanCookieExtension extends Extension
 {

diff --git a/src/Kunstmaan/DashboardBundle/DependencyInjection/KunstmaanDashboardExtension.php b/src/Kunstmaan/DashboardBundle/DependencyInjection/KunstmaanDashboardExtension.php
@@ -4,9 +4,9 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanDashboardExtension extends Extension implements PrependExtensionInterface
 {

diff --git a/src/Kunstmaan/FixturesBundle/DependencyInjection/KunstmaanFixturesExtension.php b/src/Kunstmaan/FixturesBundle/DependencyInjection/KunstmaanFixturesExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanFixturesExtension extends Extension
 {

diff --git a/src/Kunstmaan/FormBundle/DependencyInjection/KunstmaanFormExtension.php b/src/Kunstmaan/FormBundle/DependencyInjection/KunstmaanFormExtension.php
@@ -4,9 +4,9 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanFormExtension extends Extension implements PrependExtensionInterface
 {

diff --git a/src/Kunstmaan/LeadGenerationBundle/DependencyInjection/KunstmaanLeadGenerationExtension.php b/src/Kunstmaan/LeadGenerationBundle/DependencyInjection/KunstmaanLeadGenerationExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanLeadGenerationExtension extends Extension
 {

diff --git a/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php b/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php
@@ -6,9 +6,9 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Yaml\Yaml;
 

diff --git a/src/Kunstmaan/MediaPagePartBundle/DependencyInjection/KunstmaanMediaPagePartExtension.php b/src/Kunstmaan/MediaPagePartBundle/DependencyInjection/KunstmaanMediaPagePartExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanMediaPagePartExtension extends Extension
 {

diff --git a/src/Kunstmaan/MenuBundle/DependencyInjection/KunstmaanMenuExtension.php b/src/Kunstmaan/MenuBundle/DependencyInjection/KunstmaanMenuExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanMenuExtension extends Extension
 {

diff --git a/src/Kunstmaan/MultiDomainBundle/DependencyInjection/KunstmaanMultiDomainExtension.php b/src/Kunstmaan/MultiDomainBundle/DependencyInjection/KunstmaanMultiDomainExtension.php
@@ -5,8 +5,8 @@
 use Kunstmaan\MultiDomainBundle\EventSubscriber\LogoutHostOverrideCleanupEventSubscriber;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanMultiDomainExtension extends Extension
 {

diff --git a/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanNodeExtension.php b/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanNodeExtension.php
@@ -6,9 +6,9 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanNodeExtension extends Extension implements PrependExtensionInterface
 {

diff --git a/src/Kunstmaan/NodeBundle/Validator/Constraint/ValidExternalUrlValidator.php b/src/Kunstmaan/NodeBundle/Validator/Constraint/ValidExternalUrlValidator.php
@@ -21,6 +21,10 @@ public function validate($value, Constraint $constraint): void
 
         $urlValidator = new UrlValidator();
         $urlValidator->initialize($this->context);
-        $urlValidator->validate($value, new Url());
+        $options = [];
+        if (property_exists(Url::class, 'requireTld')) {
+            $options = ['requireTld' => true];
+        }
+        $urlValidator->validate($value, new Url($options));
     }
 }
diff --git a/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php b/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php
@@ -4,9 +4,9 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanNodeSearchExtension extends Extension implements PrependExtensionInterface
 {

diff --git a/src/Kunstmaan/PagePartBundle/DependencyInjection/KunstmaanPagePartExtension.php b/src/Kunstmaan/PagePartBundle/DependencyInjection/KunstmaanPagePartExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanPagePartExtension extends Extension
 {

diff --git a/src/Kunstmaan/RedirectBundle/DependencyInjection/KunstmaanRedirectExtension.php b/src/Kunstmaan/RedirectBundle/DependencyInjection/KunstmaanRedirectExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanRedirectExtension extends Extension
 {

diff --git a/src/Kunstmaan/SearchBundle/DependencyInjection/KunstmaanSearchExtension.php b/src/Kunstmaan/SearchBundle/DependencyInjection/KunstmaanSearchExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Yaml\Yaml;
 
 class KunstmaanSearchExtension extends Extension

diff --git a/src/Kunstmaan/SeoBundle/DependencyInjection/KunstmaanSeoExtension.php b/src/Kunstmaan/SeoBundle/DependencyInjection/KunstmaanSeoExtension.php
@@ -4,10 +4,10 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Yaml\Yaml;
 
 class KunstmaanSeoExtension extends Extension implements PrependExtensionInterface

diff --git a/src/Kunstmaan/SitemapBundle/DependencyInjection/KunstmaanSitemapExtension.php b/src/Kunstmaan/SitemapBundle/DependencyInjection/KunstmaanSitemapExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanSitemapExtension extends Extension
 {

diff --git a/src/Kunstmaan/TaggingBundle/DependencyInjection/KunstmaanTaggingExtension.php b/src/Kunstmaan/TaggingBundle/DependencyInjection/KunstmaanTaggingExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanTaggingExtension extends Extension
 {

diff --git a/src/Kunstmaan/TranslatorBundle/DependencyInjection/KunstmaanTranslatorExtension.php b/src/Kunstmaan/TranslatorBundle/DependencyInjection/KunstmaanTranslatorExtension.php
@@ -5,9 +5,9 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\Finder\Finder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanTranslatorExtension extends Extension
 {

diff --git a/src/Kunstmaan/UserManagementBundle/DependencyInjection/KunstmaanUserManagementExtension.php b/src/Kunstmaan/UserManagementBundle/DependencyInjection/KunstmaanUserManagementExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanUserManagementExtension extends Extension
 {

diff --git a/src/Kunstmaan/UtilitiesBundle/DependencyInjection/KunstmaanUtilitiesExtension.php b/src/Kunstmaan/UtilitiesBundle/DependencyInjection/KunstmaanUtilitiesExtension.php
@@ -4,8 +4,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanUtilitiesExtension extends Extension
 {

diff --git a/src/Kunstmaan/VotingBundle/DependencyInjection/KunstmaanVotingExtension.php b/src/Kunstmaan/VotingBundle/DependencyInjection/KunstmaanVotingExtension.php
@@ -5,9 +5,9 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class KunstmaanVotingExtension extends Extension
 {