From 6123757c3714c8a2c0378bd3782ff78fba96a676 Mon Sep 17 00:00:00 2001
From: Greg Sarjeant <greg@subcultureofone.org>
Date: Wed, 6 Aug 2025 00:14:50 +0000
Subject: [PATCH] Add strict typing to all files that were missing it. (#60)

Shockingly, this didn't require any code changes. But PHP is more forgiving with "strict typing" than I'd expected. I may go back and clean up function declarations later, but that's not urgent.

Reviewed-on: https://gitea.subcultureofone.org/greg/tkr/pulls/60
Co-authored-by: Greg Sarjeant <greg@subcultureofone.org>
Co-committed-by: Greg Sarjeant <greg@subcultureofone.org>
---
 config/bootstrap.php                                     | 2 ++
 public/index.php                                         | 2 ++
 src/Controller/AdminController/AdminController.php       | 2 ++
 src/Controller/AuthController/AuthController.php         | 2 ++
 src/Controller/Controller.php                            | 2 ++
 src/Controller/CssController/CssController.php           | 1 +
 src/Controller/EmojiController/EmojiController.php       | 2 ++
 src/Controller/FeedController/FeedController.php         | 2 ++
 src/Controller/HomeController/HomeController.php         | 2 ++
 src/Controller/LogController/LogController.php           | 2 ++
 src/Controller/MoodController/MoodController.php         | 2 ++
 src/Controller/TickController/TickController.php         | 1 +
 src/Feed/AtomGenerator.php                               | 2 ++
 src/Feed/FeedGenerator.php                               | 2 ++
 src/Feed/RssGenerator.php                                | 2 ++
 src/Framework/Log/Log.php                                | 2 ++
 src/Framework/Migrator/Migrator.php                      | 2 ++
 src/Framework/Prerequisites/Prerequisites.php            | 2 ++
 src/Framework/Router/Router.php                          | 2 ++
 src/Framework/Session/Session.php                        | 1 +
 src/Framework/Util/Util.php                              | 2 ++
 src/Model/ConfigModel/ConfigModel.php                    | 2 ++
 src/Model/CssModel/CssModel.php                          | 2 ++
 src/Model/EmojiModel/EmojiModel.php                      | 2 ++
 src/Model/TickModel/TickModel.php                        | 2 ++
 src/Model/UserModel/UserModel.php                        | 2 ++
 src/View/FlashView/FlashView.php                         | 2 ++
 src/View/MoodView/MoodView.php                           | 2 ++
 src/View/TicksView/TicksView.php                         | 2 ++
 tests/Controller/AdminController/AdminControllerTest.php | 2 ++
 tests/Controller/FeedController/FeedControllerTest.php   | 2 ++
 tests/Controller/HomeController/HomeControllerTest.php   | 2 ++
 tests/Controller/LogController/LogControllerTest.php     | 2 ++
 tests/Controller/TickController/TickControllerTest.php   | 2 ++
 tests/Feed/AtomGeneratorTest.php                         | 2 ++
 tests/Feed/FeedGeneratorTest.php                         | 2 ++
 tests/Feed/RssGeneratorTest.php                          | 2 ++
 tests/Framework/Log/LogTest.php                          | 2 ++
 tests/Framework/Util/UtilTest.php                        | 2 ++
 tkr-setup.php                                            | 2 ++
 40 files changed, 77 insertions(+)

diff --git a/config/bootstrap.php b/config/bootstrap.php
index c65e441..0adc2b8 100644
--- a/config/bootstrap.php
+++ b/config/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // This is the initialization code that needs to be run before anything else.
 // - define paths
 // - set up autoloader
diff --git a/public/index.php b/public/index.php
index 57f646c..9a92b7a 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /*
  *  Initialize fundamental configuration
  */
diff --git a/src/Controller/AdminController/AdminController.php b/src/Controller/AdminController/AdminController.php
index f86878b..dc6587e 100644
--- a/src/Controller/AdminController/AdminController.php
+++ b/src/Controller/AdminController/AdminController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class AdminController extends Controller {
     // GET handler
     // render the admin page
diff --git a/src/Controller/AuthController/AuthController.php b/src/Controller/AuthController/AuthController.php
index 4d96001..6a30a95 100644
--- a/src/Controller/AuthController/AuthController.php
+++ b/src/Controller/AuthController/AuthController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class AuthController extends Controller {
     function showLogin(?string $error = null){
         global $app;
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
index 5b1b7de..2e6254b 100644
--- a/src/Controller/Controller.php
+++ b/src/Controller/Controller.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class Controller {
     // Renders the requested template inside templates/main/php
     protected function render(string $childTemplateFile, array $vars = []) {
diff --git a/src/Controller/CssController/CssController.php b/src/Controller/CssController/CssController.php
index f372b89..ad73202 100644
--- a/src/Controller/CssController/CssController.php
+++ b/src/Controller/CssController/CssController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class CssController extends Controller {
     public function index() {
diff --git a/src/Controller/EmojiController/EmojiController.php b/src/Controller/EmojiController/EmojiController.php
index be331e5..684e139 100644
--- a/src/Controller/EmojiController/EmojiController.php
+++ b/src/Controller/EmojiController/EmojiController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
     class EmojiController extends Controller {
         // Shows the custom emoji management page
         public function index(){
diff --git a/src/Controller/FeedController/FeedController.php b/src/Controller/FeedController/FeedController.php
index 2adf9d6..c948253 100644
--- a/src/Controller/FeedController/FeedController.php
+++ b/src/Controller/FeedController/FeedController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class FeedController extends Controller {
     private $ticks;
 
diff --git a/src/Controller/HomeController/HomeController.php b/src/Controller/HomeController/HomeController.php
index 820a82b..15554c4 100644
--- a/src/Controller/HomeController/HomeController.php
+++ b/src/Controller/HomeController/HomeController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class HomeController extends Controller {
     // GET handler
     // renders the homepage view.
diff --git a/src/Controller/LogController/LogController.php b/src/Controller/LogController/LogController.php
index d338843..c8b12f4 100644
--- a/src/Controller/LogController/LogController.php
+++ b/src/Controller/LogController/LogController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class LogController extends Controller {
     private string $storageDir;
 
diff --git a/src/Controller/MoodController/MoodController.php b/src/Controller/MoodController/MoodController.php
index a34e08a..90a6394 100644
--- a/src/Controller/MoodController/MoodController.php
+++ b/src/Controller/MoodController/MoodController.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
     class MoodController extends Controller {
         public function index(){
             global $app;
diff --git a/src/Controller/TickController/TickController.php b/src/Controller/TickController/TickController.php
index 3edad16..84a12e9 100644
--- a/src/Controller/TickController/TickController.php
+++ b/src/Controller/TickController/TickController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class TickController extends Controller{
     public function index(int $id){
diff --git a/src/Feed/AtomGenerator.php b/src/Feed/AtomGenerator.php
index a00e908..f29c330 100644
--- a/src/Feed/AtomGenerator.php
+++ b/src/Feed/AtomGenerator.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class AtomGenerator extends FeedGenerator {
     public function generate(): string {
         $xml = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
diff --git a/src/Feed/FeedGenerator.php b/src/Feed/FeedGenerator.php
index fc7b349..dcebe55 100644
--- a/src/Feed/FeedGenerator.php
+++ b/src/Feed/FeedGenerator.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // Abstract base class for feeds.
 // Specific feeds (RSS, Atom, etc.) will inherit from this.
 // This will wrap the basic generator functionality.
diff --git a/src/Feed/RssGenerator.php b/src/Feed/RssGenerator.php
index 45739ab..f8739e3 100644
--- a/src/Feed/RssGenerator.php
+++ b/src/Feed/RssGenerator.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class RssGenerator extends FeedGenerator {
     public function generate(): string {
         $xml = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
diff --git a/src/Framework/Log/Log.php b/src/Framework/Log/Log.php
index c54751e..533111c 100644
--- a/src/Framework/Log/Log.php
+++ b/src/Framework/Log/Log.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class Log {
     const LEVELS = [
         'DEBUG' => 1,
diff --git a/src/Framework/Migrator/Migrator.php b/src/Framework/Migrator/Migrator.php
index 02ada1e..ec1435a 100644
--- a/src/Framework/Migrator/Migrator.php
+++ b/src/Framework/Migrator/Migrator.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class Migrator{
     public function __construct(private PDO $db) {}
 
diff --git a/src/Framework/Prerequisites/Prerequisites.php b/src/Framework/Prerequisites/Prerequisites.php
index 49ef923..181c945 100644
--- a/src/Framework/Prerequisites/Prerequisites.php
+++ b/src/Framework/Prerequisites/Prerequisites.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * tkr Prerequisites Checker
  *
diff --git a/src/Framework/Router/Router.php b/src/Framework/Router/Router.php
index 9231e05..f0bb6e0 100644
--- a/src/Framework/Router/Router.php
+++ b/src/Framework/Router/Router.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // Very simple router class
 class Router {
     // Define the recognized routes.
diff --git a/src/Framework/Session/Session.php b/src/Framework/Session/Session.php
index aad7e92..bf256af 100644
--- a/src/Framework/Session/Session.php
+++ b/src/Framework/Session/Session.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class Session {
     // These can all just be static functions
diff --git a/src/Framework/Util/Util.php b/src/Framework/Util/Util.php
index f82d902..b085fd0 100644
--- a/src/Framework/Util/Util.php
+++ b/src/Framework/Util/Util.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class Util {
     public static function getClientIp() {
         return $_SERVER['HTTP_CLIENT_IP'] ??
diff --git a/src/Model/ConfigModel/ConfigModel.php b/src/Model/ConfigModel/ConfigModel.php
index d08df4e..86d3ee1 100644
--- a/src/Model/ConfigModel/ConfigModel.php
+++ b/src/Model/ConfigModel/ConfigModel.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class ConfigModel {
     // properties and default values
     public string $siteTitle = 'My tkr';
diff --git a/src/Model/CssModel/CssModel.php b/src/Model/CssModel/CssModel.php
index 1bbfe14..9c88cea 100644
--- a/src/Model/CssModel/CssModel.php
+++ b/src/Model/CssModel/CssModel.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class CssModel {
     public function __construct(private PDO $db) {}
 
diff --git a/src/Model/EmojiModel/EmojiModel.php b/src/Model/EmojiModel/EmojiModel.php
index 4cde079..533a73a 100644
--- a/src/Model/EmojiModel/EmojiModel.php
+++ b/src/Model/EmojiModel/EmojiModel.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 // welp this model is overkill
 class EmojiModel{
     public function __construct(private PDO $db) {}
diff --git a/src/Model/TickModel/TickModel.php b/src/Model/TickModel/TickModel.php
index ea35150..41d4935 100644
--- a/src/Model/TickModel/TickModel.php
+++ b/src/Model/TickModel/TickModel.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class TickModel {
     public function __construct(private PDO $db, private ConfigModel $config) {}
     
diff --git a/src/Model/UserModel/UserModel.php b/src/Model/UserModel/UserModel.php
index 86078ea..428363c 100644
--- a/src/Model/UserModel/UserModel.php
+++ b/src/Model/UserModel/UserModel.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class UserModel {
     // properties
     public string $username = '';
diff --git a/src/View/FlashView/FlashView.php b/src/View/FlashView/FlashView.php
index e657d55..319a5e2 100644
--- a/src/View/FlashView/FlashView.php
+++ b/src/View/FlashView/FlashView.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class FlashView {
     public function renderFlashSection(array $flashMessages): string {
         ob_start();
diff --git a/src/View/MoodView/MoodView.php b/src/View/MoodView/MoodView.php
index ef38c5f..3e5b13f 100644
--- a/src/View/MoodView/MoodView.php
+++ b/src/View/MoodView/MoodView.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class MoodView {
     private function render_emoji_groups(array $emojiGroups, string $currentMood): string {
         $selected_emoji = $currentMood;  //user->mood;
diff --git a/src/View/TicksView/TicksView.php b/src/View/TicksView/TicksView.php
index 166bafa..c2f52b7 100644
--- a/src/View/TicksView/TicksView.php
+++ b/src/View/TicksView/TicksView.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 class TicksView {
     private $html;
 
diff --git a/tests/Controller/AdminController/AdminControllerTest.php b/tests/Controller/AdminController/AdminControllerTest.php
index cb25a37..714440f 100644
--- a/tests/Controller/AdminController/AdminControllerTest.php
+++ b/tests/Controller/AdminController/AdminControllerTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 require_once dirname(dirname(dirname(__DIR__))) . "/config/bootstrap.php";
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Controller/FeedController/FeedControllerTest.php b/tests/Controller/FeedController/FeedControllerTest.php
index 3cfe81f..ba1e124 100644
--- a/tests/Controller/FeedController/FeedControllerTest.php
+++ b/tests/Controller/FeedController/FeedControllerTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class FeedControllerTest extends TestCase
diff --git a/tests/Controller/HomeController/HomeControllerTest.php b/tests/Controller/HomeController/HomeControllerTest.php
index f687f7c..f3bec85 100644
--- a/tests/Controller/HomeController/HomeControllerTest.php
+++ b/tests/Controller/HomeController/HomeControllerTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class HomeControllerTest extends TestCase
diff --git a/tests/Controller/LogController/LogControllerTest.php b/tests/Controller/LogController/LogControllerTest.php
index 684e028..662bb56 100644
--- a/tests/Controller/LogController/LogControllerTest.php
+++ b/tests/Controller/LogController/LogControllerTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class LogControllerTest extends TestCase
diff --git a/tests/Controller/TickController/TickControllerTest.php b/tests/Controller/TickController/TickControllerTest.php
index 633d888..6f7b4d0 100644
--- a/tests/Controller/TickController/TickControllerTest.php
+++ b/tests/Controller/TickController/TickControllerTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class TickControllerTest extends TestCase
diff --git a/tests/Feed/AtomGeneratorTest.php b/tests/Feed/AtomGeneratorTest.php
index c64c7bb..cbe89c9 100644
--- a/tests/Feed/AtomGeneratorTest.php
+++ b/tests/Feed/AtomGeneratorTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class AtomGeneratorTest extends TestCase
diff --git a/tests/Feed/FeedGeneratorTest.php b/tests/Feed/FeedGeneratorTest.php
index 406032a..8fabfcf 100644
--- a/tests/Feed/FeedGeneratorTest.php
+++ b/tests/Feed/FeedGeneratorTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class FeedGeneratorTest extends TestCase
diff --git a/tests/Feed/RssGeneratorTest.php b/tests/Feed/RssGeneratorTest.php
index d2b2b22..b90a2c0 100644
--- a/tests/Feed/RssGeneratorTest.php
+++ b/tests/Feed/RssGeneratorTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class RssGeneratorTest extends TestCase
diff --git a/tests/Framework/Log/LogTest.php b/tests/Framework/Log/LogTest.php
index 4c1214f..9047827 100644
--- a/tests/Framework/Log/LogTest.php
+++ b/tests/Framework/Log/LogTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 
 class LogTest extends TestCase
diff --git a/tests/Framework/Util/UtilTest.php b/tests/Framework/Util/UtilTest.php
index 5e60d77..cc43f39 100644
--- a/tests/Framework/Util/UtilTest.php
+++ b/tests/Framework/Util/UtilTest.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 
diff --git a/tkr-setup.php b/tkr-setup.php
index fde0f1f..df63295 100644
--- a/tkr-setup.php
+++ b/tkr-setup.php
@@ -1,5 +1,7 @@
 #!/usr/bin/env php
 <?php
+declare(strict_types=1);
+
 /**
  * tkr Setup Script
  *