Upgrade to Sphinx 7

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
             --network host --no-cache .
 
   tests:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: console
@@ -138,7 +138,7 @@ jobs:
 
   cs-stan:
     name: Coding Standards & Static Analysis
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: console
@@ -162,8 +162,5 @@ jobs:
       - name: Run psalm
         run: composer psalm -- --output-format=github
 
-      - name: Run phpstan (src)
-        run: composer phpstan-src -- --error-format=github
-
-      - name: Run phpstan (tests)
-        run: composer phpstan-tests -- --error-format=github
+      - name: Run phpstan
+        run: composer phpstan -- --error-format=github

Dockerfile

@@ -1,7 +1,7 @@
 # This image provides the ability to build docs for CakePHP plugins
 # Plugins should use a multi-stage Dockerfile so that they only deploy
 # nginx without python and other build tooling.
-FROM python:3.8-alpine
+FROM python:3.11-alpine
 
 LABEL Description="Create an image to deploy the CakePHP plugin docs"
 

console/composer.json

@@ -42,18 +42,14 @@
         "cs-fix": "phpcbf --parallel=16 -p ./src ./tests",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover=coverage.xml",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev \"phpstan/phpstan:^1.0\" \"psalm/phar:^4.0\" && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^1.10 psalm/phar:^5.13 && mv composer.backup composer.json",
         "stan": [
-            "@phpstan-src",
-            "@phpstan-tests",
+            "@phpstan",
             "@psalm"
         ],
-        "phpstan": [
-            "@phpstan-src",
-            "@phpstan-tests"
-        ],
-        "phpstan-src": "php ./vendor/phpstan/phpstan/phpstan.phar analyse -l 8 -c ./phpstan.src.neon ./src",
-        "phpstan-tests": "php ./vendor/phpstan/phpstan/phpstan.phar analyse -l 8 -c ./phpstan.tests.neon ./tests",
+        "phpstan": "php ./vendor/phpstan/phpstan/phpstan.phar analyse",
+        "stan-baseline": "php ./vendor/phpstan/phpstan/phpstan.phar --generate-baseline",
+        "psalm-baseline": "php ./vendor/psalm/phar/psalm.phar --set-baseline=psalm-baseline.xml",
         "psalm": "php ./vendor/psalm/phar/psalm.phar"
     }
 }

console/phpstan.neon

@@ -0,0 +1,10 @@
+parameters:
+	level: 6
+	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
+	treatPhpDocTypesAsCertain: false
+	bootstrapFiles:
+		- tests/bootstrap.php
+	paths:
+		- src/
+		- tests/

console/psalm-baseline.xml

@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.x-dev@">
+<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
   <file src="src/Docs/Parser/ContentParser.php">
-    <RedundantCondition occurrences="2">
-      <code>!$node-&gt;attributes</code>
-      <code>!$node-&gt;attributes</code>
-    </RedundantCondition>
+    <PossiblyNullArgument>
+      <code>$anchor</code>
+    </PossiblyNullArgument>
+    <PossiblyNullPropertyFetch>
+      <code><![CDATA[$node->attributes->getNamedItem('id')->nodeValue]]></code>
+    </PossiblyNullPropertyFetch>
+  </file>
+  <file src="src/Index/Manager.php">
+    <PossiblyInvalidCast>
+      <code>end($aliases)</code>
+    </PossiblyInvalidCast>
   </file>
 </files>

console/psalm.xml.dist

@@ -5,6 +5,9 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
+    findUnusedPsalmSuppress="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

console/src/Command/PopulateIndexCommand.php

@@ -199,9 +199,9 @@ protected function createBuildIndex(ConsoleIo $io, Manager $indexManager, string
         ];
         $properties = [
             'type' => ['type' => 'keyword', 'index' => false],
-            'priority' => ['type' => 'keyword', 'fielddata' => true],
+            'priority' => ['type' => 'keyword'],
             'url' => ['type' => 'keyword', 'index' => false],
-            'page_url' => ['type' => 'keyword', 'fielddata' => true],
+            'page_url' => ['type' => 'keyword'],
             'level' => ['type' => 'short'],
             'max_level' => ['type' => 'short'],
             'position' => ['type' => 'short'],

requirements.txt

@@ -1,4 +1,4 @@
-docutils==0.17.1
-sphinx==4.3.1
-sphinxcontrib-phpdomain==0.8.0
+docutils==0.18.1
+sphinx==6.2.1
+sphinxcontrib-phpdomain==0.11.0
 cakephpsphinx>=0.1.55,<1.0

runtime.Dockerfile

@@ -1,5 +1,5 @@
 # Build a small nginx container with just the static site in it.
-FROM nginx:1.15-alpine
+FROM nginx:1.25-alpine
 
 # We also need PHP to update elastic search.
 RUN apk add --update bash curl composer \