Drop PHP 7.1 and allow beberlei/assert version 3.0 (#30)

tPl0ch · web-flow · commit d0f9a9df6ad8 · 2019-08-29T15:54:58.000+02:00
* [CI] Drop PHP 7.1 from build environment

* [SR] Adding `public` keyword to constants in exception classes

* [UR] Adding return types to `CacheAdapter` and implementations

* [UR] Use `static` functions where possible and add more return types
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ services:
 - docker
 
 php:
-- '7.1'
 - '7.2'
 - '7.3'
 
@@ -43,7 +42,7 @@ jobs:
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=3.1.2
+    - CONFLUENT_VERSION=3.3.3
     script:
     - make platform
     - PHP=php make phpunit-integration
@@ -52,7 +51,7 @@ jobs:
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=3.2.4
+    - CONFLUENT_VERSION=4.1.3
     script:
     - make platform
     - PHP=php make phpunit-integration
@@ -61,7 +60,7 @@ jobs:
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=3.3.2
+    - CONFLUENT_VERSION=5.2.3
     script:
     - make platform
     - PHP=php make phpunit-integration
@@ -70,25 +69,7 @@ jobs:
     env:
     - DEPENDENCIES="stable"
     - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=4.0.2
-    script:
-    - make platform
-    - PHP=php make phpunit-integration
-  - stage: integration
-    php: '7.2'
-    env:
-    - DEPENDENCIES="stable"
-    - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=4.1.2
-    script:
-    - make platform
-    - PHP=php make phpunit-integration
-  - stage: integration
-    php: '7.2'
-    env:
-    - DEPENDENCIES="stable"
-    - INTEGRATION_TEST="enabled"
-    - CONFLUENT_VERSION=5.0.0
+    - CONFLUENT_VERSION=latest
     script:
     - make platform
     - PHP=php make phpunit-integration
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-ARG PHP_VERSION=7.1
+ARG PHP_VERSION=7.2
 
 FROM php:${PHP_VERSION}-cli-alpine
 
-ARG XDEBUG_VERSION=2.7.0RC1
+ARG XDEBUG_VERSION=2.7.2
 
 RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
     && apk add --no-cache --virtual .runtime-deps git libzip-dev \
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ COMPOSER ?= bin/composer.phar
 COMPOSER_VERSION ?= 1.8.3
 PHP ?= bin/php
 PHP_VERSION ?= 7.2
-XDEBUG_VERSION ?= 2.7.0RC1
+XDEBUG_VERSION ?= 2.7.2
 
 export
 
diff --git a/bin/php b/bin/php
@@ -7,7 +7,7 @@ command -v docker >/dev/null 2>&1 || { echo "docker is required to run this bina
 USER=${USER:-$( id -un )}
 GROUP=${GROUP:-$( id -gn )}
 COMPOSER_HOME=${COMPOSER_HOME:-${HOME}/.composer}
-PHP_VERSION=${PHP_VERSION:-7.1}
+PHP_VERSION=${PHP_VERSION:-7.2}
 DOCKER_OPTS=${DOCKER_OPTS:-'-it'}
 
 exec docker run ${DOCKER_OPTS} --rm \
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "flix-tech/confluent-schema-registry-api",
-  "description": "A PHP 7.0+ library to consume the Confluent Schema Registry REST API.",
+  "description": "A PHP 7.2+ library to consume the Confluent Schema Registry REST API.",
   "minimum-stability": "stable",
   "type": "library",
   "license": "MIT",
@@ -11,9 +11,11 @@
     }
   ],
   "require": {
-    "php": "~7.1",
+    "php": "^7.2",
+    "ext-curl": "*",
+    "ext-json": "*",
     "guzzlehttp/guzzle": "~6.3",
-    "beberlei/assert": "~2.7",
+    "beberlei/assert": "~2.7|~3.0",
     "flix-tech/avro-php": "^3.0"
   },
   "require-dev": {
diff --git a/src/Exception/AbstractSchemaRegistryException.php b/src/Exception/AbstractSchemaRegistryException.php
@@ -4,14 +4,17 @@
 
 namespace FlixTech\SchemaRegistryApi\Exception;
 
-abstract class AbstractSchemaRegistryException extends \RuntimeException implements SchemaRegistryException
+use LogicException;
+use RuntimeException;
+
+abstract class AbstractSchemaRegistryException extends RuntimeException implements SchemaRegistryException
 {
-    const ERROR_CODE = 0;
+    public const ERROR_CODE = 0;
 
     final public static function errorCode(): int
     {
         if (!defined('static::ERROR_CODE') || 0 === static::ERROR_CODE) {
-            throw new \LogicException(sprintf('Class "%s" must define constant `ERROR_CODE`', static::class));
+            throw new LogicException(sprintf('Class "%s" must define constant `ERROR_CODE`', static::class));
         }
 
         return static::ERROR_CODE;
diff --git a/src/Exception/BackendDataStoreException.php b/src/Exception/BackendDataStoreException.php
@@ -6,5 +6,5 @@
 
 class BackendDataStoreException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 50001;
+    public const ERROR_CODE = 50001;
 }
diff --git a/src/Exception/IncompatibleAvroSchemaException.php b/src/Exception/IncompatibleAvroSchemaException.php
@@ -6,5 +6,5 @@
 
 class IncompatibleAvroSchemaException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 409;
+    public const ERROR_CODE = 409;
 }
diff --git a/src/Exception/InvalidAvroSchemaException.php b/src/Exception/InvalidAvroSchemaException.php
@@ -6,5 +6,5 @@
 
 class InvalidAvroSchemaException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 42201;
+    public const ERROR_CODE = 42201;
 }
