[Pkg-owncloud-commits] [php-sabredav] 08/30: Add support for tests/config.user.php

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit f9d84e1e0f59e3463eebacee8c79773c58ed9261
Author: Jakob Sack <mail at jakobsack.de>
Date:   Sun Jan 10 20:39:28 2016 +0100

    Add support for tests/config.user.php
---
 .gitignore          | 3 +++
 tests/bootstrap.php | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/.gitignore b/.gitignore
index aff6e27..6cf2458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@ tests/temp
 tests/.sabredav
 tests/cov
 
+# Custom settings for tests
+tests/config.user.php
+
 # ViM
 *.swp
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index fdbfb99..67bd074 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -20,6 +20,13 @@ $config = [
     'SABRE_MYSQLPASS' => '',
 ];
 
+if (file_exists(__DIR__ . '/config.user.php')) {
+    include __DIR__ . '/config.user.php';
+    foreach($userConfig as $key=>$value) {
+        $config[$key] = $value;
+    }
+}
+
 foreach($config as $key=>$value) {
     if (!defined($key)) define($key, $value);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git