Revert "Move out of the Backend folder; Top-Level composer"

This reverts commit c85a2a3.
felix-schindler · Oct 27, 2022 · ad31c0b · ad31c0b
1 parent 94431e8
commit ad31c0b
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-vendor/
+/Backend/Libraries/vendor/
 .DS_Store
diff --git a/.phpstan.neon b/.phpstan.neon
@@ -1,9 +1,7 @@
 parameters:
 	level: 6
 	excludePaths:
-		- vendor/*
+		- Backend/Libraries/vendor/*
 	paths:
 		- index.php
-		- Controllers
-		- Core
-		- Views
+		- Backend
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,7 +4,7 @@
         {
             "label": "PHPStan",
             "type": "shell",
-            "command": "php vendor/bin/phpstan analyse -c .phpstan.neon --memory-limit 500M",
+            "command": "php Backend/Libraries/vendor/bin/phpstan analyse -c .phpstan.neon --memory-limit 500M",
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/Controllers/APIController.php → Backend/Controllers/APIController.php b/Controllers/APIController.php → Backend/Controllers/APIController.php
diff --git a/Controllers/HomeController.php → Backend/Controllers/HomeController.php b/Controllers/HomeController.php → Backend/Controllers/HomeController.php
diff --git a/Controllers/NotCalledController.php → Backend/Controllers/NotCalledController.php b/Controllers/NotCalledController.php → Backend/Controllers/NotCalledController.php
diff --git a/Controllers/SecondHome.php → Backend/Controllers/SecondHome.php b/Controllers/SecondHome.php → Backend/Controllers/SecondHome.php
diff --git a/Core/ClassLoader.php → Backend/Core/ClassLoader.php b/Core/ClassLoader.php → Backend/Core/ClassLoader.php
diff --git a/Core/Data/Database.php → Backend/Core/Data/Database.php b/Core/Data/Database.php → Backend/Core/Data/Database.php
@@ -40,9 +40,6 @@ public function execute(string $queryStr, array $values): bool
 	 * Reads data (row by row) from database
 	 * Access returned value via $return['ColumnName']
 	 *
-	 * This should be executed if only one
-	 * row is returned or in a do-while loop
-	 *
 	 * @see https://bugs.php.net/bug.php?edit=2&id=44341 Always string values!
 	 * @throws PDOException When anything goes wrong
 	 * @return array<string,string>|null Result as array - null on failure

diff --git a/Core/Data/InsertQuery.php → Backend/Core/Data/InsertQuery.php b/Core/Data/InsertQuery.php → Backend/Core/Data/InsertQuery.php
diff --git a/Core/Data/Model.php → Backend/Core/Data/Model.php b/Core/Data/Model.php → Backend/Core/Data/Model.php
diff --git a/Core/Data/Query.php → Backend/Core/Data/Query.php b/Core/Data/Query.php → Backend/Core/Data/Query.php
diff --git a/Core/Functions/Auth.php → Backend/Core/Functions/Auth.php b/Core/Functions/Auth.php → Backend/Core/Functions/Auth.php
diff --git a/Core/Functions/Utils.php → Backend/Core/Functions/Utils.php b/Core/Functions/Utils.php → Backend/Core/Functions/Utils.php
diff --git a/Core/System/Controller.php → Backend/Core/System/Controller.php b/Core/System/Controller.php → Backend/Core/System/Controller.php
diff --git a/Core/System/IO.php → Backend/Core/System/IO.php b/Core/System/IO.php → Backend/Core/System/IO.php
diff --git a/Core/System/Router.php → Backend/Core/System/Router.php b/Core/System/Router.php → Backend/Core/System/Router.php
diff --git a/Core/System/View.php → Backend/Core/System/View.php b/Core/System/View.php → Backend/Core/System/View.php
diff --git a/Backend/Libraries/composer.json b/Backend/Libraries/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "phpstan/phpstan": "^1.2"
+    }
+}
diff --git a/composer.lock → Backend/Libraries/composer.lock b/composer.lock → Backend/Libraries/composer.lock
diff --git a/Views/Base/APIView.php → Backend/Views/Base/APIView.php b/Views/Base/APIView.php → Backend/Views/Base/APIView.php
diff --git a/Views/Base/ErrorView.php → Backend/Views/Base/ErrorView.php b/Views/Base/ErrorView.php → Backend/Views/Base/ErrorView.php
diff --git a/Views/Base/LayoutView.php → Backend/Views/Base/LayoutView.php b/Views/Base/LayoutView.php → Backend/Views/Base/LayoutView.php
diff --git a/Views/Components/HeadingView.php → Backend/Views/Components/HeadingView.php b/Views/Components/HeadingView.php → Backend/Views/Components/HeadingView.php
diff --git a/Views/Components/TextView.php → Backend/Views/Components/TextView.php b/Views/Components/TextView.php → Backend/Views/Components/TextView.php
diff --git a/README.md b/README.md
@@ -1,39 +1,31 @@
 # Router
 
-Since I'm mostly using [SvelteKit](https://github.com/sveltejs/kit) and
-[PocketBase](https://github.com/pocketbase/pocketbase), this Router is no longer
-actively maintained. When I'm bored, I might fix / improve a few things.
+Since I'm mostly using [SvelteKit](https://github.com/sveltejs/kit) and [PocketBase](https://github.com/pocketbase/pocketbase), this Router is no longer maintained. Maybe when I'm getting bored, I'll fix / improve one or two things.
 
 ## Why use this?
 
 - Dependency-free
 - MVC
-- No Models included, but you use PDO with the
-  [Query class](/Core/Data/Query.php) and
-  [Database class](/Core/Data/Database.php)
-- Easy to use readable URLs like "/u/:name" instead of things like
-  "user.php?name="
+- No Models included, but you use PDO with the [Query class](/Backend/Core/Data/Query.php)
+- Easy to use readable URLs like "/u/:name" instead of things like "user.php?name="
 
 ## Getting started
 
-1. Clone GitHub Repo -
-   `git clone git@github.com:felix-schindler/Router.git && cd Router`
-2. (Run `composer install` if you want to use `phpstan`)
-3. Run `php -S localhost:8080` or throw it on a web server
+1. Clone GitHub Repo - `git clone git@github.com:felix-schindler/Router.git && cd Router`
+2. Run `php -S localhost:8080` or throw it on a web server
 
 ## Requirements
 
-- [PHP 8.1](https://www.php.net) with
-  [PDO](https://www.php.net/manual/de/book.pdo.php)
-- **OPTIONAL**: [Composer](https://getcomposer.org)
+- [PHP 8.1](https://www.php.net) with [PDO](https://www.php.net/manual/de/book.pdo.php)
+- __OPTIONAL__: [Composer](https://getcomposer.org)
 
 ## Remove junk
 
-This router is dependency-free. The only composer package installed is
-[PHPStan](https://phpstan.org), for static code analysis. Remove composer with
+This router is dependency-free. The only composer package installed is [PHPStan](https://phpstan.org), for static code analysis. Remove composer with
 
 ```zsh
-rm -rf composer* vendor/ .phpstan.neon
+rm -rf Backend/Libraries
+rm .phpstan.neon
 ```
 
 and remove the autoloader from the `index.php` file.

diff --git a/composer.json b/composer.json
diff --git a/index.php b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 $GLOBALS['start'] = microtime(true);		// Meassure execution time -> look in Layout <footer>
 
@@ -18,14 +18,14 @@
 define("DB_USER", "user");
 define("DB_PASS", "pass");
 
-define("TITLE", "Sample");											// Title for website
-define("DOMAIN", "https://schindlerfelix.de");	// Hosted on this domain
+define("TITLE", "Sample");									// Title for website
+define("DOMAIN", "https://schindlerfelix.de");				// Hosted on this domain
 
 // Require autoloaders
-require_once("./Core/ClassLoader.php");					// Load classes
-// require_once("./vendor/autoload.php");				// Composer autoloader
+require_once("./Backend/Core/ClassLoader.php");				// Load classes
+// require_once("./Backend/Libraries/vendor/autoload.php");	// Composer autoloader
 
 // Application start
-// session_start();			// Start PHP Session (should only be executed if you use session variables)
+// session_start();		// Start PHP Session
 ClassLoader::파람();	// Run the class loader
-Router::艳颖();				// Run router
+Router::艳颖();			// Run router