MAJ en Thelia 2.3.4

core/lib/Thelia/Command/ContainerAwareCommand.php

@@ -96,8 +96,9 @@ class ContainerAwareCommand extends Command implements ContainerAwareInterface
 
         $requestContext = new RequestContext();
         $requestContext->fromRequest($request);
-        $url = new URL($container);
+        $url = $container->get('thelia.url.manager');
         $url->setRequestContext($requestContext);
+        $this->getContainer()->get('router.admin')->setContext($requestContext);
     }
 
     /**

core/lib/Thelia/Command/HookCleanCommand.php

@@ -71,7 +71,6 @@ class HookCleanCommand extends ContainerAwareCommand
         } catch (\Exception $ex) {
             $output->writeln(sprintf("<error>%s</error>", $ex->getMessage()));
         }
-
     }
 
     private function getModule(InputInterface $input)

core/lib/Thelia/Command/ModuleDeactivateCommand.php

@@ -12,10 +12,13 @@
 
 namespace Thelia\Command;
 
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Thelia\Action\Module;
 use Thelia\Core\Event\Module\ModuleToggleActivationEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\ModuleQuery;
@@ -47,6 +50,12 @@ class ModuleDeactivateCommand extends BaseModuleGenerate
                 InputArgument::REQUIRED,
                 "module to deactivate"
             )
+            ->addOption(
+                "assume-yes",
+                'y',
+                InputOption::VALUE_NONE,
+                'Assume to deactivate a mandatory module'
+            )
         ;
     }
 
@@ -67,6 +76,15 @@ class ModuleDeactivateCommand extends BaseModuleGenerate
 
         try {
             $event = new ModuleToggleActivationEvent($module->getId());
+
+            $module = ModuleQuery::create()->findPk($module->getId());
+            if ($module->getMandatory() == BaseModule::IS_MANDATORY) {
+                if (!$this->askConfirmation($input, $output)) {
+                    return;
+                }
+                $event->setAssumeDeactivate(true);
+            }
+
             if ($input->getOption("with-dependencies")) {
                 $event->setRecursive(true);
             }
@@ -84,4 +102,33 @@ class ModuleDeactivateCommand extends BaseModuleGenerate
             ), "bg=green;fg=black");
         }
     }
+
+    private function askConfirmation(InputInterface $input, OutputInterface $output)
+    {
+        $assumeYes = $input->getOption("assume-yes");
+        $moduleCode = $input->getArgument("module");
+
+        if (!$assumeYes) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $questionText = "Module ";
+            $questionText .= (empty($moduleCode))
+                ? ""
+                : $moduleCode;
+            $questionText .= " is mandatory.\n";
+            $questionText .= "Would you like to deactivate the module ";
+            $questionText .= (empty($moduleCode))
+                ? ""
+                : $moduleCode;
+            $questionText .= " ? (yes, or no) ";
+
+            $question = new ConfirmationQuestion($questionText, false);
+
+            if (!$helper->ask($input, $output, $question)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

core/lib/Thelia/Command/Skeleton/Module/module.xml

@@ -38,4 +38,6 @@
     -->
     <thelia>2.2.0</thelia>
     <stability>other</stability>
+    <mandatory>0</mandatory>
+    <hidden>0</hidden>
 </module>