diff --git a/src/Exception/InvalidCompatibilityLevelException.php b/src/Exception/InvalidCompatibilityLevelException.php
@@ -6,5 +6,5 @@
 
 class InvalidCompatibilityLevelException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 42203;
+    public const ERROR_CODE = 42203;
 }
diff --git a/src/Exception/InvalidVersionException.php b/src/Exception/InvalidVersionException.php
@@ -6,5 +6,5 @@
 
 class InvalidVersionException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 42202;
+    public const ERROR_CODE = 42202;
 }
diff --git a/src/Exception/MasterProxyException.php b/src/Exception/MasterProxyException.php
@@ -6,5 +6,5 @@
 
 class MasterProxyException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 50003;
+    public const ERROR_CODE = 50003;
 }
diff --git a/src/Exception/OperationTimedOutException.php b/src/Exception/OperationTimedOutException.php
@@ -4,5 +4,5 @@
 
 class OperationTimedOutException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 50002;
+    public const ERROR_CODE = 50002;
 }
diff --git a/src/Exception/SchemaNotFoundException.php b/src/Exception/SchemaNotFoundException.php
@@ -6,5 +6,5 @@
 
 class SchemaNotFoundException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 40403;
+    public const ERROR_CODE = 40403;
 }
diff --git a/src/Exception/SubjectNotFoundException.php b/src/Exception/SubjectNotFoundException.php
@@ -6,5 +6,5 @@
 
 class SubjectNotFoundException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 40401;
+    public const ERROR_CODE = 40401;
 }
diff --git a/src/Exception/VersionNotFoundException.php b/src/Exception/VersionNotFoundException.php
@@ -6,5 +6,5 @@
 
 class VersionNotFoundException extends AbstractSchemaRegistryException
 {
-    const ERROR_CODE = 40402;
+    public const ERROR_CODE = 40402;
 }
diff --git a/src/Registry/Cache/AvroObjectCacheAdapter.php b/src/Registry/Cache/AvroObjectCacheAdapter.php
@@ -30,31 +30,31 @@ class AvroObjectCacheAdapter implements CacheAdapter
     /**
      * {@inheritdoc}
      */
