Skip to content

Commit

Permalink
Remove redundant transformer function eval (#1417)
Browse files Browse the repository at this point in the history
* Remove redundant transformer function eval

* Fix cs issues

* Revert "Fix cs issues"

This reverts commit 5798995.

* Downgrade cs-fixer to 3.68.0 so Thrift isn't included

* Dependabot should skip buggy [email protected]
  • Loading branch information
christianc1 authored Jan 29, 2025
1 parent f2a17fc commit d1ba94d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ updates:
directory: "/tools/cs-fixer"
schedule:
interval: "daily"
ignore:
- dependency-name: "friendsofphp/php-cs-fixer"
versions: ["3.68.3"]

- package-ecosystem: "composer"
directory: "/tools/infection"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,16 @@ function (Row $r) use ($context) : Row {
return $r;
}

$val = $this->function->eval($r);

return $r->set(
$this->function instanceof ScalarFunction\TypedScalarFunction
? $context->entryFactory()->createAs(
$this->entry instanceof Definition ? $this->entry->entry()->name() : $this->entry,
$val,
$value,
$this->function->returns()
)
: $context->entryFactory()->create(
$this->entry instanceof Definition ? $this->entry->entry()->name() : $this->entry,
$val,
$value,
$this->entry instanceof Definition ? $this->entry : null
)
);
Expand Down
2 changes: 1 addition & 1 deletion tools/cs-fixer/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "flow-php/flow-tools",
"description": "Flow PHP ETL - Tools",
"require-dev": {
"friendsofphp/php-cs-fixer": "3.68.3"
"friendsofphp/php-cs-fixer": "3.68.0"
},
"config": {
"allow-plugins": false
Expand Down
16 changes: 8 additions & 8 deletions tools/cs-fixer/composer.lock

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

0 comments on commit d1ba94d

Please sign in to comment.