Skip to content

Commit e1cf24d

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Add missing dots at the end of exception messages [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) Fix bad merge Add missing dots at the end of exception messages
2 parents fd4a86d + 16f6867 commit e1cf24d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

InputStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function write($input)
4545
return;
4646
}
4747
if ($this->isClosed()) {
48-
throw new RuntimeException(sprintf('%s is closed', static::class));
48+
throw new RuntimeException(sprintf('%s is closed.', static::class));
4949
}
5050
$this->input[] = ProcessUtils::validateInput(__METHOD__, $input);
5151
}

Pipes/AbstractPipes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected function write(): ?array
103103
} elseif (!isset($this->inputBuffer[0])) {
104104
if (!\is_string($input)) {
105105
if (!is_scalar($input)) {
106-
throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported', \get_class($this->input), \gettype($input)));
106+
throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported.', \get_class($this->input), \gettype($input)));
107107
}
108108
$input = (string) $input;
109109
}

Pipes/WindowsPipes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct($input, bool $haveReadSupport)
5757

5858
if (!$h = fopen($file.'.lock', 'w')) {
5959
restore_error_handler();
60-
throw new RuntimeException(sprintf('A temporary file could not be opened to write the process output: %s', $lastError));
60+
throw new RuntimeException(sprintf('A temporary file could not be opened to write the process output: %s.', $lastError));
6161
}
6262
if (!flock($h, LOCK_EX | LOCK_NB)) {
6363
continue 2;

Process.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public function mustRun(callable $callback = null, array $env = []): self
277277
public function start(callable $callback = null, array $env = [])
278278
{
279279
if ($this->isRunning()) {
280-
throw new RuntimeException('Process is already running');
280+
throw new RuntimeException('Process is already running.');
281281
}
282282

283283
$this->resetProcessData();
@@ -371,7 +371,7 @@ public function start(callable $callback = null, array $env = [])
371371
public function restart(callable $callback = null, array $env = []): self
372372
{
373373
if ($this->isRunning()) {
374-
throw new RuntimeException('Process is already running');
374+
throw new RuntimeException('Process is already running.');
375375
}
376376

377377
$process = clone $this;
@@ -404,7 +404,7 @@ public function wait(callable $callback = null)
404404
if (null !== $callback) {
405405
if (!$this->processPipes->haveReadSupport()) {
406406
$this->stop(0);
407-
throw new LogicException('Pass the callback to the "Process::start" method or call enableOutput to use a callback with "Process::wait"');
407+
throw new LogicException('Pass the callback to the "Process::start" method or call enableOutput to use a callback with "Process::wait".');
408408
}
409409
$this->callback = $this->buildCallback($callback);
410410
}

0 commit comments

Comments
 (0)