fix: remove use of deprecated doctrine caching

Replace use of RequestFilters

.gitignore

@@ -1,3 +1,2 @@
 /vendor/
-/framework/
-/cms/
+composer.lock

README.md

@@ -7,4 +7,6 @@ The latest version only supports SilverStripe 4, see the `1.0` branch for a Silv
 
 ## Installation (composer required)
 
-	$ composer require "heyday/silverstripe-redirects"
+```
+composer require "heyday/silverstripe-redirects"
+```

_config/config.yml

@@ -1,9 +1,7 @@
+---
+Name: redirects
+---
 SilverStripe\Core\Injector\Injector:
-  RedirectsCache:
-    class: Doctrine\Common\Cache\FilesystemCache
-    constructor:
-      0: '../silverstripe-redirects/cache'
-
   RedirectUrlDataSource:
     class: Heyday\SilverStripeRedirects\Source\DataSource\DataListDataSource
     constructor:
@@ -14,16 +12,15 @@ SilverStripe\Core\Injector\Injector:
     class: Heyday\SilverStripeRedirects\Source\DataSource\CachedDataSource
     constructor:
       0: '%$RedirectUrlDataSource'
-      1: '%$RedirectsCache'
 
-  Heyday\SilverStripeRedirects\Code\RedirectUrl:
+  Heyday\SilverStripeRedirects\Source\RedirectUrl:
     properties:
       dataSource: '%$CachedRedirectUrlDataSource'
 
   RedirectUrlDataList:
     class: SilverStripe\ORM\DataList
     constructor:
-      0: 'Heyday\SilverStripeRedirects\Code\RedirectUrl'
+      0: 'Heyday\SilverStripeRedirects\Source\RedirectUrl'
 
   Heyday\SilverStripeRedirects\Source\Redirector:
     constructor:
@@ -33,7 +30,17 @@ SilverStripe\Core\Injector\Injector:
     constructor:
       0: '%$Heyday\SilverStripeRedirects\Source\Redirector'
 
-  SilverStripe\Control\RequestProcessor:
+  Psr\SimpleCache\CacheInterface.redirectsCache:
+    factory: SilverStripe\Core\Cache\CacheFactory
+    constructor:
+      namespace: "redirectsCache"
+---
+Name: redirects-processing
+After:
+  - requestprocessors
+---
+SilverStripe\Core\Injector\Injector:
+  SilverStripe\Control\Director:
     properties:
-      filters:
-        - '%$Heyday\SilverStripeRedirects\Source\RequestFilter'
+      Middlewares:
+        RedirectMiddleware: '%$Heyday\SilverStripeRedirects\Source\RequestFilter'

_config/legacy.yml

@@ -3,7 +3,7 @@ Name: redirectslegacy
 ---
 SilverStripe\ORM\DatabaseAdmin:
   classname_value_remapping:
-    RedirectUrl: 'Heyday\SilverStripeRedirects\Code\RedirectUrl'
-
-Heyday\SilverStripeRedirects\Code\RedirectUrl:
-  table_name: RedirectUrl
+    RedirectUrl: 'Heyday\SilverStripeRedirects\Source\RedirectUrl'
+    'Heyday\SilverStripeRedirects\Code\RedirectUrl': 'Heyday\SilverStripeRedirects\Source\RedirectUrl'
+Heyday\SilverStripeRedirects\Source\RedirectUrl:
+  table_name: RedirectUrl

composer.json

@@ -1,34 +1,16 @@
 {
-	"name": "heyday/silverstripe-redirects",
-	"description": "DB Management of redirects",
-	"license": "MIT",
-	"authors": [
-		{
-		"name": "Cam Spiers",
-		"email": "[email protected]"
-		},{
-		"name": "Ben Dubuisson",
-		"email": "[email protected]"
-		}
-	],
-	"type": "silverstripe-module",
-	"autoload": {
-		"psr-4": {
-			"Heyday\\SilverStripeRedirects\\Code\\": "code/",
-			"Heyday\\SilverStripeRedirects\\Source\\": "src/"
-		}
-	},
-	"require": {
-		"doctrine/cache": "~1.3",
-		"silverstripe/framework": "~4.0",
-		"silverstripe/cms": "~4.0"
-	},
-	"require-dev": {
-		"symfony/yaml": "~2.5"
-	},
-	"suggest": {
-		"symfony/yaml": "Add this Yaml library to be able to use Yaml sources"
-	},
-   	"prefer-stable": true,
-    	"minimum-stability": "dev"
+  "name": "heyday/silverstripe-redirects",
+  "description": "DB Management of redirects",
+  "license": "MIT",
+  "type": "silverstripe-vendormodule",
+  "autoload": {
+    "psr-4": {
+      "Heyday\\SilverStripeRedirects\\Source\\": "src/"
+    }
+  },
+  "require": {
+    "silverstripe/cms": "~4.0"
+  },
+  "prefer-stable": true,
+  "minimum-stability": "dev"
 }

src/DataSource/CachedDataSource.php

@@ -2,26 +2,26 @@
 
 namespace Heyday\SilverStripeRedirects\Source\DataSource;
 
-
 use Heyday\SilverStripeRedirects\Source\DataSourceInterface;
 use Heyday\SilverStripeRedirects\Source\CacheableDataSourceInterface;
