From 68ca06c821a10d45b2b2dbd09779ed6840b1ae39 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Fri, 16 Feb 2024 16:01:49 +0100
Subject: [PATCH] Revert "Downgrade code to be PHP 7.0 compliant."

This reverts commit edb2b8520ef8dd934700c092e4f0e6eccc3ea2ca.

This partially reverts some code that was done long ago to
keep compatibility with PHP 7.0.

As far as moodle-cs now only supports PHP 7.4 and up, we
can move back to use return types.

Fixes #107
---
 moodle/Util/MoodleUtil.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/moodle/Util/MoodleUtil.php b/moodle/Util/MoodleUtil.php
index 61a0daa..641415e 100644
--- a/moodle/Util/MoodleUtil.php
+++ b/moodle/Util/MoodleUtil.php
@@ -102,7 +102,7 @@ protected static function loadCoreComponent(string $moodleRoot): bool {
      * @param string $moodleRoot Full path to a valid moodle.root
      * @return array Associative array of components as keys and paths as values or null if not found.
      */
-    protected static function calculateAllComponents(string $moodleRoot) {
+    protected static function calculateAllComponents(string $moodleRoot): ?array {
         // If we have calculated the components already, straight return them.
         if (!empty(self::$moodleComponents)) {
             return self::$moodleComponents;
@@ -205,7 +205,7 @@ protected static function calculateAllComponents(string $moodleRoot) {
      *
      * @return string|null a valid moodle component for the file or null if not found.
      */
-    public static function getMoodleComponent(File $file, $selfPath = true) {
+    public static function getMoodleComponent(File $file, $selfPath = true): ?string {
         if (defined('PHPUNIT_TEST') && PHPUNIT_TEST && !empty(self::$mockedComponentMappings)) {
             $components = self::$mockedComponentMappings; // @codeCoverageIgnore
         } else {
@@ -252,7 +252,7 @@ public static function getMoodleComponent(File $file, $selfPath = true) {
      *
      * @return int|null the numeric branch in moodle root version.php or null if not found
      */
-    public static function getMoodleBranch(File $file = null, bool $selfPath = true) {
+    public static function getMoodleBranch(?File $file = null, bool $selfPath = true): ?int {
 
         // Return already calculated value if available.
         if (self::$moodleBranch !== false) {
@@ -270,7 +270,7 @@ public static function getMoodleBranch(File $file = null, bool $selfPath = true)
                 throw new DeepExitException(
                     "ERROR: Incorrect 'moodleBranch' config/runtime option. Value must be 4 digit max.: '$branch'", 3);
             }
-            self::$moodleBranch = (int)$branch;
+            self::$moodleBranch = $branch;
             return self::$moodleBranch;
         }
 
@@ -288,7 +288,7 @@ public static function getMoodleBranch(File $file = null, bool $selfPath = true)
                 // Find the $branch value.
                 if ($valueToken = $versionFile->findNext(T_CONSTANT_ENCAPSED_STRING, $varToken)) {
                     $branch = trim($versionFile->getTokens()[$valueToken]['content'], "\"'");
-                    self::$moodleBranch = (int)$branch;
+                    self::$moodleBranch = $branch;
                     return self::$moodleBranch;
                 }
             }
@@ -313,7 +313,7 @@ public static function getMoodleBranch(File $file = null, bool $selfPath = true)
      *
      * @return string|null the full path to moodle root or null if not found.
      */
-    public static function getMoodleRoot(File $file = null, bool $selfPath = true) {
+    public static function getMoodleRoot(?File $file = null, bool $selfPath = true): ?string {
         // Return already calculated value if available.
         if (self::$moodleRoot !== false) {
             return self::$moodleRoot;