Merge branch 'release/1.3' of https://github.com/elliotchance/concise …

…into 1.3/112-resizing-the-window-for-concise-destroys-layout

.scrutinizer.yml

@@ -1,10 +1,12 @@
 tools:
-    php_changetracking: true
-    php_pdepend: true
-    php_analyzer: true
-    php_mess_detector: true
-    php_sim: true
-    php_code_sniffer: true
-    php_cs_fixer: true
-    sensiolabs_security_checker: true
-    external_code_coverage: true
+  php_changetracking: true
+  php_pdepend: true
+  php_analyzer: true
+  php_mess_detector: true
+  php_sim: true
+  php_code_sniffer: true
+  php_cs_fixer: true
+  sensiolabs_security_checker: true
+  external_code_coverage: true
+filter:
+  paths: [src]

pr

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+git push
+
+VERSION=`git branch | egrep "^\*" | cut -c3- | cut -d/ -f1`
+ISSUE=`git branch | egrep "^\*" | cut -c3- | cut -d- -f1 | cut -d/ -f2`
+hub pull-request -o -i $ISSUE -b release/$VERSION

src/Concise/AssertThat.php

@@ -4,9 +4,14 @@
 
 function assert_that()
 {
-	global $_currentTestCase;
-	if(!$_currentTestCase) {
-		return call_user_func_array(array(new TestCase(), 'assert'), func_get_args());
-	}
-	call_user_func_array(array($_currentTestCase, 'assert'), func_get_args());
+    global $_currentTestCase;
+    if (!$_currentTestCase) {
+        $testCase = new TestCase();
+        $testCase->setUp();
+        $r = call_user_func_array(array($testCase, 'assert'), func_get_args());
+        $testCase->tearDown();
+
+        return $r;
+    }
+    call_user_func_array(array($_currentTestCase, 'assert'), func_get_args());
 }