+use Psr\SimpleCache\CacheInterface;
+use SilverStripe\Core\Injector\Injector;
 
 class CachedDataSource implements DataSourceInterface
 {
     /** @var \Heyday\SilverStripeRedirects\Source\CacheableDataSourceInterface */
     protected $dataSource;
-    
-    /** @var \Doctrine\Common\Cache\CacheProvider */
+
+    /** @var CacheInterface */
     protected $cache;
 
     /**
      * @param CacheableDataSourceInterface $dataSource
-     * @param \Doctrine\Common\Cache\CacheProvider $cache
      */
-    public function __construct(CacheableDataSourceInterface $dataSource, $cache)
+    public function __construct(CacheableDataSourceInterface $dataSource)
     {
         $this->dataSource = $dataSource;
-        $this->cache = $cache;
+        $this->cache = Injector::inst()->get(CacheInterface::class . '.redirectsCache');
     }
 
     /**
@@ -31,11 +31,13 @@ public function get()
     {
         $key = $this->dataSource->getKey();
 
-        if (!$result = $this->cache->fetch($key)) {
-            $this->cache->save(
+        if (!$this->cache->has($key)) {
+            $this->cache->set(
                 $key,
                 $result = $this->dataSource->get()
             );
+        } else {
+            $result = $this->cache->get($key);
         }
 
         return $result;
@@ -47,6 +49,6 @@ public function get()
      */
     public function delete()
     {
-        $this->cache->delete($this->dataSource->getKey());
+        $this->cache->clear();
     }
-}
+}

src/DataSource/DataListDataSource.php

@@ -52,4 +52,4 @@ public function getKey()
     {
         return md5($this->list->sql());
     }
-}
+}

code/RedirectUrl.php → src/RedirectUrl.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace Heyday\SilverStripeRedirects\Code;
+namespace Heyday\SilverStripeRedirects\Source;
 
 use Heyday\SilverStripeRedirects\Source\DataSource\CachedDataSource;
+use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\HeaderField;
@@ -16,15 +17,15 @@
 
 /**
  * Class RedirectUrl
- * @package Heyday\SilverStripeRedirects\Code
+ * @package Heyday\SilverStripeRedirects\Source
  */
 class RedirectUrl extends DataObject implements PermissionProvider
 {
     /**
      * Permission for managing redirects
      */
     const PERMISSION = 'MANAGE_REDIRECTS';
-    
+
     /**
      * @var string
      */
@@ -43,8 +44,8 @@ class RedirectUrl extends DataObject implements PermissionProvider
      * @var array
      */
     private static $has_one = [
-        'FromRelation' => 'SilverStripe\CMS\Model\SiteTree',
-        'ToRelation' => 'SilverStripe\CMS\Model\SiteTree'
+        'FromRelation' => SiteTree::class,
+        'ToRelation' => SiteTree::class
     ];
 
     /**
@@ -297,9 +298,7 @@ protected function hasPermission($member = null)
     }
 
 
-    /**
-     * Clear out from and to manual links if we have a relation
-     */
+
     protected function onBeforeWrite()
     {
         parent::onBeforeWrite();
@@ -317,23 +316,21 @@ protected function onBeforeWrite()
         }
     }
 
-    /**
-     *
-     */
+
     protected function onAfterWrite()
     {
         parent::onAfterWrite();
+
         if (isset($this->dataSource)) {
             $this->dataSource->delete();
         }
     }
 
-    /**
-     *
-     */
+
     protected function onAfterDelete()
     {
         parent::onAfterDelete();
+
         if (isset($this->dataSource)) {
             $this->dataSource->delete();
         }

code/RedirectUrlValidator.php → src/RedirectUrlValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Heyday\SilverStripeRedirects\Code;
+namespace Heyday\SilverStripeRedirects\Source;
 
 use SilverStripe\Forms\Validator;
 
@@ -22,7 +22,7 @@ public function php($data)
             );
             $valid = false;
         }
-        
+
         if ($data['FromType'] == 'manual' && empty($data['From'])) {
             $this->validationError(
                 'From',
@@ -31,7 +31,7 @@ public function php($data)
             );
             $valid = false;
         }
-        
+
         if ($data['ToType'] == 'page' && $data['ToRelationID'] == 0) {
             $this->validationError(
                 'ToRelationID',
@@ -40,7 +40,7 @@ public function php($data)
             );
             $valid = false;
         }
-        
+
         if ($data['ToType'] == 'manual' && empty($data['To'])) {
             $this->validationError(
                 'To',

code/RedirectsModelAdmin.php → src/RedirectsModelAdmin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Heyday\SilverStripeRedirects\Code;
+namespace Heyday\SilverStripeRedirects\Source;
 
 use SilverStripe\Admin\ModelAdmin;
 use SilverStripe\Forms\DateField;
@@ -10,32 +10,32 @@
 
 /**
  * Class RedirectsModelAdmin
- * @package Heyday\SilverStripeRedirects\Code
+ * @package Heyday\SilverStripeRedirects\Source
  */
 class RedirectsModelAdmin extends ModelAdmin
 {
     /**
      * @var array
      */
     private static $managed_models = [
-        'Heyday\SilverStripeRedirects\Code\RedirectUrl'
+        RedirectUrl::class
     ];
 
     /**
      * @var string
      */
-    private static $url_segment = 'redirects-management';
+    private static $url_segment = 'redirects';
 
     /**
      * @var string
      */
     private static $menu_title = 'Redirects';
-    
-    
+
+
     /**
      * @var string
      */
-    private static $menu_icon_class = 'font-icon-link';
+    private static $menu_icon_class = 'font-icon-p-redirect';
 
     /**
      * @param null $id