Merge branch 'master' of github.com:engelsystem/engelsystem

includes/engelsystem_provider.php

@@ -71,7 +71,9 @@ require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php');
 
 require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php');
 
-session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__)));
+if (! defined('PHPUNIT_TESTSUITE')) {
+  session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__)));
+}
 session_start();
 
 gettext_init();

test/phpunit.xml

@@ -1,11 +1,14 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.0/phpunit.xsd"
-  bootstrap="../includes/engelsystem_provider.php" colors="true" convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true" convertWarningsToExceptions="true"
-  forceCoversAnnotation="false">
+	bootstrap="../includes/engelsystem_provider.php" colors="true"
+	convertErrorsToExceptions="true" convertNoticesToExceptions="true"
+	convertWarningsToExceptions="true" forceCoversAnnotation="false">
 	<testsuites>
 		<testsuite name="Models">
 			<directory>model</directory>
 		</testsuite>
 	</testsuites>
+	<php>
+		<const name="PHPUNIT_TESTSUITE" value="true" />
+	</php>
 </phpunit>