Remove deprecated custom log middlewares

Author: jeromegamez

UPGRADE-8.0.md

@@ -50,6 +50,8 @@ The following list has been generated with [roave/backward-compatibility-check](
 [BC] REMOVED: Method Kreait\Firebase\Factory#createDynamicLinksService() was removed
 [BC] REMOVED: Method Kreait\Firebase\Factory#getDebugInfo() was removed
 [BC] REMOVED: Method Kreait\Firebase\Factory#withFirestoreDatabase() was removed
+[BC] REMOVED: Method Kreait\Firebase\Factory#withHttpDebugLogger() was removed
+[BC] REMOVED: Method Kreait\Firebase\Factory#withHttpLogger() was removed
 [BC] REMOVED: Method Kreait\Firebase\Messaging\CloudMessage#hasTarget() was removed
 [BC] REMOVED: Method Kreait\Firebase\Messaging\CloudMessage#target() was removed
 [BC] REMOVED: Method Kreait\Firebase\Messaging\CloudMessage#withChangedTarget() was removed

src/Firebase/Factory.php

@@ -19,7 +19,6 @@
 use Google\Cloud\Storage\StorageClient;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
-use GuzzleHttp\MessageFormatter;
 use GuzzleHttp\Psr7\HttpFactory;
 use GuzzleHttp\Psr7\Utils as GuzzleUtils;
 use Kreait\Firebase\AppCheck\AppCheckTokenGenerator;
@@ -48,8 +47,6 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Clock\ClockInterface;
 use Psr\Http\Message\UriInterface;
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
 use Throwable;
 
 use function array_filter;
@@ -294,60 +291,6 @@ public function withHttpClientOptions(HttpClientOptions $options): self
         return $factory;
     }
 
-    /**
-     * @deprecated 7.25.0 Create the log middleware outside the factory and use `HttpClientOptions::withGuzzleMiddleware()` and `withClientOptions()` instead
-     *
-     * @see withHttpClientOptions()
-     * @see HttpClientOptions::withGuzzleMiddleware()
-     *
-     * @param non-empty-string|null $logLevel
-     * @param non-empty-string|null $errorLogLevel
-     */
-    public function withHttpLogger(LoggerInterface $logger, ?MessageFormatter $formatter = null, ?string $logLevel = null, ?string $errorLogLevel = null): self
-    {
-        $clientOptions = $this->httpClientOptions->withGuzzleMiddleware(
-            middleware: Middleware::log(
-                $logger,
-                $formatter ?? new MessageFormatter(),
-                $logLevel ?? LogLevel::INFO,
-                $errorLogLevel ?? LogLevel::NOTICE,
-            ),
-            name: 'http_logs'
-        );
-
-        $factory = clone $this;
-        $factory->httpClientOptions = $clientOptions;
-
-        return $factory;
-    }
-
-    /**
-     * @deprecated 7.25.0 Create the log middleware outside the factory and use `HttpClientOptions::withGuzzleMiddleware()` and `withClientOptions()` instead
-     *
-     * @see withHttpClientOptions()
-     * @see HttpClientOptions::withGuzzleMiddleware()
-     *
-     * @param non-empty-string|null $logLevel
-     * @param non-empty-string|null $errorLogLevel
-     */
-    public function withHttpDebugLogger(LoggerInterface $logger, ?MessageFormatter $formatter = null, ?string $logLevel = null, ?string $errorLogLevel = null): self
-    {
-        $clientOptions = $this->httpClientOptions->withGuzzleMiddleware(
-            middleware: Middleware::log(
-                $logger,
-                $formatter ?? new MessageFormatter(MessageFormatter::DEBUG),
-                $logLevel ?? LogLevel::INFO,
-                $errorLogLevel ?? LogLevel::NOTICE,
-            ),
-            name: 'http_debug_logs'
-        );
-
-        $factory = clone $this;
-        $factory->httpClientOptions = $clientOptions;
-
-        return $factory;
-    }
-
     public function withClock(object $clock): self
     {
         if (!$clock instanceof ClockInterface) {

src/Firebase/Http/Middleware.php

@@ -6,16 +6,8 @@
 
 use Beste\Json;
 use Closure;
-use Exception;
-use Fig\Http\Message\StatusCodeInterface as StatusCode;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\MessageFormatter;
-use GuzzleHttp\Promise\Create;
-use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7\Query;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Log\LoggerInterface;
 
 use function array_merge;
 use function ltrim;
@@ -63,31 +55,4 @@ public static function addDatabaseAuthVariableOverride(?array $override): callab
             return $handler($request->withUri($uri), $options);
         };
     }
-
-    /**
-     * @deprecated 7.25.0 Use the Log Middleware provided by the GuzzleHTTP library instead
-     *
-     * @return callable(callable): Closure
-     */
-    public static function log(LoggerInterface $logger, MessageFormatter $formatter, string $logLevel, string $errorLogLevel): callable
-    {
-        return static fn(callable $handler): Closure => static fn(RequestInterface $request, array $options) => $handler($request, $options)->then(
-            static function (ResponseInterface $response) use ($logger, $request, $formatter, $logLevel, $errorLogLevel): ResponseInterface {
-                $message = $formatter->format($request, $response);
-                $messageLogLevel = $response->getStatusCode() >= StatusCode::STATUS_BAD_REQUEST ? $errorLogLevel : $logLevel;
-
-                $logger->log($messageLogLevel, $message);
-
-                return $response;
-            },
-            static function (Exception $reason) use ($logger, $request, $formatter, $errorLogLevel): PromiseInterface {
-                $response = $reason instanceof RequestException ? $reason->getResponse() : null;
-                $message = $formatter->format($request, $response, $reason);
-
-                $logger->log($errorLogLevel, $message, ['request' => $request, 'response' => $response]);
-
-                return Create::rejectionFor($reason);
-            },
-        );
-    }
 }