Skip to content

Commit

Permalink
Merge branch '1.x' into dependabot/composer/tools/cs-fixer/friendsofp…
Browse files Browse the repository at this point in the history
…hp/php-cs-fixer-3.18.0
  • Loading branch information
norberttech authored Sep 6, 2023
2 parents 7b98102 + f937b38 commit 2b709da
Show file tree
Hide file tree
Showing 33 changed files with 1,157 additions and 412 deletions.
Empty file modified .php-cs-fixer.php
100644 → 100755
Empty file.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
## [Unreleased] - 2023-08-29
## [Unreleased] - 2023-09-06

### Added
- [#474](https://github.com/flow-php/flow/pull/474) - **XMLEntry** - [@norberttech](https://github.com/norberttech)
- [#474](https://github.com/flow-php/flow/pull/474) - **XMLNodeEntry** - [@norberttech](https://github.com/norberttech)
- [#474](https://github.com/flow-php/flow/pull/474) - **ref('...')->xpath('...') - for extracting specific nodes from XMLEntry** - [@norberttech](https://github.com/norberttech)
- [#474](https://github.com/flow-php/flow/pull/474) - **ref('...')->domNodeAttribute('...') - for extracting value of attribute** - [@norberttech](https://github.com/norberttech)
- [#474](https://github.com/flow-php/flow/pull/474) - **ref('...')->domNodeValue('...') - for extracting value of node** - [@norberttech](https://github.com/norberttech)
- [#450](https://github.com/flow-php/flow/pull/450) - **Add new `ulid()` expression based on Symfony Uid** - [@stloyd](https://github.com/stloyd)
- [#445](https://github.com/flow-php/flow/pull/445) - **Add `fig/log-test` package for mock logger** - [@stloyd](https://github.com/stloyd)
- [#440](https://github.com/flow-php/flow/pull/440) - **Add MariaDB to supported platforms for Doctrine adapter** - [@stloyd](https://github.com/stloyd)
Expand Down Expand Up @@ -58,6 +63,7 @@
- [#388](https://github.com/flow-php/flow/pull/388) - **Added `ext-hash` PHP extension as required for Flow** - [@stloyd](https://github.com/stloyd)

### Changed
- [#474](https://github.com/flow-php/flow/pull/474) - **XMLReaderExtractor is now returning XMLEntry type instead of casting XML's to array** - [@norberttech](https://github.com/norberttech)
- [#445](https://github.com/flow-php/flow/pull/445) - **Allow usage of `psr/log` v2 & v3`** - [@stloyd](https://github.com/stloyd)
- [#438](https://github.com/flow-php/flow/pull/438) - **Mark methods on DataFrame api as @lazy or @trigger** - [@norberttech](https://github.com/norberttech)
- [#436](https://github.com/flow-php/flow/pull/436) - **Moved limit functionality into LimitingPipeline** - [@norberttech](https://github.com/norberttech)
Expand Down
75 changes: 38 additions & 37 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 104 additions & 0 deletions examples/data/salaries.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<Salaries>
<Month name="January">
<Department name="HR">
<TotalSalary>71883</TotalSalary>
</Department>
<Department name="Engineering">
<TotalSalary>192644</TotalSalary>
</Department>
<Department name="Finance">
<TotalSalary>174187</TotalSalary>
</Department>
<Department name="Marketing">
<TotalSalary>179932</TotalSalary>
</Department>
<Department name="Sales">
<TotalSalary>52056</TotalSalary>
</Department>
</Month>
<Month name="February">
<Department name="HR">
<TotalSalary>102342</TotalSalary>
</Department>
<Department name="Engineering">
<TotalSalary>111102</TotalSalary>
</Department>
<Department name="Finance">
<TotalSalary>81938</TotalSalary>
</Department>
<Department name="Marketing">
<TotalSalary>132202</TotalSalary>
</Department>
<Department name="Sales">
<TotalSalary>173225</TotalSalary>
</Department>
</Month>
<Month name="March">
<Department name="HR">
<TotalSalary>79619</TotalSalary>
</Department>
<Department name="Engineering">
<TotalSalary>99387</TotalSalary>
</Department>
<Department name="Finance">
<TotalSalary>198847</TotalSalary>
</Department>
<Department name="Marketing">
<TotalSalary>50550</TotalSalary>
</Department>
<Department name="Sales">
<TotalSalary>98212</TotalSalary>
</Department>
</Month>
<Month name="April">
<Department name="HR">
<TotalSalary>69721</TotalSalary>
</Department>
<Department name="Engineering">
<TotalSalary>151826</TotalSalary>
</Department>
<Department name="Finance">
<TotalSalary>158168</TotalSalary>
</Department>
<Department name="Marketing">
<TotalSalary>111872</TotalSalary>
</Department>
<Department name="Sales">
<TotalSalary>172334</TotalSalary>
</Department>
</Month>
<Month name="May">
<Department name="HR">
<TotalSalary>174220</TotalSalary>
</Department>
<Department name="Engineering">
<TotalSalary>164086</TotalSalary>
</Department>
<Department name="Finance">
<TotalSalary>104257</TotalSalary>
</Department>
<Department name="Marketing">
<TotalSalary>105817</TotalSalary>
</Department>
<Department name="Sales">
<TotalSalary>145490</TotalSalary>
</Department>
</Month>
<Month name="June">
<Department name="HR">
<TotalSalary>127383</TotalSalary>
</Department>
<Department name="Engineering">
<TotalSalary>52592</TotalSalary>
</Department>
<Department name="Finance">
<TotalSalary>71732</TotalSalary>
</Department>
<Department name="Marketing">
<TotalSalary>165083</TotalSalary>
</Department>
<Department name="Sales">
<TotalSalary>85138</TotalSalary>
</Department>
</Month>
</Salaries>
10 changes: 10 additions & 0 deletions examples/data/simple_items.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<root>
<items>
<item><id>1</id></item>
<item><id>2</id></item>
<item><id>3</id></item>
<item><id>4</id></item>
<item><id>5</id></item>
<item><id>6</id></item>
</items>
</root>
16 changes: 16 additions & 0 deletions examples/topics/types/xml/reading.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

declare(strict_types=1);

use Flow\ETL\DSL\To;
use Flow\ETL\DSL\XML;
use Flow\ETL\Flow;

require __DIR__ . '/../../../bootstrap.php';

print "Reading XML dataset...\n";

(new Flow())
->read(XML::from(__FLOW_DATA__ . '/simple_items.xml', 'root/items/item'))
->write(To::output(false))
->run();
Loading

0 comments on commit 2b709da

Please sign in to comment.