Aligned notification capitalisation

[bookstack] / app / Entities / Tools / PageContent.php

diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index c8204a18186893c874f03dcdb65e820e03c3d638..b95131fce2e25561c22131d3d81e3dc4d30a8aac 100644 (file)
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -12,6 +12,8 @@ use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageService;
 use BookStack\Util\HtmlContentFilter;
 use DOMDocument;
 use BookStack\Uploads\ImageService;
 use BookStack\Util\HtmlContentFilter;
 use DOMDocument;

+use DOMElement;
+use DOMNode;

 use DOMNodeList;
 use DOMXPath;
 use Illuminate\Support\Str;
 use DOMNodeList;
 use DOMXPath;
 use Illuminate\Support\Str;


@@ -156,7 +158,7 @@ class PageContent
     /**
      * Parse a base64 image URI into the data and extension.
      *
     /**
      * Parse a base64 image URI into the data and extension.
      *

-     * @return array{extension: array, data: string}
+     * @return array{extension: string, data: string}

      */
     protected function parseBase64ImageUri(string $uri): array
     {
      */
     protected function parseBase64ImageUri(string $uri): array
     {


@@ -237,9 +239,9 @@ class PageContent
      * A map for existing ID's should be passed in to check for current existence.
      * Returns a pair of strings in the format [old_id, new_id].
      */
      * A map for existing ID's should be passed in to check for current existence.
      * Returns a pair of strings in the format [old_id, new_id].
      */

-    protected function setUniqueId(\DOMNode $element, array &$idMap): array
+    protected function setUniqueId(DOMNode $element, array &$idMap): array

     {
     {

-        if (get_class($element) !== 'DOMElement') {
+        if (!$element instanceof DOMElement) {

             return ['', ''];
         }
 
             return ['', ''];
         }
 


@@ -251,7 +253,7 @@ class PageContent
             return [$existingId, $existingId];
         }
 
             return [$existingId, $existingId];
         }
 

-        // Create an unique id for the element
+        // Create a unique id for the element

         // Uses the content as a basis to ensure output is the same every time
         // the same content is passed through.
         $contentId = 'bkmrk-' . mb_substr(strtolower(preg_replace('/\s+/', '-', trim($element->nodeValue))), 0, 20);
         // Uses the content as a basis to ensure output is the same every time
         // the same content is passed through.
         $contentId = 'bkmrk-' . mb_substr(strtolower(preg_replace('/\s+/', '-', trim($element->nodeValue))), 0, 20);


@@ -321,7 +323,7 @@ class PageContent
      */
     protected function headerNodesToLevelList(DOMNodeList $nodeList): array
     {
      */
     protected function headerNodesToLevelList(DOMNodeList $nodeList): array
     {

-        $tree = collect($nodeList)->map(function ($header) {
+        $tree = collect($nodeList)->map(function (DOMElement $header) {

             $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue));
             $text = mb_substr($text, 0, 100);
 
             $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue));
             $text = mb_substr($text, 0, 100);