Fixes after CR vol 2

ezsystems · Dec 21, 2018 · 3cc691f · 3cc691f
1 parent c401934
commit 3cc691f
Showing 1 changed file with 16 additions and 36 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Command/UpdateTimestampsToUTCCommand.php b/eZ/Bundle/EzPublishCoreBundle/Command/UpdateTimestampsToUTCCommand.php
@@ -25,9 +25,11 @@
 class UpdateTimestampsToUTCCommand extends ContainerAwareCommand
 {
     const DEFAULT_ITERATION_COUNT = 100;
-    const EZDATE_ONLY_MODE = 'date';
-    const EZDATETIME_ONLY_MODE = 'datetime';
-    const ALL_MODE = 'all';
+    const MODES = [
+        'date' => ['ezdate'],
+        'datetime' => ['ezdatetime'],
+        'all' => ['ezdate', 'ezdatetime'],
+    ];
 
     /**
      * @var int
@@ -159,6 +161,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->dryRun = $input->getOption('dry-run');
         $this->mode = $input->getOption('mode');
 
+        if (!isset(self::MODES[$this->mode])) {
+            $output->writeln(
+                sprintf('Selected mode is not supported, please use one of: %s', implode(', ', array_keys(self::MODES)))
+            );
+
+            return;
+        }
+
         $from = $input->getOption('from');
         $to = $input->getOption('to');
 
@@ -168,11 +178,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($to && !$this->validateDateTimeString($to, $output)) {
             return;
         }
-
         if ($from) {
             $this->from = $this->dateStringToTimestamp($from);
         }
-
         if ($to) {
             $this->to = $this->dateStringToTimestamp($to);
         }
@@ -187,19 +195,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $timezone = $input->getArgument('timezone');
             $this->timezone = $this->validateTimezone($timezone, $output);
 
-            $modeTxt = 'Converting timestamps for both ezdate and ezdatetime fields.';
-
-            switch ($this->mode) {
-                case 'date':
-                    $modeTxt = 'Converting timestamps for ezdate fields.';
-                    break;
-                case 'datetime':
-                    $modeTxt = 'Converting timestamps for ezdatetime fields.';
-                    break;
-            }
-
             $output->writeln([
-                $modeTxt,
+                sprintf('Converting timestamps for fields: %s', implode(', ', self::MODES[$this->mode])),
                 'Calculating number of Field values to update...',
             ]);
             $count = $this->countTimestampBasedFields();
@@ -313,7 +310,7 @@ protected function getTimestampBasedFields($offset, $limit)
             ->where(
                 $query->expr()->in(
                     'a.data_type_string',
-                    $query->createNamedParameter($this->getFields(), Connection::PARAM_STR_ARRAY)
+                    $query->createNamedParameter(self::MODES[$this->mode], Connection::PARAM_STR_ARRAY)
                 )
             )
             ->andWhere('a.data_int is not null')
@@ -353,7 +350,7 @@ protected function countTimestampBasedFields()
             ->where(
                 $query->expr()->in(
                     'a.data_type_string',
-                    $query->createNamedParameter($this->getFields(), Connection::PARAM_STR_ARRAY)
+                    $query->createNamedParameter(self::MODES[$this->mode], Connection::PARAM_STR_ARRAY)
                 )
             )
             ->andWhere('a.data_int is not null')
@@ -498,23 +495,6 @@ private function getPhpPath()
         return $this->phpPath;
     }
 
-    /**
-     * @return string[]
-     */
-    private function getFields()
-    {
-        $fields = [];
-
-        if ($this->mode == 'date' || $this->mode == 'all') {
-            $fields[] = 'ezdate';
-        }
-        if ($this->mode == 'datetime' || $this->mode == 'all') {
-            $fields[] = 'ezdatetime';
-        }
-
-        return $fields;
-    }
-
     /**
      * @param $dateString string
      * @throws \Exception