diff --git a/composer.json b/composer.json index 68aec77..232da50 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "friendsofphp/php-cs-fixer": "^3.16", "phpunit/phpunit": "^11.2.9", "rector/rector": "^2.0.8", - "symplify/easy-coding-standard": "^12.1" + "symplify/easy-coding-standard": "^13.3" }, "autoload": { "psr-4": { diff --git a/src/Collection/ElementCollection.php b/src/Collection/ElementCollection.php index 836843b..c6dcb0d 100644 --- a/src/Collection/ElementCollection.php +++ b/src/Collection/ElementCollection.php @@ -11,9 +11,6 @@ use Traversable; use Xparse\ElementFinder\ElementFinder\Element; -/** - * @author Ivan Shcherbak - */ class ElementCollection implements IteratorAggregate, Countable { /** @@ -116,7 +113,7 @@ final public function add(Element $element): ElementCollection /** * Retrieve an external iterator * - * @link http://php.net/manual/en/iteratoraggregate.getiterator.php + * @see http://php.net/manual/en/iteratoraggregate.getiterator.php * @return Element[]|Traversable An instance of an object implementing Iterator or Traversable * @throws InvalidArgumentException */ diff --git a/src/Collection/ObjectCollection.php b/src/Collection/ObjectCollection.php index 6fb1682..3302144 100644 --- a/src/Collection/ObjectCollection.php +++ b/src/Collection/ObjectCollection.php @@ -12,9 +12,6 @@ use Traversable; use Xparse\ElementFinder\ElementFinderInterface; -/** - * @author Ivan Shcherbak - */ class ObjectCollection implements IteratorAggregate, Countable { /** diff --git a/src/Collection/StringCollection.php b/src/Collection/StringCollection.php index b44640e..d011713 100644 --- a/src/Collection/StringCollection.php +++ b/src/Collection/StringCollection.php @@ -13,9 +13,6 @@ use Xparse\ElementFinder\Collection\Filters\StringFilter\StringFilterInterface; use Xparse\ElementFinder\Collection\Modify\StringModify\StringModifyInterface; -/** - * @author Ivan Shcherbak - */ class StringCollection implements IteratorAggregate, Countable { /** @@ -191,7 +188,7 @@ final public function get(int $index): ?string } /** - * @link http://php.net/manual/en/iteratoraggregate.getiterator.php + * @see http://php.net/manual/en/iteratoraggregate.getiterator.php * @return string[]|Traversable * @throws Exception */ diff --git a/src/CssExpressionTranslator/CssExpressionTranslator.php b/src/CssExpressionTranslator/CssExpressionTranslator.php index 19d4627..1baf4bb 100644 --- a/src/CssExpressionTranslator/CssExpressionTranslator.php +++ b/src/CssExpressionTranslator/CssExpressionTranslator.php @@ -7,9 +7,6 @@ use Symfony\Component\CssSelector\CssSelectorConverter; use Xparse\ElementFinder\ExpressionTranslator\ExpressionTranslatorInterface; -/** - * @author Ivan Shcherbak - */ class CssExpressionTranslator extends CssSelectorConverter implements ExpressionTranslatorInterface { final public function convertToXpath(string $expression): string diff --git a/src/CssExpressionTranslator/CssOrXpathExpressionTranslator.php b/src/CssExpressionTranslator/CssOrXpathExpressionTranslator.php index 254e706..392d092 100644 --- a/src/CssExpressionTranslator/CssOrXpathExpressionTranslator.php +++ b/src/CssExpressionTranslator/CssOrXpathExpressionTranslator.php @@ -9,8 +9,6 @@ /** * Automatically detect xpath or css query language and convert it to the xpath - * - * @author Ivan Shcherbak */ class CssOrXpathExpressionTranslator implements ExpressionTranslatorInterface { diff --git a/src/ElementFinder.php b/src/ElementFinder.php index 02e635a..1daa810 100644 --- a/src/ElementFinder.php +++ b/src/ElementFinder.php @@ -23,9 +23,6 @@ use Xparse\ElementFinder\Helper\NodeHelper; use Xparse\ElementFinder\Helper\StringHelper; -/** - * @author Ivan Shcherbak - */ class ElementFinder implements ElementFinderInterface { /** @@ -211,9 +208,9 @@ private function setData(string $data): self if (static::DOCUMENT_HTML === $this->type) { $data = StringHelper::safeEncodeStr($data); - //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 + // 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), diff --git a/src/ElementFinder/Element.php b/src/ElementFinder/Element.php index 6b6d7b4..4edff87 100644 --- a/src/ElementFinder/Element.php +++ b/src/ElementFinder/Element.php @@ -6,9 +6,6 @@ use DOMElement; -/** - * @author Ivan Shcherbak - */ class Element extends DOMElement { /** diff --git a/src/ElementFinderInterface.php b/src/ElementFinderInterface.php index 2de4365..c657dd4 100644 --- a/src/ElementFinderInterface.php +++ b/src/ElementFinderInterface.php @@ -11,9 +11,6 @@ use Xparse\ElementFinder\Collection\StringCollection; use Xparse\ElementFinder\DomNodeListAction\DomNodeListActionInterface; -/** - * @author Ivan Shcherbak - */ interface ElementFinderInterface { /** diff --git a/src/ExpressionTranslator/ExpressionTranslatorInterface.php b/src/ExpressionTranslator/ExpressionTranslatorInterface.php index 0f86e28..10e4865 100644 --- a/src/ExpressionTranslator/ExpressionTranslatorInterface.php +++ b/src/ExpressionTranslator/ExpressionTranslatorInterface.php @@ -4,9 +4,6 @@ namespace Xparse\ElementFinder\ExpressionTranslator; -/** - * @author Ivan Shcherbak - */ interface ExpressionTranslatorInterface { /** diff --git a/src/ExpressionTranslator/XpathExpression.php b/src/ExpressionTranslator/XpathExpression.php index d0fbc00..689759e 100644 --- a/src/ExpressionTranslator/XpathExpression.php +++ b/src/ExpressionTranslator/XpathExpression.php @@ -4,9 +4,6 @@ namespace Xparse\ElementFinder\ExpressionTranslator; -/** - * @author Ivan Shcherbak - */ class XpathExpression implements ExpressionTranslatorInterface { final public function convertToXpath(string $expression): string diff --git a/src/Helper/FormHelper.php b/src/Helper/FormHelper.php index befe9ed..f1d97be 100644 --- a/src/Helper/FormHelper.php +++ b/src/Helper/FormHelper.php @@ -8,9 +8,6 @@ use InvalidArgumentException; use Xparse\ElementFinder\ElementFinderInterface; -/** - * @author Ivan Shcherbak - */ class FormHelper { public function __construct( diff --git a/src/Helper/NodeHelper.php b/src/Helper/NodeHelper.php index 399aa18..4b728ac 100644 --- a/src/Helper/NodeHelper.php +++ b/src/Helper/NodeHelper.php @@ -8,9 +8,6 @@ use DOMNode; use Xparse\ElementFinder\ElementFinder; -/** - * @author Ivan Shcherbak - */ class NodeHelper { final public static function getOuterContent(DOMNode $node, int $documentType): string diff --git a/src/Helper/StringHelper.php b/src/Helper/StringHelper.php index fce1b59..f9d78e1 100644 --- a/src/Helper/StringHelper.php +++ b/src/Helper/StringHelper.php @@ -4,9 +4,6 @@ namespace Xparse\ElementFinder\Helper; -/** - * @author Ivan Shcherbak - */ class StringHelper { final public static function safeEncodeStr(string $str): string diff --git a/tests/Collection/ElementCollectionTest.php b/tests/Collection/ElementCollectionTest.php index 449dc2d..d5da3e2 100644 --- a/tests/Collection/ElementCollectionTest.php +++ b/tests/Collection/ElementCollectionTest.php @@ -8,9 +8,6 @@ use Xparse\ElementFinder\Collection\ElementCollection; use Xparse\ElementFinder\ElementFinder\Element; -/** - * @author Ivan Shcherbak - */ class ElementCollectionTest extends TestCase { public function testIterate(): void diff --git a/tests/Collection/ObjectCollectionTest.php b/tests/Collection/ObjectCollectionTest.php index 1478f21..f3c1e46 100644 --- a/tests/Collection/ObjectCollectionTest.php +++ b/tests/Collection/ObjectCollectionTest.php @@ -9,9 +9,6 @@ use Xparse\ElementFinder\Collection\ObjectCollection; use Xparse\ElementFinder\ElementFinder; -/** - * @author Ivan Shcherbak - */ final class ObjectCollectionTest extends TestCase { public function testInvalidObjectIndex(): void diff --git a/tests/Collection/StringCollectionTest.php b/tests/Collection/StringCollectionTest.php index 45a5933..1a8b293 100644 --- a/tests/Collection/StringCollectionTest.php +++ b/tests/Collection/StringCollectionTest.php @@ -10,9 +10,6 @@ use Test\Xparse\ElementFinder\Collection\Dummy\WithLetterFilter; use Xparse\ElementFinder\Collection\StringCollection; -/** - * @author Ivan Shcherbak - */ final class StringCollectionTest extends TestCase { public function testInvalidObjectIndex(): void diff --git a/tests/CssExpressionTranslator/CssExpressionTranslatorTest.php b/tests/CssExpressionTranslator/CssExpressionTranslatorTest.php index 6204fc8..1c2299f 100644 --- a/tests/CssExpressionTranslator/CssExpressionTranslatorTest.php +++ b/tests/CssExpressionTranslator/CssExpressionTranslatorTest.php @@ -8,9 +8,6 @@ use PHPUnit\Framework\TestCase; use Xparse\ElementFinder\CssExpressionTranslator\CssExpressionTranslator; -/** - * @author Ivan Shcherbak - */ class CssExpressionTranslatorTest extends TestCase { /** diff --git a/tests/CssExpressionTranslator/CssOrXpathExpressionTranslatorTest.php b/tests/CssExpressionTranslator/CssOrXpathExpressionTranslatorTest.php index 87619f3..5cbbe30 100644 --- a/tests/CssExpressionTranslator/CssOrXpathExpressionTranslatorTest.php +++ b/tests/CssExpressionTranslator/CssOrXpathExpressionTranslatorTest.php @@ -9,9 +9,6 @@ use PHPUnit\Framework\TestCase; use Xparse\ElementFinder\CssExpressionTranslator\CssOrXpathExpressionTranslator; -/** - * @author Ivan Shcherbak - */ final class CssOrXpathExpressionTranslatorTest extends TestCase { /** diff --git a/tests/Dummy/ItemsByClassExpressionTranslator.php b/tests/Dummy/ItemsByClassExpressionTranslator.php index d94a449..c354273 100644 --- a/tests/Dummy/ItemsByClassExpressionTranslator.php +++ b/tests/Dummy/ItemsByClassExpressionTranslator.php @@ -6,9 +6,6 @@ use Xparse\ElementFinder\ExpressionTranslator\ExpressionTranslatorInterface; -/** - * @author Ivan Shcherbak - */ class ItemsByClassExpressionTranslator implements ExpressionTranslatorInterface { final public function convertToXpath(string $expression): string diff --git a/tests/ElementFinderTest.php b/tests/ElementFinderTest.php index 38f3f19..ccb9622 100644 --- a/tests/ElementFinderTest.php +++ b/tests/ElementFinderTest.php @@ -13,9 +13,6 @@ use Xparse\ElementFinder\ElementFinder; use Xparse\ElementFinder\ElementFinderInterface; -/** - * @author Ivan Shcherbak - */ final class ElementFinderTest extends TestCase { public function testLoad(): void diff --git a/tests/ExpressionTranslator/XpathExpressionTest.php b/tests/ExpressionTranslator/XpathExpressionTest.php index d25fc0d..4c49193 100644 --- a/tests/ExpressionTranslator/XpathExpressionTest.php +++ b/tests/ExpressionTranslator/XpathExpressionTest.php @@ -7,9 +7,6 @@ use PHPUnit\Framework\TestCase; use Xparse\ElementFinder\ExpressionTranslator\XpathExpression; -/** - * @author Ivan Shcherbak - */ class XpathExpressionTest extends TestCase { final public function testAssertSameIO(): void diff --git a/tests/Helper/FormHelperTest.php b/tests/Helper/FormHelperTest.php index 3c408b6..2edb1cc 100644 --- a/tests/Helper/FormHelperTest.php +++ b/tests/Helper/FormHelperTest.php @@ -9,9 +9,6 @@ use Xparse\ElementFinder\ElementFinder; use Xparse\ElementFinder\Helper\FormHelper; -/** - * @author Ivan Shcherbak - */ final class FormHelperTest extends TestCase { public function testFormData(): void diff --git a/tests/Helper/NodeHelperTest.php b/tests/Helper/NodeHelperTest.php index 61766d9..2114baa 100644 --- a/tests/Helper/NodeHelperTest.php +++ b/tests/Helper/NodeHelperTest.php @@ -9,9 +9,6 @@ use Xparse\ElementFinder\ElementFinder; use Xparse\ElementFinder\Helper\NodeHelper; -/** - * @author Ivan Shcherbak - */ final class NodeHelperTest extends TestCase { public function testHtmlOuterContent(): void diff --git a/tests/Helper/StringHelperTest.php b/tests/Helper/StringHelperTest.php index aa0130f..6e72f0c 100644 --- a/tests/Helper/StringHelperTest.php +++ b/tests/Helper/StringHelperTest.php @@ -7,9 +7,6 @@ use PHPUnit\Framework\TestCase; use Xparse\ElementFinder\Helper\StringHelper; -/** - * @author Ivan Shcherbak - */ final class StringHelperTest extends TestCase { public function testEncode(): void