From 4d626fa80cd2052f33e797b195c79df95e03d0b2 Mon Sep 17 00:00:00 2001
From: Max Podolian <max@prenohq.com>
Date: Sat, 10 Oct 2015 14:58:02 +1300
Subject: [PATCH 1/4] Add a configuration step to check that the default
 timezone is set (issue #119)

---
 src/Application/config.php                    |  1 +
 src/Module/Config/Step/SetDefaultTimezone.php | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 src/Module/Config/Step/SetDefaultTimezone.php

diff --git a/src/Application/config.php b/src/Application/config.php
index 136ad81c..ba7083f8 100644
--- a/src/Application/config.php
+++ b/src/Application/config.php
@@ -9,6 +9,7 @@
         DI\get('Couscous\Module\Config\Step\SetDefaultConfig'),
         DI\get('Couscous\Module\Config\Step\LoadConfig'),
         DI\get('Couscous\Module\Config\Step\OverrideBaseUrlForPreview'),
+        DI\get('Couscous\Module\Config\Step\SetDefaultTimezone'),
 
         DI\get('Couscous\Module\Scripts\Step\ExecuteBeforeScripts'),
 
diff --git a/src/Module/Config/Step/SetDefaultTimezone.php b/src/Module/Config/Step/SetDefaultTimezone.php
new file mode 100644
index 00000000..e148bc7d
--- /dev/null
+++ b/src/Module/Config/Step/SetDefaultTimezone.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Couscous\Module\Config\Step;
+
+use Couscous\Model\Project;
+use Couscous\Step;
+
+/**
+ * Set the default timezone if one is missing, to prevent PHP warnings.
+ *
+ * @author Max Podolian <max.podolian@gmail.com>
+ */
+class SetDefaultTimezone implements Step
+{
+    const DEFAULT_TIMEZONE = 'UTC';
+
+    public function __invoke(Project $project)
+    {
+        if ($this->timezoneNotSet()) {
+            date_default_timezone_set(self::DEFAULT_TIMEZONE);
+        }
+    }
+
+    private function timezoneNotSet()
+    {
+        return ! ini_get('date.timezone');
+    }
+
+
+}

From 713ec0718029d607cd1541772f0c913605304640 Mon Sep 17 00:00:00 2001
From: Max Podolian <max@prenohq.com>
Date: Sat, 10 Oct 2015 15:07:13 +1300
Subject: [PATCH 2/4] Formatting fix to keep StyleCI happy

---
 src/Module/Config/Step/SetDefaultTimezone.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Module/Config/Step/SetDefaultTimezone.php b/src/Module/Config/Step/SetDefaultTimezone.php
index e148bc7d..fd5b5dfc 100644
--- a/src/Module/Config/Step/SetDefaultTimezone.php
+++ b/src/Module/Config/Step/SetDefaultTimezone.php
@@ -23,7 +23,7 @@ public function __invoke(Project $project)
 
     private function timezoneNotSet()
     {
-        return ! ini_get('date.timezone');
+        return !ini_get('date.timezone');
     }
 
 

From ff1ed974dc4752fa515093666f0174d4b2ea9876 Mon Sep 17 00:00:00 2001
From: Max Podolian <max@prenohq.com>
Date: Sat, 10 Oct 2015 15:14:45 +1300
Subject: [PATCH 3/4] Remove trailing line breaks, to adhere to styling
 requirements

---
 src/Module/Config/Step/SetDefaultTimezone.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Module/Config/Step/SetDefaultTimezone.php b/src/Module/Config/Step/SetDefaultTimezone.php
index fd5b5dfc..9caa6858 100644
--- a/src/Module/Config/Step/SetDefaultTimezone.php
+++ b/src/Module/Config/Step/SetDefaultTimezone.php
@@ -25,6 +25,4 @@ private function timezoneNotSet()
     {
         return !ini_get('date.timezone');
     }
-
-
 }

From 6cbf50c527428adf0f481ba193bcb843b5841dd1 Mon Sep 17 00:00:00 2001
From: Max Podolian <max@prenohq.com>
Date: Sun, 11 Oct 2015 16:42:26 +1300
Subject: [PATCH 4/4] Set default timezone configuration in the index file.

---
 bin/couscous                                  |  4 +++
 src/Application/config.php                    |  1 -
 src/Module/Config/Step/SetDefaultTimezone.php | 28 -------------------
 3 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 src/Module/Config/Step/SetDefaultTimezone.php

diff --git a/bin/couscous b/bin/couscous
index bf2cbd57..b19dd4d9 100755
--- a/bin/couscous
+++ b/bin/couscous
@@ -14,6 +14,10 @@ if (version_compare(phpversion(), '5.4', '<')) {
     die('You must use PHP >= 5.4 in order to use Couscous. Please upgrade your PHP version.');
 }
 
+if (!ini_get('date.timezone')) {
+    date_default_timezone_set('UTC');
+}
+
 // Phar
 if (isset($include)) {
     require_once $include . '/vendor/autoload.php';
diff --git a/src/Application/config.php b/src/Application/config.php
index ba7083f8..136ad81c 100644
--- a/src/Application/config.php
+++ b/src/Application/config.php
@@ -9,7 +9,6 @@
         DI\get('Couscous\Module\Config\Step\SetDefaultConfig'),
         DI\get('Couscous\Module\Config\Step\LoadConfig'),
         DI\get('Couscous\Module\Config\Step\OverrideBaseUrlForPreview'),
-        DI\get('Couscous\Module\Config\Step\SetDefaultTimezone'),
 
         DI\get('Couscous\Module\Scripts\Step\ExecuteBeforeScripts'),
 
diff --git a/src/Module/Config/Step/SetDefaultTimezone.php b/src/Module/Config/Step/SetDefaultTimezone.php
deleted file mode 100644
index 9caa6858..00000000
--- a/src/Module/Config/Step/SetDefaultTimezone.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Couscous\Module\Config\Step;
-
-use Couscous\Model\Project;
-use Couscous\Step;
-
-/**
- * Set the default timezone if one is missing, to prevent PHP warnings.
- *
- * @author Max Podolian <max.podolian@gmail.com>
- */
-class SetDefaultTimezone implements Step
-{
-    const DEFAULT_TIMEZONE = 'UTC';
-
-    public function __invoke(Project $project)
-    {
-        if ($this->timezoneNotSet()) {
-            date_default_timezone_set(self::DEFAULT_TIMEZONE);
-        }
-    }
-
-    private function timezoneNotSet()
-    {
-        return !ini_get('date.timezone');
-    }
-}