floflax

Author: tBibaut

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -14,6 +14,7 @@
 use Composer\InstalledVersions;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Symfony\Component\Routing\StaticSiteGeneration\ParamsProviderInterface;
 use phpDocumentor\Reflection\DocBlockFactoryInterface;
 use phpDocumentor\Reflection\Types\ContextFactory;
 use PhpParser\Parser;
@@ -1247,6 +1248,9 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
             $container->getDefinition('router.request_context')
                 ->replaceArgument(0, $config['default_uri']);
         }
+
+        $container->registerForAutoconfiguration(ParamsProviderInterface::class)
+            ->addTag('routing.static_site.params_provider');
     }
 
     private function registerSessionConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void

src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php

@@ -402,8 +402,8 @@
 
         ->set('console.command.static_site_generation_generate', StaticSiteGenerationGenerateCommand::class)
             ->args([
-                service('static_pages_generator'),
-                service('static_page_dumper'),
+                service('static_site.pages_generator'),
+                service('static_site.page_dumper'),
             ])
             ->tag('console.command')
     ;

src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.php

@@ -210,9 +210,10 @@
             ])
             ->public()
 
-        ->set('routing.static_uri_provider', StaticUrisProvider::class)
+        ->set('routing.static_site.uri_provider', StaticUrisProvider::class)
             ->args([
-                service('router')
+                service('router'),
+                tagged_locator('routing.static_site.params_provider'),
             ])
     ;
 };

src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php

@@ -148,16 +148,16 @@
         ->set('controller.cache_attribute_listener', CacheAttributeListener::class)
             ->tag('kernel.event_subscriber')
 
-        ->set('static_pages_generator', StaticPagesGenerator::class)
+        ->set('static_site.pages_generator', StaticPagesGenerator::class)
             ->args([
                 service('http_kernel'),
-                service('routing.static_uri_provider'),
+                service('routing.static_site.uri_provider'),
             ])
 
-        ->set('static_page_dumper', FilesystemStaticPageDumper::class)
+        ->set('static_site.page_dumper', FilesystemStaticPageDumper::class)
             ->args([
                 param('kernel.project_dir'),
             ])
-        ->alias(StaticPageDumperInterface::class, 'static_page_dumper')
+        ->alias(StaticPageDumperInterface::class, 'static_static.page_dumper')
     ;
 };

src/Symfony/Component/HttpKernel/StaticSiteGeneration/FilesystemStaticPageDumper.php

@@ -28,9 +28,8 @@ public function dump(string $uri, string $content): void
         // @todo pas de .. dans $uri
 
         $staticPagesDirectory = sprintf('%s/static-pages', $this->getPublicDirectory());
-        $path = sprintf('%s.html', rtrim($uri, '.html'));
 
-        $this->filesystem->dumpFile(sprintf('%s/%s', $staticPagesDirectory, $path), $content);
+        $this->filesystem->dumpFile(sprintf('%s/%s', $staticPagesDirectory, $uri), $content);
     }
 
     private function getPublicDirectory(): string

src/Symfony/Component/HttpKernel/StaticSiteGeneration/StaticPagesGenerator.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpKernel\StaticSiteGeneration;
 
 // @todo dependency compsoer.json symfony/filesystem
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -37,8 +36,6 @@ public function __construct(
      */
     public function generate(?string $filterPattern = null): iterable
     {
-        $fs = new Filesystem();
-
         foreach ($this->staticUrisProvider->provide() as $uri) {
             if (null !== $filterPattern && !preg_match($filterPattern, $uri)) {
                 continue;
@@ -56,8 +53,9 @@ public function generate(?string $filterPattern = null): iterable
                 // @todo throws
             }
 
-            if (false === strpos('text/html', $response->headers->get('Content-Type'))) {
-                // @todo throws
+            $format = $request->getFormat($response->headers->get('Content-Type')) ?? '';
+            if (!str_ends_with($uri, '.' . $format)) {
+                $uri = sprintf('%s.%s', $uri, $format);
             }
 
             yield $uri => $response->getContent();

src/Symfony/Component/Routing/Loader/Configurator/Traits/RouteTrait.php

@@ -173,7 +173,7 @@ final public function stateless(bool $stateless = true): static
     /**
      * @param bool|array{params?: string|iterable<array<mixed>>} $staticGeneration
      */
-    final public function staticGeneration(bool|array $staticGeneration): static
+    final public function staticGeneration(bool|array $staticGeneration = true): static
     {
         $this->route->addDefaults(['_static_generation' => $staticGeneration]);
 

src/Symfony/Component/Routing/StaticSiteGeneration/StaticUrisProvider.php

@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Routing\StaticSiteGeneration;
 
+use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\InvalidArgumentException;
 use Symfony\Component\Routing\RouterInterface;
 
-
 /**
  * @author Thomas Bibaut
  * @author Mathias Arlaud <[email protected]>
@@ -24,6 +25,7 @@
 {
     public function __construct(
         private RouterInterface $router,
+        private ContainerInterface $paramsProviders,
     ) {
     }
 
@@ -74,9 +76,9 @@ public function provide(): iterable
     /**
      * @param true|string|array{params: list<array<string, mixed>>} $config
      *
-     * @return list<array<string, mixed>>
+     * @return iterable<array<string, mixed>>
      */
-    private function getParamsList(array $config): array
+    private function getParamsList(array $config): iterable
     {
         if (true === $config) {
             return [];
@@ -88,7 +90,17 @@ private function getParamsList(array $config): array
 
         $paramsList = $config['params'];
         if (is_string($paramsList)) {
-            // @todo locator
+            $serviceId = $paramsList;
+            if (!$this->paramsProviders->has($serviceId)) {
+                throw new InvalidArgumentException(\sprintf('You have requested a non-existent params provider service "%s". Did you implement "%s"?', $serviceId, ParamsProviderInterface::class));
+            }
+
+            $paramsProvider = $this->paramsProviders->get($serviceId);
+            if (!$paramsProvider instanceof ParamsProviderInterface) {
+                throw new InvalidArgumentException(\sprintf('The "%s" params provider service does not implement "%s".', $serviceId, ParamsProviderInterface::class));
+            }
+
+            return $paramsProvider->provideParams();
         }
 
         return $paramsList;