Merge pull request #14479 from jdalsem/upmerge5.0

Upmerge5.0

.readthedocs.yml

@@ -5,6 +5,11 @@
 # Required
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.7"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   builder: html
@@ -20,6 +25,5 @@ formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
   install:
     - requirements: docs/pip-requirements.txt

composer.json

@@ -13,7 +13,7 @@
         "ext-json": "*",
         "ext-xml": "*",
         "ckeditor/ckeditor": "~4.20.0",
-        "composer/semver": "~3.3.0",
+        "composer/semver": "~3.4.0",
         "css-crush/css-crush": "~4.1.0",
         "doctrine/dbal": "~3.4.4",
         "eloquent/composer-config-reader": "~3.0.0",
@@ -54,7 +54,7 @@
         "symfony/mime": "~5.3",
         "symfony/routing": "~5.3",
         "symfony/var-dumper": "~5.3",
-        "vanilla/htmlawed": "~2.2.0"
+        "vanilla/htmlawed": "2.2.5"
     },
     "config": {
         "process-timeout": 0,

docs/conf.py

@@ -29,6 +29,7 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
+    'sphinx_rtd_theme',
     'sphinxcontrib.phpdomain'
 ]
 
@@ -109,7 +110,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/pip-requirements.txt

@@ -1,2 +1,3 @@
 docutils<0.18
 sphinxcontrib.phpdomain
+sphinx_rtd_theme

docs/requirements.txt

@@ -1,3 +1,4 @@
 docutils<0.18
 sphinxcontrib.phpdomain
 sphinx-intl
+sphinx_rtd_theme