From a3078a85871708b51ce79977f125a2dc38a9783a Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 15 Apr 2018 07:26:43 +0200
Subject: [PATCH 01/18] Added timezone option.

---
 crunz.yml                        | 7 ++++++-
 src/Configuration/Definition.php | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/crunz.yml b/crunz.yml
index 72e7ba3d..703609cf 100644
--- a/crunz.yml
+++ b/crunz.yml
@@ -11,6 +11,11 @@ source: tasks
 # to make sure all the existing tasks files are renamed accordingly.
 suffix: Tasks.php
 
+# Timezone used to calculate task run date
+# This option is very important and not setting it is deprecated
+# and will result in exception in 2.0 version.
+timezone: UTC
+
 # By default the errors are not logged by Crunz
 # You may set the value to true for logging the errors
 log_errors: false
@@ -56,4 +61,4 @@ smtp:
     port:
     username:
     password:
-    encryption:
\ No newline at end of file
+    encryption:
diff --git a/src/Configuration/Definition.php b/src/Configuration/Definition.php
index c2ddbf38..66f461ac 100644
--- a/src/Configuration/Definition.php
+++ b/src/Configuration/Definition.php
@@ -26,6 +26,10 @@ public function getConfigTreeBuilder()
                     ->info('The suffix for filenames' . PHP_EOL)
                 ->end()
 
+                ->scalarNode('timezone')
+                    ->info('Timezone used to calculate task run date')
+                ->end()
+
                 ->booleanNode('log_errors')
                     ->defaultFalse()
                     ->info('Flag for logging errors' . PHP_EOL)

From 8880b7dc3646c9f10ebb1f52533e9918fe1c3f17 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 17:33:01 +0200
Subject: [PATCH 02/18] Do not require symfony/debug it is not in use.

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 243c0913..be1f97e9 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,6 @@
         "phpdocumentor/reflection-docblock": "^2.0.1",
         "phpunit/phpunit": "5.7.27",
         "sebastian/comparator": "1.2.4",
-        "symfony/debug": "^3.3 || ^4.0",
         "symfony/phpunit-bridge": "^2.8 || ^3.3 || ^4.0",
         "symfony/var-dumper": "^3.4"
     },

From 3f49601e64037a44ce63e1df03742912e2458586 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 17:42:37 +0200
Subject: [PATCH 03/18] Report all error in CLI.

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index d6978a51..0974b7fa 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,6 +30,7 @@ touch "$PHP_INI_PATH";
 
 echo "display_errors = On" >> "$PHP_INI_PATH";
 echo "display_startup_errors = On" >> "$PHP_INI_PATH";
+echo "error_reporting = E_ALL" >> "$PHP_INI_PATH";
 echo "log_errors = On" >> "$PHP_INI_PATH";
 echo "error_log = /var/log/php_error.log" >> "$PHP_INI_PATH";
 

From 3d390144594cc438265f7845edf103ef28791218 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 17:57:46 +0200
Subject: [PATCH 04/18] Fix type hints.

---
 src/Console/Command/Command.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Console/Command/Command.php b/src/Console/Command/Command.php
index a479198e..955c0afc 100644
--- a/src/Console/Command/Command.php
+++ b/src/Console/Command/Command.php
@@ -23,14 +23,14 @@ class Command extends BaseCommand
     /**
      * Input object.
      *
-     * @var use Symfony\Component\Console\Input\InputInterface
+     * @var \Symfony\Component\Console\Input\InputInterface
      */
     protected $input;
 
     /**
      * output object.
      *
-     * @var use Symfony\Component\Console\Input\OutputInterface
+     * @var \Symfony\Component\Console\Output\OutputInterface
      */
     protected $output;
 }

From 6d4fb5a20e293bac8c4125ec58cb135ee3ff8552 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 18:27:47 +0200
Subject: [PATCH 05/18] Type hint improved.

---
 src/EventRunner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EventRunner.php b/src/EventRunner.php
