Skip to content

Commit 9d6ad18

Browse files
kenjiskenjis
authored
Merge pull request #8339 from kenjis/update-psr-log-3.0
chore: update psr/log to v3
2 parents d0d9ccb + 5b74fc6 commit 9d6ad18

File tree

9 files changed

+27
-26
lines changed

9 files changed

+27
-26
lines changed

‎.github/workflows/reusable-coveralls.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ jobs:
6363
vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
6464
6565
- name: Upload coverage to Coveralls
66-
run: vendor/bin/php-coveralls --verbose --exclude-no-stmt --ansi
66+
run: |
67+
composer global require php-coveralls/php-coveralls
68+
php-coveralls --verbose --exclude-no-stmt --ansi
6769
env:
6870
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎admin/framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"ext-intl": "*",
1515
"ext-mbstring": "*",
1616
"laminas/laminas-escaper": "^2.13",
17-
"psr/log": "^2.0"
17+
"psr/log": "^3.0"
1818
},
1919
"require-dev": {
2020
"codeigniter/coding-standard": "^1.5",

‎composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"ext-intl": "*",
1515
"ext-mbstring": "*",
1616
"laminas/laminas-escaper": "^2.13",
17-
"psr/log": "^2.0"
17+
"psr/log": "^3.0"
1818
},
1919
"require-dev": {
2020
"codeigniter/coding-standard": "^1.5",
@@ -25,7 +25,6 @@
2525
"mikey179/vfsstream": "^1.6",
2626
"nexusphp/cs-config": "^3.6",
2727
"nexusphp/tachycardia": "^1.0",
28-
"php-coveralls/php-coveralls": "^2.5",
2928
"phpstan/extension-installer": "^1.3",
3029
"phpstan/phpstan": "^1.10.2",
3130
"phpstan/phpstan-strict-rules": "^1.5",

‎system/ThirdParty/PSR/Log/LoggerAwareInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ interface LoggerAwareInterface
1414
*
1515
* @return void
1616
*/
17-
public function setLogger(LoggerInterface $logger);
17+
public function setLogger(LoggerInterface $logger): void;
1818
}

‎system/ThirdParty/PSR/Log/LoggerAwareTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ trait LoggerAwareTrait
1919
*
2020
* @param LoggerInterface $logger
2121
*/
22-
public function setLogger(LoggerInterface $logger)
22+
public function setLogger(LoggerInterface $logger): void
2323
{
2424
$this->logger = $logger;
2525
}

‎system/ThirdParty/PSR/Log/LoggerInterface.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ interface LoggerInterface
2727
*
2828
* @return void
2929
*/
30-
public function emergency(string|\Stringable $message, array $context = []);
30+
public function emergency(string|\Stringable $message, array $context = []): void;
3131

3232
/**
3333
* Action must be taken immediately.
@@ -40,7 +40,7 @@ public function emergency(string|\Stringable $message, array $context = []);
4040
*
4141
* @return void
4242
*/
43-
public function alert(string|\Stringable $message, array $context = []);
43+
public function alert(string|\Stringable $message, array $context = []): void;
4444

4545
/**
4646
* Critical conditions.
@@ -52,7 +52,7 @@ public function alert(string|\Stringable $message, array $context = []);
5252
*
5353
* @return void
5454
*/
55-
public function critical(string|\Stringable $message, array $context = []);
55+
public function critical(string|\Stringable $message, array $context = []): void;
5656

5757
/**
5858
* Runtime errors that do not require immediate action but should typically
@@ -63,7 +63,7 @@ public function critical(string|\Stringable $message, array $context = []);
6363
*
6464
* @return void
6565
*/
66-
public function error(string|\Stringable $message, array $context = []);
66+
public function error(string|\Stringable $message, array $context = []): void;
6767

6868
/**
6969
* Exceptional occurrences that are not errors.
@@ -76,7 +76,7 @@ public function error(string|\Stringable $message, array $context = []);
7676
*
7777
* @return void
7878
*/
79-
public function warning(string|\Stringable $message, array $context = []);
79+
public function warning(string|\Stringable $message, array $context = []): void;
8080

8181
/**
8282
* Normal but significant events.
@@ -86,7 +86,7 @@ public function warning(string|\Stringable $message, array $context = []);
8686
*
8787
* @return void
8888
*/
89-
public function notice(string|\Stringable $message, array $context = []);
89+
public function notice(string|\Stringable $message, array $context = []): void;
9090

9191
/**
9292
* Interesting events.
@@ -98,7 +98,7 @@ public function notice(string|\Stringable $message, array $context = []);
9898
*
9999
* @return void
100100
*/
101-
public function info(string|\Stringable $message, array $context = []);
101+
public function info(string|\Stringable $message, array $context = []): void;
102102

