Merge pull request #173 from samsonasik/substr-strpos

change substr with strpos/stripos when possible

Author: michalbundyra

src/Pattern/PatternOptions.php

@@ -152,7 +152,7 @@ class PatternOptions extends AbstractOptions
     public function __construct($options = null)
     {
         // disable file/directory permissions by default on windows systems
-        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+        if (stripos(PHP_OS, 'WIN') === 0) {
             $this->filePermission = false;
             $this->dirPermission = false;
         }

src/Storage/Adapter/Dba.php

@@ -220,7 +220,6 @@ public function clearByNamespace($namespace)
         }
 
         $prefix  = $namespace . $this->getOptions()->getNamespaceSeparator();
-        $prefixl = strlen($prefix);
         $result  = true;
 
         $this->_open();
@@ -230,7 +229,7 @@ public function clearByNamespace($namespace)
             $recheck     = false;
             $internalKey = dba_firstkey($this->handle);
             while ($internalKey !== false && $internalKey !== null) {
-                if (substr($internalKey, 0, $prefixl) === $prefix) {
+                if (strpos($internalKey, $prefix) === 0) {
                     $result = dba_delete($internalKey, $this->handle) && $result;
                 }
 
@@ -259,7 +258,6 @@ public function clearByPrefix($prefix)
         $options   = $this->getOptions();
         $namespace = $options->getNamespace();
         $prefix    = ($namespace === '') ? '' : $namespace . $options->getNamespaceSeparator() . $prefix;
-        $prefixL   = strlen($prefix);
         $result    = true;
 
         $this->_open();
@@ -269,7 +267,7 @@ public function clearByPrefix($prefix)
             $recheck     = false;
             $internalKey = dba_firstkey($this->handle);
             while ($internalKey !== false && $internalKey !== null) {
-                if (substr($internalKey, 0, $prefixL) === $prefix) {
+                if (strpos($internalKey, $prefix) === 0) {
                     $result = dba_delete($internalKey, $this->handle) && $result;
                     $recheck = true;
                 }

src/Storage/Adapter/FilesystemOptions.php

@@ -119,7 +119,7 @@ class FilesystemOptions extends AdapterOptions
     public function __construct($options = null)
     {
         // disable file/directory permissions by default on windows systems
-        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+        if (stripos(PHP_OS, 'WIN') === 0) {
             $this->filePermission = false;
             $this->dirPermission = false;
         }

src/Storage/Adapter/MemcachedResourceManager.php

@@ -332,7 +332,7 @@ public function getLibOptions($id)
             $reflection = new ReflectionClass('Memcached');
             $constants  = $reflection->getConstants();
             foreach ($constants as $constName => $constValue) {
-                if (substr($constName, 0, 4) == 'OPT_') {
+                if (strpos($constName, 'OPT_') === 0) {
                     $libOptions[$constValue] = $resource->getOption($constValue);
                 }
             }

src/Storage/Adapter/Memory.php

@@ -203,10 +203,9 @@ public function clearByPrefix($prefix)
             return true;
         }
 
-        $prefixL = strlen($prefix);
         $data    = & $this->data[$ns];
         foreach ($data as $key => & $item) {
-            if (substr($key, 0, $prefixL) === $prefix) {
+            if (strpos($key, $prefix) === 0) {
                 unset($data[$key]);
             }
         }

src/Storage/Adapter/RedisResourceManager.php

@@ -492,7 +492,7 @@ public function getLibOptions($id)
             $reflection = new ReflectionClass('Redis');
             $constants  = $reflection->getConstants();
             foreach ($constants as $constName => $constValue) {
-                if (substr($constName, 0, 4) == 'OPT_') {
+                if (strpos($constName, 'OPT_') === 0) {
                     $libOptions[$constValue] = $resource['resource']->getOption($constValue);
                 }
             }

src/Storage/Adapter/Session.php

@@ -123,9 +123,8 @@ public function clearByPrefix($prefix)
         }
 
         $data    = $cntr->offsetGet($ns);
-        $prefixL = strlen($prefix);
         foreach ($data as $key => & $item) {
-            if (substr($key, 0, $prefixL) === $prefix) {
+            if (strpos($key, $prefix) === 0) {
                 unset($data[$key]);
             }
         }