Skip to content

Commit 3179068

Browse files
committed
Merge branch 'feature/issue-4'
2 parents e8e8099 + 2774ef9 commit 3179068

File tree

4 files changed

+64
-5
lines changed

4 files changed

+64
-5
lines changed

.github/workflows/ci.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
tests-php-5_3:
7+
runs-on: ubuntu-latest
8+
9+
strategy:
10+
matrix:
11+
php: [5.3]
12+
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v2
16+
17+
- name: Setup PHP
18+
uses: shivammathur/setup-php@v2
19+
with:
20+
php-version: ${{ matrix.php }}
21+
coverage: none
22+
23+
- name: Validate composer.json and composer.lock
24+
run: composer validate
25+
26+
- name: Install dependencies
27+
run: composer install --prefer-dist --no-progress --no-interaction --no-suggest
28+
29+
- name: Run test suite
30+
run: vendor/bin/phpunit
31+
32+
tests:
33+
runs-on: ubuntu-latest
34+
35+
strategy:
36+
matrix:
37+
php: [5.4, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
38+
39+
steps:
40+
- name: Checkout code
41+
uses: actions/checkout@v2
42+
43+
- name: Setup PHP
44+
uses: shivammathur/setup-php@v2
45+
with:
46+
php-version: ${{ matrix.php }}
47+
coverage: none
48+
49+
- name: Validate composer.json and composer.lock
50+
run: composer validate
51+
52+
- name: Install dependencies
53+
run: composer install --prefer-dist --no-progress --no-interaction --no-suggest
54+
55+
- name: Check code style
56+
run: vendor/bin/phpcs
57+
58+
- name: Run test suite
59+
run: vendor/bin/phpunit

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"ext-mbstring": "*"
1717
},
1818
"require-dev": {
19-
"phpunit/phpunit": "^4.8.35 || ^5.7",
20-
"squizlabs/php_codesniffer": "^3.5"
19+
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.5 || ^8.5 || 9.3",
20+
"squizlabs/php_codesniffer": "^2.9 || ^3.5"
2121
},
2222
"suggest": {
2323
"ext-fileinfo": "Mime-Type detecting"

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php" colors="true">
2+
<phpunit bootstrap="vendor/autoload.php" colors="true" cacheResult="false">
33
<testsuites>
44
<testsuite name="all">
55
<directory>tests</directory>

tests/MailerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class MailerTest extends TestCase
2727
*/
2828
private $factory;
2929

30-
public function setUp()
30+
public function __construct($name = null, $data = array(), $dataName = '')
3131
{
32-
parent::setUp();
32+
parent::__construct($name, (array)$data, $dataName);
3333
$this->factory = new MessageFactory();
3434
$this->transport = new MockTransport(function ($log) {
3535
});

0 commit comments

Comments
 (0)