fix #2

Author: igor-chepurnoi

.php_cs

@@ -24,6 +24,7 @@ $config = PhpCsFixer\Config::create()
         'concat_space' => ['spacing' => 'one'],
         'ordered_imports' => true,
         'array_syntax' => ['syntax' => 'short'],
+        'yoda_style' => false,
     ])
     ->setFinder($finder);
 

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 7.0
   - 7.1
 
 # faster builds on new travis setup not using sudo
@@ -18,4 +19,4 @@ install:
 
 script:
   - vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff
-  - phpunit
+  - vendor/bin/phpunit --verbose

Event.php

@@ -274,8 +274,8 @@ public function dailyAt($time)
     {
         $segments = explode(':', $time);
 
-        return $this->spliceIntoPosition(2, (int)$segments[0])
-            ->spliceIntoPosition(1, count($segments) == 2 ? (int)$segments[1] : '0');
+        return $this->spliceIntoPosition(2, (int) $segments[0])
+            ->spliceIntoPosition(1, count($segments) == 2 ? (int) $segments[1] : '0');
     }
 
     /**
@@ -509,6 +509,22 @@ public function timezone($timezone)
         return $this;
     }
 
+    /**
+     * @return bool
+     */
+    public function hasTimezone()
+    {
+        return $this->_timezone !== null;
+    }
+
+    /**
+     * @return \DateTimeZone|string
+     */
+    public function getTimezone()
+    {
+        return $this->_timezone;
+    }
+
     /**
      * Set which user the command should run as.
      *

ScheduleController.php

@@ -2,6 +2,8 @@
 
 namespace yii2mod\scheduling;
 
+use Carbon\Carbon;
+use Cron\CronExpression;
 use League\CLImate\CLImate;
 use Yii;
 use yii\base\InvalidConfigException;
@@ -82,9 +84,12 @@ public function actionList()
         foreach ($this->schedule->getEvents() as $event) {
             $data[] = [
                 '#' => ++$row,
-                'Task' => $event->getDescription(),
+                'Task' => $event->getSummaryForDisplay(),
                 'Expression' => $event->getExpression(),
-                'Command to Run' => $event->command,
+                'Command to Run' => is_a($event, CallbackEvent::class)
+                    ? $event->getSummaryForDisplay()
+                    : $event->command,
+                'Next run at' => $this->getNextRunDate($event),
             ];
         }
 
@@ -109,4 +114,23 @@ protected function importScheduleFile()
             include $scheduleFile;
         });
     }
+
+    /**
+     * Get the next scheduled run date for this event
+     *
+     * @param Event $event
+     *
+     * @return string
+     */
+    protected function getNextRunDate(Event $event)
+    {
+        $cron = CronExpression::factory($event->getExpression());
+        $date = Carbon::now();
+
+        if ($event->hasTimezone()) {
+            $date->setTimezone($event->getTimezone());
+        }
+
+        return $cron->getNextRunDate()->format('Y-m-d H:i:s');
+    }
 }

composer.json

@@ -22,7 +22,8 @@
         "guzzlehttp/guzzle": "^6.3"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.0"
+        "friendsofphp/php-cs-fixer": "~2.0",
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "psr-4": {