feat: add logger to Client constructor too (#2606)

googleapis · Jun 29, 2024 · a1c6ce7 · a1c6ce7
1 parent 71579b7
commit a1c6ce7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -196,6 +196,7 @@ public function __construct(array $config = [])
             'prompt' => '',
             'openid.realm' => '',
             'include_granted_scopes' => null,
+            'logger' => null,
             'login_hint' => '',
             'request_visible_actions' => '',
             'access_type' => 'online',
@@ -242,6 +243,11 @@ public function __construct(array $config = [])
             $this->setCache($this->config['cache']);
             unset($this->config['cache']);
         }
+
+        if (!is_null($this->config['logger'])) {
+            $this->setLogger($this->config['logger']);
+            unset($this->config['logger']);
+        }
     }
 
     /**

diff --git a/tests/Google/ClientTest.php b/tests/Google/ClientTest.php
@@ -268,6 +268,16 @@ public function testDefaultLoggerAppEngine()
         $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
     }
 
+    public function testLoggerFromConstructor()
+    {
+        $logger1 = new \Monolog\Logger('unit-test');
+        $client = new Client(['logger' => $logger1]);
+        $logger2 = $client->getLogger();
+        $this->assertInstanceOf('Monolog\Logger', $logger2);
+        $this->assertEquals('unit-test', $logger2->getName());
+        $this->assertSame($logger1, $logger2);
+    }
+
     public function testSettersGetters()
     {
         $client = new Client();
@@ -279,6 +289,7 @@ public function testSettersGetters()
 
         $client->setRedirectUri('localhost');
         $client->setConfig('application_name', 'me');
+        $client->setLogger(new \Monolog\Logger('test'));
 
         $cache = $this->prophesize(CacheItemPoolInterface::class);
         $client->setCache($cache->reveal());