Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

Laravel 8 support, official prometheus client #32

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
}
],
"require": {
"php": ">=5.6.0",
"illuminate/support": "^5.3 || ^6.0 || ^7.0",
"illuminate/routing": "^5.3 || ^6.0 || ^7.0",
"jimdo/prometheus_client_php": "^0.9.0"
"php": "^7.2.0|^8.0",
"illuminate/support": "^6.0 || ^7.0 || ^8.0",
"illuminate/routing": "^6.0 || ^7.0 || ^8.0",
"promphp/prometheus_client_php": "^2.2.2"
},
"autoload": {
"psr-4": {
Expand All @@ -22,7 +22,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.1.0-dev"
},
"laravel": {
"providers": [
Expand All @@ -34,7 +34,7 @@
}
},
"require-dev": {
"phpunit/phpunit": "^5.5",
"mockery/mockery": "^0.9.5"
"phpunit/phpunit": "^9.0",
"mockery/mockery": "^1.0"
}
}
57 changes: 29 additions & 28 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="./phpunit.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="true"
verbose="true"
>
<testsuites>
<testsuite name="laravel-prometheus-exporter/tests">
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">./src/</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
<log type="coverage-html" target="coverage" showUncoveredFiles="true"/>
<log type="coverage-clover" target="coverage.xml" showUncoveredFiles="true"/>
</logging>
</phpunit>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="./vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
verbose="true">
<coverage>
<include>
<directory suffix=".php">./src/</directory>
</include>
<report>
<clover outputFile="coverage.xml"/>
<html outputDirectory="coverage"/>
<text outputFile="php://stdout" showUncoveredFiles="true"/>
</report>
</coverage>
<testsuites>
<testsuite name="laravel-prometheus-exporter/tests">
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
<logging/>
</phpunit>