Skip to content

Allow updated psr log #3099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l0gicgate merged 3 commits into from
Aug 4, 2021
Merged

Allow updated psr log #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc484b4
Allow new version (^2.0 and ^3.0) of psr/log
t0mmy742 Aug 2, 2021
c6c3174
Install php-coveralls/php-coveralls with --with-all-dependencies (-W)…
t0mmy742 Aug 2, 2021
249b0b3
Add missing 'use function'
t0mmy742 Aug 2, 2021
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
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ updates:
ignore:
- dependency-name: phpunit/phpunit
versions:
- 8.5.14
- "8.5.*"
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ jobs:
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
composer require php-coveralls/php-coveralls -n
composer require php-coveralls/php-coveralls -n -W
vendor/bin/php-coveralls --coverage_clover=clover.xml -v
13 changes: 8 additions & 5 deletions Slim/Logger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,23 @@

use Psr\Log\AbstractLogger;
use Psr\Log\InvalidArgumentException;
use Stringable;

use function error_log;

class Logger extends AbstractLogger
{
/**
* @param mixed $level
* @param string $message
* @param array<mixed> $context
* @param mixed $level
* @param string|Stringable $message
* @param array<mixed> $context
*
* @return void
*
* @throws InvalidArgumentException
*/
public function log($level, $message, array $context = [])
public function log($level, $message, array $context = []): void
{
error_log($message);
error_log((string) $message);
}
}
14 changes: 7 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
"psr/log": "^1.1"
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"require-dev": {
"ext-simplexml": "*",
"adriansuter/php-autoload-override": "^1.2",
"guzzlehttp/psr7": "^1.8",
"http-interop/http-factory-guzzle": "^1.0",
"guzzlehttp/psr7": "^2.0",
"http-interop/http-factory-guzzle": "^1.1",
"laminas/laminas-diactoros": "^2.4",
"nyholm/psr7": "^1.4",
"nyholm/psr7-server": "^1.0.2",
"nyholm/psr7-server": "^1.0",
"phpspec/prophecy": "^1.13",
"phpstan/phpstan": "^0.12.90",
"phpunit/phpunit": "^8.5.13 || ^9.3.8",
"phpstan/phpstan": "^0.12.94",
"phpunit/phpunit": "^8.5 || ^9.5",
"slim/http": "^1.2",
"slim/psr7": "^1.4",
"squizlabs/php_codesniffer": "^3.6",
"weirdan/prophecy-shim": "^1.0 || ^2.0.2"
"weirdan/prophecy-shim": "^1.0 || ^2.0"
},
"autoload": {
"psr-4": {
Expand Down