[Magento Community Engineering] Community Contributions - 2.3-develop-fast-lane-prs

 - merged with '2.3-develop-express-lane-prs' branch

Author: magento-engcom-team

app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\System\Store\Edit\Form;
 
 /**
@@ -129,6 +132,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'label' => __('Sort Order'),
                 'value' => $storeModel->getSortOrder(),
                 'required' => false,
+                'class' => 'validate-number validate-zero-or-greater',
                 'disabled' => $storeModel->isReadOnly()
             ]
         );

app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\System\Store\Edit\Form;
 
 /**
@@ -85,6 +88,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'label' => __('Sort Order'),
                 'value' => $websiteModel->getSortOrder(),
                 'required' => false,
+                'class' => 'validate-number validate-zero-or-greater',
                 'disabled' => $websiteModel->isReadOnly()
             ]
         );

app/code/Magento/Cron/Console/Command/CronInstallCommand.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Cron\Console\Command;
 
 use Magento\Framework\Crontab\CrontabManagerInterface;
@@ -19,6 +21,9 @@
  */
 class CronInstallCommand extends Command
 {
+    private const COMMAND_OPTION_FORCE = 'force';
+    private const COMMAND_OPTION_NON_OPTIONAL = 'non-optional';
+
     /**
      * @var CrontabManagerInterface
      */
@@ -44,19 +49,27 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
         $this->setName('cron:install')
             ->setDescription('Generates and installs crontab for current user')
-            ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force install tasks');
+            ->addOption(self::COMMAND_OPTION_FORCE, 'f', InputOption::VALUE_NONE, 'Force install tasks')
+            // @codingStandardsIgnoreStart
+            ->addOption(self::COMMAND_OPTION_NON_OPTIONAL, 'd', InputOption::VALUE_NONE, 'Install only the non-optional (default) tasks');
+            // @codingStandardsIgnoreEnd
 
         parent::configure();
     }
 
     /**
-     * {@inheritdoc}
+     * Executes "cron:install" command.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int|null
+     * @throws LocalizedException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -65,8 +78,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return Cli::RETURN_FAILURE;
         }
 
+        $tasks = $this->tasksProvider->getTasks();
+        if ($input->getOption(self::COMMAND_OPTION_NON_OPTIONAL)) {
+            $tasks = $this->extractNonOptionalTasks($tasks);
+        }
+
         try {
-            $this->crontabManager->saveTasks($this->tasksProvider->getTasks());
+            $this->crontabManager->saveTasks($tasks);
         } catch (LocalizedException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             return Cli::RETURN_FAILURE;
@@ -76,4 +94,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * Returns an array of non-optional tasks
+     *
+     * @param array $tasks
+     * @return array
+     */
+    private function extractNonOptionalTasks(array $tasks = []): array
+    {
+        $defaultTasks = [];
+
+        foreach ($tasks as $taskCode => $taskParams) {
+            if (!$taskParams['optional']) {
+                $defaultTasks[$taskCode] = $taskParams;
+            }
+        }
+
+        return $defaultTasks;
+    }
 }

app/code/Magento/Cron/etc/di.xml

@@ -66,12 +66,15 @@
             <argument name="tasks" xsi:type="array">
                 <item name="cronMagento" xsi:type="array">
                     <item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log</item>
+                    <item name="optional" xsi:type="boolean">false</item>
                 </item>
                 <item name="cronUpdate" xsi:type="array">
                     <item name="command" xsi:type="string">{magentoRoot}update/cron.php >> {magentoLog}update.cron.log</item>
+                    <item name="optional" xsi:type="boolean">true</item>
                 </item>
                 <item name="cronSetup" xsi:type="array">
                     <item name="command" xsi:type="string">{magentoRoot}bin/magento setup:cron:run >> {magentoLog}setup.cron.log</item>
+                    <item name="optional" xsi:type="boolean">true</item>
                 </item>
             </argument>
         </arguments>