Skip to content

Commit 0359bff

Browse files
committed
Support Laravel 8
1 parent b68093a commit 0359bff

File tree

10 files changed

+93
-47
lines changed

10 files changed

+93
-47
lines changed
File renamed without changes.

.github/SECURITY.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Security Policy
2+
3+
If you discover any security related issues, please email freek@spatie.be instead of using the issue tracker.

.github/workflows/php-cs-fixer.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Check & fix styling
2+
3+
on: [push]
4+
5+
jobs:
6+
style:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v2
12+
13+
- name: Fix style
14+
uses: docker://oskarstark/php-cs-fixer-ga
15+
with:
16+
args: --config=.php_cs --allow-risky=yes
17+
18+
- name: Extract branch name
19+
shell: bash
20+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
21+
id: extract_branch
22+
23+
- name: Commit changes
24+
uses: stefanzweifel/git-auto-commit-action@v2.3.0
25+
with:
26+
commit_message: Fix styling
27+
branch: ${{ steps.extract_branch.outputs.branch }}
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/psalm.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/run-tests.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,28 @@ jobs:
1414
fail-fast: true
1515
matrix:
1616
php: [7.4]
17-
laravel: [7.*]
17+
laravel: [7.*, 8.*]
1818
dependency-version: [prefer-lowest, prefer-stable]
1919
include:
20+
- laravel: 8.*
21+
testbench: 6.*
2022
- laravel: 7.*
2123
testbench: 5.*
2224

2325
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
2426

2527
steps:
2628
- name: Checkout code
27-
uses: actions/checkout@v1
29+
uses: actions/checkout@v2
2830

2931
- name: Cache dependencies
30-
uses: actions/cache@v1
32+
uses: actions/cache@v2
3133
with:
3234
path: ~/.composer/cache/files
3335
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
3436

3537
- name: Setup PHP
36-
uses: shivammathur/setup-php@v1
38+
uses: shivammathur/setup-php@v2
3739
with:
3840
php-version: ${{ matrix.php }}
3941
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ docs
44
vendor
55
tests/temp
66
.phpunit.result.cache
7+
.php_cs.cache

.php_cs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
3+
$finder = Symfony\Component\Finder\Finder::create()
4+
->notPath('bootstrap/*')
5+
->notPath('storage/*')
6+
->notPath('vendor')
7+
->in([
8+
__DIR__ . '/src',
9+
__DIR__ . '/tests',
10+
])
11+
->name('*.php')
12+
->notName('*.blade.php')
13+
->ignoreDotFiles(true)
14+
->ignoreVCS(true);
15+
16+
return PhpCsFixer\Config::create()
17+
->setRules([
18+
'@PSR2' => true,
19+
'array_syntax' => ['syntax' => 'short'],
20+
'ordered_imports' => ['sortAlgorithm' => 'alpha'],
21+
'no_unused_imports' => true,
22+
'not_operator_with_successor_space' => true,
23+
'trailing_comma_in_multiline_array' => true,
24+
'phpdoc_scalar' => true,
25+
'unary_operator_spaces' => true,
26+
'binary_operator_spaces' => true,
27+
'blank_line_before_statement' => [
28+
'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
29+
],
30+
'phpdoc_single_line_var_spacing' => true,
31+
'phpdoc_var_without_name' => true,
32+
'class_attributes_separation' => [
33+
'elements' => [
34+
'method', 'property',
35+
],
36+
],
37+
'method_argument_space' => [
38+
'on_multiline' => 'ensure_fully_multiline',
39+
'keep_multiple_spaces_after_comma' => true,
40+
]
41+
])
42+
->setFinder($finder);

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to `laravel-responsecache` will be documented in this file.
44

5+
## 6.6.4 - 2020-09-09
6+
7+
- Support Laravel 8
8+
59
## 6.6.3 - 2020-08-24
610

711
- replace Laravel/framework with individual packages (#304)

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![Latest Version on Packagist](https://img.shields.io/packagist/v/spatie/laravel-responsecache.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-responsecache)
44
[![MIT Licensed](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
5-
[![Quality Score](https://img.shields.io/scrutinizer/g/spatie/laravel-responsecache.svg?style=flat-square)](https://scrutinizer-ci.com/g/spatie/laravel-responsecache)
65
![Psalm](https://github.com/spatie/laravel-responsecache/workflows/psalm/badge.svg)
76
[![Total Downloads](https://img.shields.io/packagist/dt/spatie/laravel-responsecache.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-responsecache)
87

composer.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,18 @@
2121
],
2222
"require": {
2323
"php": "^7.4",
24-
"illuminate/cache": "^7.13",
25-
"illuminate/container": "^7.13",
26-
"illuminate/console": "^7.13",
27-
"illuminate/http": "^7.13",
28-
"illuminate/support": "^7.13",
24+
"illuminate/cache": "^7.13|^8.0",
25+
"illuminate/container": "^7.13|^8.0",
26+
"illuminate/console": "^7.13|^8.0",
27+
"illuminate/http": "^7.13|^8.0",
28+
"illuminate/support": "^7.13|^8.0",
2929
"nesbot/carbon": "^2.35"
3030
},
3131
"require-dev": {
32-
"laravel/framework": "^7.13",
32+
"laravel/framework": "^7.13|^8.0",
3333
"phpunit/phpunit" : "^9.1.5",
34-
"orchestra/testbench": "^5.2",
35-
"mockery/mockery": "^1.4",
36-
"vimeo/psalm": "^3.11"
34+
"orchestra/testbench": "^5.2|^6.0",
35+
"mockery/mockery": "^1.4"
3736
},
3837
"autoload": {
3938
"psr-4": {

0 commit comments

Comments
 (0)