From 064a1750279be244f86cf24f29749b391b11f1dd Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 1 Dec 2019 22:10:10 +0100
Subject: Renamed GuzzleServiceProvider to HttpClientServiceProvider, fixed
 translation and import error

---
 config/app.php                                    |  2 +-
 includes/pages/schedule/ImportSchedule.php        |  3 ++-
 resources/lang/de_DE/default.po                   |  2 +-
 src/Http/GuzzleServiceProvider.php                | 25 -------------------
 src/Http/HttpClientServiceProvider.php            | 25 +++++++++++++++++++
 tests/Unit/Http/GuzzleServiceProviderTest.php     | 29 -----------------------
 tests/Unit/Http/HttpClientServiceProviderTest.php | 29 +++++++++++++++++++++++
 7 files changed, 58 insertions(+), 57 deletions(-)
 delete mode 100644 src/Http/GuzzleServiceProvider.php
 create mode 100644 src/Http/HttpClientServiceProvider.php
 delete mode 100644 tests/Unit/Http/GuzzleServiceProviderTest.php
 create mode 100644 tests/Unit/Http/HttpClientServiceProviderTest.php

diff --git a/config/app.php b/config/app.php
index e1001900..8ede567e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -31,7 +31,7 @@ return [
         // Additional services
         \Engelsystem\Helpers\VersionServiceProvider::class,
         \Engelsystem\Mail\MailerServiceProvider::class,
-        \Engelsystem\Http\GuzzleServiceProvider::class,
+        \Engelsystem\Http\HttpClientServiceProvider::class,
     ],
 
     // Application middleware
diff --git a/includes/pages/schedule/ImportSchedule.php b/includes/pages/schedule/ImportSchedule.php
index 8bc769d4..136f1816 100644
--- a/includes/pages/schedule/ImportSchedule.php
+++ b/includes/pages/schedule/ImportSchedule.php
@@ -451,13 +451,14 @@ class ImportSchedule extends BaseController
             $guid = $shift->guid;
             $shift = $this->loadShift($shift->shift_id);
             $event = $scheduleEvents[$guid];
+            $room = $rooms->where('name', $event->getRoom()->getName())->first();
 
             if (
                 $shift->title != $event->getTitle()
                 || $shift->shift_type_id != $shiftType
                 || Carbon::createFromTimestamp($shift->start) != $event->getDate()
                 || Carbon::createFromTimestamp($shift->end) != $event->getEndDate()
-                || $shift->room_id != $rooms->where('name', $event->getRoom()->getName())->first()->id
+                || $shift->room_id != ($room->id ?? '')
                 || $shift->url != $event->getUrl()
             ) {
                 $changeEvents[$guid] = $event;
diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po
index d5f30f22..7f017f13 100644
--- a/resources/lang/de_DE/default.po
+++ b/resources/lang/de_DE/default.po
@@ -2817,7 +2817,7 @@ msgid "schedule.import.title"
 msgstr "Programm importieren"
 
 msgid "schedule.import.text"
-msgstr "Dieser Import erstellt Räume and erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes."
+msgstr "Dieser Import erstellt Räume und erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes."
 
 msgid "schedule.import.load.title"
 msgstr "Programm importieren: Vorschau"
diff --git a/src/Http/GuzzleServiceProvider.php b/src/Http/GuzzleServiceProvider.php
deleted file mode 100644
index f81a91f5..00000000
--- a/src/Http/GuzzleServiceProvider.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Engelsystem\Http;
-
-use Engelsystem\Container\ServiceProvider;
-use GuzzleHttp\Client as GuzzleClient;
-
-class GuzzleServiceProvider extends ServiceProvider
-{
-    public function register()
-    {
-        $this->app->when(GuzzleClient::class)
-            ->needs('$config')
-            ->give(
-                function () {
-                    return [
-                        // No exception on >= 400 responses
-                        'http_errors' => false,
-                        // Wait max n seconds for a response
-                        'timeout'     => 2.0,
-                    ];
-                }
-            );
-    }
-}
diff --git a/src/Http/HttpClientServiceProvider.php b/src/Http/HttpClientServiceProvider.php
new file mode 100644
index 00000000..113af713
--- /dev/null
+++ b/src/Http/HttpClientServiceProvider.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Engelsystem\Http;
+
+use Engelsystem\Container\ServiceProvider;
+use GuzzleHttp\Client as GuzzleClient;
+
+class HttpClientServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        $this->app->when(GuzzleClient::class)
+            ->needs('$config')
+            ->give(
+                function () {
+                    return [
+                        // No exception on >= 400 responses
+                        'http_errors' => false,
+                        // Wait max n seconds for a response
+                        'timeout'     => 2.0,
+                    ];
+                }
+            );
+    }
+}
diff --git a/tests/Unit/Http/GuzzleServiceProviderTest.php b/tests/Unit/Http/GuzzleServiceProviderTest.php
deleted file mode 100644
index 4d3c938b..00000000
--- a/tests/Unit/Http/GuzzleServiceProviderTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Engelsystem\Test\Unit\Http;
-
-use Engelsystem\Application;
-use Engelsystem\Http\GuzzleServiceProvider;
-use Engelsystem\Test\Unit\ServiceProviderTest;
-use GuzzleHttp\Client as GuzzleClient;
-
-class GuzzleServiceProviderTest extends ServiceProviderTest
-{
-    /**
-     * @covers \Engelsystem\Http\GuzzleServiceProvider::register
-     */
-    public function testRegister()
-    {
-        $app = new Application();
-
-        $serviceProvider = new GuzzleServiceProvider($app);
-        $serviceProvider->register();
-
-        /** @var GuzzleClient $guzzle */
-        $guzzle = $app->make(GuzzleClient::class);
-        $config = $guzzle->getConfig();
-
-        $this->assertFalse($config['http_errors']);
-        $this->assertArrayHasKey('timeout', $config);
-    }
-}
diff --git a/tests/Unit/Http/HttpClientServiceProviderTest.php b/tests/Unit/Http/HttpClientServiceProviderTest.php
new file mode 100644
index 00000000..7dfc0a3e
--- /dev/null
+++ b/tests/Unit/Http/HttpClientServiceProviderTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http;
+
+use Engelsystem\Application;
+use Engelsystem\Http\HttpClientServiceProvider;
+use Engelsystem\Test\Unit\ServiceProviderTest;
+use GuzzleHttp\Client as GuzzleClient;
+
+class HttpClientServiceProviderTest extends ServiceProviderTest
+{
+    /**
+     * @covers \Engelsystem\Http\HttpClientServiceProvider::register
+     */
+    public function testRegister()
+    {
+        $app = new Application();
+
+        $serviceProvider = new HttpClientServiceProvider($app);
+        $serviceProvider->register();
+
+        /** @var GuzzleClient $guzzle */
+        $guzzle = $app->make(GuzzleClient::class);
+        $config = $guzzle->getConfig();
+
+        $this->assertFalse($config['http_errors']);
+        $this->assertArrayHasKey('timeout', $config);
+    }
+}
-- 
cgit v1.2.3