Dev

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Configure and Run Tests Before Release
+name: Release
 
 on:
    push:

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Execute Tests
+name: Tests
 
 on:
    push:
@@ -63,11 +63,8 @@ jobs:
 
          - name: Push changes to main
            run: |
-              git fetch origin main dev
-              git checkout main
-              git config pull.rebase false
-              git pull origin main
-              git merge origin/dev --allow-unrelated-histories --no-ff
-              git push origin main
+              git checkout -b main
+              git reset --hard dev
+              git push -u -f origin main
            env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Router/MapRoute.php

@@ -2,8 +2,8 @@
 
 namespace PhpSlides\Router;
 
-use PhpSlides\Src\Controller\Controller;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Controller\Controller;
+use PhpSlides\Core\Foundation\Application;
 use PhpSlides\Router\Interface\MapInterface;
 
 /**
@@ -18,8 +18,8 @@
  */
 class MapRoute extends Controller implements MapInterface
 {
-	use \PhpSlides\Src\Utils\Validate;
-	use \PhpSlides\Src\Utils\Routes\StrictTypes;
+	use \PhpSlides\Core\Utils\Validate;
+	use \PhpSlides\Core\Utils\Routes\StrictTypes;
 
 	/**
 	 * @var string|array $route The route(s) to be mapped.
@@ -64,14 +64,13 @@ public function match(string $method, string|array $route): bool|array
 		 *   |   $_REQUEST['uri'] will be empty if req uri is /
 		 *   ----------------------------------------------
 		 */
-		self::$request_uri = strtolower(
-		 preg_replace("/(^\/)|(\/$)/", '', Application::$request_uri),
-		);
+		self::$request_uri =
+		 preg_replace("/(^\/)|(\/$)/", '', Application::$request_uri);
 		self::$request_uri = empty(self::$request_uri) ? '/' : self::$request_uri;
 
 		self::$route = is_array($route)
 		 ? $route
-		 : strtolower(preg_replace("/(^\/)|(\/$)/", '', $route));
+		 : preg_replace("/(^\/)|(\/$)/", '', $route);
 
 		//  Firstly, resolve route with pattern
 		if (is_array(self::$route))
@@ -191,9 +190,15 @@ public function match(string $method, string|array $route): bool|array
 		 *   -----------------------------------
 		 */
 		$reqUri = str_replace('/', '\\/', $reqUri);
+		$route = self::$route;
+
+		if (Application::$caseInSensitive === true) {
+		   $reqUri = strtolower($reqUri);
+		   $route = strtolower($route);
+		}
 
 		// now matching route with regex
-		if (preg_match("/$reqUri/", self::$route . '$'))
+		if (preg_match("/$reqUri/", $route . '$'))
 		{
 			// checks if the requested method is of the given route
 			if (
@@ -247,6 +252,7 @@ private function match_routing (): bool|array
 	{
 		$uri = [];
 		$str_route = '';
+		$request_uri = self::$request_uri;
 
 		if (is_array(self::$route))
 		{
@@ -255,14 +261,20 @@ private function match_routing (): bool|array
 				$each_route = preg_replace("/(^\/)|(\/$)/", '', self::$route[$i]);
 
 				empty($each_route)
-				 ? array_push($uri, strtolower('/'))
-				 : array_push($uri, strtolower($each_route));
+				 ? array_push($uri, '/')
+				 : array_push($uri, Application::$caseInSensitive === true ? strtolower($each_route) : $each_route);
 			}
 		}
 		else
 		{
 			$str_route = empty(self::$route) ? '/' : self::$route;
 		}
+
+
+		if (Application::$caseInSensitive === true) {
+		   $request_uri = strtolower($request_uri);
+		   $str_route = strtolower($str_route);
+		}
 
 		if (
 		in_array(self::$request_uri, $uri) ||
@@ -329,9 +341,15 @@ private function pattern (): array|bool
 	 */
 	private function validatePattern (string $pattern): array|bool
 	{
+	   $request_uri = self::$request_uri;
 		$pattern = preg_replace("/(^\/)|(\/$)/", '', trim(substr($pattern, 8)));
 
-		if (fnmatch($pattern, self::$request_uri))
+		if (Application::$caseInSensitive === true) {
+		   $request_uri = strtolower($request_uri);
+		   $pattern = strtolower($pattern);
+		}
+
+		if (fnmatch($pattern, $request_uri))
 		{
 			if (
 			!in_array($_SERVER['REQUEST_METHOD'], self::$method) &&
@@ -349,4 +367,4 @@ private function validatePattern (string $pattern): array|bool
 		}
 		return false;
 	}
-}
+}

Router/Route.php

@@ -17,8 +17,8 @@
 
 use Closure;
 use PhpSlides\Exception;
-use PhpSlides\Src\Traits\FileHandler;
-use PhpSlides\Src\Controller\Controller;
+use PhpSlides\Core\Traits\FileHandler;
+use PhpSlides\Core\Controller\Controller;
 use PhpSlides\Router\Interface\RouteInterface;
 
 /**
@@ -51,6 +51,8 @@ class Route extends Controller implements RouteInterface
 
 	private ?array $mapRoute = null;
 
+	private bool $caseSensitive = false;
+
 	private ?Closure $handleInvalidParameterType = null;
 
 	private static array $routes;
@@ -140,14 +142,14 @@ public function name(string $name): self
 	 * @param string $route
 	 * @param Closure $callback
 	 */
-	public function route(string $route, Closure $callback): self
+	public function route(string $route, callable $callback): self
 	{
-		$route = rtrim('/', self::$map['route']) . '/' . ltrim('/', $route);
+		$route = rtrim(self::$map['route'], '/') . '/' . ltrim($route, '/');
 
 		if (self::$map) {
 			$this->mapRoute = [
 				'route' => $route,
-				'method' => self::$map['method'],
+				'method' => '*',
 				'callback' => $callback,
 			];
 		} else {
@@ -215,6 +217,12 @@ public function handleInvalidParameterType(Closure $closure): self
 		return $this;
 	}
 
+	public function caseSensitive(): self
+	{
+		$this->caseSensitive = true;
+		return $this;
+	}
+
 	/**
 	 * Applies Authentication Guard to the current route.
 	 *
@@ -393,6 +401,9 @@ public function __destruct()
 		$route_index = end(self::$route);
 		$route_index = is_array($route_index) ? $route_index[0] : $route_index;
 
+		$GLOBALS['__registered_routes'][$route_index]['caseSensitive'] =
+			$this->caseSensitive;
+
 		if (self::$map !== null) {
 			$GLOBALS['__registered_routes'][$route_index]['map'] = self::$map;
 		}

Router/view.php

@@ -2,8 +2,8 @@
 
 namespace PhpSlides\Router;
 
-use component;
-use PhpSlides\Src\Foundation\Application;
+use function component;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * --------------------------------------------------------------
@@ -31,11 +31,11 @@ final class view
 	 *
 	 * --------------------------------------------------------------
 	 */
-	final public static function render(string $view, mixed ...$props): mixed
+	final public static function render (string $view, mixed ...$props): mixed
 	{
 		// split :: into array and extract the folder and files
 		$file = preg_replace('/(::)|::/', '/', $view);
-		$file = strtolower(trim($file, '\/\/'));
+		$file = trim($file, '\/\/');
 		$file_uri = Application::$viewsDir . $file;
 		header('Content-Type: text/html');
 

composer.json

@@ -4,7 +4,7 @@
 	"homepage": "https://github.com/PhpSlides",
 	"type": "library",
 	"license": "MIT",
-	"keywords": [ "framework", "phpslides" ],
+	"keywords": ["framework", "phpslides"],
 	"support": {
 		"issues": "https://github.com/PhpSlides/framework/issues",
 		"source": "https://github.com/PhpSlides/framework"
@@ -31,22 +31,23 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"PhpSlides\\": [ "src/Exception/" ],
-			"PhpSlides\\Src\\": [ "src/" ],
-			"PhpSlides\\Router\\": [ "Router/" ]
+			"PhpSlides\\": "src/Exception/",
+			"PhpSlides\\Core\\": "src/",
+			"PhpSlides\\Router\\": "Router/"
 		},
-		"files": [ "src/Bootstrap/App.php" ]
+		"files": ["src/Bootstrap/App.php"]
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"PhpSlides\\Tests\\": "tests/"
+			"PhpSlides\\Tests\\": "tests/__tests__/"
 		}
 	},
 	"config": {
 		"preferred-install": "dist"
 	},
 	"scripts": {
-		"test": "vendor/bin/phpunit"
+		"test": "phpunit || vendor/bin/phpunit || php vendor/bin/phpunit",
+		"post-install-cmd": ["PhpSlides\\Core\\Cache\\Cache::clear()"]
 	},
 	"minimum-stability": "stable",
 	"prefer-stable": true

phpunit.xml

@@ -10,7 +10,7 @@
          backupStaticProperties="false">
     <testsuites>
         <testsuite name="PhpSlides Test Suite">
-            <directory>tests/tests</directory>
+            <directory>tests/__tests__</directory>
         </testsuite>
     </testsuites>
 

src/Bootstrap/App.php

@@ -3,4 +3,4 @@
 /**
  * Start the PhpSlides Application
  */
-(new \PhpSlides\Src\Foundation\Application())->create();
+(new \PhpSlides\Core\Foundation\Application())->create();

src/Cache/Cache.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace PhpSlides\Src\Cache;
+namespace PhpSlides\Core\Cache;
 
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * Class Cache
@@ -20,10 +20,11 @@ class Cache
 	 * effectively clearing all cached files. It is commonly used to
 	 * reset the cache during development or when cache corruption occurs.
 	 */
-	public function clear()
+	public static function clear ()
 	{
 		// Check if the cache directory exists
-		if (is_dir(Application::$basePath . 'app/cache')) {
+		if (is_dir(Application::$basePath . 'app/cache'))
+		{
 			// Remove the cache directory
 			rmdir(Application::$basePath . 'app/cache');
 		}
@@ -36,12 +37,13 @@ public function clear()
 	 * It is typically used during development when hot reload functionality
 	 * needs to be reset or reloaded.
 	 */
-	public function clearHotReload()
+	public static function clearHotReload ()
 	{
 		// Check if the hot-reload cache file exists
-		if (file_exists(Application::$basePath . 'app/cache/hot-reload.json')) {
+		if (file_exists(Application::$basePath . 'app/cache/hot-reload.json'))
+		{
 			// Delete the hot-reload cache file
 			unlink(Application::$basePath . 'app/cache/hot-reload.json');
 		}
 	}
-}
+}

src/Cli/Configure.php

@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
 
-namespace PhpSlides\Src\Cli;
+namespace PhpSlides\Core\Cli;
 
 trait Configure
 {
-   public static function bootstrap ()
+   protected static function bootstrap ()
    {
       if (php_sapi_name() == 'cli')
       {

src/Config/config.php

@@ -1,5 +1,5 @@
 <?php
 
-use PhpSlides\Src\Loader\FileLoader;
+use PhpSlides\Core\Loader\FileLoader;
 
 (new FileLoader())->load(__DIR__ . '/cors.php');

src/Config/cors.php

@@ -1,32 +1,34 @@
 <?php
 
-use PhpSlides\Src\Logger\Logger;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Logger\Logger;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Foundation\Application;
 
 $cors =
-	(new FileLoader())
-		->safeLoad(Application::$configsDir . 'cors.php')
-		->getLoad() ?:
-	[];
+ (new FileLoader())
+  ->safeLoad(Application::$configsDir . 'cors.php')
+  ->getLoad() ?:
+ [];
 
-foreach ($cors as $key => $value) {
+foreach ($cors as $key => $value)
+{
 	$key = 'Access-Control-' . str_replace('_', '-', ucwords($key, '_'));
 	$value = is_array($value) ? implode(', ', $value) : $value;
 
 	$header_value =
-		$key . ': ' . (is_bool($value) ? var_export($value, true) : $value);
+	 $key . ': ' . (is_bool($value) ? var_export($value, true) : $value);
 	header($header_value);
 }
 
 /**
  * Handle preflight requests (OPTIONS method)
  */
-if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS')
+{
 	class Log
 	{
 		use Logger;
-		public function __construct()
+		public function __construct ()
 		{
 			self::log();
 		}