Merge pull request #8 from silverstripe-labs/pulls/avoid-hamcrest-glo…

…bals Include Hamcrest without clashing with PHPUnit globals
silverstripe · May 27, 2015 · b219ebb · b219ebb
2 parents a35241c + 38659ba
commit b219ebb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tests/ExternalLinksTest.php b/tests/ExternalLinksTest.php
@@ -1,7 +1,5 @@
 <?php
 
-if (class_exists('Phockito')) Phockito::include_hamcrest();
-
 class ExternalLinksTest extends SapphireTest {
 
 	protected static $fixture_file = 'ExternalLinksTest.yml';
@@ -10,6 +8,14 @@ class ExternalLinksTest extends SapphireTest {
 		'ExternalLinksTest_Page'
 	);
 
+	public function setUpOnce() {
+		if (class_exists('Phockito')) {
+			Phockito::include_hamcrest(false);
+		}
+
+		parent::setUpOnce();
+	}
+
 	public function setUp() {
 		parent::setUp();
 
@@ -60,7 +66,7 @@ public function setUp() {
 			->return(null);
 
 		Phockito::when($checker)
-			->checkLink(anything()) // anything else is 404
+			->checkLink(Hamcrest_Matchers::anything()) // anything else is 404
 			->return(404);
 
 		Injector::inst()->registerService($checker, 'LinkChecker');