feat: add Twig helper generating hub URLs and setting authorization cookies (#57)

Author: dunglas

.gitignore

@@ -1,5 +1,5 @@
-/.php_cs.cache
-/.php_cs
+/.php-cs-fixer.cache
+/.php-cs-fixer.php
 /.phpunit.result.cache
 /composer.phar
 /composer.lock

.php_cs.dist .php-cs-fixer.dist.php.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -11,7 +11,7 @@
 
 $finder = PhpCsFixer\Finder::create()->in(__DIR__);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
@@ -29,25 +29,13 @@
         ],
         'modernize_types_casting' => true,
         'native_function_invocation' => true,
-        'no_extra_consecutive_blank_lines' => [
-            'break',
-            'continue',
-            'curly_brace_block',
-            'extra',
-            'parenthesis_brace_block',
-            'return',
-            'square_brace_block',
-            'throw',
-            'use',
-        ],
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_imports' => true,
         'phpdoc_add_missing_param_annotation' => [
             'only_untyped' => true,
         ],
         'phpdoc_order' => true,
-        'psr4' => true,
         'semicolon_after_instruction' => true,
         'strict_comparison' => true,
         'strict_param' => true,

.travis.yml

@@ -15,7 +15,7 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - if [[ $lint = '1' ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.18.4/php-cs-fixer.phar; fi
+  - if [[ $lint = '1' ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.0.0/php-cs-fixer.phar; fi
   - if [[ $lint = '1' ]]; then wget https://github.com/phpstan/phpstan/releases/download/0.12.82/phpstan.phar; fi
 
 before_script:

composer.json

@@ -21,7 +21,7 @@
         "symfony/config": "^4.4|^5.0|^6.0",
         "symfony/dependency-injection": "^4.4|^5.0|^6.0",
         "symfony/http-kernel": "^4.4|^5.0|^6.0",
-        "symfony/mercure": "^0.5.3",
+        "symfony/mercure": "^0.5.3|^0.6",
         "symfony/web-link": "^4.4|^5.0|^6.0"
     },
     "autoload": {

src/DependencyInjection/MercureExtension.php

@@ -27,6 +27,7 @@
 use Symfony\Component\Mercure\Debug\TraceableHub;
 use Symfony\Component\Mercure\Debug\TraceablePublisher;
 use Symfony\Component\Mercure\Discovery;
+use Symfony\Component\Mercure\EventSubscriber\SetCookieSubscriber;
 use Symfony\Component\Mercure\Hub;
 use Symfony\Component\Mercure\HubInterface;
 use Symfony\Component\Mercure\HubRegistry;
@@ -40,9 +41,11 @@
 use Symfony\Component\Mercure\Messenger\UpdateHandler;
 use Symfony\Component\Mercure\Publisher;
 use Symfony\Component\Mercure\PublisherInterface;
+use Symfony\Component\Mercure\Twig\MercureExtension as TwigMercureExtension;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\UX\Turbo\Bridge\Mercure\Broadcaster;
 use Symfony\UX\Turbo\Bridge\Mercure\TurboStreamListenRenderer;
+use Twig\Environment;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -255,10 +258,21 @@ public function load(array $configs, ContainerBuilder $container)
             ->addArgument($config['default_cookie_lifetime'])
         ;
 
-        $container->register(Discovery::class, Discovery::class)
+        $container->register(Discovery::class)
             ->addArgument(new Reference(HubRegistry::class))
         ;
 
+        if (class_exists(SetCookieSubscriber::class)) {
+            $container->register(SetCookieSubscriber::class)
+                ->addTag('kernel.event_subscriber', ['priority' => -10]);
+        }
+
+        if (class_exists(TwigMercureExtension::class) && class_exists(Environment::class)) {
+            $container->register(TwigMercureExtension::class)
+                ->setArguments([new Reference(HubRegistry::class), new Reference(Authorization::class), new Reference('request_stack')])
+                ->addTag('twig.extension');
+        }
+
         // TODO: remove these parameters in the next release.
         $container->setParameter('mercure.hubs', $hubUrls);
         $container->setParameter('mercure.default_hub', $defaultHubUrl);