Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[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 5 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
1 change: 1 addition & 0 deletions 1 CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,3 +1385,4 @@ Symfony is the result of the work of many people who made the code better
- Erik Saunier (snickers)
- Matej Žilák (teo_sk)
- Vladislav Vlastovskiy (vlastv)
- Almog Baku (AlmogBaku)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to add yourself to this file because its contents are automatically generated. And you'll appear here too: http://symfony.com/contributors/code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😎deleted it

6 changes: 3 additions & 3 deletions 6 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 All @@ -125,8 +125,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
$helper = new DescriptorHelper();
$options['format'] = $input->getOption('format');
$options['raw_text'] = $input->getOption('raw');
$options['output'] = $output;
$helper->describe($output, $object, $options);
$options['output'] = $io;
$helper->describe($io, $object, $options);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be reverted, the helper need the Output instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


if (!$input->getArgument('name') && $input->isInteractive()) {
$io->comment('To search for a specific service, re-run this command with a search term. (e.g. <comment>debug:container log</comment>)');
Expand Down
4 changes: 2 additions & 2 deletions 4 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,15 +118,15 @@ 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;
}

$builder->setWorkingDirectory($documentRoot);
$builder->setTimeout(null);
$process = $builder->getProcess();

if (OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
if (OutputInterface::VERBOSITY_VERBOSE > $io->getVerbosity()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one should probably be left as $output->getVerbosity()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are probably right. Using the original object will give better performance than the wrapped one.
DONE

$process->disableOutput();
}

Expand Down
4 changes: 2 additions & 2 deletions 4 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 2 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
Morty Proxy This is a proxified and sanitized view of the page, visit original site.