Main

.github/workflows/tests.yml

@@ -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.

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;
 
 /**

Router/view.php

@@ -3,7 +3,7 @@
 namespace PhpSlides\Router;
 
 use component;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * --------------------------------------------------------------

composer.json

@@ -32,7 +32,7 @@
 	"autoload": {
 		"psr-4": {
 			"PhpSlides\\": "src/Exception/",
-			"PhpSlides\\Src\\": "src/",
+			"PhpSlides\\Core\\": "src/",
 			"PhpSlides\\Router\\": "Router/"
 		},
 		"files": ["src/Bootstrap/App.php"]

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

src/Cli/Configure.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Cli;
+namespace PhpSlides\Core\Cli;
 
 trait Configure
 {

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,8 +1,8 @@
 <?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())

src/Config/env.config.php

@@ -1,7 +1,7 @@
 <?php
 
 use Dotenv\Dotenv;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 $basePath = Application::$basePath === '' ? 'app/../' : Application::$basePath;
 

src/Config/guards.php

@@ -1,7 +1,7 @@
 <?php
 
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Foundation\Application;
 
 return (new FileLoader())
 	->safeLoad(Application::$configsDir . 'guards.php')

src/Config/jwt.config.php

@@ -1,8 +1,8 @@
 <?php
 
 use PhpSlides\Exception;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Foundation\Application;
 
 return (new FileLoader())
 	->safeLoad(Application::$configsDir . 'jwt.php')

src/Controller/ClassController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpSlides\Src\Controller;
+namespace PhpSlides\Core\Controller;
 
 use PhpSlides\Exception;
 

src/Controller/Controller.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Controller;
+namespace PhpSlides\Core\Controller;
 
 abstract class Controller extends RouteController
 {

src/Controller/RouteController.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace PhpSlides\Src\Controller;
+namespace PhpSlides\Core\Controller;
 
 use PhpSlides\Exception;
-use PhpSlides\Src\Http\Request;
-use PhpSlides\Src\Logger\Logger;
-use PhpSlides\Src\Loader\ViewLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Http\Request;
+use PhpSlides\Core\Logger\Logger;
+use PhpSlides\Core\Loader\ViewLoader;
+use PhpSlides\Core\Foundation\Application;
 
 class RouteController
 {

src/Database/Connection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Database;
+namespace PhpSlides\Core\Database;
 
 use DB;
 

src/Database/Database.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace PhpSlides\Src\Database;
+namespace PhpSlides\Core\Database;
 
 use MeekroORM;
-use PhpSlides\Src\Parser\ORMParser;
+use PhpSlides\Core\Parser\ORMParser;
 
 /**
  * Abstract class for managing database operations with MeekroORM.

src/Exception/Exception.php

@@ -2,7 +2,7 @@
 
 namespace PhpSlides;
 
-use PhpSlides\Src\Loader\FileLoader;
+use PhpSlides\Core\Loader\FileLoader;
 use Exception as DefaultException;
 use PhpSlides\Interface\SlidesException;
 

src/Exception/template/index.php

@@ -189,9 +189,9 @@ function highlightSpecificLines(block, linesToHighlight) {
      : 'http://';
 
    $addr =
-    \PhpSlides\Src\Foundation\Application::$REMOTE_ADDR .
+    \PhpSlides\Core\Foundation\Application::$REMOTE_ADDR .
     "/hot-reload-a$sid/worker";
-   $phpslides_version = \PhpSlides\Src\Foundation\Application::PHPSLIDES_VERSION;
+   $phpslides_version = \PhpSlides\Core\Foundation\Application::PHPSLIDES_VERSION;
 
    if (getenv('HOT_RELOAD') == 'true'): ?>
    <script>

src/Forgery/Database.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace PhpSlides\Src\Forgery;
+namespace PhpSlides\Core\Forgery;
 
 use DB;
-use PhpSlides\Src\Logger\DBLogger;
-use PhpSlides\Src\Database\Connection;
-use PhpSlides\Src\Database\Database as DB_ORM;
+use PhpSlides\Core\Logger\DBLogger;
+use PhpSlides\Core\Database\Connection;
+use PhpSlides\Core\Database\Database as DB_ORM;
 
 /**
  * Abstract class for managing database operations.

src/Forgery/Forge.php

@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Forgery;
+namespace PhpSlides\Core\Forgery;
 
 use DB;
-use PhpSlides\Src\Parser\SqlParser;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Parser\SqlParser;
+use PhpSlides\Core\Foundation\Application;
 
 class Forge extends Database
 {

src/Formatter/SqlFormat.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter;
+namespace PhpSlides\Core\Formatter;
 
 /**
  * Abstract class for formatting SQL column definitions.

src/Formatter/ViewFormatter.php

@@ -1,13 +1,13 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Formatter;
+namespace PhpSlides\Core\Formatter;
 
-use PhpSlides\Src\Formatter\Views\FormatPslTags;
-use PhpSlides\Src\Formatter\Views\FormatIncludes;
-use PhpSlides\Src\Formatter\Views\FormatHotReload;
-use PhpSlides\Src\Formatter\Views\HandleProperties;
-use PhpSlides\Src\Formatter\Views\FormatImportQuotes;
-use PhpSlides\Src\Formatter\Views\FormatBracketInterpolation;
+use PhpSlides\Core\Formatter\Views\FormatPslTags;
+use PhpSlides\Core\Formatter\Views\FormatIncludes;
+use PhpSlides\Core\Formatter\Views\FormatHotReload;
+use PhpSlides\Core\Formatter\Views\HandleProperties;
+use PhpSlides\Core\Formatter\Views\FormatImportQuotes;
+use PhpSlides\Core\Formatter\Views\FormatBracketInterpolation;
 
 /**
  * Handles the formatting of view files for PhpSlides.
@@ -16,7 +16,7 @@
  * It applies multiple transformations such as handling includes, hot reloads, import quotes,
  * bracket interpolation, PSL tags, and properties for dynamic rendering.
  *
- * @package PhpSlides\Src\Formatter
+ * @package PhpSlides\Core\Formatter
  * @author Dave Conco <info@dconco.dev>
  * @copyright 2024 Dave Conco
  */

src/Formatter/Views/FormatBracketInterpolation.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait for handling bracket interpolation in view contents.

src/Formatter/Views/FormatHotReload.php

@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * Trait to add Hot Reload functionality in PhpSlides view files.

src/Formatter/Views/FormatImportQuotes.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait to format import quotes in PhpSlides view files.

src/Formatter/Views/FormatIncludes.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait to format includes elements in PhpSlides view files.

src/Formatter/Views/FormatPslTags.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait to replace PhpSlides default tags in view files.
@@ -17,7 +17,7 @@ trait FormatPslTags
 	 * This constructor is a placeholder for any necessary initialization for
 	 * the class using this trait. It currently does not perform any operations.
 	 */
-	public function __construct ()
+	public function __construct()
 	{
 		// code...
 	}
@@ -30,24 +30,23 @@ public function __construct ()
 	 * PHP tags to remove unnecessary semicolons and ensures the code is correctly
 	 * formatted for execution.
 	 */
-	protected function psl_tags ()
+	protected function psl_tags()
 	{
 		// Regular expression to match any PHP opening and closing tags
 		$formattedContents = preg_replace_callback(
-		 '/<' . '\?' . '\s+([\s\S]*?)\s*\?' . '>/s',
-		 function ($matches)
-		 {
-			 // Trim the content inside the PHP tags, removing trailing semicolons
- 			$val = trim($matches[1]);
-			 $val = str_ends_with(')', $val) ? $val . ';' : $val;
+			'/<' . '\?' . '\s+([\s\S]*?)\s*\?' . '>/s',
+			function ($matches) {
+				// Trim the content inside the PHP tags, removing trailing semicolons
+				$val = trim($matches[1]);
+				$val = str_ends_with(')', $val) ? $val . ';' : $val;
 
-			 // Reformat the PHP content and return it
- 			return '<' . '?php ' . $val . ' ?' . '>';
-		 },
-		 $this->contents,
+				// Reformat the PHP content and return it
+				return '<' . '?php ' . $val . ' ?' . '>';
+			},
+			$this->contents,
 		);
 
 		// Update the contents with the formatted PHP code blocks
 		$this->contents = $formattedContents;
 	}
-}
+}