Fixing Symfony 6 support

weaverryan · weaverryan · commit b1ec7e17fd38 · 2021-11-25T10:05:26.000-05:00
diff --git a/src/Chartjs/Tests/Kernel/AppKernelTrait.php b/src/Chartjs/Tests/Kernel/AppKernelTrait.php
@@ -18,12 +18,12 @@
  */
 trait AppKernelTrait
 {
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return $this->createTmpDir('cache');
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return $this->createTmpDir('logs');
     }
diff --git a/src/Chartjs/Tests/Kernel/EmptyAppKernel.php b/src/Chartjs/Tests/Kernel/EmptyAppKernel.php
@@ -24,7 +24,7 @@ class EmptyAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new ChartjsBundle()];
     }
diff --git a/src/Chartjs/Tests/Kernel/FrameworkAppKernel.php b/src/Chartjs/Tests/Kernel/FrameworkAppKernel.php
@@ -26,7 +26,7 @@ class FrameworkAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new ChartjsBundle()];
     }
diff --git a/src/Chartjs/Tests/Kernel/TwigAppKernel.php b/src/Chartjs/Tests/Kernel/TwigAppKernel.php
@@ -27,7 +27,7 @@ class TwigAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new TwigBundle(), new ChartjsBundle()];
     }
diff --git a/src/Cropperjs/Tests/Kernel/AppKernelTrait.php b/src/Cropperjs/Tests/Kernel/AppKernelTrait.php
@@ -18,12 +18,12 @@
  */
 trait AppKernelTrait
 {
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return $this->createTmpDir('cache');
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return $this->createTmpDir('logs');
     }
diff --git a/src/Cropperjs/Tests/Kernel/EmptyAppKernel.php b/src/Cropperjs/Tests/Kernel/EmptyAppKernel.php
@@ -24,7 +24,7 @@ class EmptyAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new CropperjsBundle()];
     }
diff --git a/src/Cropperjs/Tests/Kernel/FrameworkAppKernel.php b/src/Cropperjs/Tests/Kernel/FrameworkAppKernel.php
@@ -26,7 +26,7 @@ class FrameworkAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new CropperjsBundle()];
     }
diff --git a/src/Cropperjs/Tests/Kernel/TwigAppKernel.php b/src/Cropperjs/Tests/Kernel/TwigAppKernel.php
@@ -14,7 +14,9 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\UX\Cropperjs\CropperjsBundle;
 
@@ -27,7 +29,7 @@ class TwigAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new TwigBundle(), new CropperjsBundle()];
     }
@@ -37,6 +39,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(function (ContainerBuilder $container) {
             $container->loadFromExtension('framework', ['secret' => '$ecret', 'test' => true]);
             $container->loadFromExtension('twig', ['default_path' => __DIR__.'/templates', 'strict_variables' => true, 'exception_controller' => null]);
+
+            // create a public alias - FormFactoryInterface is removed otherwise
+            $container->setAlias('public_form_factory', new Alias(FormFactoryInterface::class, true));
         });
     }
 }
diff --git a/src/Dropzone/Tests/Kernel/AppKernelTrait.php b/src/Dropzone/Tests/Kernel/AppKernelTrait.php
@@ -18,12 +18,12 @@
  */
 trait AppKernelTrait
 {
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return $this->createTmpDir('cache');
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return $this->createTmpDir('logs');
     }
diff --git a/src/Dropzone/Tests/Kernel/EmptyAppKernel.php b/src/Dropzone/Tests/Kernel/EmptyAppKernel.php
@@ -24,7 +24,7 @@ class EmptyAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new DropzoneBundle()];
     }
diff --git a/src/Dropzone/Tests/Kernel/FrameworkAppKernel.php b/src/Dropzone/Tests/Kernel/FrameworkAppKernel.php
@@ -26,7 +26,7 @@ class FrameworkAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new DropzoneBundle()];
     }
diff --git a/src/Dropzone/Tests/Kernel/TwigAppKernel.php b/src/Dropzone/Tests/Kernel/TwigAppKernel.php
@@ -14,7 +14,9 @@
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\UX\Dropzone\DropzoneBundle;
 
@@ -27,7 +29,7 @@ class TwigAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new TwigBundle(), new DropzoneBundle()];
     }
@@ -45,6 +47,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
                 'exception_controller' => null,
                 'debug' => '%kernel.debug%',
             ]);
+
+            // create a public alias - FormFactoryInterface is removed otherwise
+            $container->setAlias('public_form_factory', new Alias(FormFactoryInterface::class, true));
         });
     }
 }
