fixed tests

scripts/all.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "\nPULLING DOMAINS\n********************\n"
+sh pull-domains.sh
+echo "\nCOMPACTING\n********************\n"
+sh compact.sh
+echo "\nRUNNING TIMER\n********************\n"
+sh timer.sh
+echo "\nRUNNING TESTS\n********************\n"
+cd ..
+phpunit
+cd scripts

src/SemaltBlocker/Blocker.php

@@ -13,9 +13,9 @@ class Blocker
 {
     const SEPERATOR = ':';
 
-    public static $blocklist = './../../domains/blocked';
     public static $explanation = "Access to this website has been blocked because your referral is set to %s. <a href='%s'>Read why</a>";
 
+    private static $blocklist = './../../domains/blocked';
     private static $debug = 'Not blocking, no reason given';
 
     //////////////////////////////////////////
@@ -62,6 +62,14 @@ public static function getBlocklist()
         return self::parseBlocklist(self::getBlocklistContents());
     }
 
+    /**
+     * @return string
+     */
+    public static function getBlocklistFilename()
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . static::$blocklist;
+    }
+
     //////////////////////////////////////////
     // PRIVATE FUNCTIONS                    //
     //////////////////////////////////////////
@@ -152,14 +160,6 @@ private static function getHttpReferer()
         return null;
     }
 
-    /**
-     * @return string
-     */
-    private static function getBlocklistFilename()
-    {
-        return __DIR__ . DIRECTORY_SEPARATOR . static::$blocklist;
-    }
-
     /**
      * @return string
      */

src/SemaltBlocker/Updater.php

@@ -8,10 +8,11 @@
  */
 class Updater
 {
-    public static $blocklist = './../../domains/blocked';
     public static $ttl = 604800; // = 60 * 60 * 24 * 7 = 7 days
     public static $updateUrl = 'https://raw.githubusercontent.com/nabble/semalt-blocker/master/domains/blocked';
 
+    private static $blocklist = './../../domains/blocked';
+
     //////////////////////////////////////////
     // PUBLIC API                           //
     //////////////////////////////////////////
@@ -49,6 +50,14 @@ public static function getNewDomainList()
         return $domains;
     }
 
+    /**
+     * @return string
+     */
+    public static function getBlocklistFilename()
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . static::$blocklist;
+    }
+
     //////////////////////////////////////////
     // PRIVATE FUNCTIONS                    //
     //////////////////////////////////////////
@@ -77,12 +86,4 @@ private static function isOutdated()
     {
         return filemtime(self::getBlocklistFilename()) < (time() - self::$ttl);
     }
-
-    /**
-     * @return string
-     */
-    private static function getBlocklistFilename()
-    {
-        return __DIR__ . DIRECTORY_SEPARATOR . static::$blocklist;
-    }
 }

tests/SemaltUpdaterTest.php

@@ -7,7 +7,7 @@ class SemaltUpdaterTest extends PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->blockFile = (\Nabble\SemaltBlocker\Updater::$blocklist = './domains/blocked');
+        $this->blockFile = \Nabble\SemaltBlocker\Updater::getBlocklistFilename();
         $this->domainUrl = \Nabble\SemaltBlocker\Updater::$updateUrl;
     }