-    public function cacheSchemaWithId(AvroSchema $schema, int $schemaId)
+    public function cacheSchemaWithId(AvroSchema $schema, int $schemaId): void
     {
         $this->idToSchema[$schemaId] = $schema;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function cacheSchemaIdByHash(int $schemaId, string $schemaHash)
+    public function cacheSchemaIdByHash(int $schemaId, string $schemaHash): void
     {
         $this->hashToSchemaId[$schemaHash] = $schemaId;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function cacheSchemaWithSubjectAndVersion(AvroSchema $schema, string $subject, int $version)
+    public function cacheSchemaWithSubjectAndVersion(AvroSchema $schema, string $subject, int $version): void
     {
         $this->subjectVersionToSchema[$this->makeKeyFromSubjectAndVersion($subject, $version)] = $schema;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getWithId(int $schemaId)
+    public function getWithId(int $schemaId): ?AvroSchema
     {
         if (!$this->hasSchemaForId($schemaId)) {
             return null;
@@ -63,7 +63,7 @@ public function getWithId(int $schemaId)
         return $this->idToSchema[$schemaId];
     }
 
-    public function getIdWithHash(string $hash)
+    public function getIdWithHash(string $hash): ?int
     {
         if (!$this->hasSchemaIdForHash($hash)) {
             return null;
@@ -75,7 +75,7 @@ public function getIdWithHash(string $hash)
     /**
      * {@inheritdoc}
      */
-    public function getWithSubjectAndVersion(string $subject, int $version)
+    public function getWithSubjectAndVersion(string $subject, int $version): ?AvroSchema
     {
         $key = $this->makeKeyFromSubjectAndVersion($subject, $version);
 
diff --git a/src/Registry/Cache/DoctrineCacheAdapter.php b/src/Registry/Cache/DoctrineCacheAdapter.php
@@ -31,15 +31,15 @@ public function cacheSchemaWithId(AvroSchema $schema, int $schemaId): void
         $this->doctrineCache->save((string) $schemaId, (string) $schema);
     }
 
-    public function cacheSchemaIdByHash(int $schemaId, string $schemaHash)
+    public function cacheSchemaIdByHash(int $schemaId, string $schemaHash): void
     {
         $this->doctrineCache->save($schemaHash, $schemaId);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function cacheSchemaWithSubjectAndVersion(AvroSchema $schema, string $subject, int $version)
+    public function cacheSchemaWithSubjectAndVersion(AvroSchema $schema, string $subject, int $version): void
     {
         $this->doctrineCache->save(
             $this->makeKeyFromSubjectAndVersion($subject, $version),
@@ -49,8 +49,10 @@ public function cacheSchemaWithSubjectAndVersion(AvroSchema $schema, string $sub
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \AvroSchemaParseException
      */
-    public function getWithId(int $schemaId)
+    public function getWithId(int $schemaId): ?AvroSchema
     {
         $rawSchema = $this->doctrineCache->fetch((string) $schemaId);
 
@@ -64,7 +66,7 @@ public function getWithId(int $schemaId)
     /**
      * {@inheritdoc}
      */
-    public function getIdWithHash(string $hash)
+    public function getIdWithHash(string $hash): ?int
     {
         $schemaId = $this->doctrineCache->fetch($hash);
 
@@ -77,8 +79,10 @@ public function getIdWithHash(string $hash)
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \AvroSchemaParseException
      */
-    public function getWithSubjectAndVersion(string $subject, int $version)
+    public function getWithSubjectAndVersion(string $subject, int $version): ?AvroSchema
     {
         $rawSchema = $this->doctrineCache->fetch(
             $this->makeKeyFromSubjectAndVersion($subject, $version)
diff --git a/src/Registry/CacheAdapter.php b/src/Registry/CacheAdapter.php
@@ -19,7 +19,7 @@ interface CacheAdapter
      *
      * @return void
      */
-    public function cacheSchemaWithId(AvroSchema $schema, int $schemaId);
+    public function cacheSchemaWithId(AvroSchema $schema, int $schemaId): void;
 
     /**
      * Caches an AvroSchema with a given subject and version
@@ -40,7 +40,7 @@ public function cacheSchemaWithSubjectAndVersion(AvroSchema $schema, string $sub
      *
      * @return void
      */
-    public function cacheSchemaIdByHash(int $schemaId, string $schemaHash);
+    public function cacheSchemaIdByHash(int $schemaId, string $schemaHash): void;
 
     /**
      * Tries to fetch a cache with the global schema id.
@@ -50,7 +50,7 @@ public function cacheSchemaIdByHash(int $schemaId, string $schemaHash);
      *
      * @return AvroSchema|null
      */
-    public function getWithId(int $schemaId);
+    public function getWithId(int $schemaId): ?AvroSchema;
 
     /**
      * Tries to fetch a cached schema id with a given hash.
@@ -60,7 +60,7 @@ public function getWithId(int $schemaId);
      *
      * @return int|null
      */
-    public function getIdWithHash(string $hash);
+    public function getIdWithHash(string $hash): ?int;
 
     /**
      * Tries to fetch a cache with a given subject and version.
@@ -71,7 +71,7 @@ public function getIdWithHash(string $hash);
      *
      * @return AvroSchema|null
      */
-    public function getWithSubjectAndVersion(string $subject, int $version);
+    public function getWithSubjectAndVersion(string $subject, int $version): ?AvroSchema;
 
     /**
      * Checks if the cache engine has a cached schema for a given global schema id.
diff --git a/src/Registry/CachedRegistry.php b/src/Registry/CachedRegistry.php
diff --git a/src/Registry/PromisingRegistry.php b/src/Registry/PromisingRegistry.php
diff --git a/src/Requests/Functions.php b/src/Requests/Functions.php
diff --git a/test/Registry/BlockingRegistryTest.php b/test/Registry/BlockingRegistryTest.php
diff --git a/test/Registry/Cache/AbstractCacheAdapterTestCase.php b/test/Registry/Cache/AbstractCacheAdapterTestCase.php
diff --git a/test/Registry/CachedRegistryTest.php b/test/Registry/CachedRegistryTest.php
diff --git a/test/Registry/PromisingRegistryTest.php b/test/Registry/PromisingRegistryTest.php
diff --git a/test/Registry/RequestCallbackValidatorTest.php b/test/Registry/RequestCallbackValidatorTest.php
diff --git a/test/Requests/FunctionsTest.php b/test/Requests/FunctionsTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,17 @@`
`4`	`4`
`5`	`5`	`namespace FlixTech\SchemaRegistryApi\Exception;`
`6`	`6`
`7`		`-abstract class AbstractSchemaRegistryException extends \RuntimeException implements SchemaRegistryException`
	`7`	`+use LogicException;`
	`8`	`+use RuntimeException;`
	`9`	`+`
	`10`	`+abstract class AbstractSchemaRegistryException extends RuntimeException implements SchemaRegistryException`
`8`	`11`	`{`
`9`		`- const ERROR_CODE = 0;`
	`12`	`+ public const ERROR_CODE = 0;`
`10`	`13`
`11`	`14`	`final public static function errorCode(): int`
`12`	`15`	`{`
`13`	`16`	`if (!defined('static::ERROR_CODE') \|\| 0 === static::ERROR_CODE) {`
`14`		- throw new \LogicException(sprintf('Class "%s" must define constant `ERROR_CODE`', static::class));
	`17`	+ throw new LogicException(sprintf('Class "%s" must define constant `ERROR_CODE`', static::class));
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`return static::ERROR_CODE;`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`
`7`	`7`	`class BackendDataStoreException extends AbstractSchemaRegistryException`
`8`	`8`	`{`
`9`		`- const ERROR_CODE = 50001;`
	`9`	`+ public const ERROR_CODE = 50001;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`
`7`	`7`	`class IncompatibleAvroSchemaException extends AbstractSchemaRegistryException`
`8`	`8`	`{`
`9`		`- const ERROR_CODE = 409;`
	`9`	`+ public const ERROR_CODE = 409;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`
`7`	`7`	`class InvalidAvroSchemaException extends AbstractSchemaRegistryException`
`8`	`8`	`{`
`9`		`- const ERROR_CODE = 42201;`
	`9`	`+ public const ERROR_CODE = 42201;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`
`7`	`7`	`class InvalidCompatibilityLevelException extends AbstractSchemaRegistryException`
`8`	`8`	`{`
`9`		`- const ERROR_CODE = 42203;`
	`9`	`+ public const ERROR_CODE = 42203;`
`10`	`10`	`}`