ISSUE-1426: Replaced regex config path matching by strpos

phalcon · Mar 14, 2021 · c4d1858 · c4d1858
1 parent e65d38c
commit c4d1858
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 ## Fixed
 - Fixed model creation failure in webtools due to wrong variable mutation [#1415](https://github.com/phalcon/phalcon-devtools/issues/1415)
+- Fixed config path detection to platform independent [#1426](https://github.com/phalcon/phalcon-devtools/issues/1426)
 
 ## Changed
 

diff --git a/src/Builder/Path.php b/src/Builder/Path.php
@@ -60,17 +60,16 @@ public function getConfig($type = null): Config
         $directory = new RecursiveDirectoryIterator('.');
         $iterator = new RecursiveIteratorIterator($directory);
         foreach ($iterator as $f) {
-            if (preg_match('/\/config\.php$/i', $f->getPathName())) {
+            if (false !== strpos($f->getPathName(), 'config.php')) {
                 $config = include $f->getPathName();
                 if (is_array($config)) {
                     $config = new Config($config);
                 }
 
                 return $config;
-            } else {
-                if (preg_match('/config\.ini$/i', $f->getPathName())) {
-                    return new ConfigIni($f->getPathName());
-                }
+            }
+            if (false !== strpos($f->getPathName(), 'config.ini')) {
+                return new ConfigIni($f->getPathName());
             }
         }