Use static method rather than function to use services

Author: natanfelles

system/CLI/CommandRunner.php

@@ -37,6 +37,7 @@
  * @filesource
  */
 
+use CodeIgniter\Config\Services;
 use CodeIgniter\Controller;
 
 class CommandRunner extends Controller
@@ -127,12 +128,10 @@ protected function runCommand(string $command, array $params)
 	/**
 	 * Scans all Commands directories and prepares a list
 	 * of each command with it's group and file.
-	 *
-	 * @return null|void
 	 */
 	protected function createCommandList()
 	{
-		$files = service('locator')->listFiles('Commands/');
+		$files = Services::locator()->listFiles('Commands/');
 
 		// If no matching command files were found, bail
 		if (empty($files))
@@ -144,7 +143,7 @@ protected function createCommandList()
 		// alias exists in the class. If so, return it. Otherwise, try the next.
 		foreach ($files as $file)
 		{
-			$className = service('locator')->findQualifiedNameFromPath($file);
+			$className = Services::locator()->findQualifiedNameFromPath($file);
 			if (empty($className) || ! class_exists($className))
 			{
 				continue;

system/Language/Language.php

@@ -36,6 +36,13 @@
  * @filesource
  */
 
+use CodeIgniter\Config\Services;
+
+/**
+ * Class Language
+ *
+ * @package CodeIgniter\Language
+ */
 class Language
 {
 
@@ -102,6 +109,8 @@ public function setLocale(string $locale = null)
 		return $this;
 	}
 
+	//--------------------------------------------------------------------
+
 	/**
 	 * @return string
 	 */
@@ -110,6 +119,8 @@ public function getLocale(): string
 		return $this->locale;
 	}
 
+	//--------------------------------------------------------------------
+
 	/**
 	 * Parses the language string for a file, loads the file, if necessary,
 	 * getting the line.
@@ -263,7 +274,7 @@ protected function load(string $file, string $locale, bool $return = false)
 	 */
 	protected function requireFile(string $path): array
 	{
-		$files = service('locator')->search($path);
+		$files = Services::locator()->search($path);
 
 		$strings = [];