Simplify file store to only have custom paths for stache ...

Closes #2294
Closes #952

CHANGELOG.md

@@ -18,6 +18,7 @@
 - The `FormSubmitted` event gets a `submission` property. [#2271](https://github.com/statamic/cms/issues/2271)
 - Images are inline in Replicator previews. [#2267](https://github.com/statamic/cms/issues/2267)
 - Addon thumbnail alignment. [#2272](https://github.com/statamic/cms/issues/2272)
+- Simplify how our custom cache store creates paths. Fixes a Windows pathing issue. [#952](https://github.com/statamic/cms/issues/952)
 - Translations. [#2282](https://github.com/statamic/cms/issues/2282) [#2256](https://github.com/statamic/cms/issues/2256)
 
 

src/Extensions/FileStore.php

@@ -4,40 +4,17 @@
 
 use Illuminate\Cache\FileStore as LaravelFileStore;
 use Illuminate\Contracts\Cache\Store;
+use Statamic\Support\Str;
 
 class FileStore extends LaravelFileStore implements Store
 {
-    /**
-     * Get the full path for the given cache key.
-     *
-     * @param  string  $key
-     * @return string
-     */
     protected function path($key)
     {
-        $namespaces = explode(':', $key);
-        array_pop($namespaces);
-
-        // Stache keys get put into their own folder for readability.
-        if (isset($namespaces[0]) && $namespaces[0] === 'stache') {
-            return $this->getStachePath($key);
+        if (! Str::startsWith($key, 'stache::')) {
+            return parent::path($key);
         }
 
-        $parts = array_slice(str_split($hash = md5($key), 2), 0, 2);
-
-        return $this->directory.'/'.implode('/', $namespaces).'/'.implode('/', $parts).'/'.$hash;
-    }
-
-    /**
-     * Stache keys will get stored without being hashed.
-     *
-     * @param string $key
-     * @return string
-     */
-    private function getStachePath($key)
-    {
-        // remove the "stache::" prefix
-        $key = substr($key, 8);
+        $key = Str::after($key, 'stache::');
 
         return $this->directory.'/stache/'.str_replace('::', '/', $key);
     }