Merge 0a762f2 into 9d82dd0

cpliakas · Feb 3, 2020 · 616f6be · 616f6be
2 parents 9d82dd0 + 0a762f2
commit 616f6be
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/GitBranches.php b/src/GitBranches.php
@@ -6,7 +6,6 @@
 
 use ArrayIterator;
 use IteratorAggregate;
-use Nette\Utils\Strings;
 
 /**
  * Class that parses and returnes an array of branches.
@@ -34,7 +33,7 @@ public function fetchBranches(bool $onlyRemote = false): array
     {
         $options = $onlyRemote ? ['r' => true] : ['a' => true];
         $output = $this->gitWorkingCopy->branch($options);
-        $branches = (array) Strings::split(rtrim($output), "/\r\n|\n|\r/");
+        $branches = $this->splitByNewline(rtrim($output));
         return array_map([$this, 'trimBranch'], $branches);
     }
 
@@ -72,4 +71,9 @@ public function head(): string
     {
         return trim($this->gitWorkingCopy->run('rev-parse', ['--abbrev-ref', 'HEAD']));
     }
+
+    private function splitByNewline(string $string): array
+    {
+        return (array)preg_split('#\R#', $string, PREG_SPLIT_NO_EMPTY);
+    }
 }
diff --git a/src/GitTags.php b/src/GitTags.php
@@ -6,7 +6,6 @@
 
 use ArrayIterator;
 use IteratorAggregate;
-use Nette\Utils\Strings;
 
 /**
  * Class that parses and returnes an array of Tags.
@@ -30,7 +29,7 @@ public function __construct(GitWorkingCopy $gitWorkingCopy)
     public function fetchTags(): array
     {
         $output = $this->gitWorkingCopy->tag(['l' => true]);
-        $tags = (array) Strings::split(rtrim($output), "/\r\n|\n|\r/");
+        $tags = $this->splitByNewline(rtrim($output));
         return array_map([$this, 'trimTags'], $tags);
     }
 
@@ -55,4 +54,9 @@ public function all(): array
     {
         return $this->fetchTags();
     }
+
+    private function splitByNewline(string $string): array
+    {
+        return (array)preg_split('#\R#', $string, PREG_SPLIT_NO_EMPTY);
+    }
 }
diff --git a/src/GitWorkingCopy.php b/src/GitWorkingCopy.php
@@ -5,7 +5,6 @@
 namespace GitWrapper;
 
 use GitWrapper\Exception\GitException;
-use Nette\Utils\Strings;
 
 /**
  * Interacts with a working copy.
@@ -679,6 +678,6 @@ private function ensureAddRemoteArgsAreValid(string $name, string $url): void
 
     private function splitByNewline(string $string): array
     {
-        return Strings::split($string, '#\R#');
+        return (array)preg_split('#\R#', $string, PREG_SPLIT_NO_EMPTY);
     }
 }
diff --git a/src/Strings/GitStrings.php b/src/Strings/GitStrings.php
@@ -4,8 +4,6 @@
 
 namespace GitWrapper\Strings;
 
-use Nette\Utils\Strings;
-
 final class GitStrings
 {
     /**
@@ -21,7 +19,7 @@ public static function parseRepositoryName(string $repositoryUrl): string
             $path = end($parts);
         } else {
             $strpos = strpos($repositoryUrl, ':');
-            $path = Strings::substring($repositoryUrl, $strpos + 1);
+            $path = mb_substr($repositoryUrl, $strpos + 1);
         }
 
         /** @var string $path */