From c08f534c61c2ca13f3f84875a5a0119b999b02d1 Mon Sep 17 00:00:00 2001
From: Toon Verwerft <toonverwerft@gmail.com>
Date: Sun, 14 Jan 2024 13:47:23 +0100
Subject: [PATCH] Drop deprecations

---
 docs/reader.md                                | 12 +--
 .../Xml/Reader/Matcher/NodeAttributeTest.php  | 76 -------------------
 tests/Xml/Reader/Matcher/NodeNameTest.php     | 69 -----------------
 tests/Xml/Reader/ReaderTest.php               | 21 +++--
 4 files changed, 16 insertions(+), 162 deletions(-)
 delete mode 100644 tests/Xml/Reader/Matcher/NodeAttributeTest.php
 delete mode 100644 tests/Xml/Reader/Matcher/NodeNameTest.php

diff --git a/docs/reader.md b/docs/reader.md
index c002595b..32635e8f 100644
--- a/docs/reader.md
+++ b/docs/reader.md
@@ -15,8 +15,8 @@ use VeeWee\Xml\Reader\Matcher;
 $reader   = Reader::fromXmlFile('large-data.xml');
 $provider = $reader->provide(
     $matcher = Matcher\all(
-        Matcher\node_name('item'),
-        Matcher\node_attribute('locale', 'nl-BE')
+        Matcher\element_name('item'),
+        Matcher\attribute_value('locale', 'nl-BE')
     ),
     // Optionally, you can provide a signal to stop reading at a given point:
     $signal = new Signal()
@@ -220,8 +220,8 @@ All provided matchers need to match in order for this matcher to succeed:
 use \VeeWee\Xml\Reader\Matcher;
 
 Matcher\all(
-    Matcher\node_name('item'),
-    Matcher\node_attribute('locale', 'nl-BE')
+    Matcher\element_name('item'),
+    Matcher\attribute_value('locale', 'nl-BE')
 );
 ```
 
@@ -235,8 +235,8 @@ One of the provided matchers need to match in order for this matcher to succeed:
 use \VeeWee\Xml\Reader\Matcher;
 
 Matcher\any(
-    Matcher\node_name('item'),
-    Matcher\node_name('product'),
+    Matcher\element_name('item'),
+    Matcher\element_name('product'),
 );
 ```
 
diff --git a/tests/Xml/Reader/Matcher/NodeAttributeTest.php b/tests/Xml/Reader/Matcher/NodeAttributeTest.php
deleted file mode 100644
index 63a92fc2..00000000
--- a/tests/Xml/Reader/Matcher/NodeAttributeTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace VeeWee\Tests\Xml\Reader\Matcher;
-
-use Generator;
-use VeeWee\Xml\Reader\Node\AttributeNode;
-use VeeWee\Xml\Reader\Node\ElementNode;
-use VeeWee\Xml\Reader\Node\NodeSequence;
-use function VeeWee\Xml\Reader\Matcher\node_attribute;
-
-/**
- * @deprecated Use attribute_value instead! This will be removed in next major version
- */
-final class NodeAttributeTest extends AbstractMatcherTest
-{
-    public static function provideRealXmlCases(): Generator
-    {
-        yield 'users' => [
-            node_attribute('country', 'BE'),
-            <<<'EOXML'
-            <root>
-                <user country="BE">Jos</user>
-                <user country="FR">Bos</user>
-                <user country="BE">Mos</user>
-            </root>
-            EOXML,
-            [
-                '<user country="BE">Jos</user>',
-                '<user country="BE">Mos</user>',
-            ]
-        ];
-        yield 'namespaced' => [
-            node_attribute('u:country', 'BE'),
-            <<<'EOXML'
-            <root xmlns:u="https://users">
-                <user u:country="BE">Jos</user>
-                <user u:country="FR">Bos</user>
-                <user u:country="BE">Mos</user>
-            </root>
-            EOXML,
-            [
-                '<user xmlns:u="https://users" u:country="BE">Jos</user>',
-                '<user xmlns:u="https://users" u:country="BE">Mos</user>'
-            ]
-        ];
-    }
-
-    public static function provideMatcherCases(): Generator
-    {
-        $sequence = new NodeSequence(
-            new ElementNode(1, 'item', 'item', '', '', [
-                new AttributeNode('locale', 'locale', '', '', 'nl')
-            ])
-        );
-
-        yield 'it_returns_true_if_node_attribute_matches' => [
-            node_attribute('locale', 'nl'),
-            $sequence,
-            true
-        ];
-
-        yield 'it_returns_false_if_node_attribute_does_not_match' => [
-            node_attribute('locale', 'en'),
-            $sequence,
-            false
-        ];
-
-        yield 'it_returns_false_if_node_attribute_is_not_available' => [
-            node_attribute('unkown', 'en'),
-            $sequence,
-            false
-        ];
-    }
-}
diff --git a/tests/Xml/Reader/Matcher/NodeNameTest.php b/tests/Xml/Reader/Matcher/NodeNameTest.php
deleted file mode 100644
index f98b69c6..00000000
--- a/tests/Xml/Reader/Matcher/NodeNameTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace VeeWee\Tests\Xml\Reader\Matcher;
-
-use Generator;
-use VeeWee\Xml\Reader\Node\ElementNode;
-use VeeWee\Xml\Reader\Node\NodeSequence;
-use function VeeWee\Xml\Reader\Matcher\node_name;
-
-/**
- * @deprecated Use element_name instead! This will be removed in next major version
- */
-final class NodeNameTest extends AbstractMatcherTest
-{
-    public static function provideRealXmlCases(): Generator
-    {
-        yield 'users' => [
-            node_name('user'),
-            <<<'EOXML'
-            <root>
-                <user>Jos</user>
-                <user>Bos</user>
-                <user>Mos</user>
-            </root>
-            EOXML,
-            [
-                '<user>Jos</user>',
-                '<user>Bos</user>',
-                '<user>Mos</user>'
-            ]
-        ];
-        yield 'namespaced' => [
-            node_name('u:user'),
-            <<<'EOXML'
-            <root xmlns:u="https://users">
-                <u:user>Jos</u:user>
-                <u:user>Bos</u:user>
-                <u:user>Mos</u:user>
-            </root>
-            EOXML,
-            [
-                '<u:user xmlns:u="https://users">Jos</u:user>',
-                '<u:user xmlns:u="https://users">Bos</u:user>',
-                '<u:user xmlns:u="https://users">Mos</u:user>'
-            ]
-        ];
-    }
-
-    public static function provideMatcherCases(): Generator
-    {
-        $sequence = new NodeSequence(
-            new ElementNode(1, 'item', 'item', '', '', [])
-        );
-
-        yield 'it_returns_true_if_element_name_matches' => [
-            node_name('item'),
-            $sequence,
-            true
-        ];
-
-        yield 'it_returns_false_if_element_name_does_not_match' => [
-            node_name('other'),
-            $sequence,
-            false
-        ];
-    }
-}
diff --git a/tests/Xml/Reader/ReaderTest.php b/tests/Xml/Reader/ReaderTest.php
index 70125d2e..baf6e5ed 100644
--- a/tests/Xml/Reader/ReaderTest.php
+++ b/tests/Xml/Reader/ReaderTest.php
@@ -15,9 +15,8 @@
 use function Psl\Vec\map;
 use function VeeWee\Xml\Reader\Loader\xml_string_loader;
 use function VeeWee\Xml\Reader\Matcher\all;
+use function VeeWee\Xml\Reader\Matcher\attribute_value;
 use function VeeWee\Xml\Reader\Matcher\element_name;
-use function VeeWee\Xml\Reader\Matcher\node_attribute;
-use function VeeWee\Xml\Reader\Matcher\node_name;
 
 final class ReaderTest extends TestCase
 {
@@ -101,7 +100,7 @@ public function provideXmlExpectations()
                     <user>Mos</user>    
                 </root>
             EOXML,
-            node_name('user'),
+            element_name('user'),
             [
                 '<user>Jos</user>',
                 '<user>Bos</user>',
@@ -118,8 +117,8 @@ public function provideXmlExpectations()
                 </root>
             EOXML,
             all(
-                node_name('user'),
-                node_attribute('locale', 'nl')
+                element_name('user'),
+                attribute_value('locale', 'nl')
             ),
             [
                 '<user locale="nl">Jos</user>',
@@ -137,9 +136,9 @@ public function provideXmlExpectations()
                 </root>
             EOXML,
             all(
-                node_name('user'),
-                node_attribute('locale', 'nl'),
-                node_attribute('dialect', 'kempisch'),
+                element_name('user'),
+                attribute_value('locale', 'nl'),
+                attribute_value('dialect', 'kempisch'),
             ),
             [
                 '<user locale="nl" dialect="kempisch">Jos</user>',
@@ -156,7 +155,7 @@ public function provideXmlExpectations()
                 </root>
             EOXML,
             all(
-                node_name('user'),
+                element_name('user'),
                 static fn (NodeSequence $sequence): bool => ($sequence->current()->position() % 2 === 0),
             ),
             [
@@ -177,7 +176,7 @@ public function provideXmlExpectations()
                 </root>
             EOXML,
             all(
-                node_name('user'),
+                element_name('user'),
                 static fn (NodeSequence $sequence): bool => ($sequence->current()->position() % 2 === 0),
             ),
             [
@@ -200,7 +199,7 @@ public function provideXmlExpectations()
                 </root>
             EOXML,
             all(
-                node_name('item'),
+                element_name('item'),
             ),
             [
                 '<item>