projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
vendor
/
drupal
/
console-core
/
src
/
Command
/
Exclude
/
DrupliconCommand.php
diff --git
a/vendor/drupal/console-core/src/Command/Exclude/DrupliconCommand.php
b/vendor/drupal/console-core/src/Command/Exclude/DrupliconCommand.php
index 540c361bba3a077f0bdd7e0c183f990dd5a6f756..aa05fab8d4e0f50dea204762dc05b6c021ae4b2b 100644
(file)
--- a/
vendor/drupal/console-core/src/Command/Exclude/DrupliconCommand.php
+++ b/
vendor/drupal/console-core/src/Command/Exclude/DrupliconCommand.php
@@
-9,11
+9,10
@@
namespace Drupal\Console\Core\Command\Exclude;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Finder\Finder;
-use Drupal\Console\Core\Command\
Shared\CommandTrait
;
+use Drupal\Console\Core\Command\
Command
;
use Drupal\Console\Core\Utils\TwigRenderer;
use Drupal\Console\Core\Utils\TwigRenderer;
-use Drupal\Console\Core\
Style\DrupalStyle
;
+use Drupal\Console\Core\
Utils\ConfigurationManager
;
/**
* Class DrupliconCommand
/**
* Class DrupliconCommand
@@
-22,29
+21,36
@@
use Drupal\Console\Core\Style\DrupalStyle;
*/
class DrupliconCommand extends Command
{
*/
class DrupliconCommand extends Command
{
- use CommandTrait;
-
/**
* @var string
*/
protected $appRoot;
/**
* @var string
*/
protected $appRoot;
+
/**
* @var TwigRenderer
*/
protected $renderer;
/**
* @var TwigRenderer
*/
protected $renderer;
+ /**
+ * @var ConfigurationManager
+ */
+ protected $configurationManager;
+
/**
* DrupliconCommand constructor.
*
/**
* DrupliconCommand constructor.
*
- * @param string $appRoot
- * @param TwigRenderer $renderer
+ * @param string $appRoot
+ * @param TwigRenderer $renderer
+ * @param ConfigurationManager $configurationManager
*/
public function __construct(
$appRoot,
*/
public function __construct(
$appRoot,
- TwigRenderer $renderer
+ TwigRenderer $renderer,
+ ConfigurationManager $configurationManager
) {
$this->appRoot = $appRoot;
$this->renderer = $renderer;
) {
$this->appRoot = $appRoot;
$this->renderer = $renderer;
+ $this->configurationManager = $configurationManager;
parent::__construct();
}
parent::__construct();
}
@@
-63,11
+69,9
@@
class DrupliconCommand extends Command
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $io = new DrupalStyle($input, $output);
-
$directory = sprintf(
'%s/templates/core/druplicon/',
$directory = sprintf(
'%s/templates/core/druplicon/',
- $this->
appRoot . DRUPAL_CONSOLE_CORE
+ $this->
configurationManager->getVendorCoreRoot()
);
$finder = new Finder();
);
$finder = new Finder();
@@
-87,7
+91,7
@@
class DrupliconCommand extends Command
)
);
)
);
- $
io
->writeln($druplicon);
+ $
this->getIo()
->writeln($druplicon);
return 0;
}
}
return 0;
}
}