Merge pull request #63 from PhpSlides/main

Main

Author: dconco

.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())