index 338b8b50..4aec7f01 100644
--- a/src/EventRunner.php
+++ b/src/EventRunner.php
@@ -11,7 +11,7 @@ class EventRunner
     /**
      * Schedule objects.
      *
-     * @var array
+     * @var Schedule[]
      */
     protected $schedules = [];
     /**

From 1d471435a9346e05cca471de4b92dde555696051 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 19:26:44 +0200
Subject: [PATCH 06/18] Added configuration to tests env.

---
 tests/crunz.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/crunz.yml

diff --git a/tests/crunz.yml b/tests/crunz.yml
new file mode 100644
index 00000000..a808646e
--- /dev/null
+++ b/tests/crunz.yml
@@ -0,0 +1,22 @@
+source: tasks
+suffix: Tasks.php
+timezone: UTC
+log_errors: false
+errors_log_file: ~
+log_output: false
+output_log_file: ~
+log_allow_line_breaks: false
+email_output: false
+email_errors: false
+mailer:
+    transport: smtp
+    recipients:
+    sender_name:
+    sender_email:
+
+smtp:
+    host: ~
+    port: ~
+    username: ~
+    password: ~
+    encryption: ~

From 8a5c4a12e4b3f47b43733e642c065ec257864749 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 19:27:26 +0200
Subject: [PATCH 07/18] Added null values.

---
 crunz.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/crunz.yml b/crunz.yml
index 703609cf..99b4a23b 100644
--- a/crunz.yml
+++ b/crunz.yml
@@ -11,10 +11,10 @@ source: tasks
 # to make sure all the existing tasks files are renamed accordingly.
 suffix: Tasks.php
 
-# Timezone used to calculate task run date
+# Timezone is used to calculate task run time
 # This option is very important and not setting it is deprecated
 # and will result in exception in 2.0 version.
-timezone: UTC
+timezone: ~
 
 # By default the errors are not logged by Crunz
 # You may set the value to true for logging the errors
@@ -22,7 +22,7 @@ log_errors: false
 
 # This is the absolute path to the errors' log file
 # You need to make sure you have the required permission to write to this file though.
-errors_log_file:
+errors_log_file: ~
 
 # By default the output is not logged as they are redirected to the
 # null output.
@@ -32,7 +32,7 @@ log_output: false
 # This is the absolute path to the global output log file
 # The events which have dedicated log files (defined with them), won't be
 # logged to this file though.
-output_log_file:
+output_log_file: ~
 
 # By default line breaks in logs aren't allowed.
 # Set the value to true to allow them.
@@ -45,7 +45,6 @@ email_output: false
 email_errors: false
 
 # Global Swift Mailer settings
-#
 mailer:
     # Possible values: smtp, mail, and sendmail
     transport: smtp
@@ -55,10 +54,9 @@ mailer:
 
 
 # SMTP settings
-#
 smtp:
-    host:
-    port:
-    username:
-    password:
-    encryption:
+    host: ~
+    port: ~
+    username: ~
+    password: ~
+    encryption: ~

From 2c2324b7f8b044fc0ad57c7d8aa39cfd96c12f2c Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 19:28:12 +0200
Subject: [PATCH 08/18] Added timezone provider.

---
 config/services.xml                  |  6 ++++++
 src/Timezone/Provider.php            | 14 ++++++++++++++
 src/Timezone/ProviderInterface.php   | 11 +++++++++++
 tests/Unit/Timezone/ProviderTest.php | 24 ++++++++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 src/Timezone/Provider.php
 create mode 100644 src/Timezone/ProviderInterface.php
 create mode 100644 tests/Unit/Timezone/ProviderTest.php

diff --git a/config/services.xml b/config/services.xml
index a2de8b59..2dab5e6f 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -127,6 +127,12 @@
             <argument type="service" id="Crunz\Configuration\Configuration"/>
         </service>
 
+        <service
+            class="Crunz\Timezone\Provider"
+            id="Crunz\Timezone\ProviderInterface"
+            public="false"
+        />
+
         <service
             class="Crunz\EventRunner"
             id="Crunz\EventRunner"
diff --git a/src/Timezone/Provider.php b/src/Timezone/Provider.php
new file mode 100644
index 00000000..6ac0200e
--- /dev/null
+++ b/src/Timezone/Provider.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Crunz\Timezone;
+
+final class Provider implements ProviderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function defaultTimezone()
+    {
+        return new \DateTimeZone(\date_default_timezone_get());
+    }
+}
diff --git a/src/Timezone/ProviderInterface.php b/src/Timezone/ProviderInterface.php
new file mode 100644
index 00000000..90a21acb
--- /dev/null
+++ b/src/Timezone/ProviderInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Crunz\Timezone;
+
+interface ProviderInterface
+{
+    /**
+     * @return \DateTimeZone
+     */
+    public function defaultTimezone();
+}
diff --git a/tests/Unit/Timezone/ProviderTest.php b/tests/Unit/Timezone/ProviderTest.php
new file mode 100644
index 00000000..c2ed4487
--- /dev/null
+++ b/tests/Unit/Timezone/ProviderTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Crunz\Tests\Unit\Timezone;
+
+use Crunz\Timezone\Provider;
+use PHPUnit\Framework\TestCase;
+
+class ProviderTest extends TestCase
+{
+    /**
+     * @runInSeparateProcess
+     * @test
+     */
+    public function defaultTimezoneIsReturned()
+    {
+        $timezoneName = 'Europe/Warsaw';
+        \date_default_timezone_set($timezoneName);
+
+        $provider = new Provider();
+        $timezone = $provider->defaultTimezone();
+
+        $this->assertSame($timezoneName, $timezone->getName());
+    }
+}

