knut7 / framework

src/Ballybran/Helpers/Utility/Ucfirst.php

Indentation +1 added lines, -5 removed lines

@@ -148,8 +148,4 @@
             $string = preg_replace('/' . $slug . '{2,}/i', $slug, $string);
             $string = trim($string, $slug);
         }
-        return $string;
-    }
-
-
-}
+        return $string
\ No newline at end of file

Switch Indentation +1 added lines, -5 removed lines

@@ -148,8 +148,4 @@
             $string = preg_replace('/' . $slug . '{2,}/i', $slug, $string);
             $string = trim($string, $slug);
         }
-        return $string;
-    }
-
-
-}
+        return $string
\ No newline at end of file

Spacing +2 added lines, -6 removed lines

@@ -85,7 +85,7 @@ 
                 if ($characterDeficit == 0) {
                     //If the word is full and we're not short any characters, ignore the character
                     continue;
-<<<<<<< HEAD
+<< << <<< HEAD
                 else
                     $characterDeficit--; //If we are short some characters, decrement the defecit and carry on with adding the character to the abbreviation
 =======
@@ -148,8 +148,4 @@ 
             $string = preg_replace('/' . $slug . '{2,}/i', $slug, $string);
             $string = trim($string, $slug);
         }
-        return $string;
-    }
-
-
-}
+        return $string
\ No newline at end of file

Braces +1 added lines, -5 removed lines

@@ -148,8 +148,4 @@
             $string = preg_replace('/' . $slug . '{2,}/i', $slug, $string);
             $string = trim($string, $slug);
         }
-        return $string;
-    }
-
-
-}
+        return $string
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -5 removed lines

@@ -148,8 +148,4 @@
             $string = preg_replace('/' . $slug . '{2,}/i', $slug, $string);
             $string = trim($string, $slug);
         }
-        return $string;
-    }
-
-
-}
+        return $string
\ No newline at end of file