applying updated ruleset

daft-framework · Jan 20, 2020 · 28092ee · 28092ee
1 parent 4b3cf0c
commit 28092ee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Tests/CatchingHttpHandlerTest.php b/Tests/CatchingHttpHandlerTest.php
@@ -97,7 +97,7 @@ public function DataProviderTesting() : Generator
 
 					$logger = new $loggerImplementation(...array_slice($loggerArgs, 1));
 
-					list($implementation, $postConstructionCalls) = $frameworkArgs;
+					[$implementation, $postConstructionCalls] = $frameworkArgs;
 
 					/**
 					* @var string
@@ -147,7 +147,7 @@ public function DataProviderTesting() : Generator
 	*
 	* @dataProvider DataProviderTesting
 	*/
-	public function testCachingHttpHandler(
+	public function test_caching_http_handler(
 		CatchingHttpHandler $framework,
 		int $expectedStatus,
 		string $expectedContentRegex,
@@ -265,16 +265,16 @@ public function DataProviderTestBadConfig() : Generator
 
 			foreach ($this->DataProviderRouterArguments() as $routerArgs) {
 				foreach ($this->DataProviderBadConfig() as $badConfigArgs) {
-					list(
+					[
 						$handlerConfigArgs,
 						$expectedExceptionType,
 						$expectedExceptionMessage
-					) = $badConfigArgs;
+					] = $badConfigArgs;
 
 					foreach ($this->DataProviderFrameworkArguments() as $frameworkArgs) {
 						$logger = new $loggerImplementation(...array_slice($loggerArgs, 1));
 
-						list($implementation) = $frameworkArgs;
+						[$implementation] = $frameworkArgs;
 
 						$frameworkArgs = array_slice($frameworkArgs, 2);
 
@@ -317,9 +317,9 @@ public function DataProviderTestBadConfig() : Generator
 	*
 	* @dataProvider DataProviderTestBadConfig
 	*
-	* @depends testCachingHttpHandler
+	* @depends test_caching_http_handler
 	*/
-	public function testBadConfig(
+	public function test_bad_config(
 		string $implementation,
 		array $frameworkArgs,
 		string $expectedExceptionType,
@@ -345,7 +345,7 @@ public function DataProviderTestBadLogger() : Generator
 				foreach ($this->DataProviderFrameworkArguments() as $frameworkArgs) {
 					$logger = new fixtures\Log\ThrowingLogger($throwUnderLogCount, 'testing');
 
-					list($implementation, $postConstructionCalls) = $frameworkArgs;
+					[$implementation, $postConstructionCalls] = $frameworkArgs;
 
 					/**
 					* @var string
@@ -408,7 +408,7 @@ public function DataProviderTestBadLogger() : Generator
 	*
 	* @dataProvider DataProviderTestBadLogger
 	*/
-	public function testBadLogger(
+	public function test_bad_logger(
 		CatchingHttpHandler $framework,
 		int $_expectedStatus,
 		string $_expectedContentRegex,

diff --git a/Tests/ImplementationTest.php b/Tests/ImplementationTest.php
@@ -117,12 +117,12 @@ public function DataProviderWhoopsHandlerArguments() : Generator
 	*
 	* @dataProvider DataProviderGoodSources
 	*/
-	public function testEverythingInitialisesFine(
+	public function test_everything_initialises_fine(
 		string $implementation,
 		array $postConstructionCalls,
 		...$implementationArgs
 	) : BaseFramework {
-		list(, , , $logger) = $implementationArgs;
+		[, , , $logger] = $implementationArgs;
 
 		static::assertInstanceOf(LoggerInterface::class, $logger);
 
@@ -148,7 +148,7 @@ public function testEverythingInitialisesFine(
 
 	protected function extractDefaultFrameworkArgs(array $implementationArgs) : array
 	{
-		list($baseUrl, $basePath, $config) = $implementationArgs;
+		[$baseUrl, $basePath, $config] = $implementationArgs;
 
 		return [$baseUrl, $basePath, $config];
 	}

diff --git a/src/CatchingHttpHandler.php b/src/CatchingHttpHandler.php
@@ -57,7 +57,7 @@ public function __construct(
 			/**
 			* @param class-string<HandlerInterface> $maybe
 			*/
-			function (string $maybe) : bool {
+			static function (string $maybe) : bool {
 				return
 					class_exists($maybe);
 			},