feat!: Removed chosen guzzle client and let psr/http-client-implement…

…ation and psr/http-factory-implementation choose their implementation based on project

composer.json

@@ -7,11 +7,14 @@
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "php-http/discovery": "^1.19",
-        "composer/composer": ">=2.0",
-        "php-http/guzzle7-adapter": "*",
-        "guzzlehttp/guzzle": "^7.8",
-        "guzzlehttp/psr7": "*",
-        "symfony/dotenv": ">=5.4"
+        "composer/composer": ">=2.2",
+        "symfony/dotenv": ">=5.4",
+        "psr/http-client-implementation": "*",
+        "psr/http-factory-implementation": "*"
+    },
+    "require-dev": {
+        "nyholm/psr7": "^1.8",
+        "symfony/http-client": "^7.2"
     },
     "extra": {
         "class": "RezoZero\\Xilofone\\Composer\\Plugin"

src/Command/FetchXilofoneFiles.php

@@ -19,10 +19,7 @@ protected function configure(): void
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln('Fetching new translations files from Xilofone');
-        $composer = $this->getComposer();
-        if (null === $composer) {
-            throw new \RuntimeException('Composer is null');
-        }
+        $composer = $this->requireComposer();
         $factory = new XilofoneFileProviderFactory($composer);
         $xilofoneFileProvider = $factory->create();
         $fileConfigurations = $factory->getFileConfigurations();

src/Model/TranslatedFile.php

@@ -6,15 +6,8 @@
 
 final class TranslatedFile
 {
-    private string $name;
-    private string $path;
-    private string $content;
-
-    public function __construct(string $name, string $path, string $content)
+    public function __construct(private string $name, private string $path, private string $content)
     {
-        $this->name = $name;
-        $this->path = $path;
-        $this->content = $content;
     }
 
     public function getName(): string

src/XilofoneFileProvider.php

@@ -9,38 +9,22 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Message\UriFactoryInterface;
 use RezoZero\Xilofone\Composer\Model\File;
 use RezoZero\Xilofone\Composer\Model\Project;
 use RezoZero\Xilofone\Composer\Model\TranslatedFile;
 
 final class XilofoneFileProvider
 {
-    private string $username;
-    private string $password;
-    private string $host;
-    private ClientInterface $client;
-    private RequestFactoryInterface $requestFactory;
-    private UriFactoryInterface $uriFactory;
-    private StreamFactoryInterface $streamFactory;
     private ?string $accessToken = null;
 
     public function __construct(
-        ClientInterface $client,
-        RequestFactoryInterface $requestFactory,
-        UriFactoryInterface $uriFactory,
-        StreamFactoryInterface $streamFactory,
-        string $username,
-        #[\SensitiveParameter] string $password,
-        string $host = 'https://xilofone.rezo-zero.com'
+        private ClientInterface $client,
+        private RequestFactoryInterface $requestFactory,
+        private StreamFactoryInterface $streamFactory,
+        private string $username,
+        #[\SensitiveParameter] private string $password,
+        private string $host = 'https://xilofone.rezo-zero.com'
     ) {
-        $this->username = $username;
-        $this->password = $password;
-        $this->host = $host;
-        $this->client = $client;
-        $this->requestFactory = $requestFactory;
-        $this->uriFactory = $uriFactory;
-        $this->streamFactory = $streamFactory;
     }
 
     private function getAccessToken(): string

src/XilofoneFileProviderFactory.php

@@ -11,11 +11,8 @@
 
 final class XilofoneFileProviderFactory
 {
-    private Composer $composer;
-
-    public function __construct(Composer $composer)
+    public function __construct(private Composer $composer)
     {
-        $this->composer = $composer;
     }
 
     private function getSingleFileConfiguration(array $config): array
@@ -92,7 +89,6 @@ public function create(): XilofoneFileProvider
             Psr18ClientDiscovery::find(),
             $psr17Factory,
             $psr17Factory,
-            $psr17Factory,
             $username,
             $password,
             $host