Skip to content

Commit 90affd5

Browse files
veeweeveewee
authored
Merge pull request #68 from veewee/drop-deprecations
Drop deprecations
2 parents 1770824 + d102ab0 commit 90affd5

File tree

12 files changed

+216
-399
lines changed

12 files changed

+216
-399
lines changed

‎build/bootstrap.php

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,22 @@ static function (SplFileInfo $file) use ($tab): string {
4747
$function = $file->getFilenameWithoutExtension();
4848
$namespace = str_replace('/', '\\', $file->getRelativePath());
4949

50-
return sprintf($tab.'$functions[\'%s\'] = __DIR__.\'/%s\';', $namespace.'\\'.$function, $path);
50+
return sprintf($tab.$tab.'\'%s\' => __DIR__.\'/%s\',', $namespace.'\\'.$function, $path);
5151
}
5252
),
53-
static fn (iterable $codeLines): iterable => concat([
54-
'<?php declare(strict_types=1);',
55-
'',
56-
'(static function (): void {',
57-
$tab . '/** @var array<string, string> $functions */',
58-
$tab . '$functions = [];',
59-
], $codeLines),
53+
static fn (iterable $codeLines): iterable => concat(
54+
[
55+
'<?php declare(strict_types=1);',
56+
'',
57+
'(static function (): void {',
58+
$tab . '/** @var array<string, string> $functions */',
59+
$tab . '$functions = [',
60+
],
61+
$codeLines,
62+
[
63+
$tab.'];'
64+
]
65+
),
6066
static fn (iterable $codeLines): iterable => concat($codeLines, ['', $autoload, '})();', '']),
6167
static fn (iterable $codeLines): string => join($codeLines, PHP_EOL)
6268
);

