Merge branch '2.0'

.travis.yml

@@ -7,13 +7,13 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=1.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=MYSQL PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=PGSQL PHPUNIT_COVERAGE_TEST=1
+      env: DB=PGSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_COVERAGE_TEST=1
     - php: 7.2
-      env: DB=MYSQL PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=1.x-dev PHPUNIT_TEST=1
 
 before_script:
   # Init PHP
@@ -22,6 +22,7 @@ before_script:
 
   # Install composer dependencies
   - composer validate
+  - composer require --no-update silverstripe/recipe-cms $RECIPE_VERSION
   - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql 2.0.x-dev; fi
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 

src/Tasks/CurlLinkChecker.php

@@ -54,22 +54,15 @@ class CurlLinkChecker implements LinkChecker
             return null;
         }
 
+        $cacheKey = md5($href);
         if (!$this->config()->get('bypass_cache')) {
             // Check if we have a cached result
-            $cacheKey = md5($href);
-            $result = $this->getCache()->load($cacheKey);
+            $result = $this->getCache()->get($cacheKey, false);
             if ($result !== false) {
                 return $result;
             }
         }
 
-        // Check if we have a cached result
-        $cacheKey = md5($href);
-        $result = $this->getCache()->get($cacheKey, false);
-        if ($result !== false) {
-            return $result;
-        }
-
         // No cached result so just request
         $handle = curl_init($href);
         curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
@@ -84,7 +77,7 @@ class CurlLinkChecker implements LinkChecker
 
         if (!$this->config()->get('bypass_cache')) {
             // Cache result
-            $this->getCache()->save($httpCode, $cacheKey);
+            $this->getCache()->set($cacheKey, $httpCode);
         }
         return $httpCode;
     }