From 1a2cad97ebee105c21aa133717d302d9d88ece90 Mon Sep 17 00:00:00 2001 From: tuj Date: Fri, 25 Oct 2019 13:21:51 +0200 Subject: [PATCH] Fixed issue with campaign time (#23) --- CHANGELOG.md | 5 +++++ app/AppKernel.php | 7 +++++++ composer.lock | 10 +++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3153d7b39..a1349c72a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 6.1.3 + +* Fixed UTC in AppKernel.php. +* Updated os2display/screen-bundle: 1.1.3 + ## 6.1.2 * Added fallback_image config. diff --git a/app/AppKernel.php b/app/AppKernel.php index 2039ff0eb..6f5023bd0 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -78,4 +78,11 @@ public function registerContainerConfiguration(LoaderInterface $loader) }); $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml'); } + + public function __construct($environment, $debug) + { + // Force the timezone to be UTC. + date_default_timezone_set('UTC'); + parent::__construct($environment, $debug); + } } diff --git a/composer.lock b/composer.lock index dc33f8a4b..9d246159a 100644 --- a/composer.lock +++ b/composer.lock @@ -2992,16 +2992,16 @@ }, { "name": "os2display/screen-bundle", - "version": "1.1.1", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/os2display/screen-bundle.git", - "reference": "77098ef975605309e3b55200e6a5cd17583353f4" + "reference": "f50c9b4b40afd5c0b63e6de18afe8f26db9379d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/os2display/screen-bundle/zipball/77098ef975605309e3b55200e6a5cd17583353f4", - "reference": "77098ef975605309e3b55200e6a5cd17583353f4", + "url": "https://api.github.com/repos/os2display/screen-bundle/zipball/f50c9b4b40afd5c0b63e6de18afe8f26db9379d9", + "reference": "f50c9b4b40afd5c0b63e6de18afe8f26db9379d9", "shasum": "" }, "type": "symfony-bundle", @@ -3015,7 +3015,7 @@ "MPL-2.0" ], "description": "Os2Display screen", - "time": "2019-10-24T07:42:44+00:00" + "time": "2019-10-24T12:55:39+00:00" }, { "name": "paragonie/random_compat",