Merge pull request #1 from Rkallenkoot/1.1.0-dev

1.1.0 dev
This commit is contained in:
Roelof Kallenkoot 2021-04-23 02:04:48 +02:00 committed by GitHub
commit 20493f5885
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 35 deletions

View file

@ -9,10 +9,10 @@
} }
], ],
"require": { "require": {
"php": ">=5.6.0", "php": "^7.2.0|^8.0",
"illuminate/support": "^5.3 || ^6.0 || ^7.0", "illuminate/support": "^6.0 || ^7.0 || ^8.0",
"illuminate/routing": "^5.3 || ^6.0 || ^7.0", "illuminate/routing": "^6.0 || ^7.0 || ^8.0",
"jimdo/prometheus_client_php": "^0.9.0" "promphp/prometheus_client_php": "^2.2.2"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -22,7 +22,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "1.1.0-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
@ -34,7 +34,7 @@
} }
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.5", "phpunit/phpunit": "^9.0",
"mockery/mockery": "^0.9.5" "mockery/mockery": "^1.0"
} }
} }

View file

@ -1,29 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false" <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupStaticAttributes="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
bootstrap="./phpunit.php" backupGlobals="false"
colors="true" backupStaticAttributes="false"
convertErrorsToExceptions="true" bootstrap="./vendor/autoload.php"
convertNoticesToExceptions="true" colors="true"
convertWarningsToExceptions="true" convertErrorsToExceptions="true"
processIsolation="false" convertNoticesToExceptions="true"
stopOnFailure="false" convertWarningsToExceptions="true"
syntaxCheck="true" processIsolation="false"
verbose="true" stopOnFailure="false"
> verbose="true">
<testsuites> <coverage>
<testsuite name="laravel-prometheus-exporter/tests"> <include>
<directory suffix=".php">./tests/</directory> <directory suffix=".php">./src/</directory>
</testsuite> </include>
</testsuites> <report>
<filter> <clover outputFile="coverage.xml"/>
<whitelist> <html outputDirectory="coverage"/>
<directory suffix=".php">./src/</directory> <text outputFile="php://stdout" showUncoveredFiles="true"/>
</whitelist> </report>
</filter> </coverage>
<logging> <testsuites>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/> <testsuite name="laravel-prometheus-exporter/tests">
<log type="coverage-html" target="coverage" showUncoveredFiles="true"/> <directory suffix=".php">./tests/</directory>
<log type="coverage-clover" target="coverage.xml" showUncoveredFiles="true"/> </testsuite>
</logging> </testsuites>
</phpunit> <logging/>
</phpunit>