Skip to content

Commit 3273ea3

Browse files
qa: Update workflows and bump deps, run tests on PHP 8.2 (#13)
1 parent a51c538 commit 3273ea3

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

.github/workflows/tests.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
php-version:
16+
- '8.2'
1617
- '8.1'
1718
- '8.0'
1819
- '7.4'
@@ -31,6 +32,20 @@ jobs:
3132
- '0.8.0'
3233

3334
exclude:
35+
# PHP 8.2 Exclusions
36+
- php-version: '8.2'
37+
mockery-version: '1.3.0'
38+
- php-version: '8.2'
39+
mockery-version: '1.2.0'
40+
- php-version: '8.2'
41+
mockery-version: '1.1.0'
42+
- php-version: '8.2'
43+
mockery-version: '1.0.0'
44+
- php-version: '8.2'
45+
mockery-version: '0.9.0'
46+
- php-version: '8.2'
47+
mockery-version: '0.8.0'
48+
3449
# PHP 8.1 Exclusions
3550
- php-version: '8.1'
3651
mockery-version: '1.3.0'
@@ -86,9 +101,7 @@ jobs:
86101
name: Mockery ${{ matrix.mockery-version }} on PHP ${{ matrix.php-version }}
87102
steps:
88103
- name: Checkout
89-
uses: actions/checkout@v2
90-
with:
91-
ref: ${{ github.head_ref }}
104+
uses: actions/checkout@v3
92105

93106
- name: Install PHP
94107
uses: shivammathur/setup-php@v2
@@ -103,7 +116,7 @@ jobs:
103116
run: vendor/bin/phpunit
104117

105118
- name: Test Flight
106-
if: matrix.php-version != '8.1'
119+
if: matrix.php-version != '8.1' && matrix.php-version != '8.2'
107120
run: |
108121
vendor/bin/test-flight README.md
109122
vendor/bin/test-flight classes/

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"require": {
2020
"php": ">=5.6",
2121
"mockery/mockery": "^1",
22-
"php-mock/php-mock-integration": "^2"
22+
"php-mock/php-mock-integration": "^2.2.1"
2323
},
2424
"require-dev": {
2525
"phpunit/phpunit": "^4|^5|^8"

tests/PHPMockeryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace phpmock\mockery;
44

5-
use phpmock\AbstractMockTest;
5+
use phpmock\AbstractMockTestCase;
66
use Mockery;
77
use Mockery\MockInterface;
88

@@ -14,7 +14,7 @@
1414
* @license http://www.wtfpl.net/txt/copying/ WTFPL
1515
* @see PHPMockery
1616
*/
17-
class PHPMockeryTest extends AbstractMockTest
17+
class PHPMockeryTest extends AbstractMockTestCase
1818
{
1919

2020
protected function disableMocks()

0 commit comments

Comments
 (0)