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

Commit 9fdedf4

Browse files
committed
Merge branch 'release/1.2.1'
2 parents afa5756 + 5852325 commit 9fdedf4

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0
1+
1.2.1

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.2",
20-
"illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|6.0.*",
20+
"illuminate/support": "~5.5|~6",
2121
"swiftmailer/swiftmailer": "~6.0",
2222
"phpunit/phpunit": "~7.0.1|~8.0"
2323
},

readme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ 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) | [![Coverage Status](https://coveralls.io/repos/spinen/laravel-mail-assertions/badge.svg?branch=develop&service=github)](https://coveralls.io/github/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) | [![Coverage Status](https://coveralls.io/repos/spinen/laravel-mail-assertions/badge.svg?branch=master&service=github)](https://coveralls.io/github/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://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) |
1818

1919
## Installation
2020

21-
Install the package:
21+
Install the package inside your dev dependencies:
2222

2323
```bash
24-
$ composer require spinen/laravel-mail-assertions
24+
$ composer require spinen/laravel-mail-assertions --dev
2525
```
2626

2727
## Configuration
@@ -30,7 +30,7 @@ In order for the package to be able to make assertions on your emails, it has to
3030

3131
## Usage
3232

33-
You mixin the assertions with the ```Spinen\MailAssertions\MailTracking``` trait. You get the following assertions...
33+
You mixin the assertions with the `Spinen\MailAssertions\MailTracking` trait. You get the following assertions...
3434

3535
* seeEmailBcc
3636
* seeEmailCc

src/MailTracking.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
use Swift_Message;
77

88
/**
9-
* Class MailTracking
9+
* Trait MailTracking
1010
*
1111
* Trait to mixin to your test to allow for custom assertions when using PHPUnit with Laravel. This trait assumes
12-
* you are extending from the PHPUnit TestCase class (or a child of it).
12+
* you are using it from the PHPUnit TestCase class (or a child class of it).
1313
*
1414
* This originally started out as a copy & paste from a video series that Jeffrey Way did on laracasts.com. If you do
1515
* not have an account on Laracasts, you should get one. It is an amazing resource to learn from. We used that
@@ -28,7 +28,6 @@ trait MailTracking
2828
// TODO: Add check for attachments (number of & name)
2929
// TODO: Add check for header
3030
// TODO: Add check for message type
31-
// TODO: Add check for Priority
3231
// TODO: Allow checking specific message not just most recent one
3332

3433
/**
@@ -41,7 +40,7 @@ trait MailTracking
4140
/**
4241
* Register a listener for new emails.
4342
*
44-
* This calls my PHPUnit before each test it runs. It registers the MailRecorder "plugin" with Swift, so that we
43+
* This calls our PHPUnit before each test it runs. It registers the MailRecorder "plugin" with Swift, so that we
4544
* can get a copy of each email that is sent during that test.
4645
*
4746
* @before
@@ -250,7 +249,7 @@ protected function seeEmailReplyTo($reply_to, Swift_Message $message = null)
250249
*
251250
* @param integer $count
252251
*
253-
* @return TestCase $this
252+
* @return MailTracking $this
254253
* @deprecated in favor of seeEmailCountEquals
255254
*/
256255
protected function seeEmailsSent($count)
@@ -280,7 +279,7 @@ protected function seeEmailCountEquals($count)
280279
* @param string $subject
281280
* @param Swift_Message|null $message
282281
*
283-
* @return TestCase $this
282+
* @return MailTracking $this
284283
* @deprecated in favor of seeEmailSubjectEquals
285284
*/
286285
protected function seeEmailSubject($subject, Swift_Message $message = null)

0 commit comments

Comments
 (0)