Merge remote-tracking branch 'origin/preview' into branch-api-extraction

Author: markrandall

.github/workflows/integrate.yaml

@@ -196,8 +196,8 @@ jobs:
       - name: "Run unit tests with phpunit/phpunit"
         run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --testsuite=unit"
 
-      - name: "Start built-in web server for PHP"
-        run: "php -S ${{ env.HTTP_HOST }} .router.php &"
+#      - name: "Start built-in web server for PHP"
+#        run: "php -S ${{ env.HTTP_HOST }} .router.php &"
 
-      - name: "Run end-to-end tests with phpunit/phpunit"
-        run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --testsuite=end-to-end"
+#      - name: "Run end-to-end tests with phpunit/phpunit"
+#        run: "vendor/bin/phpunit --colors=always --configuration=tests/phpunit.xml --testsuite=end-to-end"

include/download-instructions/windows-downloads.php

@@ -1,7 +1,10 @@
 <?php
+
+use phpweb\ProjectGlobals;
+
 $baseDownloads  = 'https://downloads.php.net/~windows/releases/archives/';
 
-$dataStr = @file_get_contents(__DIR__ . '/../../backend/win-releases.json');
+$dataStr = @file_get_contents(ProjectGlobals::getBackendRoot() . '/win-releases.json');
 $releases = $dataStr ? json_decode($dataStr, true) : null;
 
 if (!is_array($releases)) {

include/manual-lookup.inc

@@ -110,9 +110,9 @@ function find_manual_page($lang, $keyword)
     $dbh = false;
     if (class_exists('PDO')) {
         if (in_array('sqlite', PDO::getAvailableDrivers(), true)) {
-            if (file_exists(ProjectGlobals::getProjectRoot() . '/backend/manual-lookup.sqlite')) {
+            if (file_exists(ProjectGlobals::getBackendRoot() . '/manual-lookup.sqlite')) {
                 try {
-                    $dbh = new PDO( 'sqlite:' . ProjectGlobals::getProjectRoot() . '/backend/manual-lookup.sqlite', '', '', [PDO::ATTR_PERSISTENT => true, PDO::ATTR_EMULATE_PREPARES => true] );
+                    $dbh = new PDO( 'sqlite:' . ProjectGlobals::getBackendRoot() . '/manual-lookup.sqlite', '', '', [PDO::ATTR_PERSISTENT => true, PDO::ATTR_EMULATE_PREPARES => true] );
                 } catch (PDOException $e) {
                     return find_manual_page_slow($lang, $keyword);
                 }

include/shared-manual.inc

@@ -97,7 +97,7 @@ END_USERNOTE_HEADER;
 function manual_notes_load(string $id): array
 {
     $hash = substr(md5($id), 0, 16);
-    $notes_file = ProjectGlobals::getPublicRoot() . "/backend/notes/" .
+    $notes_file = ProjectGlobals::getBackendRoot() . "/notes/" .
                   substr($hash, 0, 2) . "/$hash";
 
     // Open the note file for reading and get the data (12KB)