Add support for Symfony 6

andrewmy · andrewmy · commit c536da5447e3 · 2022-02-15T22:06:53.000+02:00
diff --git a/Tests/Functional/App/AppKernel.php b/Tests/Functional/App/AppKernel.php
@@ -7,10 +7,7 @@
 
 class AppKernel extends Kernel
 {
-    /**
-     * @return array
-     */
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $bundles = [
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
@@ -21,28 +18,28 @@ public function registerBundles()
         return $bundles;
     }
 
-    /**
-     * @return string
-     */
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return sys_get_temp_dir().'/EnqueueBundle/cache';
     }
 
-    /**
-     * @return string
-     */
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return sys_get_temp_dir().'/EnqueueBundle/cache/logs';
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
+        if (self::VERSION_ID < 60000) {
+            $loader->load(__DIR__.'/config/config-sf5.yml');
+
+            return;
+        }
+
         $loader->load(__DIR__.'/config/config.yml');
     }
 
-    protected function getContainerClass()
+    protected function getContainerClass(): string
     {
         return parent::getContainerClass().'BundleDefault';
     }
diff --git a/Tests/Functional/App/CustomAppKernel.php b/Tests/Functional/App/CustomAppKernel.php
@@ -38,10 +38,7 @@ public function setEnqueueConfig(array $config)
         $fs->mkdir(sys_get_temp_dir().'/EnqueueBundleCustom/cache/'.$this->enqueueConfigId);
     }
 
-    /**
-     * @return array
-     */
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $bundles = [
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
@@ -52,23 +49,17 @@ public function registerBundles()
         return $bundles;
     }
 
-    /**
-     * @return string
-     */
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return sys_get_temp_dir().'/EnqueueBundleCustom/cache/'.$this->enqueueConfigId;
     }
 
-    /**
-     * @return string
-     */
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return sys_get_temp_dir().'/EnqueueBundleCustom/cache/logs/'.$this->enqueueConfigId;
     }
 
-    protected function getContainerClass()
+    protected function getContainerClass(): string
     {
         return parent::getContainerClass().'Custom'.$this->enqueueConfigId;
     }
@@ -78,7 +69,11 @@ protected function getContainerClass()
      */
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/custom-config.yml');
+        if (self::VERSION_ID < 60000) {
+            $loader->load(__DIR__.'/config/custom-config-sf5.yml');
+        } else {
+            $loader->load(__DIR__.'/config/custom-config.yml');
+        }
 
         $c->loadFromExtension('enqueue', $this->enqueueConfig);
     }