From 48feccbb610e40e2d5163caf8fd8378f2e60bbbe Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 19:42:55 +0200
Subject: [PATCH 09/18] Added tasks timezone.

---
 config/services.xml   |  9 +++++++++
 src/Task/Timezone.php | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 src/Task/Timezone.php

diff --git a/config/services.xml b/config/services.xml
index 2dab5e6f..d268f507 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -143,5 +143,14 @@
             <argument type="service" id="Crunz\Mailer"/>
             <argument type="service" id="Crunz\Logger\LoggerFactory"/>
         </service>
+
+        <service
+            class="Crunz\Task\Timezone"
+            id="Crunz\Task\Timezone"
+            public="false"
+        >
+            <argument type="service" id="Crunz\Configuration\Configuration"/>
+            <argument type="service" id="Crunz\Timezone\ProviderInterface"/>
+        </service>
     </services>
 </container>
diff --git a/src/Task/Timezone.php b/src/Task/Timezone.php
new file mode 100644
index 00000000..4de01054
--- /dev/null
+++ b/src/Task/Timezone.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Crunz\Task;
+
+use Crunz\Configuration\Configuration;
+use Crunz\Timezone\ProviderInterface;
+
+final class Timezone
+{
+    /** @var Configuration */
+    private $configuration;
+    /** @var ProviderInterface */
+    private $timezoneProvider;
+
+    public function __construct(Configuration $configuration, ProviderInterface $timezoneProvider)
+    {
+        $this->configuration = $configuration;
+        $this->timezoneProvider = $timezoneProvider;
+    }
+
+    public function timezoneForComparisons()
+    {
+        $newTimezone = $this->configuration
+            ->get('timezone')
+        ;
+
+        if (empty($newTimezone)) {
+            @trigger_error(
+                'Timezone is not configured and this is deprecated from 1.7 and will result in exception in 2.0 version. Add `timezone` key to your YAML config file.',
+                E_USER_DEPRECATED
+            );
+
+            $newTimezone = $this->timezoneProvider
+                ->defaultTimezone()
+                ->getName()
+            ;
+        }
+
+        return new \DateTimeZone($newTimezone);
+    }
+}

From 5e9bb6cde809072bdafc504aca49816376356fc2 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 20 May 2018 20:10:50 +0200
Subject: [PATCH 10/18] Require symfony/filesystem.

---
 composer.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index be1f97e9..52a5db83 100644
--- a/composer.json
+++ b/composer.json
@@ -28,18 +28,19 @@
         "php": "^5.6 || ^7.0",
         "guzzlehttp/guzzle": "^6.1",
         "jeremeamia/superclosure": "^2.2",
-        "nikic/php-parser": "^2.1.1 || ^3.0 || ^4.0",
         "monolog/monolog": "^1.19",
         "mtdowling/cron-expression": "^1.1",
         "nesbot/carbon": "^1.21",
+        "nikic/php-parser": "^2.1.1 || ^3.0 || ^4.0",
         "swiftmailer/swiftmailer": "^5.4 || ^6.0",
         "symfony/config": "^2.7 || ^3.3 || ^4.0",
         "symfony/console": "^2.7 || ^3.3 || ^4.0",
         "symfony/dependency-injection": "^2.7 || ^3.3 || ^4.0",
+        "symfony/filesystem": "^2.7 || ^3.3 || ^4.0",
         "symfony/finder": "^2.7 || ^3.3 || ^4.0",
         "symfony/process": "^2.7.11 || ^3.3 || ^4.0",
