From 7903a6132da10424badd73ff093ba949587f943c Mon Sep 17 00:00:00 2001 From: Felix Schulze <8378750+schulzefelix@users.noreply.github.com> Date: Sun, 15 Sep 2019 22:28:59 +0200 Subject: [PATCH] Add Laravel 6 Support --- .scrutinizer.yml | 5 ----- .travis.yml | 5 +---- CHANGELOG.md | 2 ++ composer.json | 10 +++++----- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 6077f3f..1165e72 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -16,8 +16,3 @@ checks: fix_line_ending: true fix_identation_4spaces: true fix_doc_comments: true - -tools: - external_code_coverage: - timeout: 120 - runs: 4 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6f01948..7753527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,4 @@ before_script: - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source script: - - phpunit --coverage-text --coverage-clover=coverage.clover - -after_script: - - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover \ No newline at end of file + - phpunit --coverage-text --coverage-clover=coverage.clover \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index cd3423b..dc381ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog All Notable changes to `Laravel AdWords Targeting Idea Service` will be documented in this file. +## [1.5.0] - 2019-09-15 +- add support for Laravel 6 ## [1.4.1] - 2019-03-10 - fix dependencies for carbon v2 diff --git a/composer.json b/composer.json index 307e8b2..10f7418 100644 --- a/composer.json +++ b/composer.json @@ -19,14 +19,14 @@ } ], "require": { - "php": ">=7.1.0", - "laravel/framework": "~5.8.0", - "googleads/googleads-php-lib": "^40.0", - "schulzefelix/laravel-data-transfer-object": "^1.1.0" + "php": "^7.2", + "laravel/framework": "^6.0", + "googleads/googleads-php-lib": "^43.0", + "schulzefelix/laravel-data-transfer-object": "^1.2.0" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench" : "~3.8.0", + "orchestra/testbench": "^4.0", "phpunit/phpunit" : "^8.0" }, "autoload": {