From f31cce8b884750db3e4e7b06e3ef759541a19814 Mon Sep 17 00:00:00 2001
From: Timm Friebe <thekid@thekid.de>
Date: Fri, 10 Apr 2020 13:23:56 +0200
Subject: [PATCH] Drop PHP 5.6 support

---
 .travis.yml                                              | 1 -
 ChangeLog.md                                             | 9 ++++++++-
 README.md                                                | 3 +--
 composer.json                                            | 2 +-
 src/main/php/text/json/MultiByteSource.class.php         | 4 +---
 src/main/php/text/json/StreamInput.class.php             | 3 +--
 src/test/php/text/json/unittest/FileInputTest.class.php  | 3 +--
 src/test/php/text/json/unittest/FileOutputTest.class.php | 6 ++----
 .../php/text/json/unittest/FormatFactoryTest.class.php   | 4 +---
 src/test/php/text/json/unittest/JsonTest.class.php       | 5 +----
 .../php/text/json/unittest/StreamInputTest.class.php     | 3 +--
 11 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a647cbd..0172c12 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ language: php
 dist: trusty
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
diff --git a/ChangeLog.md b/ChangeLog.md
index 7a843aa..49d2f4f 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,9 +3,16 @@ JSON for the XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 4.0.0 / 2020-04-10
+
+* Implemented xp-framework/rfc#334: Drop PHP 5.6:
+  . Group use statements
+  (@thekid)
+
 ## 3.1.2 / 2020-04-05
 
-* Implemented RFC #335: Remove deprecated key/value pair annotation syntax
+* Implemented xp-framework/rfc#335: Remove deprecated key/value pair
+  annotation syntax
   (@thekid)
 
 ## 3.1.1 / 2019-12-01
