Merge pull request #75 from MarcinOrlowski/dev

Release 4.1.4
MarcinOrlowski · Feb 24, 2018 · 494d867 · 494d867
2 parents bbc0c22 + 6ca983b
commit 494d867
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,6 +27,7 @@ env:
   - LARAVEL_VERSION="5.3"
   - LARAVEL_VERSION="5.4"
   - LARAVEL_VERSION="5.5"
+  - LARAVEL_VERSION="5.6"
 
 matrix:
   exclude:
@@ -36,10 +37,16 @@ matrix:
       env: LARAVEL_VERSION="5.4"
     - php: 5.5
       env: LARAVEL_VERSION="5.5"
+    - php: 5.5
+      env: LARAVEL_VERSION="5.6"
     - php: 5.6
       env: LARAVEL_VERSION="5.5"
+    - php: 5.6
+      env: LARAVEL_VERSION="5.6"
     - php: hhvm
       env: LARAVEL_VERSION="5.5"
+    - php: hhvm
+      env: LARAVEL_VERSION="5.6"
 
 cache:
   directories:
@@ -58,3 +65,4 @@ script:
 after_success:
 #   IF coverage file is generated then upload it to Codacy
   - if [ -f /tmp/coverage.xml ] ; then vendor/bin/codacycoverage clover /tmp/coverage.xml ; fi
+
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,10 @@ See [compatibility docs](docs/compatibility.md) for details about backward compa
 
 ## CHANGE LOG ##
 
+* v4.1.4 (2018-02-24)
+   * Updated tests to run on PHP 5.6 too
+   * Corrected docs
+
 * v4.1.3 (2017-10-23)
    * Corrected docs
 

diff --git a/README.md b/README.md
@@ -14,9 +14,11 @@
 
 ## Table of contents ##
 
- * [Introduction[(#introduction)
+ * [Introduction](#introduction)
  * [Features](#features)
  * [Documentation](docs/docs.md)
+   [Requirements](docs/docs.md#requirements)
+ * [Installation and Configuration](docs/docs.md#installation-and-configuration)
  * [Bugs reports and pull requests](#contributing)
  * [License](#license)
  * [Changelog](CHANGES.md)
@@ -67,16 +69,16 @@ Nice and easy! And there's **much, much more** you can do with rich `ResponseBui
 
  * Easy to use,
  * [Stable and production ready](https://travis-ci.org/MarcinOrlowski/laravel-api-response-builder),
- * Laravel 5.x, 5.2, 5.3, 5.4 and 5.5 compatible,
- * Supports Laravel 5.5's auto-discovery feature
+ * Laravel 5.x, 5.2, 5.3, 5.4, 5.5 and 5.6 compatible,
+ * Supports Laravel [auto-discovery](https://medium.com/@taylorotwell/package-auto-discovery-in-laravel-5-5-ea9e3ab20518) (5.5 and up),
  * Works on PHP 5.5, 5.6, 7.0, 7.1, 7.2 and [HHVM](http://hhvm.com/),
  * Configurable (with ready-to-use defaults),
  * Localization support,
  * Automatic object conversion with custom mapping,
  * API chaining/cascading support,
  * Includes traits to help [unit testing your API code](docs/testing.md),
  * Provides own [exception handler helper](docs/exceptions.md) to ensure your API stays consumable even in case of unexpected,
- * No extra mandatory dependencies.
+ * No extra dependencies.
 
 ----
 
@@ -100,5 +102,6 @@ But if all is good and clear then follow common routine:
 
 ## License ##
 
-* Written and copyrighted &copy;2016-2017 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
+* Written and copyrighted &copy;2016-2018 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
 * ResponseBuilder is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
+
diff --git a/config/response_builder.php b/config/response_builder.php
@@ -4,7 +4,7 @@
  * Laravel API Response Builder - config file
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/src/ApiCodesHelpers.php b/src/ApiCodesHelpers.php
@@ -7,7 +7,7 @@
  *
  * @package   MarcinOrlowski\ResponseBuilder
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/src/BaseApiCodes.php b/src/BaseApiCodes.php
@@ -7,7 +7,7 @@
  *
  * @package   MarcinOrlowski\ResponseBuilder
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/src/ExceptionHandlerHelper.php b/src/ExceptionHandlerHelper.php
@@ -8,7 +8,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/src/ResponseBuilder.php b/src/ResponseBuilder.php
@@ -6,7 +6,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/src/ResponseBuilderServiceProvider.php b/src/ResponseBuilderServiceProvider.php
@@ -7,7 +7,7 @@
  *
  * @package   MarcinOrlowski\ResponseBuilder
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/src/lang/en/builder.php b/src/lang/en/builder.php
@@ -4,7 +4,7 @@
  * Laravel API Response Builder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-response-builder
  */

diff --git a/src/lang/pl/builder.php b/src/lang/pl/builder.php
@@ -4,7 +4,7 @@
  * Laravel API Response Builder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-response-builder
  */

diff --git a/tests/ApiCodeBaseTest.php b/tests/ApiCodeBaseTest.php
@@ -11,7 +11,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/BuildResponseTest.php b/tests/BuildResponseTest.php
@@ -13,7 +13,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/ErrorTest.php b/tests/ErrorTest.php
@@ -11,7 +11,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/ExceptionHandlerHelperTest.php b/tests/ExceptionHandlerHelperTest.php
@@ -17,7 +17,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/InternalsTest.php b/tests/InternalsTest.php
@@ -11,7 +11,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/Providers/ResponseBuilderServiceProvider.php b/tests/Providers/ResponseBuilderServiceProvider.php
@@ -7,7 +7,7 @@
  *
  * @package   MarcinOrlowski\ResponseBuilder
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/SuccessTest.php b/tests/SuccessTest.php
@@ -12,7 +12,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -8,7 +8,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/TestModel.php b/tests/TestModel.php
@@ -8,7 +8,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/Traits/ApiCodesTests.php b/tests/Traits/ApiCodesTests.php
@@ -6,7 +6,7 @@
  * @package   MarcinOrlowski\ResponseBuilder
  *
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/tests/Traits/TestingHelpers.php b/tests/Traits/TestingHelpers.php
@@ -7,7 +7,7 @@
  *
  * @package   MarcinOrlowski\ResponseBuilder
  * @author    Marcin Orlowski <mail (#) marcinorlowski (.) com>
- * @copyright 2016-2017 Marcin Orlowski
+ * @copyright 2016-2018 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */

diff --git a/travis/composer-5.6.json b/travis/composer-5.6.json
@@ -0,0 +1,24 @@
+{
+  "name": "marcin-orlowski/laravel-api-response-builder",
+  "require": {
+    "php": ">=7.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "MarcinOrlowski\\ResponseBuilder\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "MarcinOrlowski\\ResponseBuilder\\": "src",
+      "MarcinOrlowski\\ResponseBuilder\\Tests\\": "tests"
+    }
+  },
+  "require-dev": {
+    "orchestra/testbench": "3.4.*",
+    "laravel/framework": "5.4.*",
+    "phpunit/phpunit": "~5.7",
+    "phpunit/php-code-coverage": "^4.0.4",
+    "codacy/coverage": "~1.0"
+  }
+}