diff --git a/Tests/Functional/App/config/config-sf5.yml b/Tests/Functional/App/config/config-sf5.yml
@@ -0,0 +1,129 @@
+parameters:
+    locale: 'en'
+    secret: 'ThisTokenIsNotSoSecretChangeIt'
+
+
+framework:
+    #esi:             ~
+    #translator:      { fallback: "%locale%" }
+    test: ~
+    assets: false
+    session:
+        # the only option incompatible with Symfony 6
+        storage_id: session.storage.mock_file
+    secret:          '%secret%'
+    router:          { resource: '%kernel.project_dir%/config/routing.yml' }
+    default_locale:  '%locale%'
+
+doctrine:
+    dbal:
+        url:   "%env(DOCTRINE_DSN)%"
+        driver: pdo_mysql
+        charset:  UTF8
+
+enqueue:
+    default:
+        transport: 'null:'
+        client:
+            traceable_producer: true
+        job: true
+        async_events: true
+        async_commands:
+            enabled: true
+            timeout: 60
+            command_name: ~
+            queue_name: ~
+
+services:
+    test_enqueue.client.default.traceable_producer:
+        alias: 'enqueue.client.default.traceable_producer'
+        public: true
+
+    test_enqueue.transport.default.queue_consumer:
+        alias: 'enqueue.transport.default.queue_consumer'
+        public: true
+
+    test_enqueue.client.default.queue_consumer:
+        alias: 'enqueue.client.default.queue_consumer'
+        public: true
+
+    test_enqueue.transport.default.rpc_client:
+        alias: 'enqueue.transport.default.rpc_client'
+        public: true
+
+    test_enqueue.client.default.producer:
+        alias: 'enqueue.client.default.producer'
+        public: true
+
+    test_enqueue.client.default.spool_producer:
+        alias: 'enqueue.client.default.spool_producer'
+        public: true
+
+    test_Enqueue\Client\ProducerInterface:
+        alias: 'Enqueue\Client\ProducerInterface'
+        public: true
+
+    test_enqueue.client.default.driver:
+        alias: 'enqueue.client.default.driver'
+        public: true
+
+    test_enqueue.transport.default.context:
+        alias: 'enqueue.transport.default.context'
+        public: true
+
+    test_enqueue.client.consume_command:
+        alias: 'enqueue.client.consume_command'
+        public: true
+
+    test.enqueue.client.routes_command:
+        alias: 'enqueue.client.routes_command'
+        public: true
+
+    test.enqueue.events.async_processor:
+        alias: 'enqueue.events.async_processor'
+        public: true
+
+    test_async_listener:
+        class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncListener'
+        public: true
+        tags:
+            - { name: 'kernel.event_listener', async: true, event: 'test_async', method: 'onEvent' }
+
+    test_command_subscriber_processor:
+        class: 'Enqueue\Bundle\Tests\Functional\App\TestCommandSubscriberProcessor'
+        public: true
+        tags:
+            - { name: 'enqueue.command_subscriber', client: 'default' }
+
+    test_topic_subscriber_processor:
+        class: 'Enqueue\Bundle\Tests\Functional\App\TestTopicSubscriberProcessor'
+        public: true
+        tags:
+            - { name: 'enqueue.topic_subscriber', client: 'default' }
+
+    test_exclusive_command_subscriber_processor:
+        class: 'Enqueue\Bundle\Tests\Functional\App\TestExclusiveCommandSubscriberProcessor'
+        public: true
+        tags:
+            - { name: 'enqueue.command_subscriber', client: 'default' }
+
+    test_async_subscriber:
+        class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncSubscriber'
+        public: true
+        tags:
+            - { name: 'kernel.event_subscriber', async: true }
+
+    test_async_event_transformer:
+        class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncEventTransformer'
+        public: true
+        arguments:
+            - '@enqueue.transport.default.context'
+        tags:
+            - {name: 'enqueue.event_transformer', eventName: 'test_async', transformerName: 'test_async' }
+            - {name: 'enqueue.event_transformer', eventName: 'test_async_subscriber', transformerName: 'test_async' }
+
+    # overwrite async listener with one based on client producer. so we can use traceable producer.
+    enqueue.events.async_listener:
+        class: 'Enqueue\Bundle\Tests\Functional\App\AsyncListener'
+        public: true
+        arguments: ['@enqueue.client.default.producer', '@enqueue.events.registry']
diff --git a/Tests/Functional/App/config/config.yml b/Tests/Functional/App/config/config.yml
@@ -9,7 +9,7 @@ framework:
     test: ~
     assets: false
     session:
-        storage_id: session.storage.mock_file
+        storage_factory_id: session.storage.factory.mock_file
     secret:          '%secret%'
     router:          { resource: '%kernel.project_dir%/config/routing.yml' }
     default_locale:  '%locale%'
@@ -126,3 +126,6 @@ services:
         class: 'Enqueue\Bundle\Tests\Functional\App\AsyncListener'
         public: true
         arguments: ['@enqueue.client.default.producer', '@enqueue.events.registry']
+
+    locale_aware_listener:
+        public: true
diff --git a/Tests/Functional/App/config/custom-config-sf5.yml b/Tests/Functional/App/config/custom-config-sf5.yml
@@ -0,0 +1,85 @@
+parameters:
+    locale: 'en'
+    secret: 'ThisTokenIsNotSoSecretChangeIt'
+
+framework:
+    #esi:             ~
+    #translator:      { fallback: "%locale%" }
+    test: ~
+    assets: false
+    session:
+        # the only option incompatible with Symfony 6
+        storage_id: session.storage.mock_file
+    secret:          '%secret%'
+    router:          { resource: '%kernel.project_dir%/config/routing.yml' }
+    default_locale:  '%locale%'
+
+doctrine:
+    dbal:
+        connections:
+            custom:
+                url:   "%env(DOCTRINE_DSN)%"
+                driver: pdo_mysql
+                charset:  UTF8
+
+services:
+    test_enqueue.client.default.driver:
+        alias: 'enqueue.client.default.driver'
+        public: true
+
+    test_enqueue.client.default.producer:
+        alias: 'enqueue.client.default.producer'
+        public: true
+
+    test_enqueue.client.default.lazy_producer:
+        alias: 'enqueue.client.default.lazy_producer'
+        public: true
+
+    test_enqueue.transport.default.context:
+        alias: 'enqueue.transport.default.context'
+        public: true
+
+    test_enqueue.transport.consume_command:
+        alias: 'enqueue.transport.consume_command'
+        public: true
+
+    test_enqueue.client.consume_command:
+        alias: 'enqueue.client.consume_command'
+        public: true
+
+    test_enqueue.client.produce_command:
+        alias: 'enqueue.client.produce_command'
+        public: true
+
+    test_enqueue.client.setup_broker_command:
+        alias: 'enqueue.client.setup_broker_command'
+        public: true
+
+    test.message.processor:
+        class: 'Enqueue\Bundle\Tests\Functional\TestProcessor'
+        public: true
+        tags:
+            - { name: 'enqueue.topic_subscriber', client: 'default' }
+            - { name: 'enqueue.transport.processor', transport: 'default' }
+
+    test.message.command_processor:
+        class: 'Enqueue\Bundle\Tests\Functional\TestCommandProcessor'
+        public: true
+        tags:
+            - { name: 'enqueue.command_subscriber', client: 'default' }
+
+    test.sqs_client:
+        public: true
+        class: 'Aws\Sqs\SqsClient'
+        arguments:
+            -
+                endpoint: '%env(AWS_SQS_ENDPOINT)%'
+                region: '%env(AWS_SQS_REGION)%'
+                version: '%env(AWS_SQS_VERSION)%'
+                credentials:
+                    key: '%env(AWS_SQS_KEY)%'
+                    secret: '%env(AWS_SQS_SECRET)%'
+
+    test.sqs_custom_connection_factory_factory:
+        class: 'Enqueue\Bundle\Tests\Functional\App\SqsCustomConnectionFactoryFactory'
+        arguments: ['@service_container']
diff --git a/Tests/Functional/App/config/custom-config.yml b/Tests/Functional/App/config/custom-config.yml
@@ -8,7 +8,7 @@ framework:
     test: ~
     assets: false
     session:
-        storage_id: session.storage.mock_file
+        storage_factory_id: session.storage.factory.mock_file
     secret:          '%secret%'
     router:          { resource: '%kernel.project_dir%/config/routing.yml' }
     default_locale:  '%locale%'
diff --git a/Tests/Functional/LazyProducerTest.php b/Tests/Functional/LazyProducerTest.php
@@ -47,10 +47,7 @@ public function testShouldAllowGetLazyProducerWithoutError()
         $producer->sendEvent('foo', 'foo');
     }
 
-    /**
-     * @return string
-     */
-    public static function getKernelClass()
+    public static function getKernelClass(): string
     {
         include_once __DIR__.'/App/CustomAppKernel.php';
 
diff --git a/Tests/Functional/UseCasesTest.php b/Tests/Functional/UseCasesTest.php
@@ -18,7 +18,7 @@
  */
 class UseCasesTest extends WebTestCase
 {
-    const RECEIVE_TIMEOUT = 500;
+    private const RECEIVE_TIMEOUT = 500;
 
     protected function setUp(): void
     {
@@ -360,10 +360,7 @@ public function testTransportConsumeCommandShouldConsumeOneMessage()
         $this->assertEquals($expectedBody, $processor->message->getBody());
     }
 
-    /**
-     * @return string
-     */
-    public static function getKernelClass()
+    public static function getKernelClass(): string
     {
         include_once __DIR__.'/App/CustomAppKernel.php';
 
diff --git a/Tests/Functional/WebTestCase.php b/Tests/Functional/WebTestCase.php
@@ -39,10 +39,7 @@ protected function tearDown(): void
         static::$client = null;
     }
 
-    /**
-     * @return string
-     */
-    public static function getKernelClass()
+    public static function getKernelClass(): string
     {
         include_once __DIR__.'/App/AppKernel.php';
 
diff --git a/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php b/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,7 @@`
`7`	`7`
`8`	`8`	`class AppKernel extends Kernel`
`9`	`9`	`{`
`10`		`- /**`
`11`		`- * @return array`
`12`		`- */`
`13`		`- public function registerBundles()`
	`10`	`+ public function registerBundles(): iterable`
`14`	`11`	`{`
`15`	`12`	`$bundles = [`
`16`	`13`	`new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),`
`@@ -21,28 +18,28 @@ public function registerBundles()`
`21`	`18`	`return $bundles;`
`22`	`19`	`}`
`23`	`20`
`24`		`- /**`
`25`		`- * @return string`
`26`		`- */`
`27`		`- public function getCacheDir()`
	`21`	`+ public function getCacheDir(): string`
`28`	`22`	`{`
`29`	`23`	`return sys_get_temp_dir().'/EnqueueBundle/cache';`
`30`	`24`	`}`
`31`	`25`
`32`		`- /**`
`33`		`- * @return string`
`34`		`- */`
`35`		`- public function getLogDir()`
	`26`	`+ public function getLogDir(): string`
`36`	`27`	`{`
`37`	`28`	`return sys_get_temp_dir().'/EnqueueBundle/cache/logs';`
`38`	`29`	`}`
`39`	`30`
`40`	`31`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`41`	`32`	`{`
	`33`	`+ if (self::VERSION_ID < 60000) {`
	`34`	`+ $loader->load(__DIR__.'/config/config-sf5.yml');`
	`35`	`+`
	`36`	`+ return;`
	`37`	`+ }`
	`38`	`+`
`42`	`39`	`$loader->load(__DIR__.'/config/config.yml');`
`43`	`40`	`}`
`44`	`41`
`45`		`- protected function getContainerClass()`
	`42`	`+ protected function getContainerClass(): string`
`46`	`43`	`{`
`47`	`44`	`return parent::getContainerClass().'BundleDefault';`
`48`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,7 @@ public function setEnqueueConfig(array $config)`
`38`	`38`	`$fs->mkdir(sys_get_temp_dir().'/EnqueueBundleCustom/cache/'.$this->enqueueConfigId);`
`39`	`39`	`}`
`40`	`40`
`41`		`- /**`
`42`		`- * @return array`
`43`		`- */`
`44`		`- public function registerBundles()`
	`41`	`+ public function registerBundles(): iterable`
`45`	`42`	`{`
`46`	`43`	`$bundles = [`
`47`	`44`	`new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),`
`@@ -52,23 +49,17 @@ public function registerBundles()`
`52`	`49`	`return $bundles;`
`53`	`50`	`}`
`54`	`51`
`55`		`- /**`
`56`		`- * @return string`
`57`		`- */`
`58`		`- public function getCacheDir()`
	`52`	`+ public function getCacheDir(): string`
`59`	`53`	`{`
`60`	`54`	`return sys_get_temp_dir().'/EnqueueBundleCustom/cache/'.$this->enqueueConfigId;`
`61`	`55`	`}`
`62`	`56`
`63`		`- /**`
`64`		`- * @return string`
`65`		`- */`
`66`		`- public function getLogDir()`
	`57`	`+ public function getLogDir(): string`
`67`	`58`	`{`
`68`	`59`	`return sys_get_temp_dir().'/EnqueueBundleCustom/cache/logs/'.$this->enqueueConfigId;`
`69`	`60`	`}`
`70`	`61`
`71`		`- protected function getContainerClass()`
	`62`	`+ protected function getContainerClass(): string`
`72`	`63`	`{`
`73`	`64`	`return parent::getContainerClass().'Custom'.$this->enqueueConfigId;`
`74`	`65`	`}`
`@@ -78,7 +69,11 @@ protected function getContainerClass()`
`78`	`69`	`*/`
`79`	`70`	`protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)`
`80`	`71`	`{`
`81`		`- $loader->load(__DIR__.'/config/custom-config.yml');`
	`72`	`+ if (self::VERSION_ID < 60000) {`
	`73`	`+ $loader->load(__DIR__.'/config/custom-config-sf5.yml');`
	`74`	`+ } else {`
	`75`	`+ $loader->load(__DIR__.'/config/custom-config.yml');`
	`76`	`+ }`
`82`	`77`
`83`	`78`	`$c->loadFromExtension('enqueue', $this->enqueueConfig);`
`84`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,7 @@ public function testShouldAllowGetLazyProducerWithoutError()`
`47`	`47`	`$producer->sendEvent('foo', 'foo');`
`48`	`48`	`}`
`49`	`49`
`50`		`- /**`
`51`		`- * @return string`
`52`		`- */`
`53`		`- public static function getKernelClass()`
	`50`	`+ public static function getKernelClass(): string`
`54`	`51`	`{`
`55`	`52`	`include_once __DIR__.'/App/CustomAppKernel.php';`
`56`	`53`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class UseCasesTest extends WebTestCase`
`20`	`20`	`{`
`21`		`- const RECEIVE_TIMEOUT = 500;`
	`21`	`+ private const RECEIVE_TIMEOUT = 500;`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`@@ -360,10 +360,7 @@ public function testTransportConsumeCommandShouldConsumeOneMessage()`
`360`	`360`	`$this->assertEquals($expectedBody, $processor->message->getBody());`
`361`	`361`	`}`
`362`	`362`
`363`		`- /**`
`364`		`- * @return string`
`365`		`- */`
`366`		`- public static function getKernelClass()`
	`363`	`+ public static function getKernelClass(): string`
`367`	`364`	`{`
`368`	`365`	`include_once __DIR__.'/App/CustomAppKernel.php';`
`369`	`366`
Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,7 @@ protected function tearDown(): void`
`39`	`39`	`static::$client = null;`
`40`	`40`	`}`
`41`	`41`
`42`		`- /**`
`43`		`- * @return string`
`44`		`- */`
`45`		`- public static function getKernelClass()`
	`42`	`+ public static function getKernelClass(): string`
`46`	`43`	`{`
`47`	`44`	`include_once __DIR__.'/App/AppKernel.php';`
`48`	`45`