From e15e86362585f5d00d118653232584ed0920e533 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 31 Oct 2017 14:23:23 +0100
Subject: Added tests for base_path and config_path

---
 tests/Feature/Model/RoomModelTest.php | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 tests/Feature/Model/RoomModelTest.php

(limited to 'tests/Feature/Model/RoomModelTest.php')

diff --git a/tests/Feature/Model/RoomModelTest.php b/tests/Feature/Model/RoomModelTest.php
new file mode 100644
index 00000000..20b9e34d
--- /dev/null
+++ b/tests/Feature/Model/RoomModelTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Engelsystem\Test\Feature\Model;
+
+use PHPUnit\Framework\TestCase;
+
+class RoomModelTest extends TestCase
+{
+    private $room_id = null;
+
+    public static function setUpBeforeClass()
+    {
+        require_once __DIR__ . '/../../../includes/engelsystem_provider.php';
+    }
+
+    public function create_Room()
+    {
+        $this->room_id = Room_create('test', false, true, '');
+    }
+
+    public function test_Room()
+    {
+        $this->create_Room();
+
+        $room = Room($this->room_id);
+
+        $this->assertNotFalse($room);
+        $this->assertNotNull($room);
+        $this->assertEquals($room['Name'], 'test');
+
+        $this->assertNull(Room(-1));
+    }
+
+    public function tearDown()
+    {
+        if ($this->room_id != null) {
+            Room_delete($this->room_id);
+        }
+    }
+}
-- 
cgit v1.2.3-54-g00ecf


From e727b367cc77452b58bc2d9360bcde97b7572288 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 1 Nov 2017 12:35:45 +0100
Subject: Moved includes to own file

---
 includes/engelsystem.php                       |  77 ++++++++++++
 includes/engelsystem_provider.php              | 156 -------------------------
 includes/includes.php                          |  86 ++++++++++++++
 public/index.php                               |   6 +-
 tests/Feature/Logger/EngelsystemLoggerTest.php |   2 +-
 tests/Feature/Model/LogEntriesModelTest.php    |   2 +-
 tests/Feature/Model/RoomModelTest.php          |   2 +-
 7 files changed, 171 insertions(+), 160 deletions(-)
 create mode 100644 includes/engelsystem.php
 delete mode 100644 includes/engelsystem_provider.php
 create mode 100644 includes/includes.php

(limited to 'tests/Feature/Model/RoomModelTest.php')

