Refactor.

Author: Maikuolan

src/Loader.php

@@ -804,49 +804,49 @@ public function buildPath(string $Path, bool $PointsToFile = true): string
     /**
      * Gets substring from haystack prior to the first occurrence of needle.
      *
-     * @param string $h The haystack.
-     * @param string $n The needle.
+     * @param string $Haystack The haystack.
+     * @param string $Needle The needle.
      * @return string The substring.
      */
     public function substrBeforeFirst(string $h, string $n): string
     {
-        return !$n ? '' : substr($h, 0, strpos($h, $n));
+        return !strlen($Needle) ? '' : substr($Haystack, 0, strpos($Haystack, $Needle));
     }
 
     /**
      * Gets substring from haystack after the first occurrence of needle.
      *
-     * @param string $h The haystack.
-     * @param string $n The needle.
+     * @param string $Haystack The haystack.
+     * @param string $Needle The needle.
      * @return string The substring.
      */
     public function substrAfterFirst(string $h, string $n): string
     {
-        return !$n ? '' : substr($h, strpos($h, $n) + strlen($n));
+        return !($Length = strlen($Needle)) ? '' : substr($Haystack, strpos($Haystack, $Needle) + $Length);
     }
 
     /**
      * Gets substring from haystack prior to the last occurrence of needle.
      *
-     * @param string $h The haystack.
-     * @param string $n The needle.
+     * @param string $Haystack The haystack.
+     * @param string $Needle The needle.
      * @return string The substring.
      */
     public function substrBeforeLast(string $h, string $n): string
     {
-        return !$n ? '' : substr($h, 0, strrpos($h, $n));
+        return !strlen($Needle) ? '' : substr($Haystack, 0, strrpos($Haystack, $Needle));
     }
 
     /**
      * Gets substring from haystack after the last occurrence of needle.
      *
-     * @param string $h The haystack.
-     * @param string $n The needle.
+     * @param string $Haystack The haystack.
+     * @param string $Needle The needle.
      * @return string The substring.
      */
-    public function substrAfterLast(string $h, string $n): string
+    public function substrAfterLast(string $Haystack, string $Needle): string
     {
-        return !$n ? '' : substr($h, strrpos($h, $n) + strlen($n));
+        return !($Length = strlen($Needle)) ? '' : substr($Haystack, strrpos($Haystack, $Needle) + $Length);
     }
 
     /**