Skip to content

[FrameworkBundle] [Bug] Fixes new InputStyle bug #16920 #16922

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

Closed
wants to merge 8 commits into from
Closed

[FrameworkBundle] [Bug] Fixes new InputStyle bug #16920 #16922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7137e61
Update ServerStartCommand.php
AlmogBaku Dec 9, 2015
84a1d41
Update ServerRunCommand.php
AlmogBaku Dec 9, 2015
508ad46
Update ContainerDebugCommand.php
AlmogBaku Dec 9, 2015
5c53861
Update YamlLintCommand.php
AlmogBaku Dec 9, 2015
8c7ade0
Update CONTRIBUTORS.md
AlmogBaku Dec 9, 2015
31175c5
Update ContainerDebugCommand.php
AlmogBaku Dec 9, 2015
00af297
Update CONTRIBUTORS.md
AlmogBaku Dec 9, 2015
f1faab7
Update ServerRunCommand.php
AlmogBaku Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$options = array('tag' => $tag, 'show_private' => $input->getOption('show-private'));
} elseif ($name = $input->getArgument('name')) {
$object = $this->getContainerBuilder();
$name = $this->findProperServiceName($input, $output, $object, $name);
$name = $this->findProperServiceName($input, $io, $object, $name);
$options = array('id' => $name);
} else {
$object = $this->getContainerBuilder();
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$io->success(sprintf('Server running on http://%s', $address));
$io->comment('Quit the server with CONTROL-C.');

if (null === $builder = $this->createPhpProcessBuilder($output, $address, $input->getOption('router'), $env)) {
if (null === $builder = $this->createPhpProcessBuilder($io, $address, $input->getOption('router'), $env)) {
return 1;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)

$env = $this->getContainer()->getParameter('kernel.environment');

if (false === $router = $this->determineRouterScript($input->getOption('router'), $env, $output)) {
if (false === $router = $this->determineRouterScript($input->getOption('router'), $env, $io)) {
return 1;
}

Expand Down Expand Up @@ -148,7 +148,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
return 1;
}

if (null === $process = $this->createServerProcess($output, $address, $documentRoot, $router)) {
if (null === $process = $this->createServerProcess($io, $address, $documentRoot, $router)) {
return 1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$content .= fread(STDIN, 1024);
}

return $this->display($input, $output, $output, array($this->validate($content)));
return $this->display($input, $output, $io, array($this->validate($content)));
}

if (0 !== strpos($filename, '@') && !is_readable($filename)) {
Expand Down