vysokeskoly · MortalFlesh · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 <!-- There is always Unreleased section on the top. Subsections (Added, Changed, Fixed, Removed) should be added as needed. -->
 ## Unreleased
+- Ignore warning in parsing HTML
 
 ## 7.5.0 - 2023-11-29
 - Fix finding html tags when there are encoded html entities

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "phpstan/phpstan": "^1.8.0",
         "phpstan/phpstan-beberlei-assert": "^1.0",
         "phpstan/phpstan-phpunit": "^1.1",
-        "phpunit/phpunit": "^9.5.20"
+        "phpunit/phpunit": "^10.5.20"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- http://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" colors="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
          bootstrap="vendor/autoload.php">
-
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-        <exclude>
-            <directory>src/DependencyInjection</directory>
-            <directory>src/Exception</directory>
-            <directory>src/Resources</directory>
-            <directory suffix="Bundle.php">src/*</directory>
-        </exclude>
         <report>
             <clover outputFile="./code-coverage/clover.xml"/>
             <html outputDirectory="./code-coverage" highLowerBound="90"/>
         </report>
     </coverage>
-
     <testsuites>
         <testsuite name="VysokeSkoly/UtilsBundle Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
     <logging>
         <junit outputFile="./code-coverage/junit.xml"/>
     </logging>
-
     <php>
         <!-- E_ALL = 30719 -->
         <ini name="error_reporting" value="30719"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <exclude>
+            <directory>src/DependencyInjection</directory>
+            <directory>src/Exception</directory>
+            <directory>src/Resources</directory>
+            <directory suffix="Bundle.php">src/*</directory>
+        </exclude>
+    </source>
 </phpunit>
diff --git a/src/Service/HtmlHelper.php b/src/Service/HtmlHelper.php
@@ -30,6 +30,9 @@ public function xpathHtmlDocument(string $content, string $xpathQuery): ISeq
             $htmlContent = $this->transformUnsupportedHtml($content);
             $htmlContent = $this->encodeHtml($htmlContent);
 
+            // @see https://stackoverflow.com/questions/11819603/domdocument-loadhtml-doesnt-work-properly-on-a-server
+            $previously = libxml_use_internal_errors(true);
+
             // @see https://www.php.net/manual/en/domdocument.loadhtml.php#95251
             $dom = new \DOMDocument();
             $dom->loadHTML(sprintf('<?xml encoding="UTF-8">%s', $htmlContent));

diff --git a/tests/Entity/ImageTest.php b/tests/Entity/ImageTest.php
@@ -18,7 +18,7 @@ public function testShouldGetMimeType(string $extension, string $expected): void
         $this->assertSame($expected, $result);
     }
 
-    public function provideExtension(): array
+    public static function provideExtension(): array
     {
         return [
             // extension, expected mime type

diff --git a/tests/Entity/LetterItemTest.php b/tests/Entity/LetterItemTest.php
@@ -19,7 +19,7 @@ public function testShouldGetLetterInUpperCase(string $letter, string $expected)
         $this->assertSame($expected, $letter->getLetter());
     }
 
-    public function provideLetter(): array
+    public static function provideLetter(): array
     {
         return [
             // letter, expected

diff --git a/tests/Service/ArrayHelperTest.php b/tests/Service/ArrayHelperTest.php
@@ -19,7 +19,7 @@ public function testShouldCreateAlphabeticalList(array $items, string $column, a
         $this->assertEquals($expected, ArrayHelper::getAlphabeticalList($items, $column));
     }
 
-    public function provideAplhabeticalList(): array
+    public static function provideAplhabeticalList(): array
     {
         return [
             // items, column, expected

diff --git a/tests/Service/DebugLevelTest.php b/tests/Service/DebugLevelTest.php
@@ -39,7 +39,7 @@ public function testShouldCheckAllDebugModes(
         $this->assertSame($isCacheEnabled, $this->debugLevel->isCacheEnabled());
     }
 
-    public function provideLevel(): array
+    public static function provideLevel(): array
     {
         return [
             // debug level, expected debug level, is debug?, is cache enabled?

diff --git a/tests/Service/HtmlHelperTest.php b/tests/Service/HtmlHelperTest.php
@@ -19,7 +19,7 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider imagesProvider
+     * @dataProvider provideImages
      */
     public function testShouldGetImages(string $content, array $expectedImages): void
     {
@@ -32,7 +32,7 @@ public function testShouldGetImages(string $content, array $expectedImages): voi
         }
     }
 
-    public function imagesProvider(): array
+    public static function provideImages(): array
     {
         return [
             // content, imageSources
@@ -125,11 +125,28 @@ class="wp-image-19"
                     ),
                 ],
             ],
+            'html with warning' => [
+                '<p>Text</strong></p>
+                <h3><strong><a title="Průzkum: Studium za pandemie" href="https://go.minute.app/#R/studovatzapandemie" target="_blank" rel="noopener">&gt;&gt; ZAPOJIT SE DO PRŮZKUMU ZDE &lt;&lt;</a></strong></h3>
+                <p>Text 2.</p>
+                <p><img class="wp-image-30584 alignleft" src="http://vs-admin.prod/wp-content/uploads/2021/05/apple-min_600.png" alt="apple-vyhra_vysokeskoly" width="294" height="321" /><br />Text:  with space</p>',
+                [
+                    ' class="wp-image-30584 alignleft" src="http://vs-admin.prod/wp-content/uploads/2021/05/apple-min_600.png" alt="apple-vyhra_vysokeskoly" width="294" height="321" /' => new Image(
+                        [
+                            'class' => 'wp-image-30584 alignleft',
+                            'src' => 'http://vs-admin.prod/wp-content/uploads/2021/05/apple-min_600.png',
+                            'alt' => 'apple-vyhra_vysokeskoly',
+                            'width' => '294',
+                            'height' => '321',
+                        ],
+                    ),
+                ],
+            ],
         ];
     }
 
     /**
-     * @dataProvider tagProvider
+     * @dataProvider provideTags
      */
     public function testShouldTransformToHtmlTag(
         string $tag,
@@ -140,7 +157,7 @@ public function testShouldTransformToHtmlTag(
         $this->assertSame($expected, $this->htmlHelper->transformToTag($tag, $parameters, $isSingleTag));
     }
 
-    public function tagProvider(): array
+    public static function provideTags(): array
     {
         return [
             // tag, parameters, isSingleTag, expected
@@ -180,7 +197,7 @@ public function testShouldReplaceAllImageSourcesInContent(): void
     }
 
     /**
-     * @dataProvider linksProvider
+     * @dataProvider provideLinks
      */
     public function testShouldGetAllLinksFromContent(string $content, array $expectedLinks): void
     {
@@ -193,7 +210,7 @@ public function testShouldGetAllLinksFromContent(string $content, array $expecte
         }
     }
 
-    public function linksProvider(): array
+    public static function provideLinks(): array
     {
         return [
             // content, expectedLinks
@@ -346,7 +363,7 @@ public function testShouldGetAllParagraphsFromHtml(): void
     }
 
     /**
-     * @dataProvider firstReplacementProvider
+     * @dataProvider provideFirstReplacement
      */
     public function testShouldInsertTextAfterFirstOccurrence(
         string $content,
@@ -357,7 +374,7 @@ public function testShouldInsertTextAfterFirstOccurrence(
         $this->assertSame($expectedContent, $this->htmlHelper->insertAfterFirst($content, $replacement, $search));
     }
 
-    public function firstReplacementProvider(): array
+    public static function provideFirstReplacement(): array
     {
         return [
             // content, replacement, search for, expected replaced content
@@ -371,8 +388,8 @@ public function firstReplacementProvider(): array
                     '<p> </p>' .
                     '<p>Last paragraph</p>',
                 'replacement' => '{-top-}',
-                'search for' => '<p> </p>',
-                'expected' => '<p>Žluťoučký kůň se pase 🐴</p>' .
+                'search' => '<p> </p>',
+                'expectedContent' => '<p>Žluťoučký kůň se pase 🐴</p>' .
                     '<p> </p>{-top-}' .
                     '<p>Second paragraph</p>' .
                     '<p> </p>' .
@@ -382,7 +399,7 @@ public function firstReplacementProvider(): array
     }
 
     /**
-     * @dataProvider lastReplacementProvider
+     * @dataProvider provideLastReplacement
      */
     public function testShouldInsertTextAfterLastOccurrence(
         string $content,
@@ -393,7 +410,7 @@ public function testShouldInsertTextAfterLastOccurrence(
         $this->assertSame($expectedContent, $this->htmlHelper->insertAfterLast($content, $replacement, $search));
     }
 
-    public function lastReplacementProvider(): array
+    public static function provideLastReplacement(): array
     {
         return [
             // content, replacement, search for, expected replaced content
@@ -408,8 +425,8 @@ public function lastReplacementProvider(): array
                     '<p> </p>' .
                     '<p>Last paragraph</p>',
                 'replacement' => '{-bottom-}',
-                'search for' => '<p> </p>',
-                'expected' => '<p>Žluťoučký kůň se pase 🐴</p>' .
+                'search' => '<p> </p>',
+                'expectedContent' => '<p>Žluťoučký kůň se pase 🐴</p>' .
                     '<p> </p>' .
                     '<p>Second paragraph</p>' .
                     '<p> </p>{-bottom-}' .

diff --git a/tests/Service/RegexHelperTest.php b/tests/Service/RegexHelperTest.php
@@ -16,7 +16,7 @@ public function testShouldParseMatchFromString(string $string, string $pattern,
         $this->assertSame($expected, RegexHelper::parse($string, $pattern));
     }
 
-    public function provideToParse(): array
+    public static function provideToParse(): array
     {
         return [
             'empty' => ['', '/(w+)/', null],

diff --git a/tests/Service/StringUtilsTest.php b/tests/Service/StringUtilsTest.php
@@ -47,7 +47,7 @@ public function testShouldValidateEmails(string $email, bool $isValid): void
         }
     }
 
-    public function provideEmail(): array
+    public static function provideEmail(): array
     {
         return [
             ['email@domain.com', true],
@@ -89,7 +89,7 @@ public function testShouldFormatPhoneNumber(string $expected, string $given): vo
         $this->assertEquals($expected, StringUtils::formatPhoneNumber($given));
     }
 
-    public function providePhoneNumbers(): array
+    public static function providePhoneNumbers(): array
     {
         return [
             ['+420 123 456 789', '+420123456789'],
@@ -150,7 +150,7 @@ public function testShouldDetectIfStringStartsWith(string $haystack, string $nee
         $this->assertSame($expectedResult, StringUtils::startsWith($haystack, $needle));
     }
 
-    public function provideForStartsWith(): array
+    public static function provideForStartsWith(): array
     {
         return [
             // $haystack, $needle, $expectedResult
@@ -175,7 +175,7 @@ public function testShouldDetectIfStringEndsWith(string $haystack, string $needl
         $this->assertSame($expectedResult, StringUtils::endsWith($haystack, $needle));
     }
 
-    public function provideForEndsWith(): array
+    public static function provideForEndsWith(): array
     {
         return [
             // $haystack, $needle, $expectedResult
@@ -200,7 +200,7 @@ public function testShouldGetFirstLetter(string $string, string $expected): void
         $this->assertEquals($expected, StringUtils::getFirstLetter($string));
     }
 
-    public function provideFirstLetter(): array
+    public static function provideFirstLetter(): array
     {
         return [
             'empty' => ['', ''],
@@ -221,7 +221,7 @@ public function testShouldContainsAString(string $heystack, string $needle, bool
         $this->assertSame($expected, StringUtils::contains($heystack, $needle));
     }
 
-    public function provideForContains(): array
+    public static function provideForContains(): array
     {
         return [
             // heystack, needle, expected

diff --git a/tests/Service/UrlTest.php b/tests/Service/UrlTest.php
@@ -25,7 +25,7 @@ public function testBuildUrl(string $expectedUrl, string $url, array $params): v
         $this->assertEquals($expectedUrl, Url::buildUrlWithParams($url, $params));
     }
 
-    public function provideUrlForBuild(): array
+    public static function provideUrlForBuild(): array
     {
         return [
             // url without params in it and without additional params
@@ -53,7 +53,7 @@ public function testShouldRemoveParameterIfItIsPresent(string $originalUrl, stri
         $this->assertSame($expectedUrl, Url::removeParam($originalUrl, $parameterToRemove));
     }
 
-    public function provideParameterForRemove(): array
+    public static function provideParameterForRemove(): array
     {
         return [
             // Standard URL with primitive param to be removed from multiple parameters
@@ -97,7 +97,7 @@ public function testShouldRetrievesParametersFromUrlToArray(string $url, array $
         $this->assertSame($expectedValue, Url::getParams($url));
     }
 
-    public function provideUrlParameter(): array
+    public static function provideUrlParameter(): array
     {
         return [
             ['http://www.vysokeskoly.cz/search/?foo=bar', ['foo' => 'bar']],

diff --git a/tests/Service/XmlHelperTest.php b/tests/Service/XmlHelperTest.php
@@ -38,7 +38,7 @@ public function testShouldGetAttributeValueFromXml(string $attributeName, ?strin
         $this->assertSame($expected, XmlHelper::getXmlAttributeValue($this->xml, $attributeName));
     }
 
-    public function provideAttributes(): array
+    public static function provideAttributes(): array
     {
         return [
             'existing' => ['totalCount', '123'],
@@ -122,7 +122,7 @@ public function testShouldSanitizeXml(string $inputXmlPart, string $expectedOutp
         $this->assertSame($expectedOutput, XmlHelper::sanitizeXml($input));
     }
 
-    public function provideXmlData(): array
+    public static function provideXmlData(): array
     {
         return [
             ['Text with completely valid characters ĎŤŇŠŘÜÚ', 'Text with completely valid characters ĎŤŇŠŘÜÚ'],