From 38077debac0a2356afc0de5096dd7a15c79e5713 Mon Sep 17 00:00:00 2001 From: Anton Komarev Date: Wed, 14 Feb 2018 20:25:29 +0300 Subject: [PATCH] Add Laravel 5.6 support (#11) * Add Laravel 5.6 support * Drop support of Laravel lower than 5.5 --- .php_cs | 8 ++++---- .styleci.yml | 1 + .travis.yml | 1 - CHANGELOG.md | 17 ++++++++++++++++- LICENSE | 2 +- composer.json | 16 ++++++++-------- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.php_cs b/.php_cs index 189938b..c045e14 100644 --- a/.php_cs +++ b/.php_cs @@ -1,9 +1,9 @@ notPath('bootstrap/cache') - ->notPath('storage') - ->notPath('vendor') + ->notPath('bootstrap/cache') + ->notPath('storage') + ->notPath('vendor') ->in(__DIR__) ->name('*.php') ->ignoreDotFiles(true) @@ -23,7 +23,7 @@ $fixers = [ 'list_commas', 'multiline_array_trailing_comma', 'namespace_no_leading_whitespace', - 'newline_after_open_tag', + 'newline_after_open_tag', 'no_blank_lines_after_class_opening', 'no_empty_lines_after_phpdocs', 'object_operator', diff --git a/.styleci.yml b/.styleci.yml index 22dd2f9..e5293dc 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -5,3 +5,4 @@ disabled: - phpdoc_no_package - logical_not_operators_with_successor_space - length_ordered_imports + - simplified_null_return diff --git a/.travis.yml b/.travis.yml index 80179f1..054a1fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: php sudo: false php: - - 7.0 - 7.1 - 7.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index a7d97ac..98698d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,25 @@ All notable changes to `laravel-optimus` will be documented in this file. +## [3.0.0] - 2017-02-14 + +### Added + +- ([#11](https://github.com/cybercog/laravel-optimus/pull/11)) Laravel 5.6 support + +### Changed + +- ([#11](https://github.com/cybercog/laravel-optimus/pull/11)) Minimum PHP required 7.1.3 because of manager dependency + +### Removed + +- ([#11](https://github.com/cybercog/laravel-optimus/pull/11)) Dropped support of Laravel lower than 5.5 + ## [2.1.0] - 2017-10-16 ### Added -- Implicit route model binding ([#6](https://github.com/cybercog/laravel-optimus/pull/6)) +- ([#6](https://github.com/cybercog/laravel-optimus/pull/6)) Implicit route model binding ## [2.0.0] - 2017-09-09 @@ -23,5 +37,6 @@ All notable changes to `laravel-optimus` will be documented in this file. Initial release +[3.0.0]: https://github.com/cybercog/laravel-optimus/compare/2.1.0...3.0.0 [2.1.0]: https://github.com/cybercog/laravel-optimus/compare/2.0.0...2.1.0 [2.0.0]: https://github.com/cybercog/laravel-optimus/compare/1.0.0...2.0.0 diff --git a/LICENSE b/LICENSE index 561aa76..f72d2f8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017, Anton Komarev +Copyright (c) 2018, Anton Komarev Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/composer.json b/composer.json index 8c06ff0..315b5ba 100644 --- a/composer.json +++ b/composer.json @@ -34,17 +34,17 @@ "docs": "https://github.com/cybercog/laravel-optimus/wiki" }, "require": { - "php": "^7.0", - "graham-campbell/manager": "^3.0", - "illuminate/contracts": "~5.2|~5.3|~5.4|~5.5", - "illuminate/support": "~5.2|~5.3|~5.4|~5.5", + "php": "^7.1.3", + "graham-campbell/manager": "^4.0", + "illuminate/contracts": "~5.5|~5.6", + "illuminate/support": "~5.5|~5.6", "jenssegers/optimus": "^0.2.2" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^1.11", - "graham-campbell/testbench": "^4.0", - "mockery/mockery": "^0.9.8", - "phpunit/phpunit": "^6.2" + "friendsofphp/php-cs-fixer": "^2.10", + "graham-campbell/testbench": "^5.0", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.5|^7.0" }, "autoload": { "psr-4": {