diff options
| author | zotlabs <mike@macgirvin.com> | 2019-11-08 13:10:24 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-11-08 13:10:24 -0800 |
| commit | 00dd52317adb0f7db339649e076df331975a8398 (patch) | |
| tree | d9559c19aafb1fb0ead583aeab662b1f9a94d2a5 /vendor/psr/log | |
| parent | 17522b31e9d7f092ecf5565ec28be270af7fad7b (diff) | |
| parent | 163b1ee9f82985755f8e74fd144780ae08ce4030 (diff) | |
| download | volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.tar.gz volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.tar.bz2 volse-hubzilla-00dd52317adb0f7db339649e076df331975a8398.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'vendor/psr/log')
| -rw-r--r-- | vendor/psr/log/Psr/Log/LoggerInterface.php | 2 | ||||
| -rw-r--r-- | vendor/psr/log/Psr/Log/LoggerTrait.php | 2 | ||||
| -rw-r--r-- | vendor/psr/log/Psr/Log/NullLogger.php | 2 | ||||
| -rw-r--r-- | vendor/psr/log/README.md | 6 | ||||
| -rw-r--r-- | vendor/psr/log/composer.json | 2 |
5 files changed, 13 insertions, 1 deletions
diff --git a/vendor/psr/log/Psr/Log/LoggerInterface.php b/vendor/psr/log/Psr/Log/LoggerInterface.php index 5ea72438b..e695046e3 100644 --- a/vendor/psr/log/Psr/Log/LoggerInterface.php +++ b/vendor/psr/log/Psr/Log/LoggerInterface.php @@ -118,6 +118,8 @@ interface LoggerInterface * @param array $context * * @return void + * + * @throws \Psr\Log\InvalidArgumentException */ public function log($level, $message, array $context = array()); } diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php b/vendor/psr/log/Psr/Log/LoggerTrait.php index 867225df1..e392fef0a 100644 --- a/vendor/psr/log/Psr/Log/LoggerTrait.php +++ b/vendor/psr/log/Psr/Log/LoggerTrait.php @@ -135,6 +135,8 @@ trait LoggerTrait * @param array $context * * @return void + * + * @throws \Psr\Log\InvalidArgumentException */ abstract public function log($level, $message, array $context = array()); } diff --git a/vendor/psr/log/Psr/Log/NullLogger.php b/vendor/psr/log/Psr/Log/NullLogger.php index d8cd682c8..c8f7293b1 100644 --- a/vendor/psr/log/Psr/Log/NullLogger.php +++ b/vendor/psr/log/Psr/Log/NullLogger.php @@ -20,6 +20,8 @@ class NullLogger extends AbstractLogger * @param array $context * * @return void + * + * @throws \Psr\Log\InvalidArgumentException */ public function log($level, $message, array $context = array()) { diff --git a/vendor/psr/log/README.md b/vendor/psr/log/README.md index 5571a25e8..a9f20c437 100644 --- a/vendor/psr/log/README.md +++ b/vendor/psr/log/README.md @@ -38,6 +38,12 @@ class Foo if ($this->logger) { $this->logger->info('Doing work'); } + + try { + $this->doSomethingElse(); + } catch (Exception $exception) { + $this->logger->error('Oh no!', array('exception' => $exception)); + } // do something useful } diff --git a/vendor/psr/log/composer.json b/vendor/psr/log/composer.json index 87934d707..3f6d4eea4 100644 --- a/vendor/psr/log/composer.json +++ b/vendor/psr/log/composer.json @@ -20,7 +20,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } } } |