updated versionlog

Author: ljonesfl

VERSIONLOG.md

@@ -1,4 +1,8 @@
 ## 0.6.8
+* Updated components.
+* Refactoring.
+* Improved tests.
+* Added additional uri cleanup.
 
 ## 0.6.7 2025-02-06
 ## 0.6.6 2025-01-27
@@ -7,7 +11,7 @@
 ## 0.6.4
 ## 0.6.3 2024-11-27
 * Updated route signatures.
-* Added logging
+* Added logging.
 
 ## 0.6.2 2024-11-27
 * Updated dependencies.

src/Routing/Router.php

@@ -30,22 +30,22 @@ public function registerFilter( string $Name, Filter $Filter ): void
 	}
 
 	/**
-	 * @param string $Name
+	 * @param string $routeName
 	 * @return Filter
 	 * @throws \Exception
 	 */
 
-	public function getFilter( string $Name ) : Filter
+	public function getFilter( string $routeName ) : Filter
 	{
 		$Filter = null;
 
-		if( array_key_exists( $Name, $this->_FilterRegistry ) )
+		if( array_key_exists( $routeName, $this->_FilterRegistry ) )
 		{
-			$Filter = $this->_FilterRegistry[ $Name ];
+			$Filter = $this->_FilterRegistry[ $routeName ];
 		}
 		else
 		{
-			throw new \Exception( "Filter $Name not registered." );
+			throw new \Exception( "Filter $routeName not registered." );
 		}
 
 		return $Filter;
@@ -140,6 +140,21 @@ protected function isRouteWithParams( RouteMap $Route ) : bool
 	 */
 	protected function processRoute( RouteMap $Route, $Uri ) : ?array
 	{
+		if( !$Uri )
+		{
+			$Uri = '/';
+		}
+		else if( $Uri[ 0 ] != '/' )
+		{
+			$Uri = '/' . $Uri;
+		}
+
+		if( strlen( $Uri ) > 1 && $Uri[ strlen( $Uri ) - 1 ] == "/" )
+		{
+			$string = new NString( $Uri );
+			$Uri    = $string->left( $string->length() - 1 );
+		}
+
 		// Does route have parameters?
 
 		if( $this->isRouteWithParams( $Route ) )
@@ -155,15 +170,6 @@ protected function processRoute( RouteMap $Route, $Uri ) : ?array
 		}
 		else
 		{
-			if( !$Uri )
-			{
-				$Uri = '/';
-			}
-			else if( $Uri[ 0 ] != '/' )
-			{
-				$Uri = '/' . $Uri;
-			}
-
 			if( $Route->Path == $Uri )
 			{
 				return [];
@@ -179,6 +185,7 @@ protected function processRoute( RouteMap $Route, $Uri ) : ?array
 	 * @return array
 	 * @throws \Exception
 	 */
+
 	protected function processRouteWithParameters( RouteMap $Route, string $Uri ) : array
 	{
 		$Details = $Route->parseParams();
@@ -192,9 +199,10 @@ protected function processRouteWithParameters( RouteMap $Route, string $Uri ) :
 	 * @param array $Details
 	 * @return array
 	 */
+
 	protected function extractRouteParams( string $Uri, array $Details ) : array
 	{
-		if( $Uri && $Uri[ 0 ]  == '/' )
+		if( $Uri && $Uri[ 0 ] == '/' )
 		{
 			$String = new NString( $Uri );
 			$Uri    = $String->right( $String->length() - 1 );
@@ -213,12 +221,10 @@ protected function extractRouteParams( string $Uri, array $Details ) : array
 			}
 
 			$action = $Details[ $iOffset ][ 'action' ];
-			if( $action )
+
+			if( $action && $action != $Part )
 			{
-				if( $action != $Part )
-				{
-					return [];
-				}
+				return [];
 			}
 			else
 			{
@@ -296,15 +302,7 @@ public function getRoute( int $Method, string $Uri ) : ?RouteMap
 			{
 				if( $Params )
 				{
-					if( is_array( $Params ) )
-					{
-						$Route->Parameters = $Params;
-					}
-					else
-					{
-						$Route->Parameters = [];
-					}
-
+					$Route->Parameters = $Params;
 					return $Route;
 				}
 			}
@@ -374,7 +372,9 @@ function run( array $Argv = [] ) : mixed
 			$Type = $Argv[ 'type' ];
 		}
 
-		$Route = $this->getRoute( RequestMethod::getType( $Type ), $Argv[ 'route' ] );
+		$Uri = $Argv[ 'route' ];
+
+		$Route = $this->getRoute( RequestMethod::getType( $Type ), $Uri );
 
 		if( !$Route )
 		{
@@ -394,14 +394,7 @@ function run( array $Argv = [] ) : mixed
 
 		if( array_key_exists( 'extra', $Argv ) )
 		{
-			if( is_array( $Route->Parameters ) )
-			{
-				$Route->Parameters = array_merge( $Route->Parameters, $Argv[ 'extra' ] );
-			}
-			else
-			{
-				$Route->Parameters = $Argv[ 'extra' ];
-			}
+			$Route->Parameters = array_merge( $Route->Parameters, $Argv[ 'extra' ] );
 		}
 
 		$Route->Parameters = array_merge( $Route->Parameters, $Route->Payload );

tests/unit/FilterTest.php

@@ -32,7 +32,7 @@ function( Routing\RouteMap $Route ) use ( &$Filter, &$Name )
 			'/test',
 			function(){},
 			'PreFilter'
-			);
+		);
 
 		$Route = $this->Router->getRoute(
 			Routing\RequestMethod::GET,
@@ -47,6 +47,15 @@ function(){},
 		$this->assertEquals( '/test', $Name );
 	}
 
+	public function testRouteNoFilter()
+	{
+		$Filter = false;
+		$Name = '';
+
+		$this>$this->expectException(\Exception::class);
+		$this->Router->getFilter( 'NoFilter' );
+	}
+
 	public function testRoutePostFilter()
 	{
 		$Filter = false;

tests/unit/RouteTest.php

@@ -75,6 +75,22 @@ public function testPut()
 		);
 	}
 
+	public function testMissingMethodType()
+	{
+		Routing\Route::get(
+			'/get/:id',
+			function(){ return 'get'; }
+		)->setName( 'test.get' );
+
+		$this->expectException( \Exception::class );
+
+		$Route = Routing\Router::getInstance()->run(
+			[
+				'route' => '/get/1'
+			]
+		);
+	}
+
 	public function testGet()
 	{
 		Routing\Route::get(
@@ -85,7 +101,7 @@ function(){ return 'get'; }
 
 		$Route = Routing\Router::getInstance()->getRoute(
 			Routing\RequestMethod::GET,
-			'/get/1'
+			'/get/1/'
 		);
 
 		$this->assertEquals(