Add return types - batch 1/n

Author: nicolas-grekas

AbstractString.php

@@ -95,7 +95,7 @@ public static function wrap(array $values): array
      *
      * @return static
      */
-    public function after(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): self
+    public function after(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = \PHP_INT_MAX;
@@ -130,7 +130,7 @@ public function after(string|iterable $needle, bool $includeNeedle = false, int
      *
      * @return static
      */
-    public function afterLast(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): self
+    public function afterLast(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = null;
@@ -163,14 +163,14 @@ public function afterLast(string|iterable $needle, bool $includeNeedle = false,
     /**
      * @return static
      */
-    abstract public function append(string ...$suffix): self;
+    abstract public function append(string ...$suffix): static;
 
     /**
      * @param string|string[] $needle
      *
      * @return static
      */
-    public function before(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): self
+    public function before(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = \PHP_INT_MAX;
@@ -205,7 +205,7 @@ public function before(string|iterable $needle, bool $includeNeedle = false, int
      *
      * @return static
      */
-    public function beforeLast(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): self
+    public function beforeLast(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = null;
@@ -248,7 +248,7 @@ public function bytesAt(int $offset): array
     /**
      * @return static
      */
-    abstract public function camel(): self;
+    abstract public function camel(): static;
 
     /**
      * @return static[]
@@ -258,7 +258,7 @@ abstract public function chunk(int $length = 1): array;
     /**
      * @return static
      */
-    public function collapseWhitespace(): self
+    public function collapseWhitespace(): static
     {
         $str = clone $this;
         $str->string = trim(preg_replace('/(?:\s{2,}+|[^\S ])/', ' ', $str->string));
@@ -295,7 +295,7 @@ public function endsWith(string|iterable $suffix): bool
     /**
      * @return static
      */
-    public function ensureEnd(string $suffix): self
+    public function ensureEnd(string $suffix): static
     {
         if (!$this->endsWith($suffix)) {
             return $this->append($suffix);
@@ -310,7 +310,7 @@ public function ensureEnd(string $suffix): self
     /**
      * @return static
      */
-    public function ensureStart(string $prefix): self
+    public function ensureStart(string $prefix): static
     {
         $prefix = new static($prefix);
 
@@ -350,12 +350,12 @@ public function equalsTo(string|iterable $string): bool
     /**
      * @return static
      */
-    abstract public function folded(): self;
+    abstract public function folded(): static;
 
     /**
      * @return static
      */
-    public function ignoreCase(): self
+    public function ignoreCase(): static
     {
         $str = clone $this;
         $str->ignoreCase = true;
@@ -415,7 +415,7 @@ public function isEmpty(): bool
     /**
      * @return static
      */
-    abstract public function join(array $strings, string $lastGlue = null): self;
+    abstract public function join(array $strings, string $lastGlue = null): static;
 
     public function jsonSerialize(): string
     {
@@ -427,7 +427,7 @@ abstract public function length(): int;
     /**
      * @return static
      */
-    abstract public function lower(): self;
+    abstract public function lower(): static;
 
     /**
      * Matches the string using a regular expression.
@@ -441,27 +441,27 @@ abstract public function match(string $regexp, int $flags = 0, int $offset = 0):
     /**
      * @return static
      */
-    abstract public function padBoth(int $length, string $padStr = ' '): self;
+    abstract public function padBoth(int $length, string $padStr = ' '): static;
 
     /**
      * @return static
      */
-    abstract public function padEnd(int $length, string $padStr = ' '): self;
+    abstract public function padEnd(int $length, string $padStr = ' '): static;
 
     /**
      * @return static
      */
-    abstract public function padStart(int $length, string $padStr = ' '): self;
+    abstract public function padStart(int $length, string $padStr = ' '): static;
 
     /**
      * @return static
      */
-    abstract public function prepend(string ...$prefix): self;
+    abstract public function prepend(string ...$prefix): static;
 
     /**
      * @return static
      */
-    public function repeat(int $multiplier): self
+    public function repeat(int $multiplier): static
     {
         if (0 > $multiplier) {
             throw new InvalidArgumentException(sprintf('Multiplier must be positive, %d given.', $multiplier));
@@ -476,34 +476,34 @@ public function repeat(int $multiplier): self
     /**
      * @return static
      */
-    abstract public function replace(string $from, string $to): self;
+    abstract public function replace(string $from, string $to): static;
 
     /**
      * @param string|callable $to
      *
      * @return static
      */
-    abstract public function replaceMatches(string $fromRegexp, string|callable $to): self;
+    abstract public function replaceMatches(string $fromRegexp, string|callable $to): static;
 
     /**
      * @return static
      */
-    abstract public function reverse(): self;
+    abstract public function reverse(): static;
 
     /**
      * @return static
      */
-    abstract public function slice(int $start = 0, int $length = null): self;
+    abstract public function slice(int $start = 0, int $length = null): static;
 
     /**
      * @return static
      */
-    abstract public function snake(): self;
+    abstract public function snake(): static;
 
     /**
      * @return static
      */
-    abstract public function splice(string $replacement, int $start = 0, int $length = null): self;
+    abstract public function splice(string $replacement, int $start = 0, int $length = null): static;
 
     /**
      * @return static[]
@@ -574,7 +574,7 @@ public function startsWith(string|iterable $prefix): bool
     /**
      * @return static
      */
-    abstract public function title(bool $allWords = false): self;
+    abstract public function title(bool $allWords = false): static;
 
     public function toByteString(string $toEncoding = null): ByteString
     {
@@ -625,22 +625,22 @@ public function toUnicodeString(): UnicodeString
     /**
      * @return static
      */
-    abstract public function trim(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): self;
+    abstract public function trim(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): static;
 
     /**
      * @return static
      */
-    abstract public function trimEnd(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): self;
+    abstract public function trimEnd(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): static;
 
     /**
      * @return static
      */
-    abstract public function trimStart(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): self;
+    abstract public function trimStart(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): static;
 
     /**
      * @return static
      */
-    public function truncate(int $length, string $ellipsis = '', bool $cut = true): self
+    public function truncate(int $length, string $ellipsis = '', bool $cut = true): static
     {
         $stringLength = $this->length();
 
@@ -670,7 +670,7 @@ public function truncate(int $length, string $ellipsis = '', bool $cut = true):
     /**
      * @return static
      */
-    abstract public function upper(): self;
+    abstract public function upper(): static;
 
     /**
      * Returns the printable length on a terminal.
@@ -680,7 +680,7 @@ abstract public function width(bool $ignoreAnsiDecoration = true): int;
     /**
      * @return static
      */
-    public function wordwrap(int $width = 75, string $break = "\n", bool $cut = false): self
+    public function wordwrap(int $width = 75, string $break = "\n", bool $cut = false): static
     {
         $lines = '' !== $break ? $this->split($break) : [clone $this];
         $chars = [];

AbstractUnicodeString.php

@@ -53,7 +53,7 @@ abstract class AbstractUnicodeString extends AbstractString
     /**
      * @return static
      */
-    public static function fromCodePoints(int ...$codes): self
+    public static function fromCodePoints(int ...$codes): static
     {
         $string = '';
 
@@ -157,7 +157,7 @@ public function ascii(array $rules = []): self
         return $str;
     }
 
-    public function camel(): parent
+    public function camel(): static
     {
         $str = clone $this;
         $str->string = str_replace(' ', '', preg_replace_callback('/\b./u', static function ($m) use (&$i) {
@@ -187,7 +187,7 @@ public function codePointsAt(int $offset): array
         return $codePoints;
     }
 
-    public function folded(bool $compat = true): parent
+    public function folded(bool $compat = true): static
     {
         $str = clone $this;
 
@@ -201,7 +201,7 @@ public function folded(bool $compat = true): parent
         return $str;
     }
 
-    public function join(array $strings, string $lastGlue = null): parent
+    public function join(array $strings, string $lastGlue = null): static
     {
         $str = clone $this;
 
@@ -215,7 +215,7 @@ public function join(array $strings, string $lastGlue = null): parent
         return $str;
     }
 
-    public function lower(): parent
+    public function lower(): static
     {
         $str = clone $this;
         $str->string = mb_strtolower(str_replace('İ', 'i̇', $str->string), 'UTF-8');
@@ -255,7 +255,7 @@ public function match(string $regexp, int $flags = 0, int $offset = 0): array
     /**
      * @return static
      */
-    public function normalize(int $form = self::NFC): self
+    public function normalize(int $form = self::NFC): static
     {
         if (!\in_array($form, [self::NFC, self::NFD, self::NFKC, self::NFKD])) {
             throw new InvalidArgumentException('Unsupported normalization form.');
@@ -267,7 +267,7 @@ public function normalize(int $form = self::NFC): self
         return $str;
     }
 
-    public function padBoth(int $length, string $padStr = ' '): parent
+    public function padBoth(int $length, string $padStr = ' '): static
     {
         if ('' === $padStr || !preg_match('//u', $padStr)) {
             throw new InvalidArgumentException('Invalid UTF-8 string.');
@@ -279,7 +279,7 @@ public function padBoth(int $length, string $padStr = ' '): parent
         return $this->pad($length, $pad, \STR_PAD_BOTH);
     }
 
-    public function padEnd(int $length, string $padStr = ' '): parent
+    public function padEnd(int $length, string $padStr = ' '): static
     {
         if ('' === $padStr || !preg_match('//u', $padStr)) {
             throw new InvalidArgumentException('Invalid UTF-8 string.');
@@ -291,7 +291,7 @@ public function padEnd(int $length, string $padStr = ' '): parent
         return $this->pad($length, $pad, \STR_PAD_RIGHT);
     }
 
-    public function padStart(int $length, string $padStr = ' '): parent
+    public function padStart(int $length, string $padStr = ' '): static
     {
         if ('' === $padStr || !preg_match('//u', $padStr)) {
             throw new InvalidArgumentException('Invalid UTF-8 string.');
@@ -303,7 +303,7 @@ public function padStart(int $length, string $padStr = ' '): parent
         return $this->pad($length, $pad, \STR_PAD_LEFT);
     }
 
-    public function replaceMatches(string $fromRegexp, string|callable $to): parent
+    public function replaceMatches(string $fromRegexp, string|callable $to): static
     {
         if ($this->ignoreCase) {
             $fromRegexp .= 'i';
@@ -354,23 +354,23 @@ public function replaceMatches(string $fromRegexp, string|callable $to): parent
         return $str;
     }
 
-    public function reverse(): parent
+    public function reverse(): static
     {
         $str = clone $this;
         $str->string = implode('', array_reverse(preg_split('/(\X)/u', $str->string, -1, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY)));
 
         return $str;
     }
 
-    public function snake(): parent
+    public function snake(): static
     {
         $str = $this->camel()->title();
         $str->string = mb_strtolower(preg_replace(['/(\p{Lu}+)(\p{Lu}\p{Ll})/u', '/([\p{Ll}0-9])(\p{Lu})/u'], '\1_\2', $str->string), 'UTF-8');
 
         return $str;
     }
 
-    public function title(bool $allWords = false): parent
+    public function title(bool $allWords = false): static
     {
         $str = clone $this;
 
@@ -383,7 +383,7 @@ public function title(bool $allWords = false): parent
         return $str;
     }
 
-    public function trim(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): parent
+    public function trim(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): static
     {
         if (" \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}" !== $chars && !preg_match('//u', $chars)) {
             throw new InvalidArgumentException('Invalid UTF-8 chars.');
@@ -396,7 +396,7 @@ public function trim(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): parent
         return $str;
     }
 
-    public function trimEnd(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): parent
+    public function trimEnd(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): static
     {
         if (" \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}" !== $chars && !preg_match('//u', $chars)) {
             throw new InvalidArgumentException('Invalid UTF-8 chars.');
@@ -409,7 +409,7 @@ public function trimEnd(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): pare
         return $str;
     }
 
-    public function trimStart(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): parent
+    public function trimStart(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): static
     {
         if (" \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}" !== $chars && !preg_match('//u', $chars)) {
             throw new InvalidArgumentException('Invalid UTF-8 chars.');
@@ -422,7 +422,7 @@ public function trimStart(string $chars = " \t\n\r\0\x0B\x0C\u{A0}\u{FEFF}"): pa
         return $str;
     }
 
-    public function upper(): parent
+    public function upper(): static
     {
         $str = clone $this;
         $str->string = mb_strtoupper($str->string, 'UTF-8');