Merge pull request #26 from samsonasik/substr-strpos

change substr with strpos when possible
zendframework · Feb 26, 2019 · 081f5fa · 081f5fa
2 parents 0089528 + f48547a
commit 081f5fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/File.php b/src/File.php
@@ -67,7 +67,7 @@ public function setFragment($fragment)
     public static function fromUnixPath($path)
     {
         $url = new static('file:');
-        if (substr($path, 0, 1) == '/') {
+        if (0 === strpos($path, '/')) {
             $url->setHost('');
         }
 

diff --git a/src/Uri.php b/src/Uri.php
@@ -192,7 +192,7 @@ public static function getEscaper()
     public function isValid()
     {
         if ($this->host) {
-            if (strlen($this->path) > 0 && substr($this->path, 0, 1) != '/') {
+            if (strlen($this->path) > 0 && 0 !== strpos($this->path, '/')) {
                 return false;
             }
             return true;
@@ -204,7 +204,7 @@ public function isValid()
 
         if ($this->path) {
             // Check path-only (no host) URI
-            if (substr($this->path, 0, 2) == '//') {
+            if (0 === strpos($this->path, '//')) {
                 return false;
             }
             return true;
@@ -231,7 +231,7 @@ public function isValidRelative()
 
         if ($this->path) {
             // Check path-only (no host) URI
-            if (substr($this->path, 0, 2) == '//') {
+            if (0 === strpos($this->path, '//')) {
                 return false;
             }
             return true;
@@ -337,7 +337,7 @@ public function parse($uri)
         }
 
         // All that's left is the fragment
-        if ($uri && substr($uri, 0, 1) == '#') {
+        if ($uri && 0 === strpos($uri, '#')) {
             $this->setFragment(substr($uri, 1));
         }
 
@@ -483,7 +483,7 @@ public function resolve($baseUri)
                     $this->setQuery($baseUri->getQuery());
                 }
             } else {
-                if (substr($relPath, 0, 1) == '/') {
+                if (0 === strpos($relPath, '/')) {
                     $this->setPath(static::removePathDotSegments($relPath));
                 } else {
                     if ($baseUri->getHost() && ! $basePath) {
@@ -1105,21 +1105,21 @@ public static function removePathDotSegments($path)
                     }
                     $output = substr($output, 0, $lastSlashPos);
                     break;
-                case (substr($path, 0, 4) == '/../'):
+                case (0 === strpos($path, '/../')):
                     $path   = '/' . substr($path, 4);
                     $lastSlashPos = strrpos($output, '/', -1);
                     if (false === $lastSlashPos) {
                         break;
                     }
                     $output = substr($output, 0, $lastSlashPos);
                     break;
-                case (substr($path, 0, 3) == '/./'):
+                case (0 === strpos($path, '/./')):
                     $path = substr($path, 2);
                     break;
-                case (substr($path, 0, 2) == './'):
+                case (0 === strpos($path, './')):
                     $path = substr($path, 2);
                     break;
-                case (substr($path, 0, 3) == '../'):
+                case (0 === strpos($path, '../')):
                     $path = substr($path, 3);
                     break;
                 default: