micgro42 / dokuwiki-plugin-swarmwebhook

webhooks/IFTTT.php

Indentation +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
         }
 
         /**
- * @var null|\helper_plugin_swarmwebhook $helper
+         * @var null|\helper_plugin_swarmwebhook $helper
 */
         $helper = plugin_load('helper', 'swarmwebhook');
         if (!$helper) {
@@ -58,7 +58,7 @@ 
     protected function verifyRequest(array $webhookData)
     {
         /**
- * @var null|\helper_plugin_swarmwebhook $helper
+         * @var null|\helper_plugin_swarmwebhook $helper
 */
         $helper = plugin_load('helper', 'swarmwebhook');
         $storedSecret = $helper->getConf('hook secret');
@@ -91,7 +91,7 @@ 
 
 
         /**
- * @var \helper_plugin_swarmwebhook $helper
+         * @var \helper_plugin_swarmwebhook $helper
 */
         $helper = plugin_load('helper', 'swarmwebhook');
         try {

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
     {
         global $conf, $INPUT;
 
-        if ($conf[ 'allowdebug' ]) {
+        if ($conf['allowdebug']) {
             dbglog($_SERVER);
         }
 
@@ -66,11 +66,11 @@ 
             return true;
         }
 
-        if (empty($webhookData[ 'secret' ])) {
+        if (empty($webhookData['secret'])) {
             return new Response(401, 'Header X_HOOK_SECRET missing!');
         }
 
-        if ($webhookData[ 'secret' ] !== $storedSecret) {
+        if ($webhookData['secret'] !== $storedSecret) {
             return new Response(403, 'Header X_HOOK_SECRET not identical with configured secret!');
         }
 
@@ -86,8 +86,8 @@ 
     protected function handleWebhookPayload(array $webhookData, $json)
     {
         $lookupData = $this->extractDataFromPayload($webhookData);
-        $lookupData[ 'json' ] = $json;
-        $lookupData[ 'service' ] = 'IFTTT';
+        $lookupData['json'] = $json;
+        $lookupData['service'] = 'IFTTT';
 
 
         /**
@@ -100,7 +100,7 @@ 
                 $helper->createNewSwarmSchema();
             }
 
-            $helper->deleteCheckinFromLookup($lookupData[ 'checkinid' ]);
+            $helper->deleteCheckinFromLookup($lookupData['checkinid']);
             $helper->saveDataToLookup($lookupData);
         } catch (\Exception $e) { // FIXME: catch more specific exceptions!
             $errorMessage = $e->getMessage();
@@ -120,13 +120,13 @@ 
      */
     protected function extractDataFromPayload(array $data)
     {
-        $checkinID = $data[ 'ts' ];
-        $locationName = $data[ 'VenueName' ];
+        $checkinID = $data['ts'];
+        $locationName = $data['VenueName'];
 
         // gues time zone
         $nowTS = time();
 
-        $dateTime = $this->parseTimeIntoDateTime($data[ 'ts' ], $nowTS);
+        $dateTime = $this->parseTimeIntoDateTime($data['ts'], $nowTS);
 
         $lookupData = [
             'date' => $dateTime->format('Y-m-d'),
@@ -134,8 +134,8 @@ 
             'checkinid' => $checkinID,
             'locname' => $locationName,
         ];
-        if (!empty($data[ 'shout' ])) {
-            $lookupData[ 'shout' ] = $data[ 'shout' ];
+        if (!empty($data['shout'])) {
+            $lookupData['shout'] = $data['shout'];
         }
         return $lookupData;
     }
@@ -171,6 +171,6 @@ 
         $guessedOffset = round(($dateTime->getTimestamp() - $nowTS) / 3600) * 100;
         $sign = $guessedOffset > 0 ? '+' : '';
 
-        return $sign . (string)$guessedOffset;
+        return $sign . (string) $guessedOffset;
     }
 }

_test/ZapierHandlePayload.test.php

Indentation +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
         $webhook->run($inputJSON);
 
         /**
- * @var \remote_plugin_struct $remote 
+         * @var \remote_plugin_struct $remote 
 */
         $remote = plugin_load('remote', 'struct');
         $rows = $remote->getAggregationData(
@@ -68,7 +68,7 @@ 
         $actualOK = $actualOK && $webhook->handleWebhookPayload($inputJSON);
 
         /**
- * @var \remote_plugin_struct $remote 
+         * @var \remote_plugin_struct $remote 
 */
         $remote = plugin_load('remote', 'struct');
         $rows = $remote->getAggregationData(

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
         parent::setUp();
 
-        $conf [ 'plugin' ][ 'swarmwebhook' ][ 'service' ] = 'Zapier';
+        $conf ['plugin']['swarmwebhook']['service'] = 'Zapier';
     }
 
     /**
@@ -53,7 +53,7 @@ 
             'swarm.service' => 'Zapier',
         ];
 
-        $this->assertEquals($rows[ 0 ], $expectedRows, 'single event, initially creating the schema');
+        $this->assertEquals($rows[0], $expectedRows, 'single event, initially creating the schema');
     }
 
     /**
@@ -88,6 +88,6 @@ 
 
         $this->assertTrue($actualOK, 'single event, initially creating the schema');
         $this->assertCount(1, $rows, 'saving a payload twice should only create one row');
-        $this->assertEquals($rows[ 0 ], $expectedRows);
+        $this->assertEquals($rows[0], $expectedRows);
     }
 }

_test/IFTTTfullWebhook.test.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         $IFTTT->run($inputJSON);
 
         /**
- * @var \remote_plugin_struct $remote 
+         * @var \remote_plugin_struct $remote 
 */
         $remote = plugin_load('remote', 'struct');
         $rows = $remote->getAggregationData(

Spacing +1 added lines, -1 removed lines

@@ -49,6 +49,6 @@
         ];
 
         //        $this->assertTrue($actualOK, 'single event, initially creating the schema');
-        $this->assertEquals($rows[ 0 ], $expectedRows);
+        $this->assertEquals($rows[0], $expectedRows);
     }
 }

_test/general.test.php

Spacing +5 added lines, -5 removed lines

@@ -27,11 +27,11 @@
         $this->assertArrayHasKey('desc', $info);
         $this->assertArrayHasKey('url', $info);
 
-        $this->assertEquals('swarmwebhook', $info[ 'base' ]);
-        $this->assertRegExp('/^https?:\/\//', $info[ 'url' ]);
-        $this->assertTrue(mail_isvalid($info[ 'email' ]));
-        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info[ 'date' ]);
-        $this->assertTrue(false !== strtotime($info[ 'date' ]));
+        $this->assertEquals('swarmwebhook', $info['base']);
+        $this->assertRegExp('/^https?:\/\//', $info['url']);
+        $this->assertTrue(mail_isvalid($info['email']));
+        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+        $this->assertTrue(false !== strtotime($info['date']));
     }
 
     /**

helper.php

Indentation +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
     public function saveDataToLookup(array $data)
     {
         /**
- * @var helper_plugin_struct $structHelper
+         * @var helper_plugin_struct $structHelper
 */
         $structHelper = plugin_load('helper', 'struct');
         $access = AccessTable::byTableName('swarm', 0, 0);
@@ -72,7 +72,7 @@ 
         $tablename = 'swarm';
 
         /**
- * @var remote_plugin_struct $remote
+         * @var remote_plugin_struct $remote
 */
         $remote = plugin_load('remote', 'struct');
         $rows = $remote->getAggregationData(