Skip to content

Commit 9be8220

Browse files
korobovntarampampam
authored andcommitted
Update illuminate up to 6.x (#6)
1 parent d8bbc73 commit 9be8220

File tree

6 files changed

+69
-11
lines changed

6 files changed

+69
-11
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Fixes # (issue)
1818
- [ ] My code follows the style guidelines of this project
1919
- [ ] I have performed a self-review of my own code
2020
- [ ] I have commented my code, particularly in hard-to-understand areas
21-
- [ ] I wrote unit tests for my code
21+
- [ ] I wrote unit tests for my code _(if tests is required for my changes)_
2222
- [ ] I have made changes in [CHANGELOG.md](https://github.com/avto-dev/app-version-laravel/blob/master/CHANGELOG.md) file
2323

2424
<!--
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Execute tests
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags-ignore:
8+
- '**'
9+
pull_request:
10+
11+
jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-actions>
12+
tests:
13+
name: PHP ${{ matrix.php }}, ${{ matrix.setup }} setup
14+
runs-on: ubuntu-latest
15+
timeout-minutes: 10
16+
strategy:
17+
matrix:
18+
setup: ['basic', 'lowest']
19+
php: ['7.1', '7.2', '7.3']
20+
steps:
21+
- name: Check out code
22+
uses: actions/checkout@v1
23+
with:
24+
fetch-depth: 1
25+
26+
- name: Setup PHP, with composer and extensions
27+
uses: shivammathur/setup-php@master # Action page: <https://github.com/shivammathur/setup-php>
28+
with:
29+
php-version: ${{ matrix.php }}
30+
31+
- name: Install Composer 'hirak/prestissimo' package
32+
run: composer global require hirak/prestissimo --update-no-dev
33+
34+
- name: Install lowest Composer dependencies
35+
if: matrix.setup == 'lowest'
36+
run: composer update --prefer-dist --no-interaction --no-suggest --prefer-lowest
37+
38+
- name: Install basic Composer dependencies
39+
if: matrix.setup == 'basic'
40+
run: composer update --prefer-dist --no-interaction --no-suggest
41+
42+
- name: Show most important packages versions
43+
run: composer info | grep -e laravel/laravel -e phpunit/phpunit -e phpstan/phpstan
44+
45+
- name: Execute tests
46+
run: composer test

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ matrix:
4141
env: laravel=5.5
4242
- php: 7.1.3
4343
env: laravel=5.6
44-
- php: 7.1.3
45-
env: laravel=5.7
4644
- php: 7.1.3
4745
env: coverage=true
4846

4947
- php: 7.2
5048
env: setup=lowest
5149
- php: 7.2
52-
env: coverage=true
50+
env: laravel=5.8
51+
- php: 7.2
52+
env: coverage=true laravel=6.*
5353

5454
- php: 7.3
5555
env: setup=lowest
@@ -60,7 +60,9 @@ matrix:
6060
- php: 7.3
6161
env: laravel=5.7
6262
- php: 7.3
63-
env: coverage=true
63+
env: laravel=5.8
64+
- php: 7.3
65+
env: coverage=true laravel=6.*
6466

6567
- php: nightly
6668

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
66

7+
## v2.1.0
8+
9+
### Changed
10+
11+
- Maximal `illuminate/*` packages version now is `6.*`
12+
13+
### Added
14+
15+
- GitHub actions for a tests running
16+
717
## v2.0.1
818

919
### Fixed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM composer:1.8.6 AS composer
22

3-
FROM php:7.1.3-alpine
3+
FROM php:7.2.0-alpine
44

55
ENV \
66
COMPOSER_ALLOW_SUPERUSER="1" \

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
],
1616
"require": {
1717
"php": "^7.1.3",
18-
"illuminate/contracts": ">=5.5.0 <5.9.0",
19-
"illuminate/container": ">=5.5.0 <5.9.0",
20-
"illuminate/support": ">=5.5.0 <5.9.0",
21-
"illuminate/view": ">=5.5.0 <5.9.0"
18+
"illuminate/contracts": ">=5.5.0 <5.9.0 || ~6.0",
19+
"illuminate/container": ">=5.5.0 <5.9.0 || ~6.0",
20+
"illuminate/support": ">=5.5.0 <5.9.0 || ~6.0",
21+
"illuminate/view": ">=5.5.0 <5.9.0 || ~6.0"
2222
},
2323
"require-dev": {
24-
"laravel/laravel": ">=5.5.0 <5.9.0",
24+
"laravel/laravel": ">=5.5.0 <5.9.0 || ~6.0",
2525
"mockery/mockery": "^1.0",
2626
"phpstan/phpstan": "^0.11.3",
2727
"phpunit/phpunit": "^6.4 || ~7.5"

0 commit comments

Comments
 (0)