From 98709b26962d15ea35fe8368f03a7666124c280a Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 30 Oct 2018 14:51:22 +0100 Subject: [PATCH 1/4] Fix coding style --- tests/EnumTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/EnumTest.php b/tests/EnumTest.php index 3349bd1..c83f723 100644 --- a/tests/EnumTest.php +++ b/tests/EnumTest.php @@ -261,10 +261,10 @@ public function testJsonSerialize() { $this->assertJsonStringEqualsJsonString('"foo"', json_encode(new EnumFixture(EnumFixture::FOO))); $this->assertJsonStringEqualsJsonString('"bar"', json_encode(new EnumFixture(EnumFixture::BAR))); - $this->assertJsonStringEqualsJsonString('42', json_encode(new EnumFixture(EnumFixture::NUMBER))); - $this->assertJsonStringEqualsJsonString('0', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NUMBER))); - $this->assertJsonStringEqualsJsonString('null', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NULL))); - $this->assertJsonStringEqualsJsonString('""', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_EMPTY_STRING))); + $this->assertJsonStringEqualsJsonString('42', json_encode(new EnumFixture(EnumFixture::NUMBER))); + $this->assertJsonStringEqualsJsonString('0', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NUMBER))); + $this->assertJsonStringEqualsJsonString('null', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NULL))); + $this->assertJsonStringEqualsJsonString('""', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_EMPTY_STRING))); $this->assertJsonStringEqualsJsonString('false', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE))); } From 1ac1a914eb36b17a098f9939b5d0ec0c9cf8936e Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 30 Oct 2018 14:54:02 +0100 Subject: [PATCH 2/4] Convert arrays to short arrays --- src/Enum.php | 2 +- tests/EnumTest.php | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Enum.php b/src/Enum.php index 00355df..d1bc516 100644 --- a/src/Enum.php +++ b/src/Enum.php @@ -29,7 +29,7 @@ abstract class Enum implements \JsonSerializable * * @var array */ - protected static $cache = array(); + protected static $cache = []; /** * Creates a new value of some type diff --git a/tests/EnumTest.php b/tests/EnumTest.php index c83f723..4dbcc80 100644 --- a/tests/EnumTest.php +++ b/tests/EnumTest.php @@ -166,21 +166,21 @@ public function testIsValid($value, $isValid) public function isValidProvider() { - return array( + return [ /** * Valid values */ - array('foo', true), - array(42, true), - array(null, true), - array(0, true), - array('', true), - array(false, true), + ['foo', true], + [42, true], + [null, true], + [0, true], + ['', true], + [false, true], /** * Invalid values */ - array('baz', false) - ); + ['baz', false] + ]; } /** From 8a197f1ad73d02f0f46daa00dfbae0c06f9f6cdf Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 30 Oct 2018 14:56:39 +0100 Subject: [PATCH 3/4] Fix code style --- tests/EnumTest.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/EnumTest.php b/tests/EnumTest.php index 4dbcc80..57f65a3 100644 --- a/tests/EnumTest.php +++ b/tests/EnumTest.php @@ -259,13 +259,13 @@ public function testEqualsConflictValues() */ public function testJsonSerialize() { - $this->assertJsonStringEqualsJsonString('"foo"', json_encode(new EnumFixture(EnumFixture::FOO))); - $this->assertJsonStringEqualsJsonString('"bar"', json_encode(new EnumFixture(EnumFixture::BAR))); - $this->assertJsonStringEqualsJsonString('42', json_encode(new EnumFixture(EnumFixture::NUMBER))); - $this->assertJsonStringEqualsJsonString('0', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NUMBER))); - $this->assertJsonStringEqualsJsonString('null', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NULL))); - $this->assertJsonStringEqualsJsonString('""', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_EMPTY_STRING))); - $this->assertJsonStringEqualsJsonString('false', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE))); + $this->assertJsonEqualsJson('"foo"', json_encode(new EnumFixture(EnumFixture::FOO))); + $this->assertJsonEqualsJson('"bar"', json_encode(new EnumFixture(EnumFixture::BAR))); + $this->assertJsonEqualsJson('42', json_encode(new EnumFixture(EnumFixture::NUMBER))); + $this->assertJsonEqualsJson('0', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NUMBER))); + $this->assertJsonEqualsJson('null', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_NULL))); + $this->assertJsonEqualsJson('""', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_EMPTY_STRING))); + $this->assertJsonEqualsJson('false', json_encode(new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE))); } public function testNullableEnum() @@ -280,4 +280,9 @@ public function testBooleanEnum() $this->assertFalse(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE()->getValue()); $this->assertFalse((new EnumFixture(EnumFixture::PROBLEMATIC_BOOLEAN_FALSE))->jsonSerialize()); } + + private function assertJsonEqualsJson($json1, $json2) + { + $this->assertJsonStringEqualsJsonString($json1, $json2); + } } From d24462d356e0e20f0c99eea0797a96e8c940b80c Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 30 Oct 2018 14:57:10 +0100 Subject: [PATCH 4/4] Remove coding style from Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a1bc09a..8f9e389 100755 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ php: - 7.0 - 7.1 - 7.2 + - 7.3 - nightly matrix: @@ -21,7 +22,6 @@ before_script: script: - vendor/bin/phpunit - - vendor/bin/phpcs --standard=PSR2 ./src/ # Use Travis' new container-based infrastructure. # See http://docs.travis-ci.com/user/migrating-from-legacy/#How-can-I-use-container-based-infrastructure%3F