refs matomo-org/matomo#7893 Make plugin compatible with new settings …

…API in Piwik 3

QueuedTracking.php

@@ -13,9 +13,9 @@
 class QueuedTracking extends \Piwik\Plugin
 {
     /**
-     * @see Piwik\Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::registerEvents
      */
-    public function getListHooksRegistered()
+    public function registerEvents()
     {
         return array(
             'Tracker.newHandler' => 'replaceHandlerIfQueueIsEnabled'

SystemSettings.php

@@ -13,7 +13,6 @@
 use Piwik\Plugins\QueuedTracking\Settings\NumWorkers;
 use Piwik\Settings\Setting;
 use Piwik\Settings\FieldConfig;
-use Piwik\Settings\Storage\Storage;
 use Piwik\Settings\Storage\Backend;
 use Piwik\Plugins\QueuedTracking\Queue\Factory;
 
@@ -49,12 +48,8 @@ class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings
     /** @var Setting */
     public $numRequestsToProcess;
 
-    private $staticStorage;
-
     protected function init()
     {
-        $this->staticStorage = new Storage(new Backend\Null('QueuedTracking'));
-
         $this->redisHost = $this->createRedisHostSetting();
         $this->redisPort = $this->createRedisPortSetting();
         $this->redisTimeout = $this->createRedisTimeoutSetting();

tests/Integration/Queue/FactoryTest.php

@@ -81,6 +81,7 @@ public function test_getSettings_shouldReturnARedisInstance()
     public function test_getSettings_shouldReturnASingleton()
     {
         $settings = Factory::getSettings();
+        $settings->redisTimeout->setIsWritableByCurrentUser(true);
         $settings->redisTimeout->setValue(0.7);
 
         // it would not return the same value usually as $settings->save() is not called

tests/Integration/Settings/NumWorkersTest.php

@@ -8,7 +8,6 @@
 
 namespace Piwik\Plugins\QueuedTracking\tests\Integration\Settings;
 
-use Piwik\Container\StaticContainer;
 use Piwik\Plugins\QueuedTracking\Queue\Factory;
 use Piwik\Plugins\QueuedTracking\SystemSettings;
 use Piwik\Plugins\QueuedTracking\tests\Framework\TestCase\IntegrationTestCase;
@@ -32,7 +31,8 @@ public function setUp()
         parent::setUp();
         $this->clearRedisDb();
 
-        $this->settings = self::$fixture->piwikEnvironment->getContainer()->get('Piwik\Plugins\QueuedTracking\SystemSettings');
+        $container = self::$fixture->piwikEnvironment->getContainer();
+        $this->settings = $container->get('Piwik\Plugins\QueuedTracking\SystemSettings');
     }
 
     public function tearDown()
@@ -65,6 +65,7 @@ public function test_numQueueWorkers_WhenChangingAValueItMovesRequestsIntoDiffer
         $this->assertSame(1, $queues[3]->getNumberOfRequestSetsInQueue());
 
         $this->settings->numQueueWorkers->setValue($newNumWorkers);
+        $this->settings->save();
 
         $this->assertSame(4, $manager->getNumberOfRequestSetsInAllQueues());
         $this->assertGreaterThanOrEqual(1, $queues[0]->getNumberOfRequestSetsInQueue());

tests/Integration/SettingsTest.php

@@ -69,6 +69,7 @@ public function test_redisPort_ShouldFail_IfPortIsTooHigh()
      */
     public function test_redisTimeout_ShouldFail_IfTooLong()
     {
+        $this->settings->redisTimeout->setIsWritableByCurrentUser(true);
         $this->settings->redisTimeout->setValue('333.43');
     }
 
@@ -78,6 +79,7 @@ public function test_redisTimeout_ShouldFail_IfTooLong()
      */
     public function test_redisTimeout_ShouldFail_IfNotNumeric()
     {
+        $this->settings->redisTimeout->setIsWritableByCurrentUser(true);
         $this->settings->redisTimeout->setValue('33d3.43');
     }
 
@@ -199,10 +201,16 @@ public function test_redisTimeout_ShouldBeNotUnlimitedByDefault()
 
     public function test_redisTimeout_ShouldConvertAValueToFloat()
     {
+        $this->settings->redisTimeout->setIsWritableByCurrentUser(true);
         $this->settings->redisTimeout->setValue('4.45');
         $this->assertSame(4.45, $this->settings->redisTimeout->getValue());
     }
 
+    public function test_redisTimeout_ShouldNotBeWritableByDefault()
+    {
+        $this->assertFalse($this->settings->redisTimeout->isWritableByCurrentUser());
+    }
+
     public function test_redisPort_ShouldConvertAValueToInt()
     {
         $this->settings->redisPort->setValue('4.45');
@@ -249,7 +257,7 @@ public function test_processDuringTrackingRequest_ShouldBeEnabledByDefault()
 
     public function test_processDuringTrackingRequest_ShouldConvertAnyValueToBoolean()
     {
-        $this->settings->processDuringTrackingRequest->setValue('y');
+        $this->settings->processDuringTrackingRequest->setValue('1');
         $this->assertTrue($this->settings->processDuringTrackingRequest->getValue());
     }