diff --git a/src/LazyImage/Tests/Kernel/AppKernelTrait.php b/src/LazyImage/Tests/Kernel/AppKernelTrait.php
@@ -18,12 +18,12 @@
  */
 trait AppKernelTrait
 {
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return $this->createTmpDir('cache');
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return $this->createTmpDir('logs');
     }
diff --git a/src/LazyImage/Tests/Kernel/EmptyAppKernel.php b/src/LazyImage/Tests/Kernel/EmptyAppKernel.php
@@ -24,7 +24,7 @@ class EmptyAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new LazyImageBundle()];
     }
diff --git a/src/LazyImage/Tests/Kernel/FrameworkAppKernel.php b/src/LazyImage/Tests/Kernel/FrameworkAppKernel.php
@@ -26,7 +26,7 @@ class FrameworkAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new LazyImageBundle()];
     }
diff --git a/src/LazyImage/Tests/Kernel/TwigAppKernel.php b/src/LazyImage/Tests/Kernel/TwigAppKernel.php
@@ -27,7 +27,7 @@ class TwigAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new TwigBundle(), new LazyImageBundle()];
     }

Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@`
`18`	`18`	`*/`
`19`	`19`	`trait AppKernelTrait`
`20`	`20`	`{`
`21`		`- public function getCacheDir()`
	`21`	`+ public function getCacheDir(): string`
`22`	`22`	`{`
`23`	`23`	`return $this->createTmpDir('cache');`
`24`	`24`	`}`
`25`	`25`
`26`		`- public function getLogDir()`
	`26`	`+ public function getLogDir(): string`
`27`	`27`	`{`
`28`	`28`	`return $this->createTmpDir('logs');`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class EmptyAppKernel extends Kernel`
`24`	`24`	`{`
`25`	`25`	`use AppKernelTrait;`
`26`	`26`
`27`		`- public function registerBundles()`
	`27`	`+ public function registerBundles(): iterable`
`28`	`28`	`{`
`29`	`29`	`return [new ChartjsBundle()];`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class FrameworkAppKernel extends Kernel`
`26`	`26`	`{`
`27`	`27`	`use AppKernelTrait;`
`28`	`28`
`29`		`- public function registerBundles()`
	`29`	`+ public function registerBundles(): iterable`
`30`	`30`	`{`
`31`	`31`	`return [new FrameworkBundle(), new ChartjsBundle()];`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class TwigAppKernel extends Kernel`
`27`	`27`	`{`
`28`	`28`	`use AppKernelTrait;`
`29`	`29`
`30`		`- public function registerBundles()`
	`30`	`+ public function registerBundles(): iterable`
`31`	`31`	`{`
`32`	`32`	`return [new FrameworkBundle(), new TwigBundle(), new ChartjsBundle()];`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@`
`14`	`14`	`use Symfony\Bundle\FrameworkBundle\FrameworkBundle;`
`15`	`15`	`use Symfony\Bundle\TwigBundle\TwigBundle;`
`16`	`16`	`use Symfony\Component\Config\Loader\LoaderInterface;`
	`17`	`+use Symfony\Component\DependencyInjection\Alias;`
`17`	`18`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
	`19`	`+use Symfony\Component\Form\FormFactoryInterface;`
`18`	`20`	`use Symfony\Component\HttpKernel\Kernel;`
`19`	`21`	`use Symfony\UX\Cropperjs\CropperjsBundle;`
`20`	`22`
`@@ -27,7 +29,7 @@ class TwigAppKernel extends Kernel`
`27`	`29`	`{`
`28`	`30`	`use AppKernelTrait;`
`29`	`31`
`30`		`- public function registerBundles()`
	`32`	`+ public function registerBundles(): iterable`
`31`	`33`	`{`
`32`	`34`	`return [new FrameworkBundle(), new TwigBundle(), new CropperjsBundle()];`
`33`	`35`	`}`
`@@ -37,6 +39,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`37`	`39`	`$loader->load(function (ContainerBuilder $container) {`
`38`	`40`	`$container->loadFromExtension('framework', ['secret' => '$ecret', 'test' => true]);`
`39`	`41`	`$container->loadFromExtension('twig', ['default_path' => __DIR__.'/templates', 'strict_variables' => true, 'exception_controller' => null]);`
	`42`	`+`
	`43`	`+ // create a public alias - FormFactoryInterface is removed otherwise`
	`44`	`+ $container->setAlias('public_form_factory', new Alias(FormFactoryInterface::class, true));`
`40`	`45`	`});`
`41`	`46`	`}`
`42`	`47`	`}`