From e33bef7b21b30ab0f5fe27571a9fd3b7e667d11a Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sun, 12 Jan 2020 21:41:17 +0100 Subject: [PATCH] Fix timezone related stuff --- docker/php/Dockerfile | 1 + src/Provider/ZtmGdansk/ZtmGdanskDepartureRepository.php | 2 +- src/Service/VersionExtension.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 01f1487..6142fa0 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -8,6 +8,7 @@ RUN docker-php-ext-install zip RUN pecl install xdebug-2.9.0 && docker-php-ext-enable xdebug RUN echo "xdebug.remote_enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; +RUN echo "date.timezone = Europe/Warsaw" >> /usr/local/etc/php/conf.d/datetime.ini; RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" RUN php composer-setup.php diff --git a/src/Provider/ZtmGdansk/ZtmGdanskDepartureRepository.php b/src/Provider/ZtmGdansk/ZtmGdanskDepartureRepository.php index 408f719..9f5530b 100644 --- a/src/Provider/ZtmGdansk/ZtmGdanskDepartureRepository.php +++ b/src/Provider/ZtmGdansk/ZtmGdanskDepartureRepository.php @@ -60,7 +60,7 @@ class ZtmGdanskDepartureRepository implements DepartureRepository $lines = $this->lines->getManyById($lines)->keyBy(t\property('id')); return collect($estimates)->map(function ($delay) use ($stop, $lines) { - $scheduled = (new Carbon($delay['theoreticalTime'], 'Europe/Warsaw'))->tz('UTC'); + $scheduled = (new Carbon($delay['theoreticalTime'], 'Europe/Warsaw')); $estimated = (clone $scheduled)->addSeconds($delay['delayInSeconds']); return Departure::createFromArray([ diff --git a/src/Service/VersionExtension.php b/src/Service/VersionExtension.php index 0b32a8d..45ae2c1 100644 --- a/src/Service/VersionExtension.php +++ b/src/Service/VersionExtension.php @@ -11,7 +11,7 @@ class VersionExtension extends AbstractExtension { return [ new TwigFunction('version', function () { - return substr(`git rev-parse HEAD`, 0, 8) ?: '0.2-dev'; + return substr(`git rev-parse HEAD`, 0, 8) ?: '0.2'; }) ]; }