Merge pull request #8533 from cakephp/phar-file-config

Completing fix in FileConfigTrait to make phar files work
cakephp · Mar 25, 2016 · 9290327 · 9290327
2 parents 625ca37 + 3fcca09
commit 9290327
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Core/Configure/FileConfigTrait.php b/src/Core/Configure/FileConfigTrait.php
@@ -56,10 +56,14 @@ protected function _getFilePath($key, $checkExists = false)
 
         $file .= $this->_extension;
 
-        if ($checkExists && !is_file($file) && !is_file(realpath($file))) {
-            throw new Exception(sprintf('Could not load configuration file: %s', $file));
+        if (!$checkExists || is_file($file)) {
+            return $file;
         }
 
-        return $file;
+        if (is_file(realpath($file))) {
+            return realpath($file);
+        }
+
+        throw new Exception(sprintf('Could not load configuration file: %s', $file));
     }
 }