Skip to content

Commit

Permalink
Update for php8 (#649)
Browse files Browse the repository at this point in the history
  • Loading branch information
barryvdh authored Jun 1, 2021
1 parent 25ab940 commit 0caded2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
php: [7.4, 7.3, 7.2]
php: [8.0, 7.4, 7.3]
dependency-version: [prefer-lowest, prefer-stable]

name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
Expand All @@ -33,7 +33,7 @@ jobs:
with:
php-version: ${{ matrix.php }}
coverage: none
tools: composer
tools: composer:v2

- name: Install dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
}
],
"require": {
"php": "^7.2|^8.0",
"omnipay/common": "^3",
"php": "^7.3|^8.0",
"omnipay/common": "^3.1",
"php-http/discovery": "^1.12",
"php-http/guzzle7-adapter": "^0.1"
},
Expand All @@ -34,7 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "3.1.x-dev"
"dev-master": "3.2.x-dev"
}
},
"scripts": {
Expand Down
27 changes: 14 additions & 13 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
Expand All @@ -8,15 +9,15 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false">
<testsuites>
<testsuite name="Omnipay Test Suite">
<directory>./tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>./src</directory>
</whitelist>
</filter>
</phpunit>
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage>
<include>
<directory>./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Omnipay Test Suite">
<directory>./tests/</directory>
</testsuite>
</testsuites>
</phpunit>
2 changes: 1 addition & 1 deletion tests/OmnipayTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class OmnipayTest extends TestCase
{
public function tearDown()
public function tearDown(): void
{
Omnipay::setFactory(null);

Expand Down

0 comments on commit 0caded2

Please sign in to comment.