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
/
src
/
Command
/
Generate
/
PluginImageFormatterCommand.php
diff --git
a/vendor/drupal/console/src/Command/Generate/PluginImageFormatterCommand.php
b/vendor/drupal/console/src/Command/Generate/PluginImageFormatterCommand.php
index 8fb3400531a0978937b6d2c853b5cbed3276f353..9d2b741b13bf5fb5994c973b77b9127e9e31ae15 100644
(file)
--- a/
vendor/drupal/console/src/Command/Generate/PluginImageFormatterCommand.php
+++ b/
vendor/drupal/console/src/Command/Generate/PluginImageFormatterCommand.php
@@
-13,10
+13,8
@@
use Symfony\Component\Console\Output\OutputInterface;
use Drupal\Console\Generator\PluginImageFormatterGenerator;
use Drupal\Console\Command\Shared\ModuleTrait;
use Drupal\Console\Command\Shared\ConfirmationTrait;
use Drupal\Console\Generator\PluginImageFormatterGenerator;
use Drupal\Console\Command\Shared\ModuleTrait;
use Drupal\Console\Command\Shared\ConfirmationTrait;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Core\Style\DrupalStyle;
+use Drupal\Console\Core\Command\Command;
use Drupal\Console\Extension\Manager;
use Drupal\Console\Extension\Manager;
-use Drupal\Console\Core\Command\Shared\CommandTrait;
use Drupal\Console\Core\Utils\StringConverter;
use Drupal\Console\Utils\Validator;
use Drupal\Console\Core\Utils\ChainQueue;
use Drupal\Console\Core\Utils\StringConverter;
use Drupal\Console\Utils\Validator;
use Drupal\Console\Core\Utils\ChainQueue;
@@
-25,16
+23,15
@@
class PluginImageFormatterCommand extends Command
{
use ModuleTrait;
use ConfirmationTrait;
{
use ModuleTrait;
use ConfirmationTrait;
- use CommandTrait;
/**
/**
- * @var Manager
-*/
+
* @var Manager
+
*/
protected $extensionManager;
/**
protected $extensionManager;
/**
- * @var PluginImageFormatterGenerator
-*/
+
* @var PluginImageFormatterGenerator
+
*/
protected $generator;
/**
protected $generator;
/**
@@
-43,8
+40,8
@@
class PluginImageFormatterCommand extends Command
protected $stringConverter;
/**
protected $stringConverter;
/**
- * @var Validator
-*/
+
* @var Validator
+
*/
protected $validator;
/**
protected $validator;
/**
@@
-83,7
+80,12
@@
class PluginImageFormatterCommand extends Command
->setName('generate:plugin:imageformatter')
->setDescription($this->trans('commands.generate.plugin.imageformatter.description'))
->setHelp($this->trans('commands.generate.plugin.imageformatter.help'))
->setName('generate:plugin:imageformatter')
->setDescription($this->trans('commands.generate.plugin.imageformatter.description'))
->setHelp($this->trans('commands.generate.plugin.imageformatter.help'))
- ->addOption('module', null, InputOption::VALUE_REQUIRED, $this->trans('commands.common.options.module'))
+ ->addOption(
+ 'module',
+ null,
+ InputOption::VALUE_REQUIRED,
+ $this->trans('commands.common.options.module')
+ )
->addOption(
'class',
null,
->addOption(
'class',
null,
@@
-101,7
+103,8
@@
class PluginImageFormatterCommand extends Command
null,
InputOption::VALUE_OPTIONAL,
$this->trans('commands.generate.plugin.imageformatter.options.plugin-id')
null,
InputOption::VALUE_OPTIONAL,
$this->trans('commands.generate.plugin.imageformatter.options.plugin-id')
- );
+ )
+ ->setAliases(['gpif']);
}
/**
}
/**
@@
-109,41
+112,40
@@
class PluginImageFormatterCommand extends Command
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $io = new DrupalStyle($input, $output);
-
- // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmGeneration
- if (!$this->confirmGeneration($io)) {
+ // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmOperation
+ if (!$this->confirmOperation()) {
return 1;
}
$module = $input->getOption('module');
return 1;
}
$module = $input->getOption('module');
- $class_name = $
input->getOption('class'
);
+ $class_name = $
this->validator->validateClassName($input->getOption('class')
);
$label = $input->getOption('label');
$plugin_id = $input->getOption('plugin-id');
$label = $input->getOption('label');
$plugin_id = $input->getOption('plugin-id');
- $this->generator->generate($module, $class_name, $label, $plugin_id);
+ $this->generator->generate([
+ 'module' => $module,
+ 'class_name' => $class_name,
+ 'label' => $label,
+ 'plugin_id' => $plugin_id,
+ ]);
$this->chainQueue->addCommand('cache:rebuild', ['cache' => 'discovery']);
}
protected function interact(InputInterface $input, OutputInterface $output)
{
$this->chainQueue->addCommand('cache:rebuild', ['cache' => 'discovery']);
}
protected function interact(InputInterface $input, OutputInterface $output)
{
- $io = new DrupalStyle($input, $output);
-
// --module option
// --module option
- $module = $input->getOption('module');
- if (!$module) {
- // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion
- $module = $this->moduleQuestion($io);
- }
- $input->setOption('module', $module);
+ $this->getModuleOption();
// --class option
$class_name = $input->getOption('class');
if (!$class_name) {
// --class option
$class_name = $input->getOption('class');
if (!$class_name) {
- $class_name = $
io
->ask(
+ $class_name = $
this->getIo()
->ask(
$this->trans('commands.generate.plugin.imageformatter.questions.class'),
$this->trans('commands.generate.plugin.imageformatter.questions.class'),
- 'ExampleImageFormatter'
+ 'ExampleImageFormatter',
+ function ($class_name) {
+ return $this->validator->validateClassName($class_name);
+ }
);
$input->setOption('class', $class_name);
}
);
$input->setOption('class', $class_name);
}
@@
-151,7
+153,7
@@
class PluginImageFormatterCommand extends Command
// --label option
$label = $input->getOption('label');
if (!$label) {
// --label option
$label = $input->getOption('label');
if (!$label) {
- $label = $
io
->ask(
+ $label = $
this->getIo()
->ask(
$this->trans('commands.generate.plugin.imageformatter.questions.label'),
$this->stringConverter->camelCaseToHuman($class_name)
);
$this->trans('commands.generate.plugin.imageformatter.questions.label'),
$this->stringConverter->camelCaseToHuman($class_name)
);
@@
-161,7
+163,7
@@
class PluginImageFormatterCommand extends Command
// --plugin-id option
$plugin_id = $input->getOption('plugin-id');
if (!$plugin_id) {
// --plugin-id option
$plugin_id = $input->getOption('plugin-id');
if (!$plugin_id) {
- $plugin_id = $
io
->ask(
+ $plugin_id = $
this->getIo()
->ask(
$this->trans('commands.generate.plugin.imageformatter.questions.plugin-id'),
$this->stringConverter->camelCaseToUnderscore($class_name)
);
$this->trans('commands.generate.plugin.imageformatter.questions.plugin-id'),
$this->stringConverter->camelCaseToUnderscore($class_name)
);