tidy: phpcs tweaks

Author: g105b

phpcs.xml

@@ -19,7 +19,11 @@
 	<rule ref="Generic.Files.EndFileNewline" />
 	<rule ref="Generic.Files.InlineHTML" />
 	<rule ref="Generic.Files.LineEndings" />
-	<rule ref="Generic.Files.LineLength" />
+	<rule ref="Generic.Files.LineLength">
+		<properties>
+			<property name="lineLimit" value="100"/>
+		</properties>
+	</rule>
 	<rule ref="Generic.Files.OneClassPerFile" />
 	<rule ref="Generic.Files.OneInterfacePerFile" />
 	<rule ref="Generic.Files.OneObjectStructurePerFile" />

src/NotYetRoutedException.php

@@ -4,5 +4,6 @@
 use Throwable;
 
 class NotYetRoutedException extends RoutingException {
-	const DEFAULT_MESSAGE = "A Router method is being called before route(). For help, please visit: https://www.php.gt/routing/not-yet-routed-exception";
+	const DEFAULT_MESSAGE = "A Router method is being called before route(). "
+		. "For help, please visit: https://www.php.gt/routing/not-yet-routed-exception";
 }

src/Path/DynamicPath.php

@@ -39,7 +39,12 @@ public function get(?string $key = null, ?bool $extra = false):?string {
 	 * @param bool|null $extra Whether to include extra path parts
 	 * @return string|null The matched parameter or null if no match
 	 */
-	private function processFilePathParts(array $filePathParts, array $requestPathParts, ?string $key, ?bool $extra): ?string {
+	private function processFilePathParts(
+		array $filePathParts,
+		array $requestPathParts,
+		?string $key,
+		?bool $extra,
+	): ?string {
 		foreach($filePathParts as $i => $filePart) {
 			$filePart = strtok($filePart, ".");
 			if($filePart[0] !== "@") {
@@ -67,7 +72,11 @@ private function processFilePathParts(array $filePathParts, array $requestPathPa
 	 * @param bool|null $extra Whether to include extra path parts
 	 * @return string|null The matched parameter
 	 */
-	private function handleNullKey(array $filePathParts, array $requestPathParts, ?bool $extra): ?string {
+	private function handleNullKey(
+		array $filePathParts,
+		array $requestPathParts,
+		?bool $extra,
+	): ?string {
 		if($extra) {
 			return $this->getExtraPathParts($filePathParts, $requestPathParts);
 		}
@@ -101,7 +110,12 @@ private function getExtraPathParts(array $filePathParts, array $requestPathParts
 	 * @param string $key The key to look for
 	 * @return string|null The matched parameter or null if no match
 	 */
-	private function handleNamedKey(string $filePart, array $requestPathParts, int $i, string $key): ?string {
+	private function handleNamedKey(
+		string $filePart,
+		array $requestPathParts,
+		int $i,
+		string $key,
+	): ?string {
 		if(ltrim($filePart, "@") !== $key) {
 			return null;
 		}

src/RouterCallback.php

@@ -1,7 +1,17 @@
 <?php
 namespace Gt\Routing;
 
+use Gt\Routing\Method\Any;
+use Gt\Routing\Method\Connect;
+use Gt\Routing\Method\Delete;
+use Gt\Routing\Method\Get;
+use Gt\Routing\Method\Head;
 use Gt\Routing\Method\HttpMethodHandler;
+use Gt\Routing\Method\Options;
+use Gt\Routing\Method\Patch;
+use Gt\Routing\Method\Post;
+use Gt\Routing\Method\Put;
+use Gt\Routing\Method\Trace;
 use Gt\ServiceContainer\Container;
 use Gt\ServiceContainer\Injector;
 use Negotiation\Accept;
@@ -10,10 +20,16 @@
 use ReflectionMethod;
 use Gt\Routing\Method\HttpRouteMethod;
 
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @phpcs:disable Generic.Metrics.CyclomaticComplexity
+ */
 class RouterCallback {
 	private Container $container;
 	private Injector $injector;
 	private ContentNegotiator $contentNegotiator;
+	/** @phpstan-ignore-next-line */
 	private HttpMethodHandler $httpMethodHandler;
 
 	/** @param ReflectionAttribute<HttpRouteMethod> $attribute */
@@ -38,11 +54,26 @@ public function call(BaseRouter $router):void {
 
 	public function isAllowedMethod(string $requestMethod):bool {
 		$methodsArgument = $this->attribute->getArguments()["methods"] ?? [];
-		return $this->httpMethodHandler->isAllowedMethod(
-			$requestMethod,
-			$this->attribute->getName(),
-			$methodsArgument
+
+		$allowedMethods = match($this->attribute->getName()) {
+			Any::class => HttpRoute::METHODS_ALL,
+			Connect::class => [HttpRoute::METHOD_CONNECT],
+			Delete::class => [HttpRoute::METHOD_DELETE],
+			Get::class => [HttpRoute::METHOD_GET],
+			Head::class => [HttpRoute::METHOD_HEAD],
+			Options::class => [HttpRoute::METHOD_OPTIONS],
+			Patch::class => [HttpRoute::METHOD_PATCH],
+			Post::class => [HttpRoute::METHOD_POST],
+			Put::class => [HttpRoute::METHOD_PUT],
+			Trace::class => [HttpRoute::METHOD_TRACE],
+			default => $methodsArgument,
+		};
+		$allowedMethods = array_map(
+			"strtoupper",
+			$allowedMethods
 		);
+
+		return in_array($requestMethod, $allowedMethods);
 	}
 
 	public function matchesPath(string $requestPath):bool {

src/RoutingException.php

@@ -7,6 +7,7 @@
 class RoutingException extends RuntimeException {
 	const DEFAULT_MESSAGE = "";
 
+	/** @phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod */
 	public function __construct(
 		string $message = self::DEFAULT_MESSAGE,
 		int $code = 0,