Optimise setBotExtras method, to reduce complexity.

Some minor formatting corrections.

Author: noplanman

src/BotManager.php

@@ -205,13 +205,22 @@ private function handleOutput($output)
      */
     public function setBotExtras()
     {
-        ($v = $this->params->getBotParam('admins')) && $this->telegram->enableAdmins($v);
-        ($v = $this->params->getBotParam('mysql')) && $this->telegram->enableMySql($v);
-        ($v = $this->params->getBotParam('botan_token')) && $this->telegram->enableBotan($v);
-        ($v = $this->params->getBotParam('commands_paths')) && $this->telegram->addCommandsPaths($v);
-        ($v = $this->params->getBotParam('custom_input')) && $this->telegram->setCustomInput($v);
-        ($v = $this->params->getBotParam('download_path')) && $this->telegram->setDownloadPath($v);
-        ($v = $this->params->getBotParam('upload_path')) && $this->telegram->setUploadPath($v);
+        $simple_extras = [
+            'admins'         => 'enableAdmins',
+            'mysql'          => 'enableMySql',
+            'botan_token'    => 'enableBotan',
+            'commands_paths' => 'addCommandsPaths',
+            'custom_input'   => 'setCustomInput',
+            'download_path'  => 'setDownloadPath',
+            'upload_path'    => 'setUploadPath',
+        ];
+        // For simple extras, just pass the single param value to the Telegram method.
+        foreach ($simple_extras as $param_key => $method) {
+            $param = $this->params->getBotParam($param_key);
+            if (null !== $param) {
+                $this->telegram->$method($param);
+            }
+        }
 
         $command_configs = $this->params->getBotParam('command_configs');
         if (is_array($command_configs)) {
@@ -349,8 +358,9 @@ public function handleWebhook()
      */
     public function getOutput()
     {
-        $output = $this->output;
+        $output       = $this->output;
         $this->output = '';
+
         return $output;
     }
 }

tests/BotManagerTest.php

@@ -140,6 +140,8 @@ public function testValidateAndSetWebhookSuccess()
         );
 
         $telegram = $botManager->getTelegram();
+
+        /** @var \PHPUnit_Framework_MockObject_MockObject $telegram */
         $telegram->expects(static::any())
                  ->method('setWebHook')
                  ->with('https://web/hook.php?a=handle&s=secret_12345')
@@ -150,14 +152,11 @@ public function testValidateAndSetWebhookSuccess()
         $telegram->expects(static::any())
                  ->method('getDescription')
                  ->will(static::onConsecutiveCalls(
-                 // set
-                     'Webhook was set',
+                     'Webhook was set', // set
                      'Webhook is already set',
-                     // reset
-                     'Webhook was deleted',
+                     'Webhook was deleted', // reset
                      'Webhook was set',
-                     // unset
-                     'Webhook was deleted',
+                     'Webhook was deleted', //unset
                      'Webhook is already deleted'
                  ));
 
@@ -321,16 +320,16 @@ public function testGetOutput()
     public function testGetUpdatesLiveBot()
     {
         $botManager = new BotManager(ParamsTest::$live_params);
-        $output = $botManager->run()->getOutput();
+        $output     = $botManager->run()->getOutput();
         self::assertContains('Updates processed: 0', $output);
     }
 
     public function testGetUpdatesLoopLiveBot()
     {
         // Looping for 5 seconds should be enough to get a result.
-        $_GET = ['l' => 5];
+        $_GET       = ['l' => 5];
         $botManager = new BotManager(ParamsTest::$live_params);
-        $output = $botManager->run()->getOutput();
+        $output     = $botManager->run()->getOutput();
         self::assertContains('Looping getUpdates until', $output);
         self::assertContains('Updates processed: 0', $output);
     }