X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fdrupal%2Fconsole%2Fsrc%2FCommand%2FGenerate%2FCommandCommand.php;fp=vendor%2Fdrupal%2Fconsole%2Fsrc%2FCommand%2FGenerate%2FCommandCommand.php;h=fc3a914b9613c09afe89f5ecf272210370441ff4;hp=7255609cd1e4a6f5c0425f68befe9062aae5011a;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae

diff --git a/vendor/drupal/console/src/Command/Generate/CommandCommand.php b/vendor/drupal/console/src/Command/Generate/CommandCommand.php
index 7255609cd..fc3a914b9 100644
--- a/vendor/drupal/console/src/Command/Generate/CommandCommand.php
+++ b/vendor/drupal/console/src/Command/Generate/CommandCommand.php
@@ -21,6 +21,7 @@ use Drupal\Console\Core\Utils\StringConverter;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Core\Style\DrupalStyle;
 use Drupal\Console\Utils\Validator;
+use Drupal\Console\Utils\Site;
 
 class CommandCommand extends Command
 {
@@ -50,6 +51,11 @@ class CommandCommand extends Command
      */
     protected $stringConverter;
 
+    /**
+     * @var Site
+     */
+    protected $site;
+
     /**
      * CommandCommand constructor.
      *
@@ -57,17 +63,20 @@ class CommandCommand extends Command
      * @param Manager          $extensionManager
      * @param Validator        $validator
      * @param StringConverter  $stringConverter
+     * @param Site             $site
      */
     public function __construct(
         CommandGenerator $generator,
         Manager $extensionManager,
         Validator $validator,
-        StringConverter $stringConverter
+        StringConverter $stringConverter,
+        Site  $site
     ) {
         $this->generator = $generator;
         $this->extensionManager = $extensionManager;
         $this->validator = $validator;
         $this->stringConverter = $stringConverter;
+        $this->site = $site;
         parent::__construct();
     }
 
@@ -82,37 +91,37 @@ class CommandCommand extends Command
             ->setHelp($this->trans('commands.generate.command.help'))
             ->addOption(
                 'extension',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.common.options.extension')
             )
             ->addOption(
                 'extension-type',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.common.options.extension-type')
             )
             ->addOption(
                 'class',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.generate.command.options.class')
             )
             ->addOption(
                 'name',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.generate.command.options.name')
             )
             ->addOption(
                 'container-aware',
-                '',
+                null,
                 InputOption::VALUE_NONE,
                 $this->trans('commands.generate.command.options.container-aware')
             )
             ->addOption(
                 'services',
-                '',
+                null,
                 InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 $this->trans('commands.common.options.services')
             );
@@ -135,7 +144,7 @@ class CommandCommand extends Command
 
         // @see use Drupal\Console\Command\Shared\ConfirmationTrait::confirmGeneration
         if (!$this->confirmGeneration($io, $yes)) {
-            return;
+            return 1;
         }
 
         // @see use Drupal\Console\Command\Shared\ServicesTrait::buildServices
@@ -149,6 +158,10 @@ class CommandCommand extends Command
             $containerAware,
             $build_services
         );
+
+        $this->site->removeCachedServicesFile();
+
+        return 0;
     }
 
     /**