From 75663948f20abdc9aaa634d749bd1fbba2673879 Mon Sep 17 00:00:00 2001
From: uwetews <uwe.tews@googlemail.com>
Date: Sun, 18 Oct 2015 20:22:11 +0200
Subject: [PATCH] move configuration constants in PHP file that they are seen
 also in isolated tests

---
 tests/Config.php         | 18 ++++++++++++++++++
 tests/PHPUnit_Smarty.php |  1 +
 tests/phpunit.xml        | 14 +-------------
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 tests/Config.php

diff --git a/tests/Config.php b/tests/Config.php
new file mode 100644
index 00000000..d1b6f1be
--- /dev/null
+++ b/tests/Config.php
@@ -0,0 +1,18 @@
+<?php
+/*
+* This file is part of the Smarty PHPUnit tests.
+*
+*/
+/*
+ * Smarty PHPUnit Config
+ */
+define('individualFolders', false);
+define('MemCacheEnable', false);
+define('ApcCacheEnable', false);
+define('MysqlCacheEnable', false);
+define('PdoCacheEnable', false);
+define('PdoGzipCacheEnable', false);
+define('MysqlResourceEnable', false);
+define('DB_DSN', "mysql:dbname=test;host=localhost");
+define('DB_USER', "smarty");
+define('DB_PASSWD', "");
diff --git a/tests/PHPUnit_Smarty.php b/tests/PHPUnit_Smarty.php
index 3d9b33c2..26486a35 100644
--- a/tests/PHPUnit_Smarty.php
+++ b/tests/PHPUnit_Smarty.php
@@ -4,6 +4,7 @@
  *
  */
 
+include_once __DIR__ . '/Config.php';
 /**
  * Smarty Test Case Fixture
  */
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index a9057111..7fdbe1a7 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -9,19 +9,6 @@
         beStrictAboutOutputDuringTests="true"
         stopOnFailure="false">
 
-    <php>
-        <const name="individualFolders" value="true"/>
-        <const name="MemCacheEnable" value="false"/>
-        <const name="ApcCacheEnable" value="false"/>
-        <const name="MysqlCacheEnable" value="false"/>
-        <const name="PdoCacheEnable" value="false"/>
-        <const name="PdoGzipCacheEnable" value="false"/>
-        <const name="MysqlResourceEnable" value="false"/>
-        <const name="DB_DSN" value="mysql:dbname=test;host=localhost"/>
-        <const name="DB_USER" value="smarty"/>
-        <const name="DB_PASSWD" value=""/>
-    </php>
-
     <filter>
         <testsuites>
             <testsuite name="Smarty Test Suite">
@@ -42,6 +29,7 @@
     </filter>
     <logging>
         highlight="false" lowUpperBound="35" highLowerBound="70"/>
+        <log type="tap" target="TestResults.tap"/>
     </logging>
 
 </phpunit>