Merge branch 'php:master' into ci/add-github-actions-coding-standards-

Author: lacatoire

.github/workflows/ci.yml

@@ -4,11 +4,11 @@ jobs:
   ubuntu:
     strategy:
       matrix:
-          version: ['8.1', '8.2', '8.3']
+          version: ['8.1', '8.2', '8.3', '8.4']
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PhD
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/full_render_doc-en_test.yml

@@ -6,18 +6,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PhD
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: "phd"
 
       - name: "Checkout php/doc-en"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           path: "en"
           repository: "php/doc-en"
 
       - name: "Checkout php/doc-base"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           path: "doc-base"
           repository: "php/doc-base"

.github/workflows/test.yml

@@ -5,11 +5,11 @@ jobs:
     name: test
     strategy:
       matrix:
-        version: ['8.1', '8.2', '8.3']
+        version: ['8.1', '8.2', '8.3', '8.4']
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PhD
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

phpdotnet/phd/ObjectStorage.php

@@ -3,19 +3,20 @@
 
 class ObjectStorage extends \SplObjectStorage
 {
-	public function attach(object $object, mixed $info = array()): void {
+	public function attach(object $object, mixed $info = []): void {
 		if (!($object instanceof Format)) {
 			throw new \InvalidArgumentException(
                 'Only classess inheriting ' . __NAMESPACE__ . '\\Format supported'
             );
 		}
 		if (empty($info)) {
-			$info = array(
+			$info = [
 				\XMLReader::ELEMENT => $object->getElementMap(),
 				\XMLReader::TEXT    => $object->getTextMap(),
-			);
+            ];
 		}
-		parent::attach($object, $info);
+
+        $this->offsetSet($object, $info);
 	}
 }
 

phpdotnet/phd/Package/PEAR/XHTML.php

@@ -643,7 +643,7 @@ public function format_phd_pearapi($open, $name, $attrs, $props)
             if (count($arLinkend) == 1) {
                 //link to class
                 $linktpl = '{$package}/docs/latest/{$package}/{$class}.html';
-            } else if ($arLinkend[1]{0} == '$') {
+            } else if ($arLinkend[1][0] == '$') {
                 //link to class variable
                 $variable = $arLinkend[1];
                 $linktpl = '{$package}/docs/latest/{$package}/{$class}.html#var{$variable}';

render.php

@@ -81,30 +81,6 @@
     exit(0);
 }
 
-function make_reader(Config $config, OutputHandler $outputHandler): Reader {
-    //Partial Rendering
-    $idlist = $config->renderIds + $config->skipIds;
-    if (!empty($idlist)) {
-        $outputHandler->v("Running partial build", VERBOSE_RENDER_STYLE);
-
-        $parents = [];
-        if ($config->indexCache) {
-            $parents = $config->indexCache->getParents($config->renderIds);
-        }
-
-        $reader = new Reader_Partial(
-            $outputHandler,
-            $config->renderIds,
-            $config->skipIds,
-            $parents,
-        );
-    } else {
-        $outputHandler->v("Running full build", VERBOSE_RENDER_STYLE);
-        $reader = new Reader($outputHandler);
-    }
-    return $reader;
-}
-
 $render = new Render();
 
 // Set reader LIBXML options
@@ -135,7 +111,8 @@ function make_reader(Config $config, OutputHandler $outputHandler): Reader {
 
     $render->attach($format);
 
-    $reader = make_reader($config, $outputHandler);
+    $outputHandler->v("Running full build", VERBOSE_RENDER_STYLE);
+    $reader = new Reader($outputHandler);
     $reader->open($config->xmlFile, NULL, $readerOpts);
     $render->execute($reader);
 
@@ -160,8 +137,28 @@ function make_reader(Config $config, OutputHandler $outputHandler): Reader {
     }
 }
 
+//Partial Rendering
+$idlist = $config->renderIds + $config->skipIds;
+if (!empty($idlist)) {
+    $outputHandler->v("Running partial build", VERBOSE_RENDER_STYLE);
+
+    $parents = [];
+    if ($config->indexCache) {
+        $parents = $config->indexCache->getParents($config->renderIds);
+    }
+
+    $reader = new Reader_Partial(
+        $outputHandler,
+        $config->renderIds,
+        $config->skipIds,
+        $parents,
+    );
+} else {
+    $outputHandler->v("Running full build", VERBOSE_RENDER_STYLE);
+    $reader = new Reader($outputHandler);
+}
+
 // Render formats
-$reader = make_reader($config, $outputHandler);
 $reader->open($config->xmlFile, NULL, $readerOpts);
 foreach($render as $format) {
     $format->notify(Render::VERBOSE, true);