From 5746bb38c85701e0bf26715798fca466f5d121d1 Mon Sep 17 00:00:00 2001
From: rotimi <rotimi@localhost>
Date: Wed, 13 Mar 2024 20:55:14 -0600
Subject: [PATCH] Merged 5.x into master

---
 .github/workflows/php.yml                     |   8 +-
 composer.json                                 |   8 +-
 phpunit.xml.dist                              |  22 ++--
 rector.php                                    |   3 +-
 src/HtmlErrorRenderer.php                     |   9 +-
 src/LogErrorRenderer.php                      |   2 +-
 src/MvcRouteHandler.php                       |  24 ++--
 src/Utils.php                                 |   2 +-
 src/controllers/BaseController.php            | 114 +++++-------------
 src/functions/framework-helpers.php           |   4 +-
 src/functions/str-helpers.php                 |  34 +-----
 src/scripts/cli-script-helper-functions.php   |  31 ++---
 .../controller-class-template.php.tpl         |   5 +-
 tests/BaseControllerTest.php                  |  10 +-
 tests/StrHelpersTest.php                      |  75 +++---------
 tests/test-template-output/ExpectedFooBar.php |   5 +-
 16 files changed, 103 insertions(+), 253 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 72c0dc6..fde6d7f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,17 +16,13 @@ jobs:
 
     strategy:
         matrix:
-            php: [8.3, 8.2, 8.1, 8.0, 7.4]
+            php: [8.3, 8.2, 8.1]
 # prefer-lowest is causing unit tests to fail when php 7.2 is run against PHPunit 7.x, 
 # PHPUnit 8.x is the latest stable release that supports PHP 7.2 and that runs fine
 #            dependency-version: [prefer-lowest, prefer-stable]
             dependency-version: [prefer-stable]
             os: [ubuntu-20.04, ubuntu-22.04]
             include:
-                - os: ubuntu-20.04
-                  php: 7.4
-                - os: ubuntu-20.04
-                  php: 8.0
                 - os: ubuntu-20.04
                   php: 8.1
                 - os: ubuntu-20.04
@@ -71,7 +67,7 @@ jobs:
     # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
     # Docs: https://getcomposer.org/doc/articles/scripts.md
     - name: Run PHPUnit Test Suite
-      run: vendor/bin/phpunit
+      run: vendor/bin/phpunit --display-incomplete --display-skipped --display-deprecations --display-errors --display-notices --display-warnings
 
     - name: Upload coverage results to Coveralls
       env: 
diff --git a/composer.json b/composer.json
index 9948887..b607f46 100644
--- a/composer.json
+++ b/composer.json
@@ -16,9 +16,9 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.4.0",
+        "php": ">=8.1.0",
         "slim/slim": "^4.10",
-        "rotexsoft/file-renderer": "^5.0.0",
+        "rotexsoft/file-renderer": "^6.0.0",
         "vespula/log": "^2.2.3",
         "vespula/auth": "^2.1.1",
         "psr/container": "^2.0",
@@ -28,10 +28,10 @@
         "vespula/locale": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.20",
+        "phpunit/phpunit": "^10.0.0",
         "php-coveralls/php-coveralls": "^2.5.2",
         "vimeo/psalm": "^5.15",
-        "rector/rector": "^0.19.0",
+        "rector/rector": "^1.0.0",
         "php-mock/php-mock": "^2.4"
     },
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4f2e94d..239314b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
   <coverage>
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-    <exclude>
-      <file>./src/templates/controller-class-template.php</file>
-      <file>./src/templates/index-view-template.php</file>
-    </exclude>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
@@ -15,8 +8,8 @@
   </coverage>
   <testsuites>
     <testsuite name="slim-skeleton-mvc-tools">
-       <directory>./tests</directory> 
-<!--      
+      <directory>./tests</directory>
+      <!--      
       <file>./tests/BaseControllerTest.php</file>
       <file>./tests/FrameworkHelpersTest.php</file>
       <file>./tests/CreateControllerScriptTest.php</file>
