Improve Installer code

Author: nyamsprod

src/Installer.php

@@ -73,7 +73,7 @@ public function __construct(Manager $manager, LoggerInterface $logger)
     }
 
     /**
-     * Creates a new installer instance with a Pdp\Cache.
+     * Creates a new instance with a Pdp\Cache object and the cURL HTTP client.
      * @param LoggerInterface $logger
      * @param string          $cacheDir
      */
@@ -82,6 +82,10 @@ public static function createFromCacheDir(LoggerInterface $logger, string $cache
         return new self(new Manager(new Cache($cacheDir), new CurlHttpClient()), $logger);
     }
 
+    /**
+     * Refresh the locale cache.
+     * @param array $context
+     */
     public function refresh(array $context = []): bool
     {
         $context = filter_var_array(array_replace(self::DEFAULT_CONTEXT, $context), [
@@ -110,10 +114,7 @@ public function refresh(array $context = []): bool
 
     /**
      * Refreshes the cache.
-     *
      * @param array $arguments
-     *
-     * @throws PsrCacheException
      */
     private function execute(array $arguments = []): bool
     {
@@ -157,8 +158,7 @@ private function execute(array $arguments = []): bool
 
     /**
      * Script to update the local cache using composer hook.
-     *
-     * @param Event $event
+     * @param null|Event $event
      */
     public static function updateLocalCache(Event $event = null)
     {
@@ -181,6 +181,7 @@ public static function updateLocalCache(Event $event = null)
 
         require $vendor.'/autoload.php';
 
+        $logger = new Logger();
         $arguments = [
             self::CACHE_DIR_KEY => '',
             self::REFRESH_PSL_KEY => false,
@@ -189,17 +190,19 @@ public static function updateLocalCache(Event $event = null)
         ];
 
         if (null !== $event) {
+            /** @var BaseIO $logger */
+            $logger = $event->getIO();
             $arguments = array_replace($arguments, $event->getArguments());
         }
 
-        $installer = self::createFromCacheDir(self::getLogger($event), $arguments[Installer::CACHE_DIR_KEY]);
-        $io->info('Updating your Pdp local cache.');
+        $installer = self::createFromCacheDir($logger, $arguments[Installer::CACHE_DIR_KEY]);
+        $io->write('Updating your Pdp local cache.');
         if ($installer->refresh($arguments)) {
-            $io->info('Pdp local cache successfully updated.');
+            $io->write('Pdp local cache successfully updated.');
             die(0);
         }
 
-        $io->error('The command failed to update Pdp local cache.');
+        $io->writeError('The command failed to update Pdp local cache.');
         die(1);
     }
 
@@ -231,25 +234,6 @@ private function doWrite($messages, bool $newline, bool $stderr, int $verbosity)
         };
     }
 
-    /**
-     * Detect the Logger instance to use.
-     *
-     * @param Event|null $event
-     *
-     * @return LoggerInterface
-     */
-    private static function getLogger(Event $event = null): LoggerInterface
-    {
-        if (null !== $event) {
-            /** @var BaseIO $logger */
-            $logger = $event->getIO();
-
-            return $logger;
-        }
-
-        return new Logger();
-    }
-
     /**
      * Detect the vendor path.
      *

tests/InstallerTest.php

@@ -20,11 +20,13 @@
 use Pdp\HttpClient;
 use Pdp\HttpClientException;
 use Pdp\Installer;
+use Pdp\Logger;
 use Pdp\Manager;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\AbstractLogger;
 use function file_get_contents;
+use function rewind;
 use function sprintf;
+use function stream_get_contents;
 
 /**
  * @coversDefaultClass \Pdp\Installer
@@ -37,6 +39,16 @@ class InstallerTest extends TestCase
     protected $client;
     protected $logger;
 
+    /**
+     * @return resource
+     */
+    private function setStream()
+    {
+        /** @var resource $stream */
+        $stream = fopen('php://memory', 'r+');
+        return $stream;
+    }
+
     public function setUp()
     {
         $this->root = vfsStream::setup('pdp');
@@ -57,25 +69,6 @@ public function getContent(string $url): string
                 throw new HttpClientException(sprintf('invalid url: %s', $url));
             }
         };
-
-        $this->logger = new class() extends AbstractLogger {
-            private $data = [];
-
-            public function log($level, $message, array $context = [])
-            {
-                $replace = [];
-                foreach ($context as $key => $val) {
-                    $replace['{'.$key.'}'] = $val;
-                }
-
-                $this->data[] = strtr($message, $replace);
-            }
-
-            public function getLogs(string $level = null): array
-            {
-                return $this->data;
-            }
-        };
     }
 
     public function tearDown()
@@ -95,12 +88,16 @@ public function tearDown()
      */
     public function testRefreshDefault(array $context, bool $retval, array $logs)
     {
+        $stream = $this->setStream();
+        $logger = new Logger($stream, $stream);
         $manager = new Manager($this->cachePool, $this->client);
-        $installer = new Installer($manager, $this->logger);
-
+        $installer = new Installer($manager, $logger);
         self::assertSame($retval, $installer->refresh($context));
+        rewind($stream);
+        /** @var string $data */
+        $data = stream_get_contents($stream);
         foreach ($logs as $log) {
-            self::assertContains($log, $this->logger->getLogs());
+            self::assertContains($log, $data);
         }
     }