Merge branch 'cache-key-update'

* cache-key-update:
  Update to Redirector class and DataListDataSource class to change redirect cache to be an associative array to improve performance. In order to improve performance for redirect lookup, instead of a standard array being generated an associative array (keyed on the 'from' URL) is generated which allows a direct check rather than needing to iterate through all values which can be inefficient, especially when there is a large number (and also considering this would be done on each page request).
  Revert "Minor update to Redirect class constructor to format the 'from' and 'to' URLs before setting the local properties."
  Minor update to Redirect class to improve the readability of return check of the matchI() method and also change the formatUrl() method to be static so it can be called more easily from elsewhere.
  Minor update to Redirect class constructor to format the 'from' and 'to' URLs before setting the local properties.

src/DataSource/DataListDataSource.php

@@ -3,6 +3,7 @@
 namespace Heyday\Redirects\DataSource;
 
 use Heyday\Redirects\CacheableDataSourceInterface;
+use Heyday\Redirects\Redirect;
 use Heyday\Redirects\TransformerInterface;
 
 class DataListDataSource implements CacheableDataSourceInterface
@@ -24,11 +25,23 @@ public function __construct(\DataList $list, TransformerInterface $transformer)
     }
 
     /**
+     * In order to improve performance for a larger number of redirects, instead of a standard array being generated
+     *      an associative array (keyed on the 'from' URL) is generated which allows a direct check rather than needing
+     *      to iterate through a large list (especially considering this would be done on each page request).
+     *
      * @return \Heyday\Redirects\Redirect[]
      */
     public function get()
     {
-        return array_map([$this->transformer, 'transform'], $this->list->toArray());
+        $data = array();
+
+        /* @var \Heyday\Redirects\Redirect $redirect */
+        foreach (array_map([$this->transformer, 'transform'], $this->list->toArray()) as $redirect) {
+            // Format the URL so it will match the SS_HTTPRequest request URL
+            $data[Redirect::formatUrl($redirect->getFrom())] = $redirect;
+        }
+
+        return $data;
     }
 
     /**

src/Redirect.php

@@ -55,16 +55,16 @@ public function getStatusCode()
      */
     public function match($url)
     {
-        $from = $this->formatUrl($this->from);
-        return $from === $this->formatUrl($url)
-        && $from !== $this->formatUrl($this->to);
+        $from = self::formatUrl($this->from);
+
+        return (($from === self::formatUrl($url)) && ($from !== self::formatUrl($this->to)));
     }
 
     /**
      * @param string $url
      * @return string
      */
-    public function formatUrl($url)
+    public static function formatUrl($url)
     {
         return trim(
             strtolower($url),

src/Redirector.php

@@ -21,14 +21,17 @@ public function __construct(DataSourceInterface $dataSource)
      */
     public function getRedirectForRequest(\SS_HTTPRequest $request)
     {
-        $url = $request->getURL();
+        // Format the URL as the key will have been formatted
+        $url = Redirect::formatUrl($request->getURL());
+        $dataSource = $this->dataSource->get();
 
-        foreach ($this->dataSource->get() as $redirect) {
+        // Check if there's a key for the URL
+        if (isset($dataSource[$url])) {
+            $redirect = $dataSource[$url];
             if ($redirect->match($url)) {
                 return $redirect;
             }
         }
-
         return false;
     }