From 4a35428499c40165383226addaa5295e5b7a9335 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 29 Jul 2018 16:05:57 +0200
Subject: [PATCH] cleanup of PurgeLimiter #342

---
 lib/Persistence/PurgeLimiter.php     | 27 +++++++++++----------------
 tst/Persistence/PurgeLimiterTest.php |  2 +-
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php
index 1b99d680..629dd921 100644
--- a/lib/Persistence/PurgeLimiter.php
+++ b/lib/Persistence/PurgeLimiter.php
@@ -70,23 +70,18 @@ class PurgeLimiter extends AbstractPersistence
             return true;
         }
 
-        $file    = 'purge_limiter.php';
-        $now     = time();
-        $content = '<?php' . PHP_EOL . '$GLOBALS[\'purge_limiter\'] = ' . $now . ';' . PHP_EOL;
-        if (!self::_exists($file)) {
-            self::_store($file, $content);
+        $now  = time();
+        $file = 'purge_limiter.php';
+        if (self::_exists($file)) {
+            require self::getPath($file);
+            $pl = $GLOBALS['purge_limiter'];
+            if ($pl + self::$_limit >= $now) {
+                return false;
+            }
         }
 
-        $path = self::getPath($file);
-        require $path;
-        $pl = $GLOBALS['purge_limiter'];
-
-        if ($pl + self::$_limit >= $now) {
-            $result = false;
-        } else {
-            $result = true;
-            self::_store($file, $content);
-        }
-        return $result;
+        $content = '<?php' . PHP_EOL . '$GLOBALS[\'purge_limiter\'] = ' . $now . ';';
+        self::_store($file, $content);
+        return true;
     }
 }
diff --git a/tst/Persistence/PurgeLimiterTest.php b/tst/Persistence/PurgeLimiterTest.php
index a4ae3327..391a840b 100644
--- a/tst/Persistence/PurgeLimiterTest.php
+++ b/tst/Persistence/PurgeLimiterTest.php
@@ -25,10 +25,10 @@ class PurgeLimiterTest extends PHPUnit_Framework_TestCase
     public function testLimit()
     {
         // initialize it
+        PurgeLimiter::setLimit(1);
         PurgeLimiter::canPurge();
 
         // try setting it
-        PurgeLimiter::setLimit(1);
         $this->assertEquals(false, PurgeLimiter::canPurge());
         sleep(2);
         $this->assertEquals(true, PurgeLimiter::canPurge());