updating packages & testing

daft-framework · Aug 26, 2019 · ec60f42 · ec60f42
1 parent 3e027c5
commit ec60f42
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 86 deletions.
diff --git a/Tests/CatchingHttpHandlerTest.php b/Tests/CatchingHttpHandlerTest.php
@@ -189,7 +189,12 @@ public function testCachingHttpHandler(
 		$response = $framework->handle($request);
 
 		static::assertSame($expectedStatus, $response->getStatusCode());
-		static::assertRegExp($expectedContentRegex, $response->getContent());
+
+		$response_content = $response->getContent();
+
+		static::assertIsString($response_content);
+
+		static::assertRegExp($expectedContentRegex, $response_content);
 	}
 
 	/**

diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.0.x-dev"
+			"dev-master": "3.x-dev"
 		}
 	},
 	"conflict": {
@@ -55,8 +55,8 @@
 		"php": "^7.3",
 		"filp/whoops": "^2.5",
 		"psr/log": "^1.1",
-		"signpostmarv/daft-framework": "dev-typed-object-args",
-		"signpostmarv/daft-router": "dev-typed-object-args",
+		"signpostmarv/daft-framework": "^3.0",
+		"signpostmarv/daft-router": "^4.0",
 		"symfony/http-foundation": "^4.3"
 	},
 	"require-dev": {