Skip to content

Commit 931a345

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Fix parameter types for ProcessHelper::mustRun() Remove return void PHPDoc in test
2 parents f35720e + 53a45b2 commit 931a345

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
9595
self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);
9696
}
9797

98-
/** @return void */
9998
private function dumpLazyServiceProjectAsFilesServiceContainer()
10099
{
101100
if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {

src/Symfony/Component/Console/Helper/ProcessHelper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ public function run(OutputInterface $output, $cmd, string $error = null, callabl
9292
* This is identical to run() except that an exception is thrown if the process
9393
* exits with a non-zero exit code.
9494
*
95-
* @param string|Process $cmd An instance of Process or a command to run
96-
* @param callable|null $callback A PHP callback to run whenever there is some
97-
* output available on STDOUT or STDERR
95+
* @param array|Process $cmd An instance of Process or a command to run
96+
* @param callable|null $callback A PHP callback to run whenever there is some
97+
* output available on STDOUT or STDERR
9898
*
9999
* @return Process The process that ran
100100
*

0 commit comments

Comments
 (0)