diff --git a/README.md b/README.md
index 15b910e..1b3fea4 100755
--- a/README.md
+++ b/README.md
@@ -4,8 +4,7 @@ JSON
 [![Build Status on TravisCI](https://secure.travis-ci.org/xp-forge/json.svg)](http://travis-ci.org/xp-forge/json)
 [![XP Framework Mdodule](https://raw.githubusercontent.com/xp-framework/web/master/static/xp-framework-badge.png)](https://github.com/xp-framework/core)
 [![BSD Licence](https://raw.githubusercontent.com/xp-framework/web/master/static/licence-bsd.png)](https://github.com/xp-framework/core/blob/master/LICENCE.md)
-[![Required PHP 5.6+](https://raw.githubusercontent.com/xp-framework/web/master/static/php-5_6plus.png)](http://php.net/)
-[![Supports PHP 7.0+](https://raw.githubusercontent.com/xp-framework/web/master/static/php-7_0plus.png)](http://php.net/)
+[![Requires PHP 7.0+](https://raw.githubusercontent.com/xp-framework/web/master/static/php-7_0plus.png)](http://php.net/)
 [![Latest Stable Version](https://poser.pugx.org/xp-forge/json/version.png)](https://packagist.org/packages/xp-forge/json)
 
 Reads and writes JSON to and from various input sources.
diff --git a/composer.json b/composer.json
index b6f5522..6cc39fc 100755
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
   "keywords": ["module", "xp"],
   "require" : {
     "xp-framework/core": "^10.0 | ^9.0 | ^8.0 | ^7.0 | ^6.5",
-    "php" : ">=5.6.0"
+    "php" : ">=7.0.0"
   },
   "require-dev" : {
     "xp-framework/unittest": "^11.0 | ^10.0 | ^9.0 | ^8.0 | ^7.0 | ^6.5"
diff --git a/src/main/php/text/json/MultiByteSource.class.php b/src/main/php/text/json/MultiByteSource.class.php
index a65d3d7..03bf5b4 100755
--- a/src/main/php/text/json/MultiByteSource.class.php
+++ b/src/main/php/text/json/MultiByteSource.class.php
@@ -1,9 +1,7 @@
 <?php namespace text\json;
 
-use io\streams\InputStream;
-use io\streams\Seekable;
-use io\streams\Streams;
 use io\IOException;
+use io\streams\{InputStream, Seekable, Streams};
 
 class MultiByteSource implements InputStream, Seekable {
   protected $in= null;
diff --git a/src/main/php/text/json/StreamInput.class.php b/src/main/php/text/json/StreamInput.class.php
index 10c0a37..fe64ac6 100755
--- a/src/main/php/text/json/StreamInput.class.php
+++ b/src/main/php/text/json/StreamInput.class.php
@@ -1,8 +1,7 @@
 <?php namespace text\json;
 
 use io\IOException;
-use io\streams\InputStream;
-use io\streams\Seekable;
+use io\streams\{InputStream, Seekable};
 use lang\FormatException;
 
 /**
diff --git a/src/test/php/text/json/unittest/FileInputTest.class.php b/src/test/php/text/json/unittest/FileInputTest.class.php
index 2f80020..0be0d80 100755
--- a/src/test/php/text/json/unittest/FileInputTest.class.php
+++ b/src/test/php/text/json/unittest/FileInputTest.class.php
@@ -1,7 +1,6 @@
 <?php namespace text\json\unittest;
 
-use io\File;
-use io\Path;
+use io\{File, Path};
 use lang\Environment;
 use text\json\FileInput;
 
diff --git a/src/test/php/text/json/unittest/FileOutputTest.class.php b/src/test/php/text/json/unittest/FileOutputTest.class.php
index 641a6ed..1097ef6 100755
--- a/src/test/php/text/json/unittest/FileOutputTest.class.php
+++ b/src/test/php/text/json/unittest/FileOutputTest.class.php
@@ -1,10 +1,8 @@
 <?php namespace text\json\unittest;
 
-use io\File;
-use io\Path;
+use io\{File, Path};
 use lang\Environment;
-use text\json\FileOutput;
-use text\json\Types;
+use text\json\{FileOutput, Types};
 
 class FileOutputTest extends JsonOutputTest {
 
diff --git a/src/test/php/text/json/unittest/FormatFactoryTest.class.php b/src/test/php/text/json/unittest/FormatFactoryTest.class.php
index dbc200c..dae8007 100755
--- a/src/test/php/text/json/unittest/FormatFactoryTest.class.php
+++ b/src/test/php/text/json/unittest/FormatFactoryTest.class.php
@@ -1,8 +1,6 @@
 <?php namespace text\json\unittest;
 
-use text\json\Format;
-use text\json\DenseFormat;
-use text\json\WrappedFormat;
+use text\json\{DenseFormat, Format, WrappedFormat};
 
 class FormatFactoryTest extends \unittest\TestCase {
 
diff --git a/src/test/php/text/json/unittest/JsonTest.class.php b/src/test/php/text/json/unittest/JsonTest.class.php
index f9c30c0..b5acbb6 100755
--- a/src/test/php/text/json/unittest/JsonTest.class.php
+++ b/src/test/php/text/json/unittest/JsonTest.class.php
@@ -1,10 +1,7 @@
 <?php namespace text\json\unittest;
 
-use text\json\Json;
-use text\json\Format;
-use text\json\StringInput;
-use text\json\StringOutput;
 use lang\FormatException;
+use text\json\{Format, Json, StringInput, StringOutput};
 
 class JsonTest extends \unittest\TestCase {
 
diff --git a/src/test/php/text/json/unittest/StreamInputTest.class.php b/src/test/php/text/json/unittest/StreamInputTest.class.php
index 3c0670f..634914c 100755
--- a/src/test/php/text/json/unittest/StreamInputTest.class.php
+++ b/src/test/php/text/json/unittest/StreamInputTest.class.php
@@ -1,8 +1,7 @@
 <?php namespace text\json\unittest;
 
 use io\IOException;
-use io\streams\InputStream;
-use io\streams\MemoryInputStream;
+use io\streams\{InputStream, MemoryInputStream};
 use text\json\StreamInput;
 
 /**