Skip to content

Commit 4980d98

Browse files
Merge branch 'laravel-shift-l8-compatibility'
2 parents cd7daac + d950367 commit 4980d98

File tree

10 files changed

+76
-29
lines changed

10 files changed

+76
-29
lines changed
File renamed without changes.

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Check & fix styling
2+
3+
on: [ push ]
4+
5+
jobs:
6+
php-cs-fixer:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v2
12+
with:
13+
ref: ${{ github.head_ref }}
14+
15+
- name: Run PHP CS Fixer
16+
uses: docker://oskarstark/php-cs-fixer-ga
17+
with:
18+
args: --config=.php_cs.dist --allow-risky=yes
19+
20+
- name: Commit changes
21+
uses: stefanzweifel/git-auto-commit-action@v4
22+
with:
23+
commit_message: Fix styling

.github/workflows/run-tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ jobs:
1010
matrix:
1111
os: [ubuntu-latest, windows-latest]
1212
php: [7.4]
13-
laravel: [5.8.*, 6.*, 7.*]
13+
laravel: [8.*, 5.8.*, 6.*, 7.*]
1414
dependency-version: [prefer-lowest, prefer-stable]
1515
include:
16+
- laravel: 8.*
17+
testbench: 6.*
1618
- laravel: 7.*
1719
testbench: 5.*
1820
- laravel: 6.*
@@ -24,10 +26,10 @@ jobs:
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') }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ build
22
composer.lock
33
docs
44
vendor
5+
.php_cs.cache

.php_cs.dist

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
$finder = Symfony\Component\Finder\Finder::create()
4+
->notPath('bootstrap/*')
5+
->notPath('storage/*')
6+
->notPath('resources/view/mail/*')
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+
'method_argument_space' => [
33+
'on_multiline' => 'ensure_fully_multiline',
34+
'keep_multiple_spaces_after_comma' => true,
35+
]
36+
])
37+
->setFinder($finder);

.scrutinizer.yml

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

.styleci.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

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-robots-middleware` will be documented in this file
44

5+
## 1.2.1 - 2020-09-09
6+
7+
- Add support for Laravel 8
8+
59
## 1.2.0 - 2020-03-03
610

711
- add support for Laravel 7

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Enable or disable the indexing of your app
22

33
[![Latest Version on Packagist](https://img.shields.io/packagist/v/spatie/laravel-robots-middleware.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-robots-middleware)
4-
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/spatie/laravel-blink/run-tests?label=tests)
5-
[![Quality Score](https://img.shields.io/scrutinizer/g/spatie/laravel-robots-middleware.svg?style=flat-square)](https://scrutinizer-ci.com/g/spatie/laravel-robots-middleware)
4+
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/spatie/laravel-robots-middleware/run-tests?label=tests)
5+
![Check & fix styling](https://github.com/spatie/laravel-robots-middleware/workflows/Check%20&%20fix%20styling/badge.svg)
66
[![Total Downloads](https://img.shields.io/packagist/dt/spatie/laravel-robots-middleware.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-robots-middleware)
77

88
A tiny, opinionated package to enable or disable indexing your site via a middleware in Laravel.

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"minimum-stability": "dev",
2222
"prefer-stable": true,
2323
"require": {
24-
"php" : "^7.2",
25-
"illuminate/http": "^5.8|^6.0|^7.0"
24+
"php": "^7.2",
25+
"illuminate/http": "^5.8|^6.0|^7.0|^8.0"
2626
},
2727
"require-dev": {
28-
"orchestra/testbench": "^3.8|^4.0|^5.0",
29-
"phpunit/phpunit" : "^8.0"
28+
"orchestra/testbench": "^3.8|^4.0|^5.0|^6.0",
29+
"phpunit/phpunit": "^8.0|^9.3"
3030
},
3131
"autoload": {
3232
"psr-4": {

0 commit comments

Comments
 (0)