diff --git a/includes/engelsystem.php b/includes/engelsystem.php
new file mode 100644
index 00000000..f9535847
--- /dev/null
+++ b/includes/engelsystem.php
@@ -0,0 +1,77 @@
+<?php
+
+use Engelsystem\Application;
+use Engelsystem\Config\Config;
+use Engelsystem\Exceptions\Handler as ExceptionHandler;
+use Engelsystem\Http\Request;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+
+/**
+ * This file includes all needed functions, connects to the db etc.
+ */
+require_once __DIR__ . '/autoload.php';
+
+
+/**
+ * Initialize and bootstrap the application
+ */
+$app = new Application(realpath(__DIR__ . DIRECTORY_SEPARATOR . '..'));
+$appConfig = $app->make(Config::class);
+$appConfig->set(require config_path('app.php'));
+$app->bootstrap($appConfig);
+
+
+/**
+ * Configure application
+ */
+date_default_timezone_set($app->get('config')->get('timezone'));
+
+if (config('environment') == 'development') {
+    $errorHandler = $app->get('error.handler');
+    $errorHandler->setEnvironment(ExceptionHandler::ENV_DEVELOPMENT);
+    ini_set('display_errors', true);
+    error_reporting(E_ALL);
+} else {
+    ini_set('display_errors', false);
+}
+
+
+/**
+ * Check for maintenance
+ */
+if ($app->get('config')->get('maintenance')) {
+    echo file_get_contents(__DIR__ . '/../templates/maintenance.html');
+    die();
+}
+
+
+/**
+ * Initialize Request
+ *
+ * @var Request $request
+ */
+$request = Request::createFromGlobals();
+$app->instance('request', $request);
+
+
+/**
+ * Include legacy code
+ */
+require __DIR__ . '/includes.php';
+
+
+/**
+ * Init application
+ */
+$sessionStorage = (PHP_SAPI != 'cli' ? new NativeSessionStorage(['cookie_httponly' => true]) : new MockArraySessionStorage());
+$session = new Session($sessionStorage);
+$app->instance('session', $session);
+$session->start();
+$request->setSession($session);
+
+
+gettext_init();
+
+load_auth();
diff --git a/includes/engelsystem_provider.php b/includes/engelsystem_provider.php
deleted file mode 100644
index 48206cb6..00000000
--- a/includes/engelsystem_provider.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-use Engelsystem\Application;
-use Engelsystem\Config\Config;
-use Engelsystem\Exceptions\Handler as ExceptionHandler;
-use Engelsystem\Http\Request;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
-
-/**
- * This file includes all needed functions, connects to the db etc.
- */
-require_once __DIR__ . '/autoload.php';
-
-
-/**
- * Initialize and bootstrap the application
- */
-$app = new Application(realpath(__DIR__ . DIRECTORY_SEPARATOR . '..'));
-$appConfig = $app->make(Config::class);
-$appConfig->set(require config_path('app.php'));
-$app->bootstrap($appConfig);
-
-
-/**
- * Configure application
- */
-date_default_timezone_set($app->get('config')->get('timezone'));
-
-if (config('environment') == 'development') {
-    $errorHandler = $app->get('error.handler');
-    $errorHandler->setEnvironment(ExceptionHandler::ENV_DEVELOPMENT);
-    ini_set('display_errors', true);
-    error_reporting(E_ALL);
-} else {
-    ini_set('display_errors', false);
-}
-
-
-/**
- * Check for maintenance
- */
-if ($app->get('config')->get('maintenance')) {
-    echo file_get_contents(__DIR__ . '/../templates/maintenance.html');
-    die();
-}
-
-
-/**
- * Initialize Request
- *
- * @var Request $request
- */
-$request = Request::createFromGlobals();
-$app->instance('request', $request);
-
-
-/**
- * Include legacy code
- */
-$includeFiles = [
-    __DIR__ . '/../includes/sys_auth.php',
-    __DIR__ . '/../includes/sys_form.php',
-    __DIR__ . '/../includes/sys_log.php',
-    __DIR__ . '/../includes/sys_menu.php',
-    __DIR__ . '/../includes/sys_page.php',
-    __DIR__ . '/../includes/sys_template.php',
-
-    __DIR__ . '/../includes/model/AngelType_model.php',
-    __DIR__ . '/../includes/model/EventConfig_model.php',
-    __DIR__ . '/../includes/model/LogEntries_model.php',
-    __DIR__ . '/../includes/model/Message_model.php',
-    __DIR__ . '/../includes/model/NeededAngelTypes_model.php',
-    __DIR__ . '/../includes/model/Room_model.php',
-    __DIR__ . '/../includes/model/ShiftEntry_model.php',
-    __DIR__ . '/../includes/model/Shifts_model.php',
-    __DIR__ . '/../includes/model/ShiftsFilter.php',
-    __DIR__ . '/../includes/model/ShiftSignupState.php',
-    __DIR__ . '/../includes/model/ShiftTypes_model.php',
-    __DIR__ . '/../includes/model/UserAngelTypes_model.php',
-    __DIR__ . '/../includes/model/UserDriverLicenses_model.php',
-    __DIR__ . '/../includes/model/UserGroups_model.php',
-    __DIR__ . '/../includes/model/User_model.php',
-    __DIR__ . '/../includes/model/ValidationResult.php',
-
-    __DIR__ . '/../includes/view/AngelTypes_view.php',
-    __DIR__ . '/../includes/view/EventConfig_view.php',
-    __DIR__ . '/../includes/view/Questions_view.php',
-    __DIR__ . '/../includes/view/Rooms_view.php',
-    __DIR__ . '/../includes/view/ShiftCalendarLane.php',
-    __DIR__ . '/../includes/view/ShiftCalendarRenderer.php',
-    __DIR__ . '/../includes/view/ShiftCalendarShiftRenderer.php',
-    __DIR__ . '/../includes/view/ShiftsFilterRenderer.php',
-    __DIR__ . '/../includes/view/Shifts_view.php',
-    __DIR__ . '/../includes/view/ShiftEntry_view.php',
-    __DIR__ . '/../includes/view/ShiftTypes_view.php',
-    __DIR__ . '/../includes/view/UserAngelTypes_view.php',
-    __DIR__ . '/../includes/view/UserDriverLicenses_view.php',
-    __DIR__ . '/../includes/view/UserHintsRenderer.php',
-    __DIR__ . '/../includes/view/User_view.php',
-
-    __DIR__ . '/../includes/controller/angeltypes_controller.php',
-    __DIR__ . '/../includes/controller/event_config_controller.php',
-    __DIR__ . '/../includes/controller/rooms_controller.php',
-    __DIR__ . '/../includes/controller/shift_entries_controller.php',
-    __DIR__ . '/../includes/controller/shifts_controller.php',
-    __DIR__ . '/../includes/controller/shifttypes_controller.php',
-    __DIR__ . '/../includes/controller/users_controller.php',
-    __DIR__ . '/../includes/controller/user_angeltypes_controller.php',
-    __DIR__ . '/../includes/controller/user_driver_licenses_controller.php',
-
-    __DIR__ . '/../includes/helper/graph_helper.php',
-    __DIR__ . '/../includes/helper/internationalization_helper.php',
-    __DIR__ . '/../includes/helper/message_helper.php',
-    __DIR__ . '/../includes/helper/error_helper.php',
-    __DIR__ . '/../includes/helper/email_helper.php',
-
-    __DIR__ . '/../includes/mailer/shifts_mailer.php',
-    __DIR__ . '/../includes/mailer/users_mailer.php',
-
-    __DIR__ . '/../includes/pages/admin_active.php',
-    __DIR__ . '/../includes/pages/admin_arrive.php',
-    __DIR__ . '/../includes/pages/admin_free.php',
-    __DIR__ . '/../includes/pages/admin_groups.php',
-    __DIR__ . '/../includes/pages/admin_import.php',
-    __DIR__ . '/../includes/pages/admin_log.php',
-    __DIR__ . '/../includes/pages/admin_questions.php',
-    __DIR__ . '/../includes/pages/admin_rooms.php',
-    __DIR__ . '/../includes/pages/admin_shifts.php',
-    __DIR__ . '/../includes/pages/admin_user.php',
-    __DIR__ . '/../includes/pages/guest_login.php',
-    __DIR__ . '/../includes/pages/user_messages.php',
-    __DIR__ . '/../includes/pages/user_myshifts.php',
-    __DIR__ . '/../includes/pages/user_news.php',
-    __DIR__ . '/../includes/pages/user_questions.php',
-    __DIR__ . '/../includes/pages/user_settings.php',
-    __DIR__ . '/../includes/pages/user_shifts.php',
-];
-foreach ($includeFiles as $file) {
-    require_once realpath($file);
-}
-
-
-/**
- * Init application
- */
-$sessionStorage = (PHP_SAPI != 'cli' ? new NativeSessionStorage(['cookie_httponly' => true]) : new MockArraySessionStorage());
-$session = new Session($sessionStorage);
-$app->instance('session', $session);
-$session->start();
-$request->setSession($session);
-
-gettext_init();
-
-load_auth();
diff --git a/includes/includes.php b/includes/includes.php
new file mode 100644
index 00000000..a42f960f
--- /dev/null
+++ b/includes/includes.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Include legacy code
+ */
+$includeFiles = [
+    __DIR__ . '/../includes/sys_auth.php',
+    __DIR__ . '/../includes/sys_form.php',
+    __DIR__ . '/../includes/sys_log.php',
+    __DIR__ . '/../includes/sys_menu.php',
+    __DIR__ . '/../includes/sys_page.php',
+    __DIR__ . '/../includes/sys_template.php',
+
+    __DIR__ . '/../includes/model/AngelType_model.php',
+    __DIR__ . '/../includes/model/EventConfig_model.php',
+    __DIR__ . '/../includes/model/LogEntries_model.php',
+    __DIR__ . '/../includes/model/Message_model.php',
+    __DIR__ . '/../includes/model/NeededAngelTypes_model.php',
+    __DIR__ . '/../includes/model/Room_model.php',
+    __DIR__ . '/../includes/model/ShiftEntry_model.php',
+    __DIR__ . '/../includes/model/Shifts_model.php',
+    __DIR__ . '/../includes/model/ShiftsFilter.php',
+    __DIR__ . '/../includes/model/ShiftSignupState.php',
+    __DIR__ . '/../includes/model/ShiftTypes_model.php',
+    __DIR__ . '/../includes/model/UserAngelTypes_model.php',
+    __DIR__ . '/../includes/model/UserDriverLicenses_model.php',
+    __DIR__ . '/../includes/model/UserGroups_model.php',
+    __DIR__ . '/../includes/model/User_model.php',
+    __DIR__ . '/../includes/model/ValidationResult.php',
+
+    __DIR__ . '/../includes/view/AngelTypes_view.php',
+    __DIR__ . '/../includes/view/EventConfig_view.php',
+    __DIR__ . '/../includes/view/Questions_view.php',
+    __DIR__ . '/../includes/view/Rooms_view.php',
+    __DIR__ . '/../includes/view/ShiftCalendarLane.php',
+    __DIR__ . '/../includes/view/ShiftCalendarRenderer.php',
+    __DIR__ . '/../includes/view/ShiftCalendarShiftRenderer.php',
+    __DIR__ . '/../includes/view/ShiftsFilterRenderer.php',
+    __DIR__ . '/../includes/view/Shifts_view.php',
+    __DIR__ . '/../includes/view/ShiftEntry_view.php',
+    __DIR__ . '/../includes/view/ShiftTypes_view.php',
+    __DIR__ . '/../includes/view/UserAngelTypes_view.php',
+    __DIR__ . '/../includes/view/UserDriverLicenses_view.php',
+    __DIR__ . '/../includes/view/UserHintsRenderer.php',
+    __DIR__ . '/../includes/view/User_view.php',
+
+    __DIR__ . '/../includes/controller/angeltypes_controller.php',
+    __DIR__ . '/../includes/controller/event_config_controller.php',
+    __DIR__ . '/../includes/controller/rooms_controller.php',
+    __DIR__ . '/../includes/controller/shift_entries_controller.php',
+    __DIR__ . '/../includes/controller/shifts_controller.php',
+    __DIR__ . '/../includes/controller/shifttypes_controller.php',
+    __DIR__ . '/../includes/controller/users_controller.php',
+    __DIR__ . '/../includes/controller/user_angeltypes_controller.php',
+    __DIR__ . '/../includes/controller/user_driver_licenses_controller.php',
+
+    __DIR__ . '/../includes/helper/graph_helper.php',
+    __DIR__ . '/../includes/helper/internationalization_helper.php',
+    __DIR__ . '/../includes/helper/message_helper.php',
+    __DIR__ . '/../includes/helper/error_helper.php',
+    __DIR__ . '/../includes/helper/email_helper.php',
+
+    __DIR__ . '/../includes/mailer/shifts_mailer.php',
+    __DIR__ . '/../includes/mailer/users_mailer.php',
+
+    __DIR__ . '/../includes/pages/admin_active.php',
+    __DIR__ . '/../includes/pages/admin_arrive.php',
+    __DIR__ . '/../includes/pages/admin_free.php',
+    __DIR__ . '/../includes/pages/admin_groups.php',
+    __DIR__ . '/../includes/pages/admin_import.php',
+    __DIR__ . '/../includes/pages/admin_log.php',
+    __DIR__ . '/../includes/pages/admin_questions.php',
+    __DIR__ . '/../includes/pages/admin_rooms.php',
+    __DIR__ . '/../includes/pages/admin_shifts.php',
+    __DIR__ . '/../includes/pages/admin_user.php',
+    __DIR__ . '/../includes/pages/guest_login.php',
+    __DIR__ . '/../includes/pages/user_messages.php',
+    __DIR__ . '/../includes/pages/user_myshifts.php',
+    __DIR__ . '/../includes/pages/user_news.php',
+    __DIR__ . '/../includes/pages/user_questions.php',
+    __DIR__ . '/../includes/pages/user_settings.php',
+    __DIR__ . '/../includes/pages/user_shifts.php',
+];
+foreach ($includeFiles as $file) {
+    require_once realpath($file);
+}
diff --git a/public/index.php b/public/index.php
index c65dbdf8..69d92127 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once realpath(__DIR__ . '/../includes/engelsystem_provider.php');
+use Engelsystem\Http\Request;
+
+require_once realpath(__DIR__ . '/../includes/engelsystem.php');
 
 $free_pages = [
     'admin_event_config',
@@ -25,6 +27,8 @@ $page = '';
 $title = '';
 $content = '';
 
+/** @var Request $request */
+$request = $app->get('request');
 $page = $request->query->get('p');
 if (empty($page)) {
     $page = $request->path();
diff --git a/tests/Feature/Logger/EngelsystemLoggerTest.php b/tests/Feature/Logger/EngelsystemLoggerTest.php
index 9f502198..8886d4ba 100644
--- a/tests/Feature/Logger/EngelsystemLoggerTest.php
+++ b/tests/Feature/Logger/EngelsystemLoggerTest.php
@@ -12,7 +12,7 @@ class EngelsystemLoggerTest extends TestCase
 {
     public static function setUpBeforeClass()
     {
-        require_once __DIR__ . '/../../../includes/engelsystem_provider.php';
+        require_once __DIR__ . '/../../../includes/engelsystem.php';
     }
 
     /**
diff --git a/tests/Feature/Model/LogEntriesModelTest.php b/tests/Feature/Model/LogEntriesModelTest.php
index 2678dcb5..036f5692 100644
--- a/tests/Feature/Model/LogEntriesModelTest.php
+++ b/tests/Feature/Model/LogEntriesModelTest.php
@@ -9,7 +9,7 @@ class LogEntriesModelTest extends TestCase
 {
     public static function setUpBeforeClass()
     {
-        require_once __DIR__ . '/../../../includes/engelsystem_provider.php';
+        require_once __DIR__ . '/../../../includes/engelsystem.php';
     }
 
     public function testCreateLogEntry()
diff --git a/tests/Feature/Model/RoomModelTest.php b/tests/Feature/Model/RoomModelTest.php
index 20b9e34d..3114ba2d 100644
--- a/tests/Feature/Model/RoomModelTest.php
+++ b/tests/Feature/Model/RoomModelTest.php
@@ -10,7 +10,7 @@ class RoomModelTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        require_once __DIR__ . '/../../../includes/engelsystem_provider.php';
+        require_once __DIR__ . '/../../../includes/engelsystem.php';
     }
 
     public function create_Room()
-- 
cgit v1.2.3-54-g00ecf