Pink-Crab / Perique-Route

src/Registration/WP_Rest_Registrar.php

Spacing +23 added lines, -23 removed lines

@@ -26,10 +26,10 @@ 
 	 * @param \PinkCrab\Route\Route\Route $route
 	 * @return callable
 	 */
-	public function create_callback( Route $route ): callable { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
-		return function () use ( $route ): void {
-			$model = $this->map_to_wp_rest( $route );
-			register_rest_route( $model->namespace, $model->route, $model->args );
+	public function create_callback(Route $route): callable { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+		return function() use ($route): void {
+			$model = $this->map_to_wp_rest($route);
+			register_rest_route($model->namespace, $model->route, $model->args);
 		};
 	}
 
@@ -39,11 +39,11 @@ 
 	 * @param \PinkCrab\Route\Route\Route $route
 	 * @return WP_Rest_Route
 	 */
-	public function map_to_wp_rest( Route $route ): WP_Rest_Route { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+	public function map_to_wp_rest(Route $route): WP_Rest_Route { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
 		$wp_rest            = new WP_Rest_Route();
 		$wp_rest->namespace = $route->get_namespace();
 		$wp_rest->route     = $route->get_route();
-		$wp_rest->args      = $this->parse_options( $route );
+		$wp_rest->args      = $this->parse_options($route);
 		return $wp_rest;
 	}
 
@@ -54,23 +54,23 @@ 
 	 * @return array<mixed>
 	 * @throws Route_Exception
 	 */
-	protected function parse_options( Route $route ): array {
+	protected function parse_options(Route $route): array {
 
 		// If we have no callback defined for route, throw.
-		if ( is_null( $route->get_callback() ) ) {
-			throw Route_Exception::callback_not_defined( $route ); // phpcs:ignore 
+		if (is_null($route->get_callback())) {
+			throw Route_Exception::callback_not_defined($route); // phpcs:ignore 
 		}
 
 		// If we have an invlaid method, throw
-		if ( ! $this->is_valid_method( $route->get_method() ) ) {
-			throw Route_Exception::invalid_http_method( $route ); // phpcs:ignore 
+		if ( ! $this->is_valid_method($route->get_method())) {
+			throw Route_Exception::invalid_http_method($route); // phpcs:ignore 
 		}
 
 		$options                        = array();
 		$options['methods']             = $route->get_method();
 		$options['callback']            = $route->get_callback();
-		$options['permission_callback'] = $this->compose_permission_callback( $route );
-		$options['args']                = $this->parse_args( $route );
+		$options['permission_callback'] = $this->compose_permission_callback($route);
+		$options['args']                = $this->parse_args($route);
 
 		return $options;
 	}
@@ -81,11 +81,11 @@ 
 	 * @param Route $route
 	 * @return array<mixed>
 	 */
-	protected function parse_args( Route $route ): array { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
+	protected function parse_args(Route $route): array { // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod.Found
 		return array_reduce(
 			$route->get_arguments(),
-			function ( array $args, Argument $argument ) {
-				$args[ $argument->get_key() ] = Argument_Parser::as_single( $argument );
+			function(array $args, Argument $argument) {
+				$args[$argument->get_key()] = Argument_Parser::as_single($argument);
 				return $args;
 			},
 			array()
@@ -98,12 +98,12 @@ 
 	 * @param string $method
 	 * @return boolean
 	 */
-	protected function is_valid_method( string $method ): bool {
+	protected function is_valid_method(string $method): bool {
 		return in_array(
 			$method,
 			apply_filters(
 				'pinkcrab/route/accepted_http_methods', // phpcs:ignore WordPress.NamingConventions.ValidHookName
-				array( Route::DELETE, Route::POST, Route::PUT, Route::PATCH, Route::GET )
+				array(Route::DELETE, Route::POST, Route::PUT, Route::PATCH, Route::GET)
 			),
 			true
 		);
@@ -115,19 +115,19 @@ 
 	 * @param Route $route
 	 * @return callable
 	 */
-	protected function compose_permission_callback( Route $route ): callable {
+	protected function compose_permission_callback(Route $route): callable {
 		$callbacks = $route->get_authentication();
 
 		// If we have no callback defined, use return true.
-		if ( count( $callbacks ) === 0 ) {
+		if (count($callbacks) === 0) {
 			return '__return_true';
 		}
 
 		// If we only have 1, return as is.
-		if ( count( $callbacks ) === 1 ) {
-			return reset( $callbacks );
+		if (count($callbacks) === 1) {
+			return reset($callbacks);
 		}
 
-		return all( ...$callbacks );
+		return all(...$callbacks);
 	}
 }

src/Registration/Route_Manager.php

Spacing +24 added lines, -24 removed lines

@@ -23,7 +23,7 @@ 
 	protected Hook_Loader $loader;
 	protected WP_Rest_Registrar $registrar;
 
-	public function __construct( WP_Rest_Registrar $registrar, Hook_Loader $hook_loader ) {
+	public function __construct(WP_Rest_Registrar $registrar, Hook_Loader $hook_loader) {
 		$this->loader    = $hook_loader;
 		$this->registrar = $registrar;
 	}
@@ -34,10 +34,10 @@ 
 	 * @param Route $route
 	 * @return self
 	 */
-	public function from_route( Route $route ): self {
+	public function from_route(Route $route): self {
 		$this->loader->action(
 			'rest_api_init',
-			$this->registrar->create_callback( $route )
+			$this->registrar->create_callback($route)
 		);
 
 		return $this;
@@ -49,9 +49,9 @@ 
 	 * @param \PinkCrab\Route\Route\Route_Group $group
 	 * @return self
 	 */
-	public function from_group( Route_Group $group ): self {
-		foreach ( $this->unpack_group( $group ) as $route ) {
-			$this->from_route( $route );
+	public function from_group(Route_Group $group): self {
+		foreach ($this->unpack_group($group) as $route) {
+			$this->from_route($route);
 		}
 
 		return $this;
@@ -64,31 +64,31 @@ 
 	 * @return Route[]
 	 * @throws Route_Exception code 102
 	 */
-	protected function unpack_group( Route_Group $group ): array {
+	protected function unpack_group(Route_Group $group): array {
 
 		$routes = array();
 		// Loop through each group
-		foreach ( $group->get_rest_routes() as $method => $route ) {
-			$populated_route = $this->create_base_route_from_group( $method, $group );
+		foreach ($group->get_rest_routes() as $method => $route) {
+			$populated_route = $this->create_base_route_from_group($method, $group);
 
 			// Replace args if set.
-			foreach ( $route->get_arguments() as $key => $argument ) {
-				$populated_route->argument( $argument );
+			foreach ($route->get_arguments() as $key => $argument) {
+				$populated_route->argument($argument);
 			}
 
 			// Extends any group based authentication with a route based.
-			foreach ( $route->get_authentication() as $key => $auth_callback ) {
-				$populated_route->authentication( $auth_callback );
+			foreach ($route->get_authentication() as $key => $auth_callback) {
+				$populated_route->authentication($auth_callback);
 			}
 
 			// If we have no callback defined for route, throw.
-			if ( is_null( $route->get_callback() ) ) {
-				throw Route_Exception::callback_not_defined( $route ); // phpcs:ignore
+			if (is_null($route->get_callback())) {
+				throw Route_Exception::callback_not_defined($route); // phpcs:ignore
 			}
 
-			$populated_route->callback( $route->get_callback() );
+			$populated_route->callback($route->get_callback());
 
-			$routes[ $method ] = $populated_route;
+			$routes[$method] = $populated_route;
 		}
 		return $routes;
 	}
@@ -102,16 +102,16 @@ 
 	 * @param Route_Group $group
 	 * @return Route
 	 */
-	protected function create_base_route_from_group( string $method, Route_Group $group ): Route {
-		$route = new Route( \strtoupper( $method ), $group->get_route() );
-		$route->namespace( $group->get_namespace() );
+	protected function create_base_route_from_group(string $method, Route_Group $group): Route {
+		$route = new Route(\strtoupper($method), $group->get_route());
+		$route->namespace($group->get_namespace());
 
-		foreach ( $group->get_authentication() as $auth_callback ) {
-			$route->authentication( $auth_callback );
+		foreach ($group->get_authentication() as $auth_callback) {
+			$route->authentication($auth_callback);
 		}
 
-		foreach ( $group->get_arguments() as $argument ) {
-			$route->argument( $argument );
+		foreach ($group->get_arguments() as $argument) {
+			$route->argument($argument);
 		}
 
 		return $route;

src/Route_Factory.php

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
 
 	protected string $namespace;
 
-	public function __construct( string $namespace ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
+	public function __construct(string $namespace) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
 		$this->namespace = $namespace;
 	}
 
@@ -30,8 +30,8 @@ 
 	 * @param string $namespace
 	 * @return Route_Factory
 	 */
-	public static function for( string $namespace ): Route_Factory { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
-		return new self( $namespace );
+	public static function for (string $namespace): Route_Factory { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
+		return new self($namespace);
 	}
 
 	/**
@@ -42,11 +42,11 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callback
 	 * @return Route
 	 */
-	protected function request( string $method, string $route, callable $callback ): Route {
-		$route = new Route( $method, $route );
+	protected function request(string $method, string $route, callable $callback): Route {
+		$route = new Route($method, $route);
 		return $route
-			->callback( $callback )
-			->namespace( $this->namespace );
+			->callback($callback)
+			->namespace($this->namespace);
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callback
 	 * @return Route
 	 */
-	public function get( string $route, callable $callback ): Route {
-		return $this->request( Route::GET, $route, $callback );
+	public function get(string $route, callable $callback): Route {
+		return $this->request(Route::GET, $route, $callback);
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callback
 	 * @return Route
 	 */
-	public function post( string $route, callable $callback ): Route {
-		return $this->request( Route::POST, $route, $callback );
+	public function post(string $route, callable $callback): Route {
+		return $this->request(Route::POST, $route, $callback);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callback
 	 * @return Route
 	 */
-	public function put( string $route, callable $callback ): Route {
-		return $this->request( Route::PUT, $route, $callback );
+	public function put(string $route, callable $callback): Route {
+		return $this->request(Route::PUT, $route, $callback);
 	}
 
 	/**
@@ -89,8 +89,8 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callback
 	 * @return Route
 	 */
-	public function patch( string $route, callable $callback ): Route {
-		return $this->request( Route::PATCH, $route, $callback );
+	public function patch(string $route, callable $callback): Route {
+		return $this->request(Route::PATCH, $route, $callback);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callback
 	 * @return Route
 	 */
-	public function delete( string $route, callable $callback ): Route {
-		return $this->request( Route::DELETE, $route, $callback );
+	public function delete(string $route, callable $callback): Route {
+		return $this->request(Route::DELETE, $route, $callback);
 	}
 
 	/**
@@ -111,12 +111,12 @@ 
 	 * @param ?callable(Route_Group): void $config
 	 * @return Route_Group
 	 */
-	public function group_builder( string $route, ?callable $config ): Route_Group {
-		$group = new Route_Group( $this->namespace, $route );
+	public function group_builder(string $route, ?callable $config): Route_Group {
+		$group = new Route_Group($this->namespace, $route);
 
 		// Apply the callback.
-		if ( ! is_null( $config ) ) {
-			$config( $group );
+		if ( ! is_null($config)) {
+			$config($group);
 		}
 
 		return $group;

src/Module/Route_Middleware.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 
 	protected Route_Manager $route_manager;
 
-	public function __construct( Route_Manager $route_manager ) {
+	public function __construct(Route_Manager $route_manager) {
 		$this->route_manager = $route_manager;
 	}
 
@@ -35,19 +35,19 @@ 
 	 * @param object $class
 	 * @return object
 	 */
-	public function process( object $class ): object { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.classFound
+	public function process(object $class): object { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.classFound
 
-		if ( is_a( $class, Route_Controller::class ) ) {
-			$routes = $class->get_routes( new Route_Collection() );
+		if (is_a($class, Route_Controller::class)) {
+			$routes = $class->get_routes(new Route_Collection());
 			$routes->each(
-				function ( Abstract_Route $route ) {
-					if ( is_a( $route, Route::class ) ) {
-						$this->route_manager->from_route( $route );
+				function(Abstract_Route $route) {
+					if (is_a($route, Route::class)) {
+						$this->route_manager->from_route($route);
 						return;
 					}
 
-					if ( is_a( $route, Route_Group::class ) ) {
-						$this->route_manager->from_group( $route );
+					if (is_a($route, Route_Group::class)) {
+						$this->route_manager->from_group($route);
 						return;
 					}
 				}

src/Route_Collection.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 
 class Route_Collection extends Collection {
 
-	protected const ALLOWED_ROUTE_TYPES = array( Route::class, Route_Group::class );
+	protected const ALLOWED_ROUTE_TYPES = array(Route::class, Route_Group::class);
 
 	/**
 	 * Overwrite this method in any extended classes, to modify the inital data.
@@ -26,12 +26,12 @@ 
 	 * @param array<int|string, mixed> $data
 	 * @return array<int|string, mixed>
 	 */
-	protected function map_construct( array $data ): array {
+	protected function map_construct(array $data): array {
 		return array_filter(
 			$data,
-			function ( $datum ): bool {
+			function($datum): bool {
 				return in_array(
-					esc_attr( get_class( $datum ) ?: '' ), // phpcs:ignore Universal.Operators.DisallowShortTernary.Found
+					esc_attr(get_class($datum) ?: ''), // phpcs:ignore Universal.Operators.DisallowShortTernary.Found
 					self::ALLOWED_ROUTE_TYPES,
 					true
 				);
@@ -45,8 +45,8 @@ 
 	 * @param Route|Route_Group $route
 	 * @return static
 	 */
-	public function add_route( $route ) {
-		$this->push( $route );
+	public function add_route($route) {
+		$this->push($route);
 		return $this;
 	}
 }

src/Route_Controller.php

Spacing +8 added lines, -8 removed lines

@@ -35,8 +35,8 @@ 
 	 * @throws Route_Exception (code 101)
 	 */
 	private function get_namespace(): string {
-		if ( ! is_string( $this->namespace ) || mb_strlen( $this->namespace ) === 0 ) {
-			throw Route_Exception::namespace_not_defined( \esc_html( get_class( $this ) ) );
+		if ( ! is_string($this->namespace) || mb_strlen($this->namespace) === 0) {
+			throw Route_Exception::namespace_not_defined(\esc_html(get_class($this)));
 		}
 
 		return $this->namespace;
@@ -49,7 +49,7 @@ 
 	 * @throws Route_Exception (code 101)
 	 */
 	private function get_factory(): Route_Factory {
-		return Route_Factory::for( $this->get_namespace() );
+		return Route_Factory::for ($this->get_namespace());
 	}
 
 	/**
@@ -58,10 +58,10 @@ 
 	 * @param Route_Collection $collection
 	 * @return Route_Collection
 	 */
-	final public function get_routes( Route_Collection $collection ): Route_Collection {
-		$routes = $this->define_routes( $this->get_factory() );
-		foreach ( $routes as $route ) {
-			$collection->add_route( $route );
+	final public function get_routes(Route_Collection $collection): Route_Collection {
+		$routes = $this->define_routes($this->get_factory());
+		foreach ($routes as $route) {
+			$collection->add_route($route);
 		}
 
 		return $collection;
@@ -73,5 +73,5 @@ 
 	 * @param Route_Factory $factory
 	 * @return array<Route|Route_Group>
 	 */
-	abstract protected function define_routes( Route_Factory $factory ): array;
+	abstract protected function define_routes(Route_Factory $factory): array;
 }

src/Route/Route_Group.php

Spacing +27 added lines, -27 removed lines

@@ -30,10 +30,10 @@ 
 	protected Route_Factory $route_factory;
 	protected string $route;
 
-	public function __construct( string $namespace, string $route ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
+	public function __construct(string $namespace, string $route) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
 		$this->route         = $route;
 		$this->namespace     = $namespace;
-		$this->route_factory = new Route_Factory( $namespace );
+		$this->route_factory = new Route_Factory($namespace);
 	}
 
 	/**
@@ -51,10 +51,10 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callable
 	 * @return Route
 	 */
-	public function get( callable $callable ): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
-		$route = $this->route_factory->get( $this->route, $callable );
-		$route->namespace( $this->namespace );
-		$this->routes[ Route::GET ] = $route;
+	public function get(callable $callable): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
+		$route = $this->route_factory->get($this->route, $callable);
+		$route->namespace($this->namespace);
+		$this->routes[Route::GET] = $route;
 		return $route;
 	}
 
@@ -64,10 +64,10 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callable
 	 * @return Route
 	 */
-	public function post( callable $callable ): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
-		$route = $this->route_factory->post( $this->route, $callable );
-		$route->namespace( $this->namespace );
-		$this->routes[ Route::POST ] = $route;
+	public function post(callable $callable): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
+		$route = $this->route_factory->post($this->route, $callable);
+		$route->namespace($this->namespace);
+		$this->routes[Route::POST] = $route;
 		return $route;
 	}
 
@@ -77,10 +77,10 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callable
 	 * @return Route
 	 */
-	public function put( callable $callable ): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
-		$route = $this->route_factory->put( $this->route, $callable );
-		$route->namespace( $this->namespace );
-		$this->routes[ Route::PUT ] = $route;
+	public function put(callable $callable): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
+		$route = $this->route_factory->put($this->route, $callable);
+		$route->namespace($this->namespace);
+		$this->routes[Route::PUT] = $route;
 		return $route;
 	}
 
@@ -90,10 +90,10 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callable
 	 * @return Route
 	 */
-	public function patch( callable $callable ): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
-		$route = $this->route_factory->patch( $this->route, $callable );
-		$route->namespace( $this->namespace );
-		$this->routes[ Route::PATCH ] = $route;
+	public function patch(callable $callable): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
+		$route = $this->route_factory->patch($this->route, $callable);
+		$route->namespace($this->namespace);
+		$this->routes[Route::PATCH] = $route;
 		return $route;
 	}
 
@@ -103,10 +103,10 @@ 
 	 * @param callable(\WP_REST_Request): (\WP_HTTP_Response|\WP_Error) $callable
 	 * @return Route
 	 */
-	public function delete( callable $callable ): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
-		$route = $this->route_factory->delete( $this->route, $callable );
-		$route->namespace( $this->namespace );
-		$this->routes[ Route::DELETE ] = $route;
+	public function delete(callable $callable): Route { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.callableFound
+		$route = $this->route_factory->delete($this->route, $callable);
+		$route->namespace($this->namespace);
+		$this->routes[Route::DELETE] = $route;
 		return $route;
 	}
 
@@ -117,8 +117,8 @@ 
 	 * @deprecated 0.0.2 This is not really used and should be removed in a future version.
 	 * @return self
 	 */
-	public function add_rest_route( Route $route ): self {
-		$this->routes[ $route->get_method() ] = $route;
+	public function add_rest_route(Route $route): self {
+		$this->routes[$route->get_method()] = $route;
 		return $this;
 	}
 
@@ -137,8 +137,8 @@ 
 	 * @param string $method
 	 * @return boolean
 	 */
-	public function method_exists( string $method ): bool {
-		return array_key_exists( \strtoupper( $method ), $this->routes );
+	public function method_exists(string $method): bool {
+		return array_key_exists(\strtoupper($method), $this->routes);
 	}
 
 	/**
@@ -147,6 +147,6 @@ 
 	 * @return boolean
 	 */
 	public function has_routes(): bool {
-		return ! empty( $this->routes );
+		return ! empty($this->routes);
 	}
 }

src/Route/Route.php

Spacing +27 added lines, -27 removed lines

@@ -36,9 +36,9 @@ 
 	protected $callback = null;
 
 
-	public function __construct( string $method, string $route ) {
+	public function __construct(string $method, string $route) {
 		$this->method = $method;
-		$this->route  = $this->format_route( $route );
+		$this->route  = $this->format_route($route);
 	}
 
 	/**
@@ -47,9 +47,9 @@ 
 	 * @param string $route
 	 * @return string
 	 */
-	protected function format_route( string $route ): string {
-		$route = $this->translate_arguments( $route );
-		return '/' . ltrim( $route, '/\\' );
+	protected function format_route(string $route): string {
+		$route = $this->translate_arguments($route);
+		return '/'.ltrim($route, '/\\');
 	}
 
 	/**
@@ -59,27 +59,27 @@ 
 	 * @param string $route
 	 * @return string
 	 */
-	protected function translate_arguments( string $route ): string {
-		if ( preg_match( '/[^-:\/_{}()a-zA-Z\d]/', $route ) ) {
+	protected function translate_arguments(string $route): string {
+		if (preg_match('/[^-:\/_{}()a-zA-Z\d]/', $route)) {
 			return $route;
 		}
 
 		// Create capture group for ":parameter"
 		$allowed_chars = '[\@a-zA-Z0-9&.?:-_=#]*';
 		$route         = preg_replace(
-			'/:(' . $allowed_chars . ')/',
-			'(?<$1>' . $allowed_chars . ')',
+			'/:('.$allowed_chars.')/',
+			'(?<$1>'.$allowed_chars.')',
 			$route
 		);
 
 		// Create capture group for '{parameter}'
 		$route = preg_replace(
-			'/{(' . $allowed_chars . ')}/',
-			'(?<$1>' . $allowed_chars . ')',
-			is_string( $route ) ? $route : ''
+			'/{('.$allowed_chars.')}/',
+			'(?<$1>'.$allowed_chars.')',
+			is_string($route) ? $route : ''
 		);
 
-		return is_string( $route ) ? $route : '';
+		return is_string($route) ? $route : '';
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 *
 	 * @return self
 	 */
-	public function callback( callable $callback ): self {
+	public function callback(callable $callback): self {
 		$this->callback = $callback;
 		return $this;
 	}
@@ -127,7 +127,7 @@ 
 	 * @param string $namespace
 	 * @return static
 	 */
-	public function namespace( string $namespace ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
+	public function namespace(string $namespace) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.namespaceFound
 		$this->namespace = $namespace;
 		return $this;
 	}
@@ -138,27 +138,27 @@ 
 	 * @param string $method
 	 * @return self
 	 */
-	public function with_method( string $method ): self {
-		$clone = new self( $method, $this->get_route() );
+	public function with_method(string $method): self {
+		$clone = new self($method, $this->get_route());
 		// Arguments
-		if ( ! empty( $this->arguments ) ) {
-			foreach ( $this->arguments as $argument ) {
-				$clone->argument( $argument );
+		if ( ! empty($this->arguments)) {
+			foreach ($this->arguments as $argument) {
+				$clone->argument($argument);
 			}
 		}
 		// Authentication
-		if ( ! empty( $this->authentication ) ) {
-			foreach ( $this->authentication as $authentication ) {
-				$clone->authentication( $authentication );
+		if ( ! empty($this->authentication)) {
+			foreach ($this->authentication as $authentication) {
+				$clone->authentication($authentication);
 			}
 		}
 		// Callback
-		if ( ! empty( $this->callback ) ) {
-			$clone->callback( $this->callback );
+		if ( ! empty($this->callback)) {
+			$clone->callback($this->callback);
 		}
 		// Namespace
-		if ( ! empty( $this->namespace ) ) {
-			$clone->namespace( $this->namespace );
+		if ( ! empty($this->namespace)) {
+			$clone->namespace($this->namespace);
 		}
 
 		return $clone;