Skip to content

[WIP][Console] Add ContainerAwareCommand #10087

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 1 commit into from
Closed

[WIP][Console] Add ContainerAwareCommand #10087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 4 additions & 19 deletions src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,24 @@

namespace Symfony\Bundle\FrameworkBundle\Command;

use Symfony\Component\Console\Command\Command;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\Console\DependencyInjection\ContainerAwareCommand as BaseContainerAwareCommand;

/**
* Command.
*
* @author Fabien Potencier <fabien@symfony.com>
*/
abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface
abstract class ContainerAwareCommand extends BaseContainerAwareCommand
{
/**
* @var ContainerInterface|null
*/
private $container;

/**
* @return ContainerInterface
*/
protected function getContainer()
{
if (null === $this->container) {
if (null === parent::getContainer()) {
$this->container = $this->getApplication()->getKernel()->getContainer();
Copy link
Contributor

Choose a reason for hiding this comment

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

You have to either use setContainer or make $container protected

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, overlooked that one. I'll wait for the feedback if we still need this piece of code before fixing it.

}

return $this->container;
}

/**
* {@inheritdoc}
*/
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
return parent::getContainer();
}
}
1 change: 1 addition & 0 deletions src/Symfony/Component/Console/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CHANGELOG

* added a way to set a default command instead of `ListCommand`
* added a way to set the process name of a command
* added ContainerAwareCommand

2.4.0
-----
Expand Down
45 changes: 45 additions & 0 deletions src/Symfony/Component/Console/DependencyInjection/ContainerAwareCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Console\DependencyInjection;

use Symfony\Component\Console\Command\Command;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;

/**
* Command.
*
* @author Fabien Potencier <fabien@symfony.com>
Copy link
Contributor

Choose a reason for hiding this comment

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

he is not the author, or add yourself too right? 👶

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well since it's essentially a copy of Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand plus a small modification to getContainer so that only seemed fair.

*/
abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface
{
/**
* @var ContainerInterface|null
*/
private $container;

/**
* @return ContainerInterface
*/
protected function getContainer()
{
return $this->container;
}

/**
* {@inheritdoc}
*/
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
}