Remove deprecated usage of function

.gitattributes

@@ -9,4 +9,4 @@
 phpunit.xml.dist   export-ignore
 tests              export-ignore
 docs               export-ignore
-
+.phpunit.result.cache

.github/workflows/test.yaml

@@ -16,9 +16,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: '8.1'
-            main: true
           - php-version: '8.2'
+            main: true
           - php-version: '8.3'
           - php-version: '8.4'
             nightly: true
@@ -44,7 +43,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies
-        run: composer install --prefer-dist --dev
+        run: composer install --prefer-dist
 
       - name: Run tests
         continue-on-error: ${{ matrix.nightly }}

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 All Notable changes to `ElementFinder` will be documented in this file
+## 3.0 [Unreleased]
+- Move to php 8.2
 
 ## 2.0.0 [2023-01-11]
 - Move to php 8.1

composer.json

@@ -17,7 +17,7 @@
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-dom": "*",
     "ext-libxml": "*",
     "symfony/css-selector": "^7.1"
@@ -35,7 +35,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Test\\Xparse\\ElementFinder\\": "tests"
+      "Test\\Xparse\\ElementFinder\\": "./tests"
     }
   },
   "config": {

ecs.php

@@ -4,6 +4,7 @@
 
 use PhpCsFixer\Fixer\FunctionNotation\VoidReturnFixer;
 use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
+use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
@@ -14,7 +15,11 @@
         __FILE__,
     ]);
 
-    $ecsConfig->rules([NoUnusedImportsFixer::class, VoidReturnFixer::class]);
+    $ecsConfig->rules([
+        NoUnusedImportsFixer::class,
+        VoidReturnFixer::class,
+        DeclareStrictTypesFixer::class,
+    ]);
 
     // this way you can add sets - group of rules
     $ecsConfig->sets([SetList::SPACES, SetList::ARRAY, SetList::DOCBLOCK, SetList::NAMESPACES, SetList::COMMENTS, SetList::PSR_12]);

phpunit.xml

@@ -2,19 +2,25 @@
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php"
         colors="true"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
+        displayDetailsOnTestsThatTriggerDeprecations="true"
+        displayDetailsOnTestsThatTriggerErrors="true"
+        displayDetailsOnTestsThatTriggerNotices="true"
+        displayDetailsOnTestsThatTriggerWarnings="true"
 >
     <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
         <report>
             <clover outputFile=".tmp/clover.xml"/>
         </report>
     </coverage>
     <testsuites>
         <testsuite name="Test Suite">
-            <directory>tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
 </phpunit>

src/ElementFinder.php

