Skip to content

Commit 99aff89

Browse files
committed
Merge remote-tracking branch 'origin/feature/move-property-path-builder-to-satellite-toolbox' into feature/move-property-path-builder-to-satellite-toolbox
# Conflicts: # src/Compiler/Builder/PropertyPathBuilder.php
2 parents c6cbd7d + aa1741d commit 99aff89

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/Compiler/Builder/PropertyPathBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Kiboko\Component\SatelliteToolbox\Builder\PropertyPathBuilder;
88

9-
trigger_deprecation('php-etl/satellite', '0.7', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\FastMap\\Compiler\\Builder\\PropertyPathBuilder', PropertyPathBuilder::class);
9+
trigger_deprecation('php-etl/fast-map', '0.5', 'The "%s" class is deprecated, use "%s" instead.', 'Kiboko\\Component\\FastMap\\Compiler\\Builder\\PropertyPathBuilder', PropertyPathBuilder::class);
1010

1111
/*
1212
* @deprecated since Satellite 0.7, use Kiboko\Component\SatelliteToolbox\Builder\PropertyPathBuilder instead.

src/Mapping/Field/ExpressionLanguageValueMapper.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ public function __invoke($input, $output, PropertyPathInterface $outputPath)
3535
$this->accessor->setValue(
3636
$output,
3737
$outputPath,
38-
$this->interpreter->evaluate($this->expression, array_merge($this->variables, [
39-
'input' => $input,
40-
'output' => $output,
41-
]))
38+
$this->interpreter->evaluate($this->expression, [...$this->variables, 'input' => $input, 'output' => $output])
4239
);
4340

4441
return $output;

0 commit comments

Comments
 (0)