Merge branch '6.1' into 6.2

javiereguiluz · javiereguiluz · commit f794d1e90a32 · 2022-12-08T17:37:18.000+01:00
* 6.1:
  enable_annotations read also attributes
  Fix assets path in all directories no matter the deep. Add fix for js' assets. Add fix for fontawesome' assets.
diff --git a/_build/build.php b/_build/build.php
@@ -47,9 +47,18 @@
 
         if ($result->isSuccessful()) {
             // fix assets URLs to make them absolute (otherwise, they don't work in subdirectories)
-            foreach (glob($outputDir.'/**/*.html') as $htmlFilePath) {
+            $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($outputDir));
+
+            foreach (new RegexIterator($iterator, '/^.+\.html$/i', RegexIterator::GET_MATCH) as $match) {
+                $htmlFilePath = array_shift($match);
+                $htmlContents = file_get_contents($htmlFilePath);
+                file_put_contents($htmlFilePath, str_replace('<head>', '<head><base href="/">', $htmlContents));
+            }
+
+            foreach (new RegexIterator($iterator, '/^.+\.css/i', RegexIterator::GET_MATCH) as $match) {
+                $htmlFilePath = array_shift($match);
                 $htmlContents = file_get_contents($htmlFilePath);
-                file_put_contents($htmlFilePath, str_replace('href="assets/', 'href="/assets/', $htmlContents));
+                file_put_contents($htmlFilePath, str_replace('fonts/', '../fonts/', $htmlContents));
             }
 
             $io->success(sprintf("The Symfony Docs were successfully built at %s", realpath($outputDir)));
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -2514,7 +2514,7 @@ enable_annotations
 
 **type**: ``boolean`` **default**: ``false``
 
-If this option is enabled, validation constraints can be defined using annotations.
+If this option is enabled, validation constraints can be defined using annotations or attributes.
 
 translation_domain
 ..................
@@ -2722,7 +2722,7 @@ enable_annotations
 
 **type**: ``boolean`` **default**: ``false``
 
-If this option is enabled, serialization groups can be defined using annotations.
+If this option is enabled, serialization groups can be defined using annotations or attributes.
 
 .. seealso::
 
