Merge branch 'release/1.1.0'

.gitignore

@@ -2,4 +2,5 @@ composer.phar
 composer.lock
 /vendor/
 /.idea/
-/.phpunit.result.cache
+/.phpunit.result.cache
+/build

.travis.yml

@@ -8,19 +8,30 @@ matrix:
   include:
     # Latest dependencies with all PHP versions
     - php: 7.2
+    - php: 7.2
+      env: COMPOSER_UPDATE_FLAGS='--prefer-lowest --prefer-stable'
+    - php: 7.3
     - php: 7.3
+      env: COMPOSER_UPDATE_FLAGS='--prefer-lowest --prefer-stable'
     - php: 7.4
+    - php: 7.4
+      env: COMPOSER_UPDATE_FLAGS='--prefer-lowest --prefer-stable'
 
       # Ignore the platform requirements for the upcoming PHP version
     - php: nightly
       env: COMPOSER_FLAGS='--ignore-platform-reqs'
+    - php: nightly
+      env:
+        - COMPOSER_FLAGS='--ignore-platform-reqs'
+          COMPOSER_UPDATE_FLAGS='--prefer-lowest --prefer-stable --ignore-platform-reqs'
   allow_failures:
     - php: nightly
   fast_finish: true
 
 install:
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev --no-interaction $COMPOSER_FLAGS
+  - if [[ -n $COMPOSER_UPDATE_FLAGS ]]; then php composer.phar update $COMPOSER_UPDATE_FLAGS; fi
 
 script:
   - mkdir -p build/logs;

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2020-07-12
+### Fixed
+- Optimised composer dependencies. [PR#2](https://github.com/JsonMapper/LaravelPackage/pull/2)
+
 ## [1.0.1] - 2020-04-28
 ### Fixed	
 - Fixed readme shields

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 JsonMapper
+Copyright (c) 2020 Danny van der Sluijs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,9 +1,10 @@
-![Logo](https://jsonmapper.github.io/JsonMapper/images/jsonmapper.png)
+![Logo](https://jsonmapper.net/images/jsonmapper.png)
+
 ---
 **This is a Laravel package for using JsonMapper in you Laravel application.** 
 
 JsonMapper is a PHP library that allows you to map a JSON response to your PHP objects that are either annotated using doc blocks or use typed properties.
-For more information see the project website: https://jsonmapper.github.io/JsonMapper/
+For more information see the project website: https://jsonmapper.net
 
 ![GitHub](https://img.shields.io/github/license/JsonMapper/LaravelPackage)
 ![Packagist Version](https://img.shields.io/packagist/v/json-mapper/laravel-package)
@@ -40,4 +41,4 @@ Please refer to [CONTRIBUTING.md](https://github.com/JsonMapper/LaravelPackage/b
 Thanks to everyone who has contributed to JsonMapper Laravel package! You can find a detailed list of contributors of JsonMapper on [GitHub](https://github.com/JsonMapper/LaravelPackage/graphs/contributors).
 
 # License
-The MIT License (MIT). Please see [License File](https://github.com/JsonMapper/LaravelPackage/blob/master/LICENSE) for more information.
+The MIT License (MIT). Please see [License File](https://github.com/JsonMapper/LaravelPackage/blob/master/LICENSE) for more information.

Version

@@ -1 +1 @@
-1.0.1
+1.1.0

composer.json

@@ -13,8 +13,8 @@
     "minimum-stability": "stable",
     "require": {
         "json-mapper/json-mapper": "^1.0",
-        "laravel/framework": "^7.0",
-        "php": "^7.2 || ^8.0"
+        "php": "^7.2 || ^8.0",
+        "illuminate/support": "^5.5|^6|^7"
     },
     "autoload": {
         "psr-4": {
@@ -27,10 +27,10 @@
         }
     },
     "scripts": {
-        "phpcs": ["./vendor/bin/phpcs --standard=PSR12 src tests"],
-        "phpcbf": ["./vendor/bin/phpcbf --standard=PSR12 src tests"],
-        "phpstan": "./vendor/bin/phpstan analyse",
-        "unit-tests": "./vendor/bin/phpunit --testsuite unit --testdox --coverage-clover=build/logs/clover-unit-tests.xml"
+        "phpcs": "phpcs --standard=PSR12 src tests",
+        "phpcbf": "phpcbf --standard=PSR12 src tests",
+        "phpstan": "phpstan analyse",
+        "unit-tests": "phpunit --testsuite unit --testdox --coverage-clover=build/logs/clover-unit-tests.xml"
     },
     "extra": {
         "laravel": {
@@ -43,6 +43,7 @@
         "squizlabs/php_codesniffer": "^3.5",
         "phpstan/phpstan": "^0.12.19",
         "php-coveralls/php-coveralls": "^2.2",
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": "^8.0",
+        "orchestra/testbench": "^5.3"
     }
 }