Drop deprecations

veewee · Jan 14, 2024 · bb3ff4e · bb3ff4e
1 parent 1770824
commit bb3ff4e
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 220 deletions.
diff --git 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/src/Xml/Reader/Matcher/node_attribute.php b/src/Xml/Reader/Matcher/node_attribute.php
diff --git a/src/Xml/Reader/Matcher/node_name.php b/src/Xml/Reader/Matcher/node_name.php
diff --git a/src/bootstrap.php b/src/bootstrap.php
@@ -140,8 +140,6 @@
     $functions['Xml\Reader\Matcher\namespaced_attribute_value'] =  __DIR__.'/Xml/Reader/Matcher/namespaced_attribute_value.php';
     $functions['Xml\Reader\Matcher\namespaced_element'] =  __DIR__.'/Xml/Reader/Matcher/namespaced_element.php';
     $functions['Xml\Reader\Matcher\nested'] =  __DIR__.'/Xml/Reader/Matcher/nested.php';
-    $functions['Xml\Reader\Matcher\node_attribute'] =  __DIR__.'/Xml/Reader/Matcher/node_attribute.php';
-    $functions['Xml\Reader\Matcher\node_name'] =  __DIR__.'/Xml/Reader/Matcher/node_name.php';
     $functions['Xml\Reader\Matcher\not'] =  __DIR__.'/Xml/Reader/Matcher/not.php';
     $functions['Xml\Reader\Matcher\sequence'] =  __DIR__.'/Xml/Reader/Matcher/sequence.php';
     $functions['Xml\Writer\Builder\attribute'] =  __DIR__.'/Xml/Writer/Builder/attribute.php';

diff --git a/tests/Stress/Memory/ReadWriteTest.php b/tests/Stress/Memory/ReadWriteTest.php
@@ -9,7 +9,7 @@
 use VeeWee\Tests\Xml\Helper\TmpFileTrait;
 use VeeWee\Xml\Reader\Reader;
 use VeeWee\Xml\Writer\Writer;
-use function VeeWee\Xml\Reader\Matcher\node_name;
+use function VeeWee\Xml\Reader\Matcher\element_name;
 use function VeeWee\Xml\Writer\Builder\children;
 use function VeeWee\Xml\Writer\Builder\document;
 use function VeeWee\Xml\Writer\Builder\element;
@@ -81,7 +81,7 @@ private function readALot(): int
         return $this->time(
             function () {
                 $reader = Reader::fromXmlFile($this->file);
-                $cursor = $reader->provide(node_name('FizzBuzz'));
+                $cursor = $reader->provide(element_name('FizzBuzz'));
                 $counter = 0;
                 foreach ($cursor as $item) {
                     $counter++;
@@ -99,6 +99,7 @@ private function time(callable $run)
         $stop = hrtime(true);
 
         $this->logLine('Action took: '.(($stop-$start)/1e+6).'ms');
+        $this->logLine('Peak Memory usage: '.(memory_get_peak_usage(true)/1024/1024).'Mb');
 
         return $result;
     }

diff --git a/tests/Xml/Reader/Configurator/ParserOptionsTest.php b/tests/Xml/Reader/Configurator/ParserOptionsTest.php
@@ -9,22 +9,22 @@
 use VeeWee\Xml\Reader\Reader;
 use XMLReader;
 use function VeeWee\Xml\Reader\Configurator\parser_options;
-use function VeeWee\Xml\Reader\Matcher\node_name;
+use function VeeWee\Xml\Reader\Matcher\element_name;
 
 final class ParserOptionsTest extends TestCase
 {
     public function test_it_throws_when_you_provide_an_invalid_option(): void
     {
         $xml = '<root />';
         $reader = Reader::fromXmlString($xml, parser_options([9019203 => true]));
-        $iterator = $reader->provide(node_name('user'));
+        $iterator = $reader->provide(element_name('user'));
 
         $this->expectException(RuntimeException::class);
 
         [...$iterator];
     }
 
-    
+
     public function test_it_does_not_throw_exceptions_when_called_after_read_has_been_called(): void
     {
         $xml = '<root />';

diff --git a/tests/Xml/Reader/Configurator/SubstituteEntitiesTest.php b/tests/Xml/Reader/Configurator/SubstituteEntitiesTest.php
@@ -9,15 +9,15 @@
 use VeeWee\Xml\Reader\Reader;
 use function Psl\Vec\map;
 use function VeeWee\Xml\Reader\Configurator\substitute_entities;
-use function VeeWee\Xml\Reader\Matcher\node_name;
+use function VeeWee\Xml\Reader\Matcher\element_name;
 
 final class SubstituteEntitiesTest extends TestCase
 {
     public function test_it_can_substitute_entities(): void
     {
         $xml = $this->buildXml();
         $reader = Reader::fromXmlString($xml, substitute_entities(true));
-        $iterator = $reader->provide(node_name('user'));
+        $iterator = $reader->provide(element_name('user'));
 
         static::assertSame(
             [
@@ -32,7 +32,7 @@ public function test_it_can_skip_substituting_entities(): void
     {
         $xml = $this->buildXml();
         $reader = Reader::fromXmlString($xml, substitute_entities(false));
-        $iterator = $reader->provide(node_name('user'));
+        $iterator = $reader->provide(element_name('user'));
 
         static::assertSame(
             [

diff --git a/tests/Xml/Reader/Configurator/XsdSchemaTest.php b/tests/Xml/Reader/Configurator/XsdSchemaTest.php
@@ -12,7 +12,7 @@
 use XMLReader;
 use function Psl\Vec\map;
 use function VeeWee\Xml\Reader\Configurator\xsd_schema;
-use function VeeWee\Xml\Reader\Matcher\node_name;
+use function VeeWee\Xml\Reader\Matcher\element_name;
 
 final class XsdSchemaTest extends TestCase
 {
@@ -31,7 +31,7 @@ public function test_it_can_iterate_if_the_schema_matches(): void
         EOXML;
 
         $reader = Reader::fromXmlString($xml, xsd_schema($xsdFile));
-        $iterator = $reader->provide(node_name('user'));
+        $iterator = $reader->provide(element_name('user'));
 
         static::assertSame(
             [
@@ -58,7 +58,7 @@ public function test_it_triggers_an_error_on_invalid_schema(): void
         EOXML;
 
         $reader = Reader::fromXmlString($xml, xsd_schema($xsdFile));
-        $iterator = $reader->provide(node_name('user'));
+        $iterator = $reader->provide(element_name('user'));
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Detected issues during the parsing of the XML Stream');
@@ -73,7 +73,7 @@ public function test_it_triggers_an_error_if_schema_file_does_not_exist(): void
         $xml = '<root />';
 
         $reader = Reader::fromXmlString($xml, xsd_schema('unkown-file'));
-        $iterator = $reader->provide(node_name('user'));
+        $iterator = $reader->provide(element_name('user'));
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('The file "unkown-file" does not exist.');
@@ -102,7 +102,7 @@ public function test_it_can_not_set_a_schema_if_the_schema_is_invalid(): void
         $xml = '<root />';
 
         $reader = Reader::fromXmlString($xml, xsd_schema($xsdFile));
-        $iterator = $reader->provide(node_name('user'));
+        $iterator = $reader->provide(element_name('user'));
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Schema contains errors');

diff --git a/tests/Xml/Reader/Matcher/NodeAttributeTest.php b/tests/Xml/Reader/Matcher/NodeAttributeTest.php
diff --git a/tests/Xml/Reader/Matcher/NodeNameTest.php b/tests/Xml/Reader/Matcher/NodeNameTest.php