Skip to content

Commit 68bbd4b

Browse files
Merge branch '4.4' into 5.1
* 4.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents 1168af6 + 4c925b0 commit 68bbd4b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Dumper/PlantUmlDumper.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,20 @@ private function isWorkflowTransitionType(): bool
128128

129129
private function startPuml(array $options): string
130130
{
131-
$start = '@startuml'.PHP_EOL;
132-
$start .= 'allow_mixing'.PHP_EOL;
131+
$start = '@startuml'.\PHP_EOL;
132+
$start .= 'allow_mixing'.\PHP_EOL;
133133

134134
return $start;
135135
}
136136

137137
private function endPuml(array $options): string
138138
{
139-
return PHP_EOL.'@enduml';
139+
return \PHP_EOL.'@enduml';
140140
}
141141

142142
private function getLines(array $code): string
143143
{
144-
return implode(PHP_EOL, $code);
144+
return implode(\PHP_EOL, $code);
145145
}
146146

147147
private function initialize(array $options, Definition $definition): array
@@ -210,7 +210,7 @@ private function getState(string $place, Definition $definition, Marking $markin
210210
$description = $workflowMetadata->getMetadata('description', $place);
211211
if (null !== $description) {
212212
$output .= ' as '.$place.
213-
PHP_EOL.
213+
\PHP_EOL.
214214
$place.' : '.$description;
215215
}
216216

Tests/Dumper/PlantUmlDumperTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testDumpWorkflowWithoutMarking($definition, $marking, $expectedF
2727
$dumper = new PlantUmlDumper(PlantUmlDumper::WORKFLOW_TRANSITION);
2828
$dump = $dumper->dump($definition, $marking, ['title' => $title]);
2929
// handle windows, and avoid to create more fixtures
30-
$dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL);
30+
$dump = str_replace(\PHP_EOL, "\n", $dump.\PHP_EOL);
3131
$file = $this->getFixturePath($expectedFileName, PlantUmlDumper::WORKFLOW_TRANSITION);
3232
$this->assertStringEqualsFile($file, $dump);
3333
}
@@ -50,7 +50,7 @@ public function testDumpStateMachineWithoutMarking($definition, $marking, $expec
5050
$dumper = new PlantUmlDumper(PlantUmlDumper::STATEMACHINE_TRANSITION);
5151
$dump = $dumper->dump($definition, $marking, ['title' => $title]);
5252
// handle windows, and avoid to create more fixtures
53-
$dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL);
53+
$dump = str_replace(\PHP_EOL, "\n", $dump.\PHP_EOL);
5454
$file = $this->getFixturePath($expectedFileName, PlantUmlDumper::STATEMACHINE_TRANSITION);
5555
$this->assertStringEqualsFile($file, $dump);
5656
}

TransitionBlocker.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static function createUnknown(string $message = null, int $backtraceFrame
7373
return new static($message, self::UNKNOWN);
7474
}
7575

76-
$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $backtraceFrame + 1)[$backtraceFrame]['class'] ?? null;
76+
$caller = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS, $backtraceFrame + 1)[$backtraceFrame]['class'] ?? null;
7777

7878
if (null !== $caller) {
7979
return new static("The transition has been blocked by a guard ($caller).", self::UNKNOWN);

0 commit comments

Comments
 (0)