Merge pull request #27 from localheinz/fix/php71

Fix: Require PHP 7.1
ergebnis · Jan 27, 2018 · 12c6623 · 12c6623
2 parents b51671d + 844f97c
commit 12c6623
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 65 deletions.
diff --git a/.php_cs b/.php_cs
@@ -11,7 +11,7 @@ the LICENSE file that was distributed with this source code.
 @see https://github.com/localheinz/json-normalizer
 EOF;
 
-$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php70($header), [
+$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php71($header), [
     'mb_str_functions' => false,
 ]);
 

diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ jobs:
   include:
     - stage: Style
 
-      php: 7.0
+      php: 7.1
 
       before_install:
         - source .travis/xdebug.sh
@@ -40,7 +40,7 @@ jobs:
 
       stage: Test
 
-      php: 7.0
+      php: 7.1
 
       env: WITH_LOWEST=true
 
@@ -63,24 +63,6 @@ jobs:
       after_success:
         - if [[ "$WITH_COVERAGE" == "true" ]]; then bash <(curl -s https://codecov.io/bash); fi
 
-    - <<: *TEST
-
-      php: 7.0
-
-      env: WITH_LOCKED=true
-
-    - <<: *TEST
-
-      php: 7.0
-
-      env: WITH_HIGHEST=true
-
-    - <<: *TEST
-
-      php: 7.1
-
-      env: WITH_LOWEST=true
-
     - <<: *TEST
 
       php: 7.1

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     }
   ],
   "require": {
-    "php": "^7.0",
+    "php": "^7.1",
     "justinrainbow/json-schema": "^4.0.0 || ^5.0.0",
     "localheinz/json-printer": "^1.0.0"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/test/Bench/SchemaNormalizerBench.php b/test/Bench/SchemaNormalizerBench.php
@@ -23,7 +23,7 @@ final class SchemaNormalizerBench
      * @Revs(5)
      * @Iterations(1)
      */
-    public function benchNormalizeProjectComposerFile()
+    public function benchNormalizeProjectComposerFile(): void
     {
         $this->normalize(
             __DIR__ . '/../../composer.json',
@@ -37,15 +37,15 @@ public function benchNormalizeProjectComposerFile()
      * @Revs(5)
      * @Iterations(1)
      */
-    public function benchNormalizeLargeComposerFile()
+    public function benchNormalizeLargeComposerFile(): void
     {
         $this->normalize(
             __DIR__ . '/../Fixture/LargeComposerFile/composer.json',
             $this->localComposerSchema()
         );
     }
 
-    private function normalize(string $file, string $schemaUri)
+    private function normalize(string $file, string $schemaUri): void
     {
         $original = \file_get_contents($file);
 

diff --git a/test/Unit/AbstractNormalizerTestCase.php b/test/Unit/AbstractNormalizerTestCase.php
@@ -21,12 +21,12 @@ abstract class AbstractNormalizerTestCase extends Framework\TestCase
 {
     use Helper;
 
-    final public function testImplementsNormalizerInterface()
+    final public function testImplementsNormalizerInterface(): void
     {
         $this->assertClassImplementsInterface(NormalizerInterface::class, $this->className());
     }
 
-    final public function testNormalizeRejectsInvalidJson()
+    final public function testNormalizeRejectsInvalidJson(): void
     {
         $json = $this->faker()->realText();
 

diff --git a/test/Unit/AutoFormatNormalizerTest.php b/test/Unit/AutoFormatNormalizerTest.php
@@ -27,7 +27,7 @@ final class AutoFormatNormalizerTest extends AbstractNormalizerTestCase
      * @param bool   $hasFinalNewLine
      * @param string $suffix
      */
-    public function testNormalizeEncodesWithJsonEncodeOptionsIndentsAndPossiblySuffixesWithFinalNewLine(bool $hasFinalNewLine, string $suffix)
+    public function testNormalizeEncodesWithJsonEncodeOptionsIndentsAndPossiblySuffixesWithFinalNewLine(bool $hasFinalNewLine, string $suffix): void
     {
         $faker = $this->faker();
 
@@ -123,7 +123,7 @@ public function providerFinalNewLine(): \Generator
             ],
         ];
 
-        foreach ($values as $key => list($hasFinalNewLine, $suffix)) {
+        foreach ($values as $key => [$hasFinalNewLine, $suffix]) {
             yield $key => [
                 $hasFinalNewLine,
                 $suffix,

diff --git a/test/Unit/CallableNormalizerTest.php b/test/Unit/CallableNormalizerTest.php
@@ -22,7 +22,7 @@ final class CallableNormalizerTest extends AbstractNormalizerTestCase
      *
      * @param callable $callable
      */
-    public function testNormalizePassesJsonThroughCallable(callable $callable)
+    public function testNormalizePassesJsonThroughCallable(callable $callable): void
     {
         $json = <<<'JSON'
 {

diff --git a/test/Unit/ChainNormalizerTest.php b/test/Unit/ChainNormalizerTest.php
@@ -19,7 +19,7 @@
 
 final class ChainNormalizerTest extends AbstractNormalizerTestCase
 {
-    public function testNormalizePassesJsonThroughNormalizers()
+    public function testNormalizePassesJsonThroughNormalizers(): void
     {
         $count = $this->faker()->numberBetween(3, 5);
 

diff --git a/test/Unit/FinalNewLineNormalizerTest.php b/test/Unit/FinalNewLineNormalizerTest.php
@@ -22,7 +22,7 @@ final class FinalNewLineNormalizerTest extends AbstractNormalizerTestCase
      *
      * @param string $whitespace
      */
-    public function testNormalizeEnsuresSingleFinalNewLine(string $whitespace)
+    public function testNormalizeEnsuresSingleFinalNewLine(string $whitespace): void
     {
         $json = <<<'JSON'
 {

diff --git a/test/Unit/FixedFormatNormalizerTest.php b/test/Unit/FixedFormatNormalizerTest.php
@@ -27,7 +27,7 @@ final class FixedFormatNormalizerTest extends AbstractNormalizerTestCase
      * @param bool   $hasFinalNewLine
      * @param string $suffix
      */
-    public function testNormalizeEncodesWithJsonEncodeOptionsIndentsAndPossiblySuffixesWithFinalNewLine(bool $hasFinalNewLine, string $suffix)
+    public function testNormalizeEncodesWithJsonEncodeOptionsIndentsAndPossiblySuffixesWithFinalNewLine(bool $hasFinalNewLine, string $suffix): void
     {
         $faker = $this->faker();
 
@@ -116,7 +116,7 @@ public function providerFinalNewLine(): \Generator
             ],
         ];
 
-        foreach ($values as $key => list($hasFinalNewLine, $suffix)) {
+        foreach ($values as $key => [$hasFinalNewLine, $suffix]) {
             yield $key => [
                 $hasFinalNewLine,
                 $suffix,

diff --git a/test/Unit/Format/FormatSnifferTest.php b/test/Unit/Format/FormatSnifferTest.php
@@ -23,12 +23,12 @@ final class FormatSnifferTest extends Framework\TestCase
 {
     use Helper;
 
-    public function testImplementsSnifferInterface()
+    public function testImplementsSnifferInterface(): void
     {
         $this->assertClassImplementsInterface(FormatSnifferInterface::class, FormatSniffer::class);
     }
 
-    public function testSniffRejectsInvalidJson()
+    public function testSniffRejectsInvalidJson(): void
     {
         $json = $this->faker()->realText();
 
@@ -49,7 +49,7 @@ public function testSniffRejectsInvalidJson()
      * @param int    $jsonEncodeOptions
      * @param string $json
      */
-    public function testSniffReturnsFormatWithJsonEncodeOptions(int $jsonEncodeOptions, string $json)
+    public function testSniffReturnsFormatWithJsonEncodeOptions(int $jsonEncodeOptions, string $json): void
     {
         $sniffer = new FormatSniffer();
 
@@ -98,7 +98,7 @@ public function providerJsonAndJsonEncodeOptions(): array
      *
      * @param string $json
      */
-    public function testSniffReturnsFormatWithDefaultIndentIfUnableToSniff(string $json)
+    public function testSniffReturnsFormatWithDefaultIndentIfUnableToSniff(string $json): void
     {
         $sniffer = new FormatSniffer();
 
@@ -129,7 +129,7 @@ public function providerJsonWithoutWhitespace(): \Generator
      *
      * @param string $indent
      */
-    public function testSniffReturnsFormatWithIndentSniffedFromArray(string $indent)
+    public function testSniffReturnsFormatWithIndentSniffedFromArray(string $indent): void
     {
         $json = <<<JSON
 [
@@ -154,7 +154,7 @@ public function testSniffReturnsFormatWithIndentSniffedFromArray(string $indent)
      *
      * @param string $indent
      */
-    public function testSniffReturnsFormatWithIndentIndentSniffedFromObject(string $indent)
+    public function testSniffReturnsFormatWithIndentIndentSniffedFromObject(string $indent): void
     {
         $json = <<<JSON
 {
@@ -199,7 +199,7 @@ public function providerIndent(): \Generator
      *
      * @param string $actualWhitespace
      */
-    public function testSniffReturnsFormatWithoutFinalNewLineIfThereIsNoFinalNewLine(string $actualWhitespace)
+    public function testSniffReturnsFormatWithoutFinalNewLineIfThereIsNoFinalNewLine(string $actualWhitespace): void
     {
         $json = <<<'JSON'
 {
@@ -243,7 +243,7 @@ public function providerWhitespaceWithoutNewLine(): \Generator
      *
      * @param string $actualWhitespace
      */
-    public function testSniffReturnsFormatWithFinalNewLineIfThereIsAtLeastOneFinalNewLine(string $actualWhitespace)
+    public function testSniffReturnsFormatWithFinalNewLineIfThereIsAtLeastOneFinalNewLine(string $actualWhitespace): void
     {
         $json = <<<'JSON'
 {

diff --git a/test/Unit/Format/FormatTest.php b/test/Unit/Format/FormatTest.php
@@ -22,12 +22,12 @@ final class FormatTest extends Framework\TestCase
 {
     use Helper;
 
-    public function testImplementsFormatInterface()
+    public function testImplementsFormatInterface(): void
     {
         $this->assertClassImplementsInterface(FormatInterface::class, Format::class);
     }
 
-    public function testConstructorRejectsInvalidEncodeOptions()
+    public function testConstructorRejectsInvalidEncodeOptions(): void
     {
         $jsonEncodeOptions = -1;
         $indent = '  ';
@@ -51,7 +51,7 @@ public function testConstructorRejectsInvalidEncodeOptions()
      *
      * @param string $indent
      */
-    public function testConstructorRejectsInvalidIndent(string $indent)
+    public function testConstructorRejectsInvalidIndent(string $indent): void
     {
         $jsonEncodeOptions = 0;
         $hasFinalNewLine = true;
@@ -89,7 +89,7 @@ public function providerInvalidIndent(): \Generator
      * @param string $indent
      * @param bool   $hasFinalNewLine
      */
-    public function testConstructorSetsValues(string $indent, bool $hasFinalNewLine)
+    public function testConstructorSetsValues(string $indent, bool $hasFinalNewLine): void
     {
         $jsonEncodeOptions = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
 

diff --git a/test/Unit/IndentNormalizerTest.php b/test/Unit/IndentNormalizerTest.php
@@ -24,7 +24,7 @@ final class IndentNormalizerTest extends AbstractNormalizerTestCase
      *
      * @param string $indent
      */
-    public function testConstructorRejectsInvalidIndent(string $indent)
+    public function testConstructorRejectsInvalidIndent(string $indent): void
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage(\sprintf(
@@ -52,7 +52,7 @@ public function providerInvalidIndent(): \Generator
         }
     }
 
-    public function testNormalizeUsesPrinterToNormalizeJsonWithIndent()
+    public function testNormalizeUsesPrinterToNormalizeJsonWithIndent(): void
     {
         $indent = '  ';
 

diff --git a/test/Unit/JsonEncodeNormalizerTest.php b/test/Unit/JsonEncodeNormalizerTest.php
@@ -17,7 +17,7 @@
 
 final class JsonEncodeNormalizerTest extends AbstractNormalizerTestCase
 {
-    public function testConstructorRejectsInvalidJsonEncodeOptions()
+    public function testConstructorRejectsInvalidJsonEncodeOptions(): void
     {
         $jsonEncodeOptions = -1;
 
@@ -35,7 +35,7 @@ public function testConstructorRejectsInvalidJsonEncodeOptions()
      *
      * @param int $jsonEncodeOptions
      */
-    public function testNormalizeDecodesAndEncodesJsonWithJsonEncodeOptions(int $jsonEncodeOptions)
+    public function testNormalizeDecodesAndEncodesJsonWithJsonEncodeOptions(int $jsonEncodeOptions): void
     {
         $json = <<<'JSON'
 {

diff --git a/test/Unit/NoFinalNewLineNormalizerTest.php b/test/Unit/NoFinalNewLineNormalizerTest.php
@@ -22,7 +22,7 @@ final class NoFinalNewLineNormalizerTest extends AbstractNormalizerTestCase
      *
      * @param string $whitespace
      */
-    public function testNormalizeRemovesAllWhitespaceFromEndOfJson(string $whitespace)
+    public function testNormalizeRemovesAllWhitespaceFromEndOfJson(string $whitespace): void
     {
         $json = <<<'JSON'
 {

diff --git a/test/Unit/ProjectCodeTest.php b/test/Unit/ProjectCodeTest.php
@@ -20,12 +20,12 @@ final class ProjectCodeTest extends Framework\TestCase
 {
     use Helper;
 
-    public function testProductionClassesAreAbstractOrFinal()
+    public function testProductionClassesAreAbstractOrFinal(): void
     {
         $this->assertClassesAreAbstractOrFinal(__DIR__ . '/../../src');
     }
 
-    public function testProductionClassesHaveTests()
+    public function testProductionClassesHaveTests(): void
     {
         $this->assertClassesHaveTests(
             __DIR__ . '/../../src',
@@ -34,7 +34,7 @@ public function testProductionClassesHaveTests()
         );
     }
 
-    public function testTestClassesAreAbstractOrFinal()
+    public function testTestClassesAreAbstractOrFinal(): void
     {
         $this->assertClassesAreAbstractOrFinal(__DIR__ . '/..');
     }