[CI] Upgrade tested versions in CI and local (#43)

Author: tPl0ch

.gitignore

@@ -17,3 +17,5 @@ variables.mk
 /build/
 ocular.phar
 php-cs-fixer.phar
+
+.phpunit.result.cache

.travis.yml

@@ -6,8 +6,8 @@ services:
 - docker
 
 php:
-- '7.2'
 - '7.3'
+- '7.4'
 
 env:
   global:
@@ -32,44 +32,89 @@ script:
 jobs:
   include:
   - stage: coverage
-    php: '7.2'
+    php: '7.4'
     env:
     - DEPENDENCIES="stable"
     script:
     - PHP=php make coverage
   - stage: integration
-    php: '7.2'
+    php: '7.4'
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=3.3.3
+    - CONFLUENT_VERSION=4.0.3
     script:
     - make platform
     - PHP=php make phpunit-integration
   - stage: integration
-    php: '7.2'
+    php: '7.4'
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=4.1.3
+    - CONFLUENT_VERSION=4.1.4
     script:
     - make platform
     - PHP=php make phpunit-integration
   - stage: integration
-    php: '7.2'
+    php: '7.4'
+    env:
+      - DEPENDENCIES="stable"
+      - INTEGRATION_TEST="enabled"
+      - CONFLUENT_VERSION=5.0.4
+    script:
+      - make platform
+      - PHP=php make phpunit-integration
+  - stage: integration
+    php: '7.4'
+    env:
+      - DEPENDENCIES="stable"
+      - INTEGRATION_TEST="enabled"
+      - CONFLUENT_VERSION=5.1.4
+    script:
+      - make platform
+      - PHP=php make phpunit-integration
+  - stage: integration
+    php: '7.4'
+    env:
+      - DEPENDENCIES="stable"
+      - INTEGRATION_TEST="enabled"
+      - CONFLUENT_VERSION=5.2.4
+    script:
+      - make platform
+      - PHP=php make phpunit-integration
+  - stage: integration
+    php: '7.4'
+    env:
+      - DEPENDENCIES="stable"
+      - INTEGRATION_TEST="enabled"
+      - CONFLUENT_VERSION=5.3.4
+    script:
+      - make platform
+      - PHP=php make phpunit-integration
+  - stage: integration
+    php: '7.4'
+    env:
+      - DEPENDENCIES="stable"
+      - INTEGRATION_TEST="enabled"
+      - CONFLUENT_VERSION=5.4.2
+    script:
+      - make platform
+      - PHP=php make phpunit-integration
+  - stage: integration
+    php: '7.4'
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=5.2.3
+    - CONFLUENT_VERSION=5.5.2
     script:
     - make platform
     - PHP=php make phpunit-integration
   - stage: integration
-    php: '7.2'
+    php: '7.4'
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=latest
+    - CONFLUENT_VERSION=6.0.0
     script:
     - make platform
     - PHP=php make phpunit-integration

Makefile

@@ -9,10 +9,10 @@ SCHEMA_REGISTRY_IPV4 ?= 172.68.0.103
 KAFKA_BROKER_IPV4 ?= 172.68.0.102
 ZOOKEEPER_IPV4 ?= 172.68.0.101
 COMPOSER ?= bin/composer.phar
-COMPOSER_VERSION ?= 1.8.3
+COMPOSER_VERSION ?= 1.10.13
 PHP ?= bin/php
-PHP_VERSION ?= 7.2
-XDEBUG_VERSION ?= 2.7.2
+PHP_VERSION ?= 7.4
+XDEBUG_VERSION ?= 2.9.8
 
 export
 

README.md

@@ -45,7 +45,6 @@ compliant requests that can be used as well as high level abstractions to ease d
 | **`doctrine/cache`** | ~1.3 | If you want to use the `DoctrineCacheAdapter` |
 | **`psr/cache`** | ^1.0 | If you want to use the `CacheItemPoolAdapter` |
 | **`psr/simple-cache`** | ^1.0 | If you want to use the `SimpleCacheAdapter` |
-| **`raphhh/trex-reflection`** | ~1.0 | If you want to use the `RequestCallbackValidator`s |
 
 ## Installation
 
@@ -80,7 +79,6 @@ major version upgrades will have incompatibilities that will be released in the
 use GuzzleHttp\Client;
 use FlixTech\SchemaRegistryApi\Registry\PromisingRegistry;
 use FlixTech\SchemaRegistryApi\Exception\SchemaRegistryException;
-use Psr\Http\Message\RequestInterface;
 
 $registry = new PromisingRegistry(
     new Client(['base_uri' => 'registry.example.com'])
@@ -117,14 +115,9 @@ $promise = $registry->schemaForId($schemaId);
 $schema = $promise->wait();
 
 // Get the version of a schema for a given subject.
-// All methods also have a request callback third parameter.
-// It takes a `Psr\Http\Message\RequestInterface` and should return a `Psr\Http\Message\RequestInterface`
 $version = $registry->schemaVersion(
     'test-subject',
-    $schema,
-    static function (RequestInterface $request) {
-        return $request->withAddedHeader('Cache-Control', 'no-cache');
-    }
+    $schema
 )->wait();
 
 // You can also get a schema by subject and version

composer.json

@@ -11,16 +11,16 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.3",
     "ext-curl": "*",
     "ext-json": "*",
     "guzzlehttp/guzzle": "~6.3",
     "guzzlehttp/psr7": "<1.7",
     "beberlei/assert": "~2.7|~3.0",
-    "flix-tech/avro-php": "^3.0|^4.0"
+    "flix-tech/avro-php": "^4.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "~7.0",
+    "phpunit/phpunit": "^8.2.3",
     "phpstan/phpstan": "^0.12",
     "raphhh/trex-reflection": "~1.0",
     "doctrine/cache": "~1.3",
@@ -29,7 +29,6 @@
     "psr/simple-cache": "^1.0"
   },
   "suggest": {
-    "raphhh/trex-reflection": "Needed if you want to use the `RequestCallbackValidator`",
     "doctrine/cache": "If you want to use the DoctrineCacheAdapter",
     "psr/cache": "If you want to use the CacheItemPoolAdapter",
     "psr/simple-cache": "If you want to use the SimpleCacheAdapter"

src/AsynchronousRegistry.php

@@ -17,40 +17,40 @@ interface AsynchronousRegistry extends Registry
      *
      * @return PromiseInterface Either the schema id as int or a SchemaRegistryException object when fulfilled
      */
-    public function register(string $subject, AvroSchema $schema, callable $requestCallback = null): PromiseInterface;
+    public function register(string $subject, AvroSchema $schema): PromiseInterface;
 
     /**
      * {@inheritdoc}
      *
      * @return PromiseInterface Either the version as int or a SchemaRegistryException object when fulfilled
      */
-    public function schemaVersion(string $subject, AvroSchema $schema, callable $requestCallback = null): PromiseInterface;
+    public function schemaVersion(string $subject, AvroSchema $schema): PromiseInterface;
 
     /**
      * {@inheritdoc}
      *
      * @return PromiseInterface Either the schema as AvroSchema or a SchemaRegistryException object when fulfilled
      */
-    public function latestVersion(string $subject, callable $requestCallback = null): PromiseInterface;
+    public function latestVersion(string $subject): PromiseInterface;
 
     /**
      * {@inheritdoc}
      *
      * @return PromiseInterface Either the schema id as int or a SchemaRegistryException object when fulfilled
      */
-    public function schemaId(string $subject, AvroSchema $schema, callable $requestCallback = null): PromiseInterface;
+    public function schemaId(string $subject, AvroSchema $schema): PromiseInterface;
 
     /**
      * {@inheritdoc}
      *
      * @return PromiseInterface Either the schema as AvroSchema or a SchemaRegistryException object when fulfilled
      */
-    public function schemaForId(int $schemaId, callable $requestCallback = null): PromiseInterface;
+    public function schemaForId(int $schemaId): PromiseInterface;
 
     /**
      * {@inheritdoc}
      *
      * @return PromiseInterface Either the schema as AvroSchema or a SchemaRegistryException object when fulfilled
      */
-    public function schemaForSubjectAndVersion(string $subject, int $version, callable $requestCallback = null): PromiseInterface;
+    public function schemaForSubjectAndVersion(string $subject, int $version): PromiseInterface;
 }

src/Constants/Constants.php

@@ -12,4 +12,3 @@
 const VERSION_LATEST = 'latest';
 const ACCEPT_HEADER = ['Accept' => 'application/vnd.schemaregistry.v1+json'];
 const CONTENT_TYPE_HEADER = ['Content-Type' => 'application/vnd.schemaregistry.v1+json'];
-

src/Exception/ExceptionMap.php

@@ -4,8 +4,12 @@
 
 namespace FlixTech\SchemaRegistryApi\Exception;
 
+use Exception;
 use GuzzleHttp\Exception\RequestException;
 use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
+use function array_key_exists;
+use function sprintf;
 
 final class ExceptionMap
 {
@@ -14,7 +18,7 @@ final class ExceptionMap
     public const ERROR_MESSAGE_FIELD_NAME = 'message';
 
     /**
-     * @var \FlixTech\SchemaRegistryApi\Exception\ExceptionMap
+     * @var ExceptionMap
      */
     private static $instance;
 
@@ -38,7 +42,7 @@ private function __construct()
      *
      * @return SchemaRegistryException
      *
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function __invoke(RequestException $exception): SchemaRegistryException
     {
@@ -55,7 +59,7 @@ private function guardAgainstMissingResponse(RequestException $exception): Respo
         $response = $exception->getResponse();
 
         if (!$response) {
-            throw new \RuntimeException('RequestException has no response to inspect', 0, $exception);
+            throw new RuntimeException('RequestException has no response to inspect', 0, $exception);
         }
 
         return $response;
@@ -70,8 +74,8 @@ private function guardAgainstMissingErrorCode(ResponseInterface $response): arra
         try {
             $decodedBody = \GuzzleHttp\json_decode((string) $response->getBody(), true);
 
-            if (!\array_key_exists(self::ERROR_CODE_FIELD_NAME, $decodedBody)) {
-                throw new \RuntimeException(
+            if (!array_key_exists(self::ERROR_CODE_FIELD_NAME, $decodedBody)) {
+                throw new RuntimeException(
                     sprintf(
                         'Invalid message body received - cannot find "error_code" field in response body "%s"',
                         (string) $response->getBody()
@@ -80,9 +84,9 @@ private function guardAgainstMissingErrorCode(ResponseInterface $response): arra
             }
 
             return $decodedBody;
-        } catch (\Exception $e) {
-            throw new \RuntimeException(
-                \sprintf(
+        } catch (Exception $e) {
+            throw new RuntimeException(
+                sprintf(
                     'Invalid message body received - cannot find "error_code" field in response body "%s"',
                     (string) $response->getBody()
                 ),
@@ -92,12 +96,7 @@ private function guardAgainstMissingErrorCode(ResponseInterface $response): arra
         }
     }
 
-    /**
-     * @param int $errorCode
-     * @param string $errorMessage
-     * @return SchemaRegistryException
-     */
-    private function mapErrorCodeToException($errorCode, $errorMessage): SchemaRegistryException
+    private function mapErrorCodeToException(int $errorCode, string $errorMessage): SchemaRegistryException
     {
         switch ($errorCode) {
             case IncompatibleAvroSchemaException::errorCode():
@@ -131,7 +130,7 @@ private function mapErrorCodeToException($errorCode, $errorMessage): SchemaRegis
                 return new InvalidCompatibilityLevelException($errorMessage, $errorCode);
 
             default:
-                throw new \RuntimeException(sprintf('Unknown error code "%d"', $errorCode));
+                throw new RuntimeException(sprintf('Unknown error code "%d"', $errorCode));
         }
     }
 }

src/Exception/SchemaRegistryException.php

@@ -4,7 +4,9 @@
 
 namespace FlixTech\SchemaRegistryApi\Exception;
 
-interface SchemaRegistryException extends \Throwable
+use Throwable;
+
+interface SchemaRegistryException extends Throwable
 {
     public static function errorCode(): int;
 }