Skip to content

Commit

Permalink
Merge pull request #256 from phil-davis/update-v3-20231109
Browse files Browse the repository at this point in the history
Update CI etc in v2
  • Loading branch information
phil-davis authored Nov 9, 2023
2 parents 6ee5e18 + 8ef4fdc commit 77ec45a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
code-analysis: 'yes'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.20",
"friendsofphp/php-cs-fixer": "^3.38",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit" : "^9.6"
},
Expand Down
14 changes: 8 additions & 6 deletions tests/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<?xml version="1.0"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
colors="true"
bootstrap="../vendor/autoload.php"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutOutputDuringTests="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
>
<coverage includeUncoveredFiles="true">
<include>
<directory suffix=".php">../lib/</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Sabre_XML">
<directory>.</directory>
</testsuite>
</testsuites>

<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">../lib/</directory>
</whitelist>
</filter>
</phpunit>

0 comments on commit 77ec45a

Please sign in to comment.