103103
/**
104104
* Detailed debug information.
@@ -108,7 +108,7 @@ public function info(string|\Stringable $message, array $context = []);
108108
*
109109
* @return void
110110
*/
111-
public function debug(string|\Stringable $message, array $context = []);
111+
public function debug(string|\Stringable $message, array $context = []): void;
112112

113113
/**
114114
* Logs with an arbitrary level.
@@ -121,5 +121,5 @@ public function debug(string|\Stringable $message, array $context = []);
121121
*
122122
* @throws \Psr\Log\InvalidArgumentException
123123
*/
124-
public function log($level, string|\Stringable $message, array $context = []);
124+
public function log($level, string|\Stringable $message, array $context = []): void;
125125
}

‎system/ThirdParty/PSR/Log/LoggerTrait.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trait LoggerTrait
2020
*
2121
* @return void
2222
*/
23-
public function emergency(string|\Stringable $message, array $context = [])
23+
public function emergency(string|\Stringable $message, array $context = []): void
2424
{
2525
$this->log(LogLevel::EMERGENCY, $message, $context);
2626
}
@@ -36,7 +36,7 @@ public function emergency(string|\Stringable $message, array $context = [])
3636
*
3737
* @return void
3838
*/
39-
public function alert(string|\Stringable $message, array $context = [])
39+
public function alert(string|\Stringable $message, array $context = []): void
4040
{
4141
$this->log(LogLevel::ALERT, $message, $context);
4242
}
@@ -51,7 +51,7 @@ public function alert(string|\Stringable $message, array $context = [])
5151
*
5252
* @return void
5353
*/
54-
public function critical(string|\Stringable $message, array $context = [])
54+
public function critical(string|\Stringable $message, array $context = []): void
5555
{
5656
$this->log(LogLevel::CRITICAL, $message, $context);
5757
}
@@ -65,7 +65,7 @@ public function critical(string|\Stringable $message, array $context = [])
6565
*
6666
* @return void
6767
*/
68-
public function error(string|\Stringable $message, array $context = [])
68+
public function error(string|\Stringable $message, array $context = []): void
6969
{
7070
$this->log(LogLevel::ERROR, $message, $context);
7171
}
@@ -81,7 +81,7 @@ public function error(string|\Stringable $message, array $context = [])
8181
*
8282
* @return void
8383
*/
84-
public function warning(string|\Stringable $message, array $context = [])
84+
public function warning(string|\Stringable $message, array $context = []): void
8585
{
8686
$this->log(LogLevel::WARNING, $message, $context);
8787
}
@@ -94,7 +94,7 @@ public function warning(string|\Stringable $message, array $context = [])
9494
*
9595
* @return void
9696
*/
97-
public function notice(string|\Stringable $message, array $context = [])
97+
public function notice(string|\Stringable $message, array $context = []): void
9898
{
9999
$this->log(LogLevel::NOTICE, $message, $context);
100100
}
@@ -109,7 +109,7 @@ public function notice(string|\Stringable $message, array $context = [])
109109
*
110110
* @return void
111111
*/
112-
public function info(string|\Stringable $message, array $context = [])
112+
public function info(string|\Stringable $message, array $context = []): void
113113
{
114114
$this->log(LogLevel::INFO, $message, $context);
115115
}
@@ -122,7 +122,7 @@ public function info(string|\Stringable $message, array $context = [])
122122
*
123123
* @return void
124124
*/
125-
public function debug(string|\Stringable $message, array $context = [])
125+
public function debug(string|\Stringable $message, array $context = []): void
126126
{
127127
$this->log(LogLevel::DEBUG, $message, $context);
128128
}
@@ -138,5 +138,5 @@ public function debug(string|\Stringable $message, array $context = [])
138138
*
139139
* @throws \Psr\Log\InvalidArgumentException
140140
*/
141-
abstract public function log($level, string|\Stringable $message, array $context = []);
141+
abstract public function log($level, string|\Stringable $message, array $context = []): void;
142142
}

‎system/ThirdParty/PSR/Log/NullLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class NullLogger extends AbstractLogger
2323
*
2424
* @throws \Psr\Log\InvalidArgumentException
2525
*/
26-
public function log($level, string|\Stringable $message, array $context = [])
26+
public function log($level, string|\Stringable $message, array $context = []): void
2727
{
2828
// noop
2929
}

‎user_guide_src/source/changelogs/v4.5.0.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Interface Changes
7979
- **ResponseInterface:** The default value of the third parameter ``$expire`` of
8080
the ``ResponseInterface::setCookie()`` has been fixed from ``''`` to ``0``.
8181
- **Logger:** The `psr/log <https://packagist.org/packages/psr/log>`_ package has
82-
been upgraded to v2.0.0.
82+
been upgraded to v3.0.0.
8383

8484
.. _v450-method-signature-changes:
8585

0 commit comments

Comments
 (0)