Replace guzzle with buzz (#30)

bajdzun · web-flow · commit 7467f2cda4ed · 2021-12-17T13:33:46.000+01:00
* Fix command description * Fix CS * Bump PHP * Bump registry client * Require libs * Remove additional libs and set client * Revert changes in service provider * Bump alpine * Replace guzzle with buzz and psr7 * Replace guzzle with buzz and psr7 in code * Replace guzzle with buzz and psr7 in test * Sort and bump deps * Bump orbs * Update PHPDoc comments * Update readme * Refactor tests * Remove @throws where no actual exception has been thrown * Added php dependency * Remove throws * Remove throws
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 orbs:
-  ci-caching: jobcloud/ci-caching@1.0.2
-  ci-php: jobcloud/ci-php@0.32
+  ci-caching: jobcloud/ci-caching@3.0
+  ci-php: jobcloud/ci-php@2.0
 
 workflows:
   test-console-kafka-schema-registry:
diff --git a/README.md b/README.md
@@ -2,9 +2,12 @@
 
 ## Installation
 ```
-composer require jobcloud/php-console-kafka-schema-registry "^1.1"
+composer require jobcloud/php-console-kafka-schema-registry
 ```
 
+## Requirements
+- php: >= 7.4
+
 ## Register commands
 You can register each command separately like this:
 ```php
diff --git a/composer.json b/composer.json
@@ -16,19 +16,21 @@
         }
     ],
     "require": {
+        "php": ">=7.4",
         "ext-json": "*",
         "flix-tech/avro-php": "^3.0|^4.0",
-        "symfony/console": "^4.3|^5.1",
+        "jobcloud/php-kafka-schema-registry-client": "^1.0",
+        "kriswallsmith/buzz": "^1.2",
+        "nyholm/psr7": "^1.4",
         "pimple/pimple": "^3.2",
-        "jobcloud/php-kafka-schema-registry-client": "^0.1",
-        "guzzlehttp/guzzle": "^6.3|^7.3"
+        "symfony/console": "^4.3|^5.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "infection/infection": "^0.25",
         "phpstan/phpstan": "^0.12",
-        "infection/infection": "^0.18",
-        "squizlabs/php_codesniffer": "^3.4",
-        "rregeer/phpunit-coverage-check": "^0.3.1"
+        "phpunit/phpunit": "^9.5",
+        "rregeer/phpunit-coverage-check": "^0.3.1",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {
         "psr-4": {
diff --git a/docker/dev/php/Dockerfile b/docker/dev/php/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-cli-alpine3.14
+FROM php:7.4-cli-alpine3.15
 
 ARG HOST_USER_ID
 
diff --git a/src/Command/AbstractModeCommand.php b/src/Command/AbstractModeCommand.php
@@ -4,13 +4,11 @@
 
 namespace Jobcloud\SchemaConsole\Command;
 
-use GuzzleHttp\Exception\ClientException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class AbstractModeCommand extends AbstractSchemaCommand implements ModeCommandInterface
 {
-
     /**
      * @return void
      */
@@ -23,10 +21,9 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
-     * @throws ClientException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
diff --git a/src/Command/AbstractSchemaCommand.php b/src/Command/AbstractSchemaCommand.php
@@ -7,7 +7,6 @@
 
 abstract class AbstractSchemaCommand extends Command
 {
-
     /**
      * @var KafkaSchemaRegistryApiClientInterface
      */
diff --git a/src/Command/CheckAllSchemaTemplatesDefaultTypeCommand.php b/src/Command/CheckAllSchemaTemplatesDefaultTypeCommand.php
@@ -2,7 +2,6 @@
 
 namespace Jobcloud\SchemaConsole\Command;
 
-use GuzzleHttp\Exception\RequestException;
 use Jobcloud\SchemaConsole\Helper\SchemaFileHelper;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -41,7 +40,6 @@ protected function configure(): void
      * @param InputInterface  $input
      * @param OutputInterface $output
      * @return integer
-     * @throws RequestException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
diff --git a/src/Command/CheckAllSchemaTemplatesDocCommentsCommand.php b/src/Command/CheckAllSchemaTemplatesDocCommentsCommand.php
@@ -4,8 +4,8 @@
 
 namespace Jobcloud\SchemaConsole\Command;
 
-use GuzzleHttp\Exception\RequestException;
 use Jobcloud\SchemaConsole\Helper\SchemaFileHelper;
+use JsonException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -34,10 +34,9 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
-     * @throws RequestException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
@@ -66,6 +65,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
      * @param array<string, mixed> $avroFiles
      * @param array<string, mixed> $failed
      * @return boolean
+     * @throws JsonException
      */
     private function checkDocCommentsOnSchemaTemplates(array $avroFiles, array &$failed = []): bool
     {
diff --git a/src/Command/CheckAllSchemasAreValidAvroCommand.php b/src/Command/CheckAllSchemasAreValidAvroCommand.php
@@ -4,7 +4,6 @@
 
 use AvroSchema;
 use AvroSchemaParseException;
-use GuzzleHttp\Exception\RequestException;
 use Jobcloud\SchemaConsole\Helper\SchemaFileHelper;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -30,7 +29,6 @@ protected function configure(): void
      * @param InputInterface  $input
      * @param OutputInterface $output
      * @return integer
-     * @throws RequestException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
diff --git a/src/Command/CheckAllSchemasCompatibilityCommand.php b/src/Command/CheckAllSchemasCompatibilityCommand.php
@@ -2,7 +2,6 @@
 
 namespace Jobcloud\SchemaConsole\Command;
 
-use GuzzleHttp\Exception\RequestException;
 use Jobcloud\SchemaConsole\Helper\SchemaFileHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -11,7 +10,6 @@
 
 class CheckAllSchemasCompatibilityCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -25,10 +23,9 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
-     * @throws RequestException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
diff --git a/src/Command/CheckCompatibilityCommand.php b/src/Command/CheckCompatibilityCommand.php
@@ -4,15 +4,13 @@
 
 namespace Jobcloud\SchemaConsole\Command;
 
-use GuzzleHttp\Exception\ClientException;
 use Jobcloud\SchemaConsole\Helper\SchemaFileHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CheckCompatibilityCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -27,10 +25,9 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
-     * @throws ClientException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
diff --git a/src/Command/CheckDocCommentsCommand.php b/src/Command/CheckDocCommentsCommand.php
@@ -4,7 +4,6 @@
 
 namespace Jobcloud\SchemaConsole\Command;
 
-use GuzzleHttp\Exception\RequestException;
 use Jobcloud\SchemaConsole\Helper\SchemaFileHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -30,10 +29,9 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
-     * @throws RequestException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
diff --git a/src/Command/CheckIsRegistredCommand.php b/src/Command/CheckIsRegistredCommand.php
@@ -11,7 +11,6 @@
 
 class CheckIsRegistredCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -25,7 +24,7 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
      */
diff --git a/src/Command/DeleteAllSchemasCommand.php b/src/Command/DeleteAllSchemasCommand.php
@@ -9,7 +9,6 @@
 
 class DeleteAllSchemasCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -22,13 +21,12 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-
         $schemas = $this->schemaRegistryApi->getSubjects();
 
         foreach ($schemas as $schemaName) {
diff --git a/src/Command/GetCompatibilityModeCommand.php b/src/Command/GetCompatibilityModeCommand.php
@@ -9,7 +9,6 @@
 
 class GetCompatibilityModeCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -22,7 +21,7 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
      */
diff --git a/src/Command/GetCompatibilityModeForSchemaCommand.php b/src/Command/GetCompatibilityModeForSchemaCommand.php
@@ -10,7 +10,6 @@
 
 class GetCompatibilityModeForSchemaCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -24,7 +23,7 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
      */
diff --git a/src/Command/GetLatestSchemaCommand.php b/src/Command/GetLatestSchemaCommand.php
@@ -4,7 +4,7 @@
 
 namespace Jobcloud\SchemaConsole\Command;
 
-use GuzzleHttp\Exception\ClientException;
+use Buzz\Exception\ClientException;
 use Jobcloud\Kafka\SchemaRegistryClient\KafkaSchemaRegistryApiClientInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -13,7 +13,6 @@
 
 class GetLatestSchemaCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -28,10 +27,9 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
-     * @throws ClientException
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
diff --git a/src/Command/GetSchemaByVersionCommand.php b/src/Command/GetSchemaByVersionCommand.php
@@ -11,29 +11,27 @@
 
 class GetSchemaByVersionCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
     protected function configure(): void
     {
         $this
             ->setName('kafka-schema-registry:fetch:schema')
-            ->setDescription('List all versions for given schema')
-            ->setHelp('List all versions for given schema')
+            ->setDescription('Get schema by version number')
+            ->setHelp('Get schema by version number')
             ->addArgument('schemaName', InputArgument::REQUIRED, 'Name of the schema')
             ->addArgument('schemaVersion', InputArgument::REQUIRED, 'Version of the schema')
             ->addArgument('outputFile', InputArgument::REQUIRED, 'Path to output file');
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-
         /** @var string $outputFile */
         $outputFile = $input->getArgument('outputFile');
 
diff --git a/src/Command/ListAllSchemasCommand.php b/src/Command/ListAllSchemasCommand.php
@@ -9,7 +9,6 @@
 
 class ListAllSchemasCommand extends AbstractSchemaCommand
 {
-
     /**
      * @return void
      */
@@ -22,13 +21,12 @@ protected function configure(): void
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      * @return integer
      */
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-
         $schemas = $this->schemaRegistryApi->getSubjects();
 
         foreach ($schemas as $schema) {
diff --git a/src/Command/ListVersionsForSchemaCommand.php b/src/Command/ListVersionsForSchemaCommand.php
diff --git a/src/Command/RegisterChangedSchemasCommand.php b/src/Command/RegisterChangedSchemasCommand.php
diff --git a/src/Command/RegisterSchemaVersionCommand.php b/src/Command/RegisterSchemaVersionCommand.php
diff --git a/src/ServiceProvider/CommandServiceProvider.php b/src/ServiceProvider/CommandServiceProvider.php
diff --git a/tests/AbstractSchemaRegistryTestCase.php b/tests/AbstractSchemaRegistryTestCase.php
diff --git a/tests/Command/GetLatestSchemaCommandTest.php b/tests/Command/GetLatestSchemaCommandTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.3-cli-alpine3.14`
	`1`	`+FROM php:7.4-cli-alpine3.15`
`2`	`2`
`3`	`3`	`ARG HOST_USER_ID`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`abstract class AbstractSchemaCommand extends Command`
`9`	`9`	`{`
`10`		`-`
`11`	`10`	`/**`
`12`	`11`	`* @var KafkaSchemaRegistryApiClientInterface`
`13`	`12`	`*/`