From d49e49c364c1b73e4e4e3b52dc10ee9d0150e447 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Fri, 22 Sep 2017 14:02:02 +0200
Subject: Implemented service provider functionality

---
 src/helpers.php | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

(limited to 'src/helpers.php')

diff --git a/src/helpers.php b/src/helpers.php
index de303963..c3c727ec 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -23,6 +23,15 @@ function app($id = null)
     return Application::getInstance()->get($id);
 }
 
+/**
+ * @param string $path
+ * @return string
+ */
+function base_path($path = '')
+{
+    return app('path') . (empty($path) ? '' : DIRECTORY_SEPARATOR . $path);
+}
+
 /**
  * Get or set config values
  *
@@ -46,6 +55,15 @@ function config($key = null, $default = null)
     return $config->get($key, $default);
 }
 
+/**
+ * @param string $path
+ * @return string
+ */
+function config_path($path = '')
+{
+    return app('path.config') . (empty($path) ? '' : DIRECTORY_SEPARATOR . $path);
+}
+
 /**
  * @param string $key
  * @param mixed  $default
@@ -78,22 +96,6 @@ function session($key = null, $default = null)
     return $session->get($key, $default);
 }
 
-/**
- * @param string  $template
- * @param mixed[] $data
- * @return Renderer|string
- */
-function view($template = null, $data = null)
-{
-    $renderer = app('renderer');
-
-    if (is_null($template)) {
-        return $renderer;
-    }
-
-    return $renderer->render($template, $data);
-}
-
 /**
  * @param string $path
  * @param array  $parameters
@@ -109,3 +111,19 @@ function url($path = null, $parameters = [])
 
     return $urlGenerator->to($path, $parameters);
 }
+
+/**
+ * @param string  $template
+ * @param mixed[] $data
+ * @return Renderer|string
+ */
+function view($template = null, $data = null)
+{
+    $renderer = app('renderer');
+
+    if (is_null($template)) {
+        return $renderer;
+    }
+
+    return $renderer->render($template, $data);
+}
-- 
cgit v1.2.3-54-g00ecf


From 449e2cdd00632acff63bb75c5282c3aa2642b59f Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Mon, 25 Sep 2017 00:03:22 +0200
Subject: Added env function, added GitLab CI code coverage config

---
 .gitlab-ci.yml             | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 config/config.default.php  |  8 ++++----
 src/helpers.php            | 15 +++++++++++++++
 tests/Unit/HelpersTest.php | 14 ++++++++++++++
 4 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 .gitlab-ci.yml

(limited to 'src/helpers.php')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..c44507b1
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,47 @@
+image: php
+
+cache:
+  paths:
+  - .composer
+
+services:
+  - mysql:5.6
+
+variables:
+  MYSQL_DATABASE: engelsystem
+  MYSQL_USER: engel
+  MYSQL_PASSWORD: engelsystem
+  COMPOSER_HOME: .composer
+  MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+
+before_script:
+  # Install required Packages
+  - apt-get update -yqq
+  - apt-get install -yqq git unzip mysql-client
+  - docker-php-ext-install pdo pdo_mysql gettext
+  # Install xdebug
+  - pecl install xdebug
+  - docker-php-ext-enable xdebug
+  # MySQL DB
+  - mysql -h mysql -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" < db/install.sql
+  - mysql -h mysql -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" < db/update.sql
+  # Install Composer
+  - curl -sS https://getcomposer.org/installer | php -- --no-ansi --install-dir /usr/local/bin/ --filename composer
+  - /usr/local/bin/composer --no-ansi install
+
+.test_template: &test_definition
+  artifacts:
+    name: "${CI_JOB_NAME}_${CI_PROJECT_ID}_${PHP_VERSION}"
+    expire_in: 1 week
+    paths:
+      - ./coverage/
+  coverage: '/^\s*Lines:\s*(\d+(?:\.\d+)?%)/'
+  script: vendor/bin/phpunit --colors=never --coverage-text --coverage-html ./coverage/
+
+test:7.0:
+  image: php:7.0
+  <<: *test_definition
+
+test:7.1:
+  image: php:7.1
+  <<: *test_definition
diff --git a/config/config.default.php b/config/config.default.php
index c2d742ef..1bad9668 100644
--- a/config/config.default.php
+++ b/config/config.default.php
@@ -5,10 +5,10 @@
 return [
     // MySQL-Connection Settings
     'database'                => [
-        'host' => 'localhost',
-        'user' => 'root',
-        'pw'   => '',
-        'db'   => 'engelsystem',
+        'host' => env('MYSQL_HOST', (env('CI', false) ? 'mysql' : 'localhost')),
+        'user' => env('MYSQL_USER', 'root'),
+        'pw'   => env('MYSQL_PASSWORD', ''),
+        'db'   => env('MYSQL_DATABASE', 'engelsystem'),
     ],
 
     // For accessing stats
diff --git a/src/helpers.php b/src/helpers.php
index c3c727ec..5a48498a 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -64,6 +64,21 @@ function config_path($path = '')
     return app('path.config') . (empty($path) ? '' : DIRECTORY_SEPARATOR . $path);
 }
 
+/**
+ * @param string $key
+ * @param mixed  $default
+ * @return mixed
+ */
+function env($key, $default = null)
+{
+    $value = getenv($key);
+    if ($value === false) {
+        return $default;
+    }
+
+    return $value;
+}
+
 /**
  * @param string $key
  * @param mixed  $default
diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
index d9782888..9ec824af 100644
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@@ -53,6 +53,20 @@ class HelpersTest extends TestCase
         $this->assertEquals(['user' => 'FooBar'], config('mail'));
     }
 
+    /**
+     * @covers \env
+     */
+    public function testEnv()
+    {
+        putenv('envTestVar=someContent');
+
+        $env = env('envTestVar');
+        $this->assertEquals('someContent', $env);
+
+        $env = env('someRandomEnvVarThatShouldNeverExist', 'someDefaultValue');
+        $this->assertEquals('someDefaultValue', $env);
+    }
+
     /**
      * @covers \request
      */
-- 
cgit v1.2.3-54-g00ecf