Merge branch 'v2'

composer.json

@@ -15,7 +15,8 @@
   ],
   "require": {
     "php": ">=7.0.0",
-    "psr/log": "^1.0",
+    "roave/security-advisories": "dev-master",
+    "unreal4u/dummy-logger": "^1.0",
     "react/http-client": "^0.5",
     "react/promise": "^2.5",
     "clue/block-react": "^1.1",

src/Abstracts/TelegramTypes.php

@@ -5,7 +5,7 @@
 namespace unreal4u\TelegramAPI\Abstracts;
 
 use Psr\Log\LoggerInterface;
-use unreal4u\TelegramAPI\InternalFunctionality\DummyLogger;
+use unreal4u\Dummy\Logger;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\ResultArray;
 
 abstract class TelegramTypes
@@ -18,7 +18,7 @@ abstract class TelegramTypes
     public function __construct(array $data = null, LoggerInterface $logger = null)
     {
         if ($logger === null) {
-            $logger = new DummyLogger();
+            $logger = new Logger();
         }
 
         $this->logger = $logger;

src/InternalFunctionality/PostOptionsConstructor.php

@@ -7,6 +7,7 @@
 use MultipartBuilder\Builder;
 use MultipartBuilder\MultipartData;
 use Psr\Log\LoggerInterface;
+use unreal4u\Dummy\Logger;
 use unreal4u\TelegramAPI\Abstracts\TelegramMethods;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\InputFile;
 
@@ -30,7 +31,7 @@ class PostOptionsConstructor
     public function __construct(LoggerInterface $logger = null)
     {
         if ($logger === null) {
-            $logger = new DummyLogger();
+            $logger = new Logger();
         }
         $this->logger = $logger;
     }

src/TgLog.php

@@ -6,8 +6,8 @@
 
 use Psr\Log\LoggerInterface;
 use React\Promise\PromiseInterface;
+use unreal4u\Dummy\Logger;
 use unreal4u\TelegramAPI\Abstracts\TelegramMethods;
-use unreal4u\TelegramAPI\InternalFunctionality\DummyLogger;
 use unreal4u\TelegramAPI\InternalFunctionality\PostOptionsConstructor;
 use unreal4u\TelegramAPI\InternalFunctionality\TelegramDocument;
 use unreal4u\TelegramAPI\InternalFunctionality\TelegramResponse;
@@ -64,7 +64,7 @@ public function __construct(string $botToken, RequestHandlerInterface $handler,
 
         // Initialize new dummy logger (PSR-3 compatible) if not injected
         if ($logger === null) {
-            $logger = new DummyLogger();
+            $logger = new Logger();
         }
         $this->logger = $logger;
 
@@ -113,6 +113,8 @@ function (TelegramResponse $rawData) {
     }
 
     /**
+     * This is the method that actually makes the call, which can be easily overwritten so that our unit tests can work
+     *
      * @param TelegramMethods $method
      * @param array $formData
      *
@@ -148,7 +150,7 @@ final protected function resetObjectValues(): TgLog
      */
     protected function composeApiMethodUrl(TelegramMethods $call): string
     {
-        $completeClassName = get_class($call);
+        $completeClassName = \get_class($call);
         $this->methodName = substr($completeClassName, strrpos($completeClassName, '\\') + 1);
         $this->logger->info('About to perform API request', ['method' => $this->methodName]);