Replace substr()-based comparisons by substr_compare()

Author: PhrozenByte

plugins/PluginApi0Plugin.php

@@ -231,8 +231,8 @@ public function onPagesLoaded(
         $pages = [];
         foreach ($plainPages as &$pageData) {
             if (!isset($pageData['id'])) {
-                if (substr($pageData['url'], 0, $baseUrlLength) === $baseUrl) {
-                    if ($urlRewritingEnabled && (substr($pageData['url'], $baseUrlLength, 1) === '?')) {
+                if (substr_compare($pageData['url'], $baseUrl, 0, $baseUrlLength) === 0) {
+                    if ($urlRewritingEnabled && (substr_compare($pageData['url'], '?', $baseUrlLength, 1) === 0)) {
                         $pageData['id'] = substr($pageData['url'], $baseUrlLength + 1);
                     } else {
                         $pageData['id'] = substr($pageData['url'], $baseUrlLength);

plugins/ThemeApi2Plugin.php

@@ -138,7 +138,7 @@ public function twigEscapeStrategy($templateName)
 
         if ($templatePath) {
             $themePath = realpath($this->getPico()->getThemesDir() . $this->getPico()->getTheme()) . '/';
-            if (substr($templatePath, 0, strlen($themePath)) === $themePath) {
+            if (substr_compare($templatePath, $themePath, 0, strlen($themePath)) === 0) {
                 $themeApiVersion = $this->getPico()->getThemeApiVersion();
                 return ($themeApiVersion >= PicoDeprecated::API_VERSION_3) ? $escapeStrategy : false;
             }
@@ -167,7 +167,7 @@ protected function getPluginFromPath($path)
     {
         $plugins = $this->getPico()->getPlugins();
         foreach ($this->pluginPaths as $pluginName => $pluginPath) {
-            if ($pluginPath && (substr($path, 0, strlen($pluginPath)) === $pluginPath)) {
+            if ($pluginPath && (substr_compare($path, $pluginPath, 0, strlen($pluginPath)) === 0)) {
                 return $plugins[$pluginName];
             }
         }
@@ -190,7 +190,7 @@ protected function getPluginFromPath($path)
 
             $this->pluginPaths[$pluginName] = $pluginPath;
 
-            if ($pluginPath && (substr($path, 0, strlen($pluginPath)) === $pluginPath)) {
+            if ($pluginPath && (substr_compare($path, $pluginPath, 0, strlen($pluginPath)) === 0)) {
                 return $plugins[$pluginName];
             }
         }