@@ -214,7 +214,19 @@ private function setData(string $data): self
 
         if (static::DOCUMENT_HTML === $this->type) {
             $data = StringHelper::safeEncodeStr($data);
-            $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
+
+            //Analogue of mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8')
+            //Usage of mb_convert_encoding with encoding to HTML_ENTITIES is deprecated since php version 8.2
+            //When passing data to ElementFinder in an encoding other than UTF-8, any unrecognized characters will be ignored
+            $data = mb_encode_numericentity(
+                htmlspecialchars_decode(
+                    htmlentities($data, ENT_NOQUOTES | ENT_IGNORE, 'UTF-8', false),
+                    ENT_NOQUOTES
+                ),
+                [0x80, 0x10FFFF, 0, ~0],
+                'UTF-8'
+            );
+
             $this->dom->loadHTML($data, LIBXML_NOCDATA & LIBXML_NOERROR);
         } elseif (static::DOCUMENT_XML === $this->type) {
             $this->dom->loadXML($data, LIBXML_NOCDATA & LIBXML_NOERROR);

tests/Collection/Filters/StringFilter/RegexStringFilterTest.php

@@ -1,11 +1,13 @@
 <?php
 
-namespace Tests\Xparse\ElementFinder\Collection\Filters\StringFilter;
+declare(strict_types=1);
+
+namespace Test\Xparse\ElementFinder\Collection\Filters\StringFilter;
 
 use PHPUnit\Framework\TestCase;
 use Xparse\ElementFinder\Collection\Filters\StringFilter\RegexStringFilter;
 
-class RegexStringFilterTest extends TestCase
+final class RegexStringFilterTest extends TestCase
 {
     public function testRegexSuccess(): void
     {

tests/Collection/Modify/StringModify/RegexReplaceTest.php

@@ -1,12 +1,14 @@
 <?php
 
-namespace Tests\Xparse\ElementFinder\Collection\Modify\StringModify;
+declare(strict_types=1);
+
+namespace Test\Xparse\ElementFinder\Collection\Modify\StringModify;
 
 use PHPUnit\Framework\TestCase;
 use Xparse\ElementFinder\Collection\Modify\StringModify\RegexReplace;
 use Xparse\ElementFinder\Collection\StringCollection;
 
-class RegexReplaceTest extends TestCase
+final class RegexReplaceTest extends TestCase
 {
     public function testReplace(): void
     {

tests/Collection/StringCollectionTest.php

@@ -4,6 +4,7 @@
 
 namespace Test\Xparse\ElementFinder\Collection;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Test\Xparse\ElementFinder\Collection\Dummy\JoinedBy;
 use Test\Xparse\ElementFinder\Collection\Dummy\WithLetterFilter;
@@ -12,7 +13,7 @@
 /**
  * @author Ivan Shcherbak <[email protected]>
  */
-class StringCollectionTest extends TestCase
+final class StringCollectionTest extends TestCase
 {
     public function testInvalidObjectIndex(): void
     {
@@ -87,10 +88,12 @@ public function testMergeWithPartialItems(): void
     {
         $collection = (new StringCollection([
             1 => 'a',
-        ]))->merge(new StringCollection([
-            1 => 'b',
-            'c',
-        ]));
+        ]))->merge(
+            new StringCollection([
+                1 => 'b',
+                'c',
+            ])
+        );
         self::assertSame(['a', 'b', 'c'], $collection->all());
     }
 
@@ -128,7 +131,8 @@ public function testFilter(): void
 
         self::assertSame(
             [
-                'bar', 'baz',
+                'bar',
+                'baz',
             ],
             $collection->all()
         );
@@ -148,9 +152,7 @@ public function testMap(): void
         );
     }
 
-    /**
-     * @dataProvider lastDataProvider
-     */
+    #[DataProvider('lastDataProvider')]
     public function testLast(array $items, mixed $expected): void
     {
         $collection = new StringCollection($items);

tests/CssExpressionTranslator/CssExpressionTranslatorTest.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Xparse\ElementFinder\CssExpressionTranslator\Test;
+namespace Test\Xparse\ElementFinder\CssExpressionTranslator;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Xparse\ElementFinder\CssExpressionTranslator\CssExpressionTranslator;
 
@@ -15,7 +16,7 @@ class CssExpressionTranslatorTest extends TestCase
     /**
      * @return string[][]
      */
-    final public function getConvertWithAttributesDataProvider(): array
+    final public static function getConvertWithAttributesDataProvider(): array
     {
         return [
             ['a', 'descendant-or-self::a'],
@@ -26,9 +27,7 @@ final public function getConvertWithAttributesDataProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider getConvertWithAttributesDataProvider
-     */
+    #[DataProvider('getConvertWithAttributesDataProvider')]
     final public function testConvertWithAttributes(string $input, string $expect): void
     {
         self::assertSame(

tests/CssExpressionTranslator/CssOrXpathExpressionTranslatorTest.php

@@ -5,6 +5,7 @@
 namespace Test\Xparse\ElementFinder\CssExpressionTranslator;
 
 use InvalidArgumentException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Xparse\ElementFinder\CssExpressionTranslator\CssOrXpathExpressionTranslator;
 
@@ -16,7 +17,7 @@ final class CssOrXpathExpressionTranslatorTest extends TestCase
     /**
      * @return string[][]
      */
-    public function getQueriesDataProvider(): array
+    public static function getQueriesDataProvider(): array
     {
         return [
             [
@@ -90,9 +91,7 @@ public function getQueriesDataProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider getQueriesDataProvider
-     */
+    #[DataProvider('getQueriesDataProvider')]
     public function testQueries(string $input, string $expect): void
     {
         $output = (new CssOrXpathExpressionTranslator())

tests/Dummy/ItemsByClassExpressionTranslator.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Test\Xparse\ElementFinder\Dummy;
 
 use Xparse\ElementFinder\ExpressionTranslator\ExpressionTranslatorInterface;

tests/ElementFinderTest.php

@@ -5,6 +5,7 @@
 namespace Test\Xparse\ElementFinder;
 
 use InvalidArgumentException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use Test\Xparse\ElementFinder\Dummy\ItemsByClassExpressionTranslator;
@@ -519,4 +520,30 @@ private function getValidXml(): string
       </breakfast_menu>
       ';
     }
+
+    /**
+     * @return string[][]
+     */
+    public static function getDifferentEncodingsSupportDataProvider(): array
+    {
+        return [
+            [
+                '<body>Текст текст text</body>',
+                'Текст текст text',
+            ],
+            [
+                '<body>&#4294967295;&#4294967295;&#4294967295;&#4294967295;&#4294967295; &#4294967295;&#4294967295;&#4294967295;&#4294967295;&#4294967295; text</body>',
+                '  text',
+            ],
+        ];
+    }
+
+    #[DataProvider('getDifferentEncodingsSupportDataProvider')]
+    public function testDifferentEncodingsSupport(string $html, string $bodyText): void
+    {
+        $page = new ElementFinder($html);
+        $pageBodyText = $page->content('//body')->first();
+        self::assertInstanceOf(ElementFinder::class, $page);
+        self::assertEquals($bodyText, $pageBodyText);
+    }
 }

tests/Helper/FormHelperTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Xparse\ElementFinder\Helper;
+namespace Test\Xparse\ElementFinder\Helper;
 
 use Exception;
 use PHPUnit\Framework\TestCase;

tests/Helper/NodeHelperTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Xparse\ElementFinder\Helper;
+namespace Test\Xparse\ElementFinder\Helper;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;