convert all string methods to StringHelper

Author: alexandresalome

src/Gitonomy/Git/Commit.php

@@ -190,7 +190,7 @@ public function getShortHash()
      */
     public function getFixedShortHash($length = 6)
     {
-        return substr($this->hash, 0, $length);
+        return StringHelper::substr($this->hash, 0, $length);
     }
 
     /**
@@ -252,7 +252,7 @@ public function getTree()
     public function getLastModification($path, $lastHash = null)
     {
         if (preg_match('#^/#', $path)) {
-            $path = substr($path, 1);
+            $path = StringHelper::substr($path, 1);
         }
 
         $result = $this->repository->run('log', array('--format=%H', '-n', 1, $this->hash, '--', $path));
@@ -319,7 +319,7 @@ public function getIncludingBranches($local = true, $remote = true)
         }
 
         $branchesName = explode("\n", trim(str_replace('*', '', $result)));
-        $branchesName = array_filter($branchesName, function($v) { return false === strpos($v, '->');});
+        $branchesName = array_filter($branchesName, function($v) { return false === StringHelper::strpos($v, '->');});
         $branchesName = array_map('trim', $branchesName);
 
         $references = $this->repository->getReferences();
@@ -328,7 +328,7 @@ public function getIncludingBranches($local = true, $remote = true)
         foreach ($branchesName as $branchName) {
             if (false === $local) {
                 $branches[] = $references->getRemoteBranch($branchName);
-            } elseif (0 === strrpos($branchName, 'remotes/')) {
+            } elseif (0 === StringHelper::strrpos($branchName, 'remotes/')) {
                 $branches[] = $references->getRemoteBranch(str_replace('remotes/', '', $branchName));
             } else {
                 $branches[] = $references->getBranch($branchName);

src/Gitonomy/Git/Parser/CommitParser.php

@@ -12,6 +12,8 @@
 
 namespace Gitonomy\Git\Parser;
 
+use Gitonomy\Git\Util\StringHelper;
+
 class CommitParser extends ParserBase
 {
     public $tree;
@@ -56,7 +58,7 @@ protected function consumeNameEmailDate()
             throw new \RuntimeException('Unable to parse name, email and date');
         }
 
-        $this->cursor += mb_strlen($vars[1]);
+        $this->cursor += StringHelper::strlen($vars[1]);
 
         return array($vars[2], $vars[3], $vars[4]);
     }

src/Gitonomy/Git/Parser/DiffParser.php

@@ -14,6 +14,7 @@
 
 use Gitonomy\Git\Diff\File;
 use Gitonomy\Git\Diff\FileChange;
+use Gitonomy\Git\Util\StringHelper;
 use Gitonomy\Git\Repository;
 
 class DiffParser extends ParserBase
@@ -99,8 +100,8 @@ protected function doParse()
                 }
             }
 
-            $oldName  = $oldName === '/dev/null' ? null : substr($oldName, 2);
-            $newName  = $newName === '/dev/null' ? null : substr($newName, 2);
+            $oldName  = $oldName === '/dev/null' ? null : StringHelper::substr($oldName, 2);
+            $newName  = $newName === '/dev/null' ? null : StringHelper::substr($newName, 2);
             $oldIndex = preg_match('/^0+$/', $oldIndex) ? null : $oldIndex;
             $newIndex = preg_match('/^0+$/', $newIndex) ? null : $newIndex;
             $file = new File($this->repository, $oldName, $newName, $oldMode, $newMode, $oldIndex, $newIndex, $isBinary);

src/Gitonomy/Git/Parser/ParserBase.php

@@ -12,6 +12,8 @@
 
 namespace Gitonomy\Git\Parser;
 
+use Gitonomy\Git\Util\StringHelper;
+
 abstract class ParserBase
 {
     protected $cursor;
@@ -24,7 +26,7 @@ public function parse($content)
     {
         $this->cursor  = 0;
         $this->content = $content;
-        $this->length  = strlen($this->content);
+        $this->length  = StringHelper::strlen($this->content);
 
         $this->doParse();
     }
@@ -36,16 +38,16 @@ protected function isFinished()
 
     protected function consumeAll()
     {
-        $rest = substr($this->content, $this->cursor);
-        $this->cursor += strlen($rest);
+        $rest = StringHelper::substr($this->content, $this->cursor);
+        $this->cursor += StringHelper::strlen($rest);
 
         return $rest;
     }
 
     protected function expects($expected)
     {
-        $length = strlen($expected);
-        $actual = substr($this->content, $this->cursor, $length);
+        $length = StringHelper::strlen($expected);
+        $actual = StringHelper::substr($this->content, $this->cursor, $length);
         if ($actual !== $expected) {
             return false;
         }
@@ -58,18 +60,18 @@ protected function expects($expected)
     protected function consumeShortHash()
     {
         if (!preg_match('/([A-Za-z0-9]{7,40})/A', $this->content, $vars, null, $this->cursor)) {
-            throw new \RuntimeException('No short hash found: '.substr($this->content, $this->cursor, 7));
+            throw new \RuntimeException('No short hash found: '.StringHelper::substr($this->content, $this->cursor, 7));
         }
 
-        $this->cursor += strlen($vars[1]);
+        $this->cursor += StringHelper::strlen($vars[1]);
 
         return $vars[1];
     }
 
     protected function consumeHash()
     {
         if (!preg_match('/([A-Za-z0-9]{40})/A', $this->content, $vars, null, $this->cursor)) {
-            throw new \RuntimeException('No hash found: '.substr($this->content, $this->cursor, 40));
+            throw new \RuntimeException('No hash found: '.StringHelper::substr($this->content, $this->cursor, 40));
         }
 
         $this->cursor += 40;
@@ -83,29 +85,29 @@ protected function consumeRegexp($regexp)
             throw new \RuntimeException('No match for regexp '.$regexp);
         }
 
-        $this->cursor += strlen($vars[0]);
+        $this->cursor += StringHelper::strlen($vars[0]);
 
         return $vars;
     }
 
     protected function consumeTo($text)
     {
-        $pos = strpos($this->content, $text, $this->cursor);
+        $pos = StringHelper::strpos($this->content, $text, $this->cursor);
 
         if (false === $pos) {
             throw new \RuntimeException(sprintf('Unable to find "%s"', $text));
         }
 
-        $result = substr($this->content, $this->cursor, $pos - $this->cursor);
+        $result = StringHelper::substr($this->content, $this->cursor, $pos - $this->cursor);
         $this->cursor = $pos;
 
         return $result;
     }
 
     protected function consume($expected)
     {
-        $length = strlen($expected);
-        $actual = substr($this->content, $this->cursor, $length);
+        $length = StringHelper::strlen($expected);
+        $actual = StringHelper::substr($this->content, $this->cursor, $length);
         if ($actual !== $expected) {
             throw new \RuntimeException(sprintf('Expected "%s", but got "%s"', $expected, $actual));
         }

src/Gitonomy/Git/Util/StringHelper.php

@@ -31,8 +31,12 @@ public static function strlen($string)
         return function_exists('mb_strlen') ? mb_strlen($string, self::$encoding) : strlen($string);
     }
 
-    public static function substr($string, $start, $length = null)
+    public static function substr($string, $start, $length = false)
     {
+        if (false === $length) {
+            $length = self::strlen($string);
+        }
+
         return function_exists('mb_substr') ? mb_substr($string, $start, $length, self::$encoding) : substr($string, $start, $length);
     }