Skip to content
This repository has been archived by the owner on Mar 14, 2024. It is now read-only.

Commit

Permalink
Merge pull request #335 from tighten/v9.44.0-changes
Browse files Browse the repository at this point in the history
v9.44.0 changes
  • Loading branch information
jamisonvalenta authored Jan 13, 2023
2 parents 67333c1 + 5fa8cdc commit 4f94320
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions tests/files/Support/Str.php
Original file line number Diff line number Diff line change
Expand Up @@ -1125,11 +1125,12 @@ public static function studly($value)
* @param string $string
* @param int $start
* @param int|null $length
* @param string $encoding
* @return string
*/
public static function substr($string, $start, $length = null)
public static function substr($string, $start, $length = null, $encoding = 'UTF-8')
{
return mb_substr($string, $start, $length, 'UTF-8');
return mb_substr($string, $start, $length, $encoding);
}

/**
Expand Down
5 changes: 3 additions & 2 deletions tests/files/Support/Stringable.php
Original file line number Diff line number Diff line change
Expand Up @@ -784,11 +784,12 @@ public function studly()
*
* @param int $start
* @param int|null $length
* @param string $encoding
* @return static
*/
public function substr($start, $length = null)
public function substr($start, $length = null, $encoding = 'UTF-8')
{
return new static(Str::substr($this->value, $start, $length));
return new static(Str::substr($this->value, $start, $length, $encoding));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ function getCurrentVersionFromGitHub()
echo Getting current version from $repository...

if [ -z "$requestedVersion" ]; then
collectionVersion=$(git ls-remote $repository --tags v9.43\* | grep tags/ | grep -v {} | cut -d \/ -f 3 | cut -d v -f 2 | grep -v RC | grep -vi beta | sort -t. -k 1,1n -k 2,2n -k 3,3n| tail -1)
collectionVersion=$(git ls-remote $repository --tags v9.44\* | grep tags/ | grep -v {} | cut -d \/ -f 3 | cut -d v -f 2 | grep -v RC | grep -vi beta | sort -t. -k 1,1n -k 2,2n -k 3,3n| tail -1)
else
collectionVersion=$requestedVersion
fi
Expand Down

0 comments on commit 4f94320

Please sign in to comment.