Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistently add return type hints to CommandDispatcher #671

Merged
merged 2 commits into from
Feb 16, 2018
Merged

Consistently add return type hints to CommandDispatcher #671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
009ad00
[BUGFIX] Fix command execution in composer run context
helhum Feb 1, 2018
8d97603
Consistently add return type hints to CommandDispatcher
helhum Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 7 additions & 20 deletions Classes/Mvc/Cli/CommandDispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
namespace Helhum\Typo3Console\Mvc\Cli;

/*
Expand Down Expand Up @@ -62,24 +63,10 @@ private function __construct(array $commandLinePrefix, array $environmentVars =
* @throws RuntimeException
* @return CommandDispatcher
*/
public static function createFromComposerRun(ScriptEvent $event, array $commandLine = [], array $environmentVars = [], PhpExecutableFinder $phpFinder = null)
public static function createFromComposerRun(ScriptEvent $event, array $commandLine = [], array $environmentVars = [], PhpExecutableFinder $phpFinder = null): self
{
// should be Application::COMMAND_NAME, but our Application class currently conflicts with symfony/console 2.7, which is used by Composer
$name = 'typo3cms';
$searchDirs = [
$event->getComposer()->getConfig()->get('bin-dir'),
dirname(__DIR__, 3),
];
foreach ($searchDirs as $dir) {
$file = $dir . DIRECTORY_SEPARATOR . $name;
if (is_file($file)) {
$typo3CommandPath = $file;
break;
}
}
if (!isset($typo3CommandPath)) {
throw new RuntimeException(sprintf('The "%s" binary could not be found.', $name), 1494778973);
}
$typo3CommandPath = dirname(__DIR__, 3) . '/typo3cms';
$environmentVars['TYPO3_CONSOLE_PLUGIN_RUN'] = true;

return self::create($typo3CommandPath, $commandLine, $environmentVars, $phpFinder);
Expand All @@ -96,7 +83,7 @@ public static function createFromComposerRun(ScriptEvent $event, array $commandL
* @throws RuntimeException
* @return CommandDispatcher
*/
public static function createFromCommandRun(array $commandLine = [], array $environmentVars = [], PhpExecutableFinder $phpFinder = null)
public static function createFromCommandRun(array $commandLine = [], array $environmentVars = [], PhpExecutableFinder $phpFinder = null): self
{
if (!isset($_SERVER['argv'][0]) && strpos($_SERVER['argv'][0], Application::COMMAND_NAME) === false) {
throw new RuntimeException('Tried to create typo3 command runner from wrong context', 1484945065);
Expand All @@ -114,7 +101,7 @@ public static function createFromCommandRun(array $commandLine = [], array $envi
* @throws RuntimeException
* @return CommandDispatcher
*/
public static function createFromTestRun($typo3CommandPath = null)
public static function createFromTestRun($typo3CommandPath = null): self
{
if (!isset($_SERVER['argv'][0]) && strpos($_SERVER['argv'][0], 'phpunit') === false) {
throw new RuntimeException(sprintf('Tried to create %s command runner from wrong context', Application::COMMAND_NAME), 1493570522);
Expand All @@ -133,7 +120,7 @@ public static function createFromTestRun($typo3CommandPath = null)
* @throws RuntimeException
* @return CommandDispatcher
*/
public static function create($typo3CommandPath, array $commandLine = [], array $environmentVars = [], PhpExecutableFinder $phpFinder = null)
public static function create($typo3CommandPath, array $commandLine = [], array $environmentVars = [], PhpExecutableFinder $phpFinder = null): self
{
$phpFinder = $phpFinder ?: new PhpExecutableFinder();
if (!($php = $phpFinder->find())) {
Expand All @@ -159,7 +146,7 @@ public static function create($typo3CommandPath, array $commandLine = [], array
* @throws FailedSubProcessCommandException
* @return string
*/
public function executeCommand($command, array $arguments = [], array $envVars = [], $input = null)
public function executeCommand($command, array $arguments = [], array $envVars = [], $input = null): string
{
$envVars = array_replace($this->environmentVars, $envVars);
$commandLine = $this->commandLinePrefix;
Expand Down