4 files changed, 39 insertions, 24 deletions

diff --git a/src/web/core/_controller.php b/src/web/core/_controller.php
index 0dbb5b8..1da5a96 100644
--- a/src/web/core/_controller.php
+++ b/src/web/core/_controller.php
@@ -2,10 +2,10 @@
 abstract class Controller {
 
 	// the main model
-	public $main;
+	public Main_model $main;
 
 	// the loader
-	public $load;
+	public Loader $load;
 
 	/**
 	 * Creates a constructor
@@ -23,14 +23,17 @@ abstract class Controller {
 		}
 	}
 
-	public function index() {}
+	public function index(): void {}
 
-	public function redirect($link) {
+	public function redirect(string $link): void {
 		header('Location: '. $link, true, 301);
 		die();
 	}
 
-	protected function view($__name, $data = array()) {
+    /**
+     * @param array<int,mixed> $data
+     */
+    protected function view(string $__name, array $data = array()): void {
 		$__root = $GLOBALS['webroot'];
 		$__path = $__root . '/_views/' . $__name . '.php';
 		if (is_file($__path)) {
@@ -40,7 +43,7 @@ abstract class Controller {
 		}
 	}
 
-	protected function error($code): void {
+    protected function error(int $code): void {
 		$_GET['code'] = $code;
 		$this->main->info['app'] = 'error';
 		$error_controller = $this->load->controller('error');
diff --git a/src/web/core/_model.php b/src/web/core/_model.php
index 4c27b1b..57127de 100644
--- a/src/web/core/_model.php
+++ b/src/web/core/_model.php
@@ -2,19 +2,20 @@
 abstract class Model {
 	// the main model
 	// shared by all controllers and models
-	public $main;
-	public $load;
+	public Main_model $main;
+	public Loader $load;
 
 	// the database
-	public $db;
+	public DatabaseHelper $db;
 
-	private $config;
+	private mixed $config;
 
 	/**
 	 * Creates a model
 	 * @param Loader $load - the main loader object
-	 */
-	function __construct($load, $main = FALSE) {
+     * @param ?Main_model $main
+ 	 */
+	function __construct(Loader $load, bool $main = FALSE) {
 		$this->load = $load;
 		if ($main) {
 			$this->main = $this;
diff --git a/src/web/core/loader.php b/src/web/core/loader.php
index b0a1cbd..101abef 100644
--- a/src/web/core/loader.php
+++ b/src/web/core/loader.php
@@ -2,13 +2,14 @@
 class Loader {
 
 	// keep track of what has been loaded
-	private $loaded;
+	private array $loaded;
 
 	// the database
-	private $db;
+	private ?DatabaseHelper $db;
 
 	function __construct() {
 		$this->loaded = array();
+		$this->db = NULL;
 	}
 
 	/**
@@ -99,7 +100,7 @@ class Loader {
 		}
 	}
 
-	public function db() {
+	public function db(): DatabaseHelper {
 		if ($this->db) {
 			return $this->db;
 		} else {
diff --git a/src/web/core/router.php b/src/web/core/router.php
index c8fb142..1ad6cb5 100644
--- a/src/web/core/router.php
+++ b/src/web/core/router.php
@@ -2,15 +2,15 @@
 class Router {
 
 	// the loader
-	private $load;
+	private Loader $load;
 
 	// the main model
-	private $main;
+	private Main_model $main;
 
 	// the database
-	private $db;
+	private DatabaseHelper $db;
 
-	private $db_ready;
+	private bool $db_ready;
 
 	/**
 	 * Creates a router
@@ -123,7 +123,7 @@ class Router {
 	 * @param int $code - the http error code
 	 * @param bool $recursed
 	 */
-	private function handle_error($code, $recursed): void {
+	private function handle_error(int $code, bool $recursed): void {
 		if ($recursed) {
 			die($code . ' (recursed)');
 		}
@@ -137,7 +137,10 @@ class Router {
 		$this->handle_req($req, TRUE);
 	}
 
-	private  function load_htc($req, $recursed): void {
+    /**
+     * @param array<int,mixed> $req
+     */
+    private  function load_htc(array $req, bool $recursed): void {
 		$parts = explode('/', $req['uri_str']);
 		$file = end($parts);
 		$path = $GLOBALS['publicroot'] . '/polyfills/' . $file;
@@ -152,9 +155,10 @@ class Router {
 
 	/**
 	 * @param array $req
+     * @param array<int,mixed> $req
 	 * @param bool $recursed
 	 */
-	private function handle_req($req, $recursed = FALSE): void {
+	private function handle_req(array $req, bool $recursed = FALSE): void {
 
 		if ($recursed === false) {
 			if (
@@ -202,7 +206,10 @@ class Router {
 		$ref->invoke($controller);
 	}
 
-	private function log_request($req): void {
+    /**
+     * @param array<int,mixed> $req
+     */
+    private function log_request(array $req): void {
 		if (
 			$req === FALSE ||
 			$this->db_ready === FALSE ||
@@ -220,7 +227,10 @@ class Router {
 		$query->execute();
 	}
 
-	private function check_banned($req) {
+    /**
+     * @param array<int,mixed> $req
+     */
+    private function check_banned(array $req): bool {
 		$ip = FALSE;
 		if ($req) {
 			$ip = $req['ip'];