-        "symfony/yaml": "^2.7 || ^3.3 || ^4.0",
-        "symfony/property-access": "^2.7 || ^3.3 || ^4.0"
+        "symfony/property-access": "^2.7 || ^3.3 || ^4.0",
+        "symfony/yaml": "^2.7 || ^3.3 || ^4.0"
     },
     "require-dev": {
         "ext-mbstring": "*",

From 40d35c350c6715128742abe670596534aaadf435 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 07:00:41 +0200
Subject: [PATCH 11/18] Add composer as a non-privileged user.

---
 Vagrantfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 0974b7fa..382876ad 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -38,7 +38,7 @@ SCRIPT
 
 $composer = <<SCRIPT
 
-COMPOSER_VERSION="1.6.4";
+COMPOSER_VERSION="1.6.5";
 BIN_DIR="/home/vagrant/bin";
 COMPOSER_FILE="$BIN_DIR/composer";
 
@@ -72,5 +72,5 @@ Vagrant.configure("2") do |config|
     end
 
     config.vm.provision "shell", inline: $script
-    config.vm.provision "shell", inline: $composer
+    config.vm.provision "shell", inline: $composer, privileged: false
 end

From 79c6a4854a36887ccdbd1b90231f7c50b96dcc64 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 08:13:32 +0200
Subject: [PATCH 12/18] Added VerbosityAwareOutput.

---
 src/Output/VerbosityAwareOutput.php | 45 +++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/Output/VerbosityAwareOutput.php

diff --git a/src/Output/VerbosityAwareOutput.php b/src/Output/VerbosityAwareOutput.php
new file mode 100644
index 00000000..7240f05e
--- /dev/null
+++ b/src/Output/VerbosityAwareOutput.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Crunz\Output;
+
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @TODO Remove it in Crunz v2.
+ */
+class VerbosityAwareOutput
+{
+    /** @var OutputInterface */
+    private $output;
+
+    public function __construct(OutputInterface $output)
+    {
+        $this->output = $output;
+    }
+
+    public function write($messages, $verbosity = OutputInterface::VERBOSITY_NORMAL)
+    {
+        $commandVerbosity = $this->output
+            ->getVerbosity()
+        ;
+
+        if ($commandVerbosity >= $verbosity) {
+            $this->output
+                ->write($messages)
+            ;
+        }
+    }
+
+    public function writeln($messages, $verbosity = OutputInterface::VERBOSITY_NORMAL)
+    {
+        $commandVerbosity = $this->output
+            ->getVerbosity()
+        ;
+
+        if ($commandVerbosity >= $verbosity) {
+            $this->output
+                ->writeln($messages)
+            ;
+        }
+    }
+}

From 223c8dd1e31a2f02d2679fa65b4d5bf3f3fe84b1 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 08:13:57 +0200
Subject: [PATCH 13/18] Added TODO.

---
 src/Task/Timezone.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Task/Timezone.php b/src/Task/Timezone.php
index 4de01054..f03d9ab6 100644
--- a/src/Task/Timezone.php
+++ b/src/Task/Timezone.php
@@ -24,6 +24,7 @@ public function timezoneForComparisons()
             ->get('timezone')
         ;
 
+        /* @TODO Throw Exception in Crunz v2. */
         if (empty($newTimezone)) {
             @trigger_error(
                 'Timezone is not configured and this is deprecated from 1.7 and will result in exception in 2.0 version. Add `timezone` key to your YAML config file.',

From 6a387509227d86db63994fd539c379ad0be27cf0 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 08:14:38 +0200
Subject: [PATCH 14/18] Improved type hint.

---
 src/Event.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Event.php b/src/Event.php
index 48489786..f435bf00 100644
--- a/src/Event.php
+++ b/src/Event.php
@@ -6,6 +6,7 @@
 use Closure;
 use Cron\CronExpression;
 use Crunz\Exception\NotImplementedException;
+use Crunz\Logger\Logger;
 use GuzzleHttp\Client as HttpClient;
 use SuperClosure\Serializer;
 use Symfony\Component\Process\Process;
@@ -56,7 +57,7 @@ class Event
     /**
      * Event personal logger instance.
      *
-     * @var string
+     * @var Logger
      */
     public $logger;
     /**

From 8bce9f187a9c3cd7d61c2c25290d616752051992 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 08:15:04 +0200
Subject: [PATCH 15/18] Added deprecation handler.

---
 src/Application.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/Application.php b/src/Application.php
index 5b061338..9891e9b9 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -5,6 +5,11 @@
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Console\Application as SymfonyApplication;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -63,6 +68,21 @@ public function __construct($appName, $appVersion)
         }
     }
 
+    public function run(InputInterface $input = null, OutputInterface $output = null)
+    {
+        if ($output === null) {
+            $output = new ConsoleOutput();
+        }
+
+        if (null === $input) {
+            $input = new ArgvInput();
+        }
+
+        $this->registerDeprecationHandler($input, $output);
+
+        return parent::run($input, $output);
+    }
+
     private function initializeContainer()
     {
         $class = 'CrunzContainer';
@@ -138,6 +158,9 @@ private function dumpContainer(
         $cache->write($content, $container->getResources());
     }
 
+    /**
+     * @return string
+     */
     private function getCacheDir()
     {
         return implode(
@@ -148,4 +171,26 @@ private function getCacheDir()
             ]
         );
     }
+
+    private function registerDeprecationHandler(InputInterface $input, OutputInterface $output)
+    {
+        $io = new SymfonyStyle($input, $output);
+        \set_error_handler(
+            function (
+                $errorNumber,
+                $errorString,
+                $file,
+                $line
+            ) use ($io) {
+                $io->block(
+                    "{$errorString} File {$file}, line {$line}",
+                    'Deprecation',
+                    'bg=yellow;fg=black',
+                    ' ',
+                    true
+                );
+            },
+            E_USER_DEPRECATED
+        );
+    }
 }

From a90043d430f1bb392381ebd55884b19d6e4133d6 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 08:17:29 +0200
Subject: [PATCH 16/18] Make calculation task's run date aware of timezone.

---
 config/services.xml                        |  1 +
 src/Console/Command/ScheduleRunCommand.php | 17 ++++++++++--
 src/Event.php                              |  7 ++---
 src/Schedule.php                           | 30 ++++++++++++++-------
 tests/Functional/ConfigProviderTest.php    | 23 ++++++++++++++++
 tests/Unit/EventTest.php                   | 31 +++++++++++++---------
 6 files changed, 82 insertions(+), 27 deletions(-)
 create mode 100644 tests/Functional/ConfigProviderTest.php

diff --git a/config/services.xml b/config/services.xml
index d268f507..40c9601b 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -13,6 +13,7 @@
             <argument type="service" id="Crunz\Task\Collection"/>
             <argument type="service" id="Crunz\Configuration\Configuration"/>
             <argument type="service" id="Crunz\EventRunner"/>
+            <argument type="service" id="Crunz\Task\Timezone"/>
         </service>
 
         <service
diff --git a/src/Console/Command/ScheduleRunCommand.php b/src/Console/Command/ScheduleRunCommand.php
index 84409252..3b36feac 100644
--- a/src/Console/Command/ScheduleRunCommand.php
+++ b/src/Console/Command/ScheduleRunCommand.php
@@ -6,6 +6,7 @@
 use Crunz\EventRunner;
 use Crunz\Schedule;
 use Crunz\Task\Collection;
+use Crunz\Task\Timezone;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -24,15 +25,19 @@ class ScheduleRunCommand extends Command
     private $configuration;
     /** @var EventRunner */
     private $eventRunner;
+    /** @var Timezone */
+    private $taskTimezone;
 
     public function __construct(
         Collection $taskCollection,
         Configuration $configuration,
-        EventRunner $eventRunner
+        EventRunner $eventRunner,
+        Timezone $taskTimezone
     ) {
         $this->taskCollection = $taskCollection;
         $this->configuration = $configuration;
         $this->eventRunner = $eventRunner;
+        $this->taskTimezone = $taskTimezone;
 
         parent::__construct();
     }
@@ -81,6 +86,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // List of schedules
         $schedules = [];
 
+        $tasksTimezone = $this->taskTimezone
+            ->timezoneForComparisons()
+        ;
+
         foreach ($files as $file) {
             $schedule = require $file->getRealPath();
             if (!$schedule instanceof Schedule) {
@@ -88,7 +97,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             // We keep the events which are due and dismiss the rest.
-            $schedule->events($schedule->dueEvents());
+            $schedule->events(
+                $schedule->dueEvents(
+                    $tasksTimezone
+                )
+            );
 
             if (count($schedule->events())) {
                 $schedules[] = $schedule;
diff --git a/src/Event.php b/src/Event.php
index f435bf00..ce52f1ae 100644
--- a/src/Event.php
+++ b/src/Event.php
@@ -256,9 +256,9 @@ public function isClosure()
      *
      * @return bool
      */
-    public function isDue()
+    public function isDue(\DateTimeZone $timeZone)
     {
-        return $this->expressionPasses() && $this->filtersPass();
+        return $this->expressionPasses($timeZone) && $this->filtersPass();
     }
 
     /**
@@ -1103,9 +1103,10 @@ protected function serializeClosure($closure)
      *
      * @return bool
      */
-    protected function expressionPasses()
+    protected function expressionPasses(\DateTimeZone $timeZone)
     {
         $date = Carbon::now();
+        $date->setTimezone($timeZone);
 
         if ($this->timezone) {
             $date->setTimezone($this->timezone);
diff --git a/src/Schedule.php b/src/Schedule.php
index 60aa7533..d001cea9 100644
--- a/src/Schedule.php
+++ b/src/Schedule.php
@@ -172,7 +172,7 @@ public function errorCallbacks()
      */
     public function events(array $events = null)
     {
-        if (!is_null($events)) {
+        if ($events !== null) {
             return $this->events = $events;
         }
 
@@ -184,11 +184,14 @@ public function events(array $events = null)
      *
      * @return array
      */
-    public function dueEvents()
+    public function dueEvents(\DateTimeZone $timeZone)
     {
-        return array_filter($this->events, function ($event) {
-            return $event->isDue();
-        });
+        return \array_filter(
+            $this->events,
+            function (Event $event) use ($timeZone) {
+                return $event->isDue($timeZone);
+            }
+        );
     }
 
     /**
@@ -213,8 +216,8 @@ public function dismissEvent($key)
     protected function id()
     {
         while (true) {
-            $id = uniqid();
-            if (!array_key_exists($id, $this->events)) {
+            $id = \uniqid('crunz', true);
+            if (!\array_key_exists($id, $this->events)) {
                 return $id;
             }
         }
@@ -229,8 +232,15 @@ protected function id()
      */
     protected function compileParameters(array $parameters)
     {
-        return implode(' ', array_map(function ($value, $key) {
-            return is_numeric($key) ? $value : $key . '=' . (is_numeric($value) ? $value : ProcessUtils::escapeArgument($value));
-        }, $parameters, array_keys($parameters)));
+        return implode(
+            ' ',
+            \array_map(
+                function ($value, $key) {
+                    return \is_numeric($key) ? $value : "{$key}=" . (\is_numeric($value) ? $value : ProcessUtils::escapeArgument($value));
+                },
+                $parameters,
+                \array_keys($parameters)
+            )
+        );
     }
 }
diff --git a/tests/Functional/ConfigProviderTest.php b/tests/Functional/ConfigProviderTest.php
new file mode 100644
index 00000000..f62b3169
--- /dev/null
+++ b/tests/Functional/ConfigProviderTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Crunz\Tests\Functional;
+
+use Crunz\Application;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class ConfigProviderTest extends TestCase
+{
+    /** @test */
+    public function configAlreadyExists()
+    {
+        $application = new Application('Crunz', '0.1.0-test.1');
+        $command = $application->get('publish:config');
+
+        $commandTester = new CommandTester($command);
+        $returnCode = $commandTester->execute([]);
+
+        $this->assertSame(0, $returnCode);
+        $this->assertContains('The configuration file already exists at', $commandTester->getDisplay());
+    }
+}
diff --git a/tests/Unit/EventTest.php b/tests/Unit/EventTest.php
index 6d4f066e..1de854cf 100644
--- a/tests/Unit/EventTest.php
+++ b/tests/Unit/EventTest.php
@@ -25,7 +25,7 @@ class EventTest extends TestCase
 
     public function setUp()
     {
-        $this->id = uniqid();
+        $this->id = \uniqid('crunz', true);
 
         $this->defaultTimezone = date_default_timezone_get();
         date_default_timezone_set('UTC');
@@ -58,7 +58,7 @@ public function testDynamicMethods()
         $e->everyFiftyMinutes()->mondays();
 
         $this->assertEquals('*/50 * * * 1 *', $e->getExpression());
-        $this->assertFalse($e->isDue());
+        $this->assertFalse($e->isDue(new \DateTimeZone('UTC')));
     }
 
     /**
@@ -98,6 +98,8 @@ public function testUnitMethods()
      */
     public function testLowLevelMethods()
     {
+        $timezone = new \DateTimeZone('UTC');
+
         $e = new Event($this->id, 'php foo');
         $this->assertEquals('30 1 11 4 * *', $e->on('01:30 11-04-2016')->getExpression());
 
@@ -121,7 +123,7 @@ public function testLowLevelMethods()
         $this->assertEquals('45 13 * * * *', $e->cron('45 13 * * * *')->getExpression());
 
         $e = new Event($this->id, 'php foo');
-        $this->assertTrue($e->isDue());
+        $this->assertTrue($e->isDue($timezone));
     }
 
     /**
@@ -150,29 +152,33 @@ public function testWeekdayMethods()
 
     public function testCronLifeTime()
     {
+        $timezone = new \DateTimeZone('UTC');
+
         $e = new Event($this->id, 'php foo');
-        $this->assertFalse($e->cron('* * * * * *')->between('1-1-2015', '1-2-2015')->isDue());
+        $this->assertFalse($e->cron('* * * * * *')->between('1-1-2015', '1-2-2015')->isDue($timezone));
 
         $e = new Event($this->id, 'php foo');
-        $this->assertFalse($e->cron('* * * * * *')->from('01-01-2048')->isDue());
+        $this->assertFalse($e->cron('* * * * * *')->from('01-01-2048')->isDue($timezone));
 
         $e = new Event($this->id, 'php foo');
-        $this->assertFalse($e->cron('* * * * * *')->to('01-01-2015')->isDue());
+        $this->assertFalse($e->cron('* * * * * *')->to('01-01-2015')->isDue($timezone));
     }
 
     public function testCronConditions()
     {
+        $timezone = new \DateTimeZone('UTC');
+
         $e = new Event($this->id, 'php foo');
-        $this->assertFalse($e->cron('* * * * * *')->when(function () { return false; })->isDue());
+        $this->assertFalse($e->cron('* * * * * *')->when(function () { return false; })->isDue($timezone));
 
         $e = new Event($this->id, 'php foo');
-        $this->assertTrue($e->cron('* * * * * *')->when(function () { return true; })->isDue());
+        $this->assertTrue($e->cron('* * * * * *')->when(function () { return true; })->isDue($timezone));
 
         $e = new Event($this->id, 'php foo');
-        $this->assertFalse($e->cron('* * * * * *')->skip(function () { return true; })->isDue());
+        $this->assertFalse($e->cron('* * * * * *')->skip(function () { return true; })->isDue($timezone));
 
         $e = new Event($this->id, 'php foo');
-        $this->assertTrue($e->cron('* * * * * *')->skip(function () { return false; })->isDue());
+        $this->assertTrue($e->cron('* * * * * *')->skip(function () { return false; })->isDue($timezone));
     }
 
     public function testBuildCommand()
@@ -185,13 +191,14 @@ public function testBuildCommand()
     public function testIsDue()
     {
         Carbon::setTestNow(Carbon::create(2015, 4, 12, 0, 0, 0));
+        $timezone = new \DateTimeZone('UTC');
 
         $e = new Event($this->id, 'php foo');
-        $this->assertTrue($e->sundays()->isDue());
+        $this->assertTrue($e->sundays()->isDue($timezone));
 
         $e = new Event($this->id, 'php bar');
         $this->assertEquals('0 19 * * 6 *', $e->saturdays()->at('19:00')->timezone('EST')->getExpression());
-        $this->assertTrue($e->isDue());
+        $this->assertTrue($e->isDue($timezone));
     }
 
     public function testName()

From c0b85d520345abef7ce85994a6fab638b2572000 Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 08:18:30 +0200
Subject: [PATCH 17/18] Ask about timezone while generating config file.

---
 README.md                                     |   5 +
 config/services.xml                           |   7 +
 .../Command/ConfigGeneratorCommand.php        | 126 +++++++++++++++---
 3 files changed, 119 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index a644790e..7fae36ea 100644
--- a/README.md
+++ b/README.md
@@ -460,6 +460,11 @@ source: tasks
 # to make sure all the existing tasks files are renamed accordingly.
 suffix: Tasks.php
 
+# Timezone is used to calculate task run time
+# This option is very important and not setting it is deprecated
+# and will result in exception in 2.0 version.
+timezone: ~
+
 # By default the errors are not logged by Crunz
 # You may set the value to true for logging the errors
 log_errors: false
diff --git a/config/services.xml b/config/services.xml
index 40c9601b..472d73cd 100644
--- a/config/services.xml
+++ b/config/services.xml
@@ -28,6 +28,8 @@
             id="Crunz\Console\Command\ConfigGeneratorCommand"
             public="true"
         >
+            <argument type="service" id="Crunz\Timezone\ProviderInterface"/>
+            <argument type="service" id="Symfony\Component\Filesystem\Filesystem"/>
         </service>
 
         <service
@@ -145,6 +147,11 @@
             <argument type="service" id="Crunz\Logger\LoggerFactory"/>
         </service>
 
+        <service
+            class="Symfony\Component\Filesystem\Filesystem"
+            id="Symfony\Component\Filesystem\Filesystem"
+        />
+
         <service
             class="Crunz\Task\Timezone"
             id="Crunz\Task\Timezone"
diff --git a/src/Console/Command/ConfigGeneratorCommand.php b/src/Console/Command/ConfigGeneratorCommand.php
index 33f72765..838ea048 100644
--- a/src/Console/Command/ConfigGeneratorCommand.php
+++ b/src/Console/Command/ConfigGeneratorCommand.php
@@ -2,45 +2,133 @@
 
 namespace Crunz\Console\Command;
 
+use Crunz\Output\VerbosityAwareOutput;
+use Crunz\Timezone\ProviderInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Filesystem\Filesystem;
 
 class ConfigGeneratorCommand extends Command
 {
+    /** @var ProviderInterface */
+    private $timezoneProvider;
+    /** @var Filesystem */
+    private $filesystem;
+
+    public function __construct(ProviderInterface $timezoneProvider, Filesystem $filesystem)
+    {
+        $this->timezoneProvider = $timezoneProvider;
+        $this->filesystem = $filesystem;
+
+        parent::__construct();
+    }
+
     /**
      * Configures the current command.
      */
     protected function configure()
     {
-        $this->setName('publish:config')
-            ->setDescription('Generates a config file within the project\'s root directory.')
-            ->setHelp('This generates a config file in YML format within the project\'s root directory.');
+        $this
+            ->setName('publish:config')
+            ->setDescription("Generates a config file within the project's root directory.")
+            ->setHelp("This generates a config file in YML format within the project's root directory.")
+        ;
     }
 
     /**
-     * Executes the current command.
-     *
-     * @param use Symfony\Component\Console\Input\InputInterface $input
-     * @param use Symfony\Component\Console\Input\OutputIterface $output
-     *
-     * @return null|int null or 0 if everything went fine, or an error code
+     * {@inheritdoc}
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $filename = getbase() . '/crunz.yml';
+        $verbosityAwareOutput = new VerbosityAwareOutput($output);
+        $symfonyStyleIo = new SymfonyStyle($input, $output);
 
-        if (file_exists($filename)) {
-            $output->writeln('<comment>The configuration file already exists.</comment>');
-            exit();
+        $path = getbase() . '/crunz.yml';
+        $destination = \realpath($path) ?: $path;
+        $configExists = $this->filesystem
+            ->exists($destination)
+        ;
+
+        $verbosityAwareOutput->writeln(
+            "<info>Destination config file: '{$destination}'.</info>",
+            OutputInterface::VERBOSITY_VERBOSE
+        );
+
+        if ($configExists) {
+            $verbosityAwareOutput->writeln(
+                "<comment>The configuration file already exists at '{$destination}'.</comment>"
+            );
+
+            return 0;
         }
 
         $src = __DIR__ . '/../../../crunz.yml';
-        if (copy($src, $filename)) {
-            $output->writeln('<info>The configuration file was generated successfully.</info>');
-            exit();
-        }
+        $verbosityAwareOutput->writeln(
+            "<info>Source config file: '{$src}'.</info>",
+            OutputInterface::VERBOSITY_VERBOSE
+        );
+        $defaultTimezone = $this->askForTimezone($symfonyStyleIo);
+        $verbosityAwareOutput->writeln(
+            "<info>Provided timezone: '{$defaultTimezone}'.</info>",
+            OutputInterface::VERBOSITY_VERBOSE
+        );
+
+        $this->updateTimezone(
+            $destination,
+            $src,
+            $defaultTimezone
+        );
+
+        $output->writeln('<info>The configuration file was generated successfully.</info>');
+
+        return 0;
+    }
+
+    /**
+     * @return string
+     */
+    protected function askForTimezone(SymfonyStyle $symfonyStyleIo)
+    {
+        $defaultTimezone = $this->timezoneProvider
+            ->defaultTimezone()
+            ->getName()
+        ;
+        $question = new Question(
+            '<question>Please provide default timezone for task run date calculations</question>',
+            $defaultTimezone
+        );
+        $question->setAutocompleterValues(\DateTimeZone::listIdentifiers());
+        $question->setValidator(
+            function ($answer) {
+                try {
+                    new \DateTimeZone($answer);
+                } catch (\Exception $exception) {
+                    throw new \Exception("Timezone '{$answer}' is not valid. Please provide valid timezone.");
+                }
+
+                return $answer;
+            }
+        );
+
+        return $symfonyStyleIo->askQuestion($question);
+    }
 
-        $output->writeln('<comment>There was a problem when generating the file.</comment>');
-        exit();
+    private function updateTimezone(
+        $destination,
+        $src,
+        $timezone
+    ) {
+        $this->filesystem
+            ->dumpFile(
+                $destination,
+                \str_replace(
+                    'timezone: ~',
+                    "timezone: {$timezone}",
+                    \file_get_contents($src)
+                )
+            )
+        ;
     }
 }

From a8c9db465e9885f7236917b9462f171dab15898d Mon Sep 17 00:00:00 2001
From: pkowalczyk <11366345+PabloKowalczyk@users.noreply.github.com>
Date: Sun, 27 May 2018 08:24:50 +0200
Subject: [PATCH 18/18] Updated changelog.

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89bfa317..9e7ec8ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+- `timezone` option to config file - PR [#94](https://github.com/lavary/crunz/pull/94),
+[@PabloKowalczyk](https://github.com/PabloKowalczyk)
+
+### Deprecated
+- `timezone` option in config file is now required,
+lack of it will result in Exception in version `2.0`
+
 ## 1.6.1 - 2018-05-13
 
 ### Fixed