diff --git a/.travis.yml b/.travis.yml index be44ea7..615cb34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,23 @@ language: php -php: - - 7.0 - - 7.1 +jobs: + include: + - php: 7.0 + env: BROADWAY=^1.0 + - php: 7.3 + env: BROADWAY=^2.1 before_script: - composer selfupdate - - composer update --prefer-dist + - composer require broadway/broadway $BROADWAY --prefer-dist script: - vendor/bin/phpunit - vendor/bin/phpbench run --report=default - after_script: - vendor/bin/coveralls -sudo: false - cache: directories: - $HOME/.composer/cache diff --git a/composer.json b/composer.json index fcc4848..a9592fa 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "require": { "php": "^7.0", "doctrine/instantiator": "^1.0", - "broadway/broadway": "^1.0" + "broadway/broadway": "^1.0|^2.1" }, "autoload": { "psr-4": { diff --git a/src/SymfonyIntegration/Resources/config/services.yml b/src/SymfonyIntegration/Resources/config/services.yml index a901242..1d5b27f 100644 --- a/src/SymfonyIntegration/Resources/config/services.yml +++ b/src/SymfonyIntegration/Resources/config/services.yml @@ -9,6 +9,7 @@ services: broadway_serialization.reconstitute: class: BroadwaySerialization\Reconstitution\ReconstituteUsingInstantiatorAndHydrator + public: true arguments: - "@broadway_serialization.instantiator" - "@broadway_serialization.hydrate" diff --git a/test/Performance/SomeOtherSerializableClass.php b/test/Performance/SomeOtherSerializableClass.php index dfa3e3f..2637f0d 100644 --- a/test/Performance/SomeOtherSerializableClass.php +++ b/test/Performance/SomeOtherSerializableClass.php @@ -14,7 +14,7 @@ public static function deserialize(array $data) return new self($data['foo']); } - public function serialize() + public function serialize(): array { return [ 'foo' => $this->foo diff --git a/test/Performance/TraditionalSerializableClass.php b/test/Performance/TraditionalSerializableClass.php index d483c6f..fa10608 100644 --- a/test/Performance/TraditionalSerializableClass.php +++ b/test/Performance/TraditionalSerializableClass.php @@ -42,7 +42,7 @@ function ($data) { return $object; } - public function serialize() + public function serialize(): array { return [ 'stringProperty' => $this->stringProperty, diff --git a/test/Serialization/Fixtures/TraditionalSerializableObject.php b/test/Serialization/Fixtures/TraditionalSerializableObject.php index 8629d17..27d2714 100644 --- a/test/Serialization/Fixtures/TraditionalSerializableObject.php +++ b/test/Serialization/Fixtures/TraditionalSerializableObject.php @@ -24,7 +24,7 @@ public static function deserialize(array $data) return new self($data['bar']); } - public function serialize() + public function serialize(): array { return ['bar' => $this->bar]; }