@@ -29,4 +22,13 @@
   <logging>
     <junit outputFile="build/logs/junit.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <file>./src/templates/controller-class-template.php</file>
+      <file>./src/templates/index-view-template.php</file>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/rector.php b/rector.php
index 7c1046a..885cfb0 100644
--- a/rector.php
+++ b/rector.php
@@ -27,8 +27,7 @@
         \Rector\CodeQuality\Rector\If_\ShortenElseIfRector::class,
 //        \Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector::class,
         \Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector::class,
-        \Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector::class,
-        \Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector::class,
+        \Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector::class,
 //        \Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector::class,
 //        \Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector::class,
 //        //\Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector::class,
diff --git a/src/HtmlErrorRenderer.php b/src/HtmlErrorRenderer.php
index ec54254..8434d33 100644
--- a/src/HtmlErrorRenderer.php
+++ b/src/HtmlErrorRenderer.php
@@ -13,14 +13,11 @@ class HtmlErrorRenderer extends \Slim\Error\Renderers\HtmlErrorRenderer {
     
     use BaseErrorRendererTrait;
     
-    protected string $path_to_error_template_file = '';
-    
     /**
      * @psalm-suppress PossiblyUnusedMethod
      */
-    public function __construct(string $full_path_to_error_template_file) {
-        
-        $this->path_to_error_template_file = $full_path_to_error_template_file;
+    public function __construct(protected string $path_to_error_template_file='')
+    {
     }
     
     public function __invoke(\Throwable $exception, bool $displayErrorDetails): string {
@@ -59,7 +56,7 @@ public function renderHtmlBody(string $title = '', string $html = ''): string {
     
     private function renderExceptionFragment(\Throwable $exception): string {
         
-        $html = sprintf('<div><strong>Type:</strong> %s</div>', get_class($exception));
+        $html = sprintf('<div><strong>Type:</strong> %s</div>', $exception::class);
         $code = $exception->getCode();
         $html .= sprintf('<div><strong>Code:</strong> %s</div>', $code);
         $html .= sprintf('<div><strong>Message:</strong> %s</div>', htmlentities($exception->getMessage()));
diff --git a/src/LogErrorRenderer.php b/src/LogErrorRenderer.php
index 3bb41fa..3558f5c 100644
--- a/src/LogErrorRenderer.php
+++ b/src/LogErrorRenderer.php
@@ -38,7 +38,7 @@ public function __invoke(\Throwable $exception, bool $displayErrorDetails): stri
     private function formatExceptionFragment(\Throwable $exception): string {
         
         $nl = PHP_EOL;
-        $text = sprintf("Type: %s{$nl}", get_class($exception));
+        $text = sprintf("Type: %s{$nl}", $exception::class);
         $code = $exception->getCode();
         $text .= sprintf("Code: %s{$nl}", $code);
         $text .= sprintf("Message: %s{$nl}", htmlentities($exception->getMessage()));
diff --git a/src/MvcRouteHandler.php b/src/MvcRouteHandler.php
index 675ee66..6729df2 100644
--- a/src/MvcRouteHandler.php
+++ b/src/MvcRouteHandler.php
@@ -11,22 +11,12 @@
  */
 class MvcRouteHandler {
     
-    protected \Slim\App $app;
-    protected bool $auto_prepend_action_to_method_name = false;
-    protected string $default_controller_class;
-    protected string $default_controller_action;
-
     public function __construct(
-        \Slim\App $app,
-        string $default_controller_class,
-        string $default_controller_action,
-        bool $auto_prepend_action_to_method_name
-    ) {
-        $this->app = $app;
-        $this->auto_prepend_action_to_method_name = $auto_prepend_action_to_method_name;
-        $this->default_controller_class = $default_controller_class;
-        $this->default_controller_action = $default_controller_action;
-    }
+        protected \Slim\App $app, 
+        protected string $default_controller_class, 
+        protected string $default_controller_action, 
+        protected bool $auto_prepend_action_to_method_name = false
+    ) { }
     
     public function __invoke(
         \Psr\Http\Message\ServerRequestInterface $req,
@@ -43,7 +33,7 @@ public function __invoke(
 
         // strip trailing forward slash
         /** @psalm-suppress MixedArgument */
-        $params_str = isset($args['parameters'])? rtrim($args['parameters'], '/') : '';
+        $params_str = isset($args['parameters'])? rtrim((string) $args['parameters'], '/') : '';
 
         // convert to array of parameters
         $params = ($params_str === '') && mb_strlen($params_str, 'UTF-8') <= 0 ? [] : explode('/', $params_str);
@@ -137,7 +127,7 @@ protected function assertMethodExistsOnControllerObj(
         
         if( !method_exists($controller_obj, $action_method) ) {
 
-            $controller_class_name = get_class($controller_obj);
+            $controller_class_name = $controller_obj::class;
 
             // 404 Not Found: Action method does not exist in the controller object.
             $err_message = "`".__FILE__."` on line ".__LINE__
diff --git a/src/Utils.php b/src/Utils.php
index e32b321..b690aff 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -19,7 +19,7 @@ public static function getThrowableAsStr(Throwable $e, string $eol=PHP_EOL): str
 
         do {
             $message .= "Exception / Error Code: {$previous_throwable->getCode()}"
-                . $eol . "Exception / Error Class: " . \get_class($previous_throwable)
+                . $eol . "Exception / Error Class: " . $previous_throwable::class
                 . $eol . "File: {$previous_throwable->getFile()}"
                 . $eol . "Line: {$previous_throwable->getLine()}"
                 . $eol . "Message: {$previous_throwable->getMessage()}" . $eol
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
index 05dca6d..c8ae426 100644
--- a/src/controllers/BaseController.php
+++ b/src/controllers/BaseController.php
@@ -17,11 +17,6 @@
  */
 class BaseController
 {
-    /**
-     * A container object containing dependencies needed by the controller.
-     */
-    protected \Psr\Container\ContainerInterface $container;
-
     /**
      * View object for rendering layout files.
      */
@@ -117,16 +112,6 @@ public function getLoginSuccessRedirectController(): string {
         return $this->login_success_redirect_controller;
     }
 
-    /**
-     * Request Object 
-     */
-    protected \Psr\Http\Message\ServerRequestInterface $request;
-    
-    /**
-     * Response Object 
-     */
-    protected \Psr\Http\Message\ResponseInterface $response;
-
     /**
      * The action section of the url.
      *
@@ -192,15 +177,21 @@ public function getControllerNameFromUri(): string {
      * @psalm-suppress PossiblyUnusedMethod
      */
     public function __construct(
-        \Psr\Container\ContainerInterface $container, 
+        /**
+         * A container object containing dependencies needed by the controller.
+         */
+        protected \Psr\Container\ContainerInterface $container, 
         string $controller_name_from_uri,
         string $action_name_from_uri,
-        ServerRequestInterface $req, 
-        ResponseInterface $res
+        /**
+         * Request Object
+         */
+        protected \Psr\Http\Message\ServerRequestInterface $request, 
+        /**
+         * Response Object
+         */
+        protected \Psr\Http\Message\ResponseInterface $response
     ) {
-        $this->container = $container;
-        $this->request = $req;
-        $this->response = $res;
         $this->action_name_from_uri = ($action_name_from_uri !== '') ? $action_name_from_uri : $this->action_name_from_uri;
         $this->controller_name_from_uri = ($controller_name_from_uri !== '') ? $controller_name_from_uri : $this->controller_name_from_uri;
         
@@ -223,12 +214,12 @@ public function __construct(
          */
         $this->view_renderer = $this->getContainerItem(ContainerKeys::VIEW_RENDERER);
         
-        $uri_path = ($req->getUri() instanceof \Psr\Http\Message\UriInterface)
-                                                ? $req->getUri()->getPath() : '';
+        $uri_path = ($this->request->getUri() instanceof \Psr\Http\Message\UriInterface)
+                                                ? $this->request->getUri()->getPath() : '';
         
         if( 
             ( ($this->controller_name_from_uri === '') || ($this->action_name_from_uri === '') )
-            && ( ($uri_path !== '') && ($uri_path !== '/') && (strpos($uri_path, '/') !== false) )
+            && ( ($uri_path !== '') && ($uri_path !== '/') && (str_contains($uri_path, '/')) )
         ) {
             // Calculate $this->controller_name_from_uri and / or
             // $this->action_name_from_uri if necessary
@@ -522,10 +513,8 @@ public function renderView( string $file_name, array $data = [] ): string {
 
     /**
      * @psalm-suppress PossiblyUnusedMethod
-     * 
-     * @return ResponseInterface|string
      */
-    public function actionIndex() {
+    public function actionIndex(): ResponseInterface|string {
 
         //get the contents of the view first
         $view_str = $this->renderView('index.php', ['controller_object'=>$this]);
@@ -538,10 +527,9 @@ public function actionIndex() {
      *
      * @param bool $onlyPublicMethodsPrefixedWithAction true to include only public methods prefixed with `action`
      *                                                  or false to include all public methods
-     * @return \Psr\Http\Message\ResponseInterface|string
      * @psalm-suppress PossiblyUnusedMethod
      */
-    public function actionRoutes($onlyPublicMethodsPrefixedWithAction=true) {
+    public function actionRoutes($onlyPublicMethodsPrefixedWithAction=true): ResponseInterface|string {
 
         $resp = $this->getResponseObjForLoginRedirectionIfNotLoggedIn();
 
@@ -563,10 +551,9 @@ public function actionRoutes($onlyPublicMethodsPrefixedWithAction=true) {
     }
 
     /**
-     * @return \Psr\Http\Message\ResponseInterface|string
      * @psalm-suppress PossiblyUnusedMethod
      */
-    public function actionLogin() {
+    public function actionLogin(): ResponseInterface|string {
 
         $data_4_login_view = [
             'controller_object' => $this, 'error_message' => '', 
@@ -805,7 +792,7 @@ protected function doLogin(\Vespula\Auth\Auth $auth, array $credentials, string
              */
             $this->logger
                  ->error( 
-                    \str_replace('<br>', PHP_EOL, $_msg)
+                    \str_replace('<br>', PHP_EOL, (string) $_msg)
                     . Utils::getThrowableAsStr($vaExc)
                  );
 
@@ -823,7 +810,7 @@ protected function doLogin(\Vespula\Auth\Auth $auth, array $credentials, string
              */
             $this->logger
                  ->error(
-                    \str_replace('<br>', PHP_EOL, $_msg)
+                    \str_replace('<br>', PHP_EOL, (string) $_msg)
                     . Utils::getThrowableAsStr($basExc)
                  );
         }
@@ -839,7 +826,7 @@ protected function doLogin(\Vespula\Auth\Auth $auth, array $credentials, string
      *                                         actionLogin()
      * @psalm-suppress PossiblyUnusedMethod
      */
-    public function actionLogout($show_status_on_completion = false): ResponseInterface {
+    public function actionLogout(mixed $show_status_on_completion = false): ResponseInterface {
         
         $auth = $this->vespula_auth;
         $logged_in_user = $this->isLoggedIn() ? $auth->getUsername() : '';
@@ -912,48 +899,14 @@ public function actionLoginStatus(): string {
         $auth = $this->vespula_auth;
 
         //Just get the current login status
-        switch (true) {
-
-            case $auth->isAnon():
-                /**
-                 * @psalm-suppress MixedAssignment 
-                 * @psalm-suppress MixedOperand
-                 */
-                $msg = $this->vespula_locale->gettext('base_controller_action_login_status_is_anon_msg');
-                break;
-
-            case $auth->isIdle():
-                /**
-                 * @psalm-suppress MixedAssignment 
-                 * @psalm-suppress MixedOperand
-                 */
-                $msg = $this->vespula_locale->gettext('base_controller_action_login_status_is_idle_msg');
-                break;
-
-            case $auth->isExpired():
-                /**
-                 * @psalm-suppress MixedAssignment 
-                 * @psalm-suppress MixedOperand
-                 */
-                $msg = $this->vespula_locale->gettext('base_controller_action_login_status_is_expired_msg');
-                break;
-
-            case $auth->isValid():
-                /**
-                 * @psalm-suppress MixedAssignment 
-                 * @psalm-suppress MixedOperand
-                 */
-                $msg = $this->vespula_locale->gettext('base_controller_action_login_status_is_valid_msg');
-                break;
-
-            default:
-                /**
-                 * @psalm-suppress MixedAssignment 
-                 * @psalm-suppress MixedOperand
-                 */
-                $msg =  $this->vespula_locale->gettext('base_controller_action_login_status_unknown_msg');
-                break;
-        }
+        /** @psalm-suppress MixedAssignment */
+        $msg = match (true) {
+            $auth->isAnon() => $this->vespula_locale->gettext('base_controller_action_login_status_is_anon_msg'),
+            $auth->isIdle() => $this->vespula_locale->gettext('base_controller_action_login_status_is_idle_msg'),
+            $auth->isExpired() => $this->vespula_locale->gettext('base_controller_action_login_status_is_expired_msg'),
+            $auth->isValid() => $this->vespula_locale->gettext('base_controller_action_login_status_is_valid_msg'),
+            default => $this->vespula_locale->gettext('base_controller_action_login_status_unknown_msg'),
+        };
 
         /** 
          * @psalm-suppress UndefinedConstant
@@ -984,10 +937,8 @@ public function isLoggedIn(): bool {
      *
      * False is returned if the user is logged in and there is no need to redirect to
      * the login page.
-     *
-     * @return bool|\Psr\Http\Message\ResponseInterface
      */
-    public function getResponseObjForLoginRedirectionIfNotLoggedIn() {
+    public function getResponseObjForLoginRedirectionIfNotLoggedIn(): bool|\Psr\Http\Message\ResponseInterface {
 
         if( !$this->isLoggedIn() ) {
 
@@ -1027,6 +978,7 @@ public function postAction(\Psr\Http\Message\ResponseInterface $response): Respo
 
     public function storeCurrentUrlForLoginRedirection(): self {
 
+        /** @psalm-suppress RedundantCast */
         if(
             in_array(
                 strtolower($this->action_name_from_uri),
@@ -1036,7 +988,7 @@ public function storeCurrentUrlForLoginRedirection(): self {
                 ]
             )
             || strtolower($this->request->getHeaderLine('X-Requested-With')) === strtolower('XMLHttpRequest') //ajax request
-            || ( isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest' ) //ajax request
+            || ( isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower((string) $_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest' ) //ajax request
         ) { return $this; }
 
         // Use the uri to grab the query string & the fragment part 
@@ -1077,7 +1029,7 @@ public function getContainerItem(string $item_key_in_container) {
         } else {
 
             $msg = "ERROR: The item with the key named `$item_key_in_container` does not exist in"
-                 . " the container associated with `" . get_class($this) . "` ."
+                 . " the container associated with `" . static::class . "` ."
                  . PHP_EOL;
 
             throw new \Slim\Exception\HttpInternalServerErrorException($this->request, $msg);
diff --git a/src/functions/framework-helpers.php b/src/functions/framework-helpers.php
index 8de6b99..2cb1d15 100644
--- a/src/functions/framework-helpers.php
+++ b/src/functions/framework-helpers.php
@@ -156,7 +156,7 @@ function sMVC_DumpVar(...$vals): void {
  *              super global associated with each key).
  * 
  */
-function sMVC_GetSuperGlobal(string $global_name='', string $key='', $default_val='') {
+function sMVC_GetSuperGlobal(string $global_name='', string $key='', mixed $default_val='') {
 
     static $super_globals;
 
@@ -221,7 +221,7 @@ function sMVC_GetSuperGlobal(string $global_name='', string $key='', $default_va
     //normalize the global name
     $global_name = strtolower($global_name);
 
-    if( strpos($global_name, '$_') === 0 ) {
+    if( str_starts_with($global_name, '$_') ) {
 
         $global_name = substr($global_name, 2);
     }
diff --git a/src/functions/str-helpers.php b/src/functions/str-helpers.php
index 755d59b..e85c496 100644
--- a/src/functions/str-helpers.php
+++ b/src/functions/str-helpers.php
@@ -8,36 +8,6 @@
     // Delete when PHP 8.1 becomes minimum version 
     ////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @see https://www.php.net/manual/en/function.str-starts-with
-     */
-    if (!function_exists('str_starts_with')) {
-        function str_starts_with (string $haystack, string $needle): bool
-        {
-            return $needle === '' || strpos($haystack, $needle) === 0;
-        }
-    }
-
-    /**
-     * @see https://www.php.net/manual/en/function.str-contains
-     */
-    if (!function_exists('str_contains')) {
-        function str_contains (string $haystack, string $needle): bool
-        {
-            return $needle === '' || strpos($haystack, $needle) !== false;
-        }
-    }
-
-    /**
-     * @see https://www.php.net/manual/en/function.str-ends-with
-     */
-    if (!function_exists('str_ends_with')) {
-        function str_ends_with (string $haystack, string $needle): bool
-        {
-            return $needle === '' || substr($haystack, -strlen($needle)) === $needle;
-        }
-    }
-
     if (!function_exists('mb_str_starts_with')) {
         function mb_str_starts_with (string $haystack, string $needle): bool
         {
@@ -157,7 +127,7 @@ function toDashes(string $str): string
     function camelToUnder(string $str): string
     {
         $str = preg_replace('/([a-z])([A-Z])/', '$1 $2', $str);
-        return str_replace(' ', '_', ucwords($str));
+        return str_replace(' ', '_', ucwords((string) $str));
     }
 
     /**
@@ -172,7 +142,7 @@ function camelToUnder(string $str): string
     function camelToDashes(string $str): string
     {
         $str = preg_replace('/([a-z])([A-Z])/', '$1 $2', $str);
-        $str = str_replace(' ', '-', ucwords($str));
+        $str = str_replace(' ', '-', ucwords((string) $str));
         return strtolower($str);
     }
 
diff --git a/src/scripts/cli-script-helper-functions.php b/src/scripts/cli-script-helper-functions.php
index a1bb232..f401743 100644
--- a/src/scripts/cli-script-helper-functions.php
+++ b/src/scripts/cli-script-helper-functions.php
@@ -11,25 +11,20 @@ interface CliExitCodes {
 
 class CreateControllerReturnValue {
     
-    /**
-     * Must be any one of 
-     *  CliExitCodes::SUCCESS_EXIT, 
-     *  CliExitCodes::EXCEPTION_EXIT or
-     *  CliExitCodes::FAILURE_EXIT
-     */
-    private int $returnCode;
-    
-    /**
-     * Description of the operation just performed by createController
-     */
-    private string $returnMessage;
-    
     public function __construct(
-        int $returnCode,
-        string $returnMessage
-    ) {
-        $this->returnCode = $returnCode;
-        $this->returnMessage = $returnMessage;
+        /**
+         * Must be any one of
+         *  CliExitCodes::SUCCESS_EXIT,
+         *  CliExitCodes::EXCEPTION_EXIT or
+         *  CliExitCodes::FAILURE_EXIT
+         */
+        private readonly int $returnCode,
+        /**
+         * Description of the operation just performed by createController
+         */
+        private readonly string $returnMessage
+    )
+    {
     }
     
     /** 
diff --git a/src/templates/controller-class-template.php.tpl b/src/templates/controller-class-template.php.tpl
index cd5292b..7be44e9 100644
--- a/src/templates/controller-class-template.php.tpl
+++ b/src/templates/controller-class-template.php.tpl
@@ -40,10 +40,7 @@ class __TEMPLTATE_CONTROLLER__ extends __CONTROLLER_2_EXTEND__
         parent::__construct($container, $controller_name_from_uri, $action_name_from_uri, $req, $res);
     }
     
-    /**
-     * @return \Psr\Http\Message\ResponseInterface|string
-     */
-    public function actionIndex() {
+    public function actionIndex(): ResponseInterface|string  {
         
         //get the contents of the view first
         $view_str = $this->renderView('index.php', ['controller_object'=>$this]);
diff --git a/tests/BaseControllerTest.php b/tests/BaseControllerTest.php
index 8c50898..29f9602 100644
--- a/tests/BaseControllerTest.php
+++ b/tests/BaseControllerTest.php
@@ -1562,6 +1562,11 @@ public function testThat_actionLoginStatus_WorksAsExpected() {
             'Unknown' => 'Unknown session status.',
         ];
         
+        if(!defined('SMVC_APP_AUTO_PREPEND_ACTION_TO_ACTION_METHOD_NAMES')){
+
+            define('SMVC_APP_AUTO_PREPEND_ACTION_TO_ACTION_METHOD_NAMES', true );
+        }
+        
         foreach ($test_params as $auth_status => $status_message_in_rendered_view) {
             
             $auth->getSession()->setStatus($auth_status);
@@ -1570,11 +1575,6 @@ public function testThat_actionLoginStatus_WorksAsExpected() {
             self::assertStringContainsString('<br>'.nl2br(sMVC_DumpAuthinfo($auth)), $action_result);
         }
         
-        if(!defined('SMVC_APP_AUTO_PREPEND_ACTION_TO_ACTION_METHOD_NAMES')){
-
-            define('SMVC_APP_AUTO_PREPEND_ACTION_TO_ACTION_METHOD_NAMES', true );
-        }
-        
         ////////////////////////////////////////////////////////////////////////
         // Login & check that the page returned contains expected html elements
         ////////////////////////////////////////////////////////////////////////
diff --git a/tests/StrHelpersTest.php b/tests/StrHelpersTest.php
index ca0fcf9..8b28b01 100644
--- a/tests/StrHelpersTest.php
+++ b/tests/StrHelpersTest.php
@@ -13,76 +13,31 @@ protected function setUp(): void {
         parent::setUp();
     }
 
-    public function testThat_str_starts_with_WorksAsExpected() {
-        
-        if( PHP_MAJOR_VERSION < 8 ) {
-            
-            self::assertSame(true, str_starts_with('abbcd', ''));
-            self::assertSame(true, str_starts_with('abbcd', 'abb'));
-            self::assertSame(true, str_starts_with('abbcd', 'ab'));
-            self::assertSame(true, str_starts_with('abbcd', 'a'));
-            self::assertSame(false, str_starts_with('abc', 'abb'));
-        }
-    }
-
-    public function testThat_str_ends_with_WorksAsExpected() {
-        
-        if( PHP_MAJOR_VERSION < 8 ) {
-            
-            self::assertSame(true, str_ends_with('abbcd', ''));
-            self::assertSame(true, str_ends_with('abbcd', 'bcd'));
-            self::assertSame(true, str_ends_with('abbcd', 'cd'));
-            self::assertSame(true, str_ends_with('abbcd', 'd'));
-            self::assertSame(false, str_ends_with('abc', 'abb'));
-        }
-    }
-
-    public function testThat_str_contains_WorksAsExpected() {
-        
-        if( PHP_MAJOR_VERSION < 8 ) {
-            
-            self::assertSame(true, str_contains('abbcd', ''));
-            self::assertSame(true, str_contains('abbcd', 'abb'));
-            self::assertSame(true, str_contains('abbcd', 'bbc'));
-            self::assertSame(true, str_contains('abbcd', 'bcd'));
-            self::assertSame(false, str_contains('abcss', 'abb'));
-        }
-    }
-
     public function testThat_mb_str_starts_with_WorksAsExpected() {
-        
-        if( PHP_MAJOR_VERSION < 8 ) {
             
-            self::assertSame(true, mb_str_starts_with('Âbbcd', ''));
-            self::assertSame(true, mb_str_starts_with('Âbbcd', 'Âbb'));
-            self::assertSame(true, mb_str_starts_with('Âbbcd', 'Âb'));
-            self::assertSame(true, mb_str_starts_with('Âbbcd', 'Â'));
-            self::assertSame(false, mb_str_starts_with('Âbc', 'Âbb'));
-        }
+        self::assertSame(true, mb_str_starts_with('Âbbcd', ''));
+        self::assertSame(true, mb_str_starts_with('Âbbcd', 'Âbb'));
+        self::assertSame(true, mb_str_starts_with('Âbbcd', 'Âb'));
+        self::assertSame(true, mb_str_starts_with('Âbbcd', 'Â'));
+        self::assertSame(false, mb_str_starts_with('Âbc', 'Âbb'));
     }
 
     public function testThat_mb_str_ends_with_WorksAsExpected() {
         
-        if( PHP_MAJOR_VERSION < 8 ) {
-            
-            self::assertSame(true, mb_str_ends_with('abbcđ', ''));
-            self::assertSame(true, mb_str_ends_with('abbcđ', 'bcđ'));
-            self::assertSame(true, mb_str_ends_with('abbcđ', 'cđ'));
-            self::assertSame(true, mb_str_ends_with('abbcđ', 'đ'));
-            self::assertSame(false, mb_str_ends_with('abc', 'abđ'));
-        }
+        self::assertSame(true, mb_str_ends_with('abbcđ', ''));
+        self::assertSame(true, mb_str_ends_with('abbcđ', 'bcđ'));
+        self::assertSame(true, mb_str_ends_with('abbcđ', 'cđ'));
+        self::assertSame(true, mb_str_ends_with('abbcđ', 'đ'));
+        self::assertSame(false, mb_str_ends_with('abc', 'abđ'));
     }
 
     public function testThat_mb_str_contains_WorksAsExpected() {
         
-        if( PHP_MAJOR_VERSION < 8 ) {
-            
-            self::assertSame(true, mb_str_contains('Âbbcd', ''));
-            self::assertSame(true, mb_str_contains('Âbbcd', 'Âbb'));
-            self::assertSame(true, mb_str_contains('Âbbcd', 'bbc'));
-            self::assertSame(true, mb_str_contains('Âbbcd', 'bcd'));
-            self::assertSame(false, mb_str_contains('Âbcss', 'Âbb'));
-        }
+        self::assertSame(true, mb_str_contains('Âbbcd', ''));
+        self::assertSame(true, mb_str_contains('Âbbcd', 'Âbb'));
+        self::assertSame(true, mb_str_contains('Âbbcd', 'bbc'));
+        self::assertSame(true, mb_str_contains('Âbbcd', 'bcd'));
+        self::assertSame(false, mb_str_contains('Âbcss', 'Âbb'));
     }
     
     public function testThatDashesToCamelWorksAsExpected() {
diff --git a/tests/test-template-output/ExpectedFooBar.php b/tests/test-template-output/ExpectedFooBar.php
index 3183989..3574efb 100644
--- a/tests/test-template-output/ExpectedFooBar.php
+++ b/tests/test-template-output/ExpectedFooBar.php
@@ -40,10 +40,7 @@ public function __construct(
         parent::__construct($container, $controller_name_from_uri, $action_name_from_uri, $req, $res);
     }
     
-    /**
-     * @return \Psr\Http\Message\ResponseInterface|string
-     */
-    public function actionIndex() {
+    public function actionIndex(): ResponseInterface|string  {
         
         //get the contents of the view first
         $view_str = $this->renderView('index.php', ['controller_object'=>$this]);