Merge branch 'master' of github.com:yii2mod/yii2-cron-log

Conflicts:
	.php_cs

Author: igor-chepurnoi

.php_cs

@@ -7,7 +7,10 @@ $finder = PhpCsFixer\Finder::create()
 $config = PhpCsFixer\Config::create()
     ->setUsingCache(false)
     ->setRules([
+<<<<<<< HEAD
         '@Symfony' => true,
+=======
+>>>>>>> 729f3ff516db2509cc5e7ac88dace9ce50189f26
         'phpdoc_align' => false,
         'phpdoc_summary' => false,
         'phpdoc_inline_tag' => false,
@@ -18,6 +21,18 @@ $config = PhpCsFixer\Config::create()
         'phpdoc_no_package' => false,
         'concat_space' => ['spacing' => 'one'],
         'ordered_imports' => true,
+<<<<<<< HEAD
+=======
+        'single_quote' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_spaces_inside_parenthesis' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'phpdoc_order' => true,
+        'trim_array_spaces' => true,
+>>>>>>> 729f3ff516db2509cc5e7ac88dace9ce50189f26
         'array_syntax' => ['syntax' => 'short'],
     ])
     ->setFinder($finder);

composer.json

@@ -23,7 +23,7 @@
         "yii2mod/yii2-enum": ">=1.4"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~1.7"
+        "friendsofphp/php-cs-fixer": "~2.0"
     },
     "autoload": {
         "psr-4": {

migrations/m160804_101551_drop_dateSheduled_and_dateExecuted_columns.php

@@ -6,10 +6,11 @@ class m160804_101551_drop_dateSheduled_and_dateExecuted_columns extends Migratio
 {
     public function up()
     {
+        $this->dropIndex('idx-CronSchedule-dateScheduled-status', '{{%CronSchedule}}');
+        
         $this->dropColumn('{{%CronSchedule}}', 'dateScheduled');
         $this->dropColumn('{{%CronSchedule}}', 'dateExecuted');
 
-        $this->dropIndex('idx-CronSchedule-dateScheduled-status', '{{%CronSchedule}}');
         $this->createIndex('idx-CronSchedule-status', '{{%CronSchedule}}', 'status');
     }