Utility: Review Str

- Rename `Str::wrap()` to `Str::enclose()`
- Rename `Str::wordwrap()` to `Str::wrap()`

Author: lkrms

src/Toolkit/Console/ConsoleFormatter.php

@@ -544,12 +544,12 @@ function (array $match) use (
         }
         if ($wrapToWidth !== null) {
             if (strlen($break) === 1) {
-                $string = Str::wordwrap($string, $wrapToWidth, $break);
+                $string = Str::wrap($string, $wrapToWidth, $break);
             } else {
                 if (strpos($string, "\x7f") !== false) {
                     $string = $this->insertPlaceholders($string, '/\x7f/', $replace);
                 }
-                $string = Str::wordwrap($string, $wrapToWidth, "\x7f");
+                $string = Str::wrap($string, $wrapToWidth, "\x7f");
                 $string = $this->insertPlaceholders($string, '/\x7f/', $replace, "\n", $break);
             }
         }

src/Toolkit/Utility/Format.php

@@ -147,7 +147,7 @@ public static function date(
             $format .= ' H:i:s T';
         }
 
-        return Str::wrap($date->format($format), $before, $after);
+        return Str::enclose($date->format($format), $before, $after);
     }
 
     /**
@@ -207,9 +207,9 @@ public static function dateRange(
 
         return sprintf(
             '%s%s%s',
-            Str::wrap($from->format($fromFormat), $before, $after),
+            Str::enclose($from->format($fromFormat), $before, $after),
             $delimiter,
-            Str::wrap($to->format($toFormat), $before, $after),
+            Str::enclose($to->format($toFormat), $before, $after),
         );
     }
 

src/Toolkit/Utility/Str.php

@@ -529,7 +529,7 @@ public static function splitDelimited(
      *
      * @param array{int,int}|int $width
      */
-    public static function wordwrap(
+    public static function wrap(
         string $string,
         $width = 75,
         string $break = "\n",
@@ -605,7 +605,7 @@ public static function unwrap(
      * @param string|null $after If `null`, `$before` is used before and after
      * the string.
      */
-    public static function wrap(string $string, string $before, ?string $after = null): string
+    public static function enclose(string $string, string $before, ?string $after = null): string
     {
         return $before . $string . ($after ?? $before);
     }

tests/unit/Toolkit/Utility/StrTest.php

@@ -665,11 +665,11 @@ public function splitDelimitedProvider(): array
         ];
     }
 
-    public function testWrap(): void
+    public function testEnclose(): void
     {
-        $this->assertEquals('**test**', Str::wrap('test', '**'));
-        $this->assertEquals('[test]', Str::wrap('test', '[', ']'));
-        $this->assertEquals('!!test?', Str::wrap('test', '!!', '?'));
+        $this->assertEquals('**test**', Str::enclose('test', '**'));
+        $this->assertEquals('[test]', Str::enclose('test', '[', ']'));
+        $this->assertEquals('!!test?', Str::enclose('test', '!!', '?'));
     }
 
     /**