Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Commit 69de10c

Browse files
committed
Merge branch 'release/1.2.3'
2 parents 9ee60a9 + fd7b677 commit 69de10c

File tree

6 files changed

+63
-51
lines changed

6 files changed

+63
-51
lines changed

.gitattributes

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
* text=auto
2+
3+
/.github export-ignore
4+
/build export-ignore
5+
/tests export-ignore
6+
.gitattributes export-ignore
7+
.gitignore export-ignore
8+
nitpick.json export-ignore
9+
phpunit.xml.dist export-ignore

.github/workflows/ci.yml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
tests:
9+
10+
runs-on: ubuntu-latest
11+
12+
strategy:
13+
fail-fast: true
14+
matrix:
15+
php: [7.2, 7.3, 7.4]
16+
stability: [prefer-lowest, prefer-stable]
17+
18+
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
19+
20+
steps:
21+
- name: Checkout code
22+
uses: actions/checkout@v2
23+
24+
- name: Cache dependencies
25+
uses: actions/cache@v1
26+
with:
27+
path: ~/.composer/cache
28+
key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
29+
30+
- name: Setup PHP
31+
uses: shivammathur/setup-php@v2
32+
with:
33+
php-version: ${{ matrix.php }}
34+
coverage: pcov
35+
36+
- name: Install dependencies
37+
run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
38+
39+
- name: PHP Security Checker
40+
uses: StephaneBour/actions-php-security-checker@1.0
41+
if: ${{ matrix.stability == 'prefer-stable' }}
42+
with:
43+
composer-lock: './composer.lock'
44+
45+
- name: Execute tests
46+
run: vendor/bin/phpunit --coverage-clover=coverage.clover --verbose
47+
48+
- name: Upload Code Coverage
49+
run: wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover

.travis.yml

-46
This file was deleted.

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0
1+
1.2.3

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
],
2222
"require": {
2323
"php": ">=7.2",
24-
"illuminate/container": "~5.7|~6|~7",
25-
"illuminate/mail": "~5.7|~6|~7",
24+
"illuminate/container": "~5.7|~6|~7|~8",
25+
"illuminate/mail": "~5.7|~6|~7|~8",
2626
"swiftmailer/swiftmailer": "~6.2",
2727
"phpunit/phpunit": "^8.4|^9.0"
2828
},

readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ PHPUnit mail assertions for testing email in Laravel.
1313

1414
| Branch | Status | Coverage | Code Quality |
1515
| ------ | :----: | :------: | :----------: |
16-
| Develop | [![Build Status](https://travis-ci.org/spinen/laravel-mail-assertions.svg?branch=develop)](https://travis-ci.org/spinen/laravel-mail-assertions) | [![Code Coverage](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=develop) | [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=develop) |
17-
| Master | [![Build Status](https://travis-ci.org/spinen/laravel-mail-assertions.svg?branch=master)](https://travis-ci.org/spinen/laravel-mail-assertions) | [![Code Coverage](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=master) | [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=master) |
16+
| Develop | [![Build Status](https://github.com/spinen/laravel-mail-assertions/workflows/CI/badge.svg?branch=develop)](https://github.com/spinen/laravel-mail-assertions/workflows/CI/badge.svg?branch=develop) | [![Code Coverage](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=develop) | [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=develop) |
17+
| Master | [![Build Status](https://github.com/spinen/laravel-mail-assertions/workflows/CI/badge.svg?branch=master)](https://github.com/spinen/laravel-mail-assertions/workflows/CI/badge.svg?branch=master) | [![Code Coverage](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=master) | [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/spinen/laravel-mail-assertions/?branch=master) |
1818

1919
## Installation
2020

0 commit comments

Comments
 (0)