Merge branch 'final' into final

Author: Geolim4

src/phpFastCache/Core/PathSeekerTrait.php

@@ -82,19 +82,20 @@ public function getPath($readonly = false)
             if (!isset($this->tmp[ $full_path_hash ]) || (!@file_exists($full_path) || !@is_writable($full_path))) {
                 if (!@file_exists($full_path)) {
                     @mkdir($full_path, $this->setChmodAuto(), true);
-                }else if (!@is_writable($full_path)) {
-                    @chmod($full_path, $this->setChmodAuto());
-                }
-                if (!@is_writable($full_path)) {
-                    /**
-                     * Switch back to tmp dir
-                     * again if the path is not writable
-                     */
-                    $full_path = $full_path_tmp;
-                    if (!@file_exists($full_path)) {
-                        @mkdir($full_path, $this->setChmodAuto(), true);
+                }elseif (!@is_writable($full_path)) {
+                    if (!@chmod($full_path, $this->setChmodAuto()))
+                    {
+                        /**
+                         * Switch back to tmp dir
+                         * again if the path is not writable
+                         */
+                        $full_path = $full_path_tmp;
+                        if (!@file_exists($full_path)) {
+                            @mkdir($full_path, $this->setChmodAuto(), true);
+                        }
                     }
                 }
+
                 /**
                  * In case there is no directory
                  * writable including tye temporary

src/phpFastCache/Util/Directory.php

@@ -120,8 +120,7 @@ public static function rrmdir($source, $removeOnlyChildren = false)
      */
     public static function getAbsolutePath($path)
     {
-        $path = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $path);
-        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
+        $parts = preg_split('~[/\\\\]+~', $path, 0, PREG_SPLIT_NO_EMPTY);
         $absolutes = [];
         foreach ($parts as $part) {
             if ('.' === $part) {
@@ -133,6 +132,8 @@ public static function getAbsolutePath($path)
                 $absolutes[] = $part;
             }
         }
-        return implode(DIRECTORY_SEPARATOR, $absolutes);
+        $__FILE__ = __FILE__; // allows to dereference char
+        $prefix = $__FILE__[0] === DIRECTORY_SEPARATOR ? DIRECTORY_SEPARATOR : '';
+        return $prefix . implode(DIRECTORY_SEPARATOR, $absolutes);
     }
 }