‎docs/reader.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use VeeWee\Xml\Reader\Matcher;
1515
$reader = Reader::fromXmlFile('large-data.xml');
1616
$provider = $reader->provide(
1717
$matcher = Matcher\all(
18-
Matcher\node_name('item'),
19-
Matcher\node_attribute('locale', 'nl-BE')
18+
Matcher\element_name('item'),
19+
Matcher\attribute_value('locale', 'nl-BE')
2020
),
2121
// Optionally, you can provide a signal to stop reading at a given point:
2222
$signal = new Signal()
@@ -220,8 +220,8 @@ All provided matchers need to match in order for this matcher to succeed:
220220
use \VeeWee\Xml\Reader\Matcher;
221221

222222
Matcher\all(
223-
Matcher\node_name('item'),
224-
Matcher\node_attribute('locale', 'nl-BE')
223+
Matcher\element_name('item'),
224+
Matcher\attribute_value('locale', 'nl-BE')
225225
);
226226
```
227227

@@ -235,8 +235,8 @@ One of the provided matchers need to match in order for this matcher to succeed:
235235
use \VeeWee\Xml\Reader\Matcher;
236236

237237
Matcher\any(
238-
Matcher\node_name('item'),
239-
Matcher\node_name('product'),
238+
Matcher\element_name('item'),
239+
Matcher\element_name('product'),
240240
);
241241
```
242242

‎src/Xml/Reader/Matcher/node_attribute.php

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/Xml/Reader/Matcher/node_name.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/bootstrap.php

Lines changed: 172 additions & 173 deletions
Large diffs are not rendered by default.

‎tests/Stress/Memory/ReadWriteTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use VeeWee\Tests\Xml\Helper\TmpFileTrait;
1010
use VeeWee\Xml\Reader\Reader;
1111
use VeeWee\Xml\Writer\Writer;
12-
use function VeeWee\Xml\Reader\Matcher\node_name;
12+
use function VeeWee\Xml\Reader\Matcher\element_name;
1313
use function VeeWee\Xml\Writer\Builder\children;
1414
use function VeeWee\Xml\Writer\Builder\document;
1515
use function VeeWee\Xml\Writer\Builder\element;
@@ -81,7 +81,7 @@ private function readALot(): int
8181
return $this->time(
8282
function () {
8383
$reader = Reader::fromXmlFile($this->file);
84-
$cursor = $reader->provide(node_name('FizzBuzz'));
84+
$cursor = $reader->provide(element_name('FizzBuzz'));
8585
$counter = 0;
8686
foreach ($cursor as $item) {
8787
$counter++;
@@ -99,6 +99,7 @@ private function time(callable $run)
9999
$stop = hrtime(true);
100100

101101
$this->logLine('Action took: '.(($stop-$start)/1e+6).'ms');
102+
$this->logLine('Peak Memory usage: '.(memory_get_peak_usage(true)/1024/1024).'Mb');
102103

103104
return $result;
104105
}

‎tests/Xml/Reader/Configurator/ParserOptionsTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
use VeeWee\Xml\Reader\Reader;
1010
use XMLReader;
1111
use function VeeWee\Xml\Reader\Configurator\parser_options;
12-
use function VeeWee\Xml\Reader\Matcher\node_name;
12+
use function VeeWee\Xml\Reader\Matcher\element_name;
1313

1414
final class ParserOptionsTest extends TestCase
1515
{
1616
public function test_it_throws_when_you_provide_an_invalid_option(): void
1717
{
1818
$xml = '<root />';
1919
$reader = Reader::fromXmlString($xml, parser_options([9019203 => true]));
20-
$iterator = $reader->provide(node_name('user'));
20+
$iterator = $reader->provide(element_name('user'));
2121

2222
$this->expectException(RuntimeException::class);
2323

2424
[...$iterator];
2525
}
2626

27-
27+
2828
public function test_it_does_not_throw_exceptions_when_called_after_read_has_been_called(): void
2929
{
3030
$xml = '<root />';

‎tests/Xml/Reader/Configurator/SubstituteEntitiesTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
use VeeWee\Xml\Reader\Reader;
1010
use function Psl\Vec\map;
1111
use function VeeWee\Xml\Reader\Configurator\substitute_entities;
12-
use function VeeWee\Xml\Reader\Matcher\node_name;
12+
use function VeeWee\Xml\Reader\Matcher\element_name;
1313

1414
final class SubstituteEntitiesTest extends TestCase
1515
{
1616
public function test_it_can_substitute_entities(): void
1717
{
1818
$xml = $this->buildXml();
1919
$reader = Reader::fromXmlString($xml, substitute_entities(true));
20-
$iterator = $reader->provide(node_name('user'));
20+
$iterator = $reader->provide(element_name('user'));
2121

2222
static::assertSame(
2323
[
@@ -32,7 +32,7 @@ public function test_it_can_skip_substituting_entities(): void
3232
{
3333
$xml = $this->buildXml();
3434
$reader = Reader::fromXmlString($xml, substitute_entities(false));
35-
$iterator = $reader->provide(node_name('user'));
35+
$iterator = $reader->provide(element_name('user'));
3636

3737
static::assertSame(
3838
[

‎tests/Xml/Reader/Configurator/XsdSchemaTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use XMLReader;
1313
use function Psl\Vec\map;
1414
use function VeeWee\Xml\Reader\Configurator\xsd_schema;
15-
use function VeeWee\Xml\Reader\Matcher\node_name;
15+
use function VeeWee\Xml\Reader\Matcher\element_name;
1616

1717
final class XsdSchemaTest extends TestCase
1818
{
@@ -31,7 +31,7 @@ public function test_it_can_iterate_if_the_schema_matches(): void
3131
EOXML;
3232

3333
$reader = Reader::fromXmlString($xml, xsd_schema($xsdFile));
34-
$iterator = $reader->provide(node_name('user'));
34+
$iterator = $reader->provide(element_name('user'));
3535

3636
static::assertSame(
3737
[
@@ -58,7 +58,7 @@ public function test_it_triggers_an_error_on_invalid_schema(): void
5858
EOXML;
5959

6060
$reader = Reader::fromXmlString($xml, xsd_schema($xsdFile));
61-
$iterator = $reader->provide(node_name('user'));
61+
$iterator = $reader->provide(element_name('user'));
6262

6363
$this->expectException(RuntimeException::class);
6464
$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
7373
$xml = '<root />';
7474

7575
$reader = Reader::fromXmlString($xml, xsd_schema('unkown-file'));
76-
$iterator = $reader->provide(node_name('user'));
76+
$iterator = $reader->provide(element_name('user'));
7777

7878
$this->expectException(RuntimeException::class);
7979
$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
102102
$xml = '<root />';
103103

104104
$reader = Reader::fromXmlString($xml, xsd_schema($xsdFile));
105-
$iterator = $reader->provide(node_name('user'));
105+
$iterator = $reader->provide(element_name('user'));
106106

107107
$this->expectException(RuntimeException::class);
108108
$this->expectExceptionMessage('Schema contains errors');

‎tests/Xml/Reader/Matcher/NodeAttributeTest.php

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)