Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Laravel 6 Support #12

Merged
merged 1 commit into from
Sep 15, 2019
Merged

Add Laravel 6 Support #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .scrutinizer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
- phpunit --coverage-text --coverage-clover=coverage.clover
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down