Add Laravel 5.6 support (#11)

* Add Laravel 5.6 support * Drop support of Laravel lower than 5.5
cybercog · Feb 14, 2018 · 38077de · 38077de
1 parent bd477b1
commit 38077de
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,9 +1,9 @@
 <?php
 
 $finder = Symfony\Component\Finder\Finder::create()
-	->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
@@ -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
@@ -3,7 +3,6 @@ language: php
 sudo: false
 
 php:
-  - 7.0
   - 7.1
   - 7.2
 

diff --git 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
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017, Anton Komarev <[email protected]>
+Copyright (c) 2018, Anton Komarev <[email protected]>
 
 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
@@ -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": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ language: php @@
     sudo: false
     php:
-      - 7.0
       - 7.1
       - 7.2
@@ Expand Down @@