Skip to content
This repository has been archived by the owner on Nov 21, 2022. It is now read-only.

Commit

Permalink
update dependencies (#160)
Browse files Browse the repository at this point in the history
  • Loading branch information
mimmi20 authored Mar 14, 2022
1 parent 868fdb9 commit c86b201
Show file tree
Hide file tree
Showing 216 changed files with 2,211 additions and 1,457 deletions.
50 changes: 0 additions & 50 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -734,53 +734,3 @@ jobs:

- name: "Run mutation tests with infection/infection"
run: "infection -s --min-covered-msi=88 --min-msi=88 --coverage=.build/coverage --only-covered --logger-github"

roave-backwards-compatibility-check:
name: "Check for Backward Compatibility breaks"

needs: "lint"

runs-on: "${{ matrix.operating-system }}"

continue-on-error: false

strategy:
fail-fast: false

matrix:
operating-system:
- "ubuntu-20.04"

php-version:
- "8.1"

dependencies:
- "highest"

steps:
- name: "Checkout"
uses: "actions/checkout@v3"
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0

- name: "Install PHP"
uses: "shivammathur/[email protected]"
with:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}, bcmath, sodium"
ini-values: "${{ env.PHP_INI_VALUES }}"
coverage: "none"
tools: "${{ env.TOOLS }}"

- name: "Require Roave/BackwardCompatibilityCheck"
run: "composer require --no-update --no-interaction --prefer-dist --prefer-stable --dev \"roave/backward-compatibility-check:^6.1\" \"mimmi20/coding-standard:^2.6\" \"friendsofphp/php-cs-fixer:^3.4\""

- name: "Update dependencies with composer"
uses: "ramsey/composer-install@v1"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }}"

- name: "Check for BC breaks"
run: "vendor/bin/roave-backward-compatibility-check --format=github-actions"
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- name: "Release Drafter"
uses: "release-drafter/release-drafter@v5.18.1"
uses: "release-drafter/release-drafter@v5.19.0"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 6 additions & 2 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -13,7 +13,7 @@
$header = <<<'EOF'
This file is part of the mimmi20/monolog-laminas-factory package.
Copyright (c) 2021, Thomas Mueller <[email protected]>
Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
Expand Down Expand Up @@ -42,6 +42,10 @@
'location' => 'after_open',
'separate' => 'bottom',
],
'@PHP74Migration' => true,
'@PHP74Migration:risky' => true,
'@PHP80Migration' => false,
'@PHP80Migration:risky' => false,
]
)
)
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"php": "^7.4.3 || ^8.0.0",
"ext-mbstring": "*",
"laminas/laminas-log": "^2.15.0",
"monolog/monolog": "^2.3.5"
"monolog/monolog": "^2.4.0"
},
"require-dev": {
"actived/microsoft-teams-notifier": "^1.2.0",
"aws/aws-sdk-php": "^3.212.2",
"aws/aws-sdk-php": "^3.212.7",
"bartlett/monolog-callbackfilterhandler": "^2.0.0",
"cmdisp/monolog-microsoft-teams": "^1.2.0",
"doctrine/couchdb": "1.0.0-beta4",
Expand All @@ -36,15 +36,15 @@
"laminas/laminas-servicemanager": "^3.10.0",
"mikey179/vfsstream": "^1.6.10",
"mimmi20/coding-standard": "^2.6.3",
"php-amqplib/php-amqplib": "^3.1.2",
"php-amqplib/php-amqplib": "^3.2.0",
"php-console/php-console": "^3.1.8",
"phpstan/extension-installer": "^1.1.0",
"phpstan/phpstan": "^1.4.8",
"phpstan/phpstan": "^1.4.10",
"phpstan/phpstan-deprecation-rules": "^1.0.0",
"phpstan/phpstan-phpunit": "^1.0.0",
"phpunit/phpunit": "^9.5.17",
"phpunit/phpunit": "^9.5.18",
"predis/predis": "^1.1.10",
"rollbar/rollbar": "^v2.1.0 || ^v3.0.0",
"rollbar/rollbar": "^v2.1.0 || ^v3.1.1",
"ruflin/elastica": "^7.1.4",
"swiftmailer/swiftmailer": "^6.3.0"
},
Expand Down
4 changes: 3 additions & 1 deletion phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
<arg name="encoding" value="utf-8"/>

<!-- inherit rules from: -->
<rule ref="mimmi20-cs"/>
<rule ref="mimmi20-cs">
<exclude name="SlevomatCodingStandard.Classes.ModernClassNameReference.ClassNameReferencedViaFunctionCall"/>
</rule>

<!-- Paths to check -->
<file>src</file>
Expand Down
1 change: 0 additions & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ parameters:
- '~Call to an undefined method Laminas\\ModuleManager\\ModuleManagerInterface::getEvent~'
- '~MongoDB\\Client~'
- '~Call to deprecated method getType\(\) of class Monolog\\Formatter\\ElasticaFormatter~'
- '~Parameter #2 \$extraFields of class Monolog\\Processor\\WebProcessor constructor expects~'
- '~Parameter #1 \$stream of class Monolog\\Handler\\StreamHandler constructor expects~'
- '~Parameter #2 \$level of class CMDISP\\MonologMicrosoftTeams\\TeamsLogHandler constructor expects~'
- '~Parameter #2 \$channelToActionLevel of class Monolog\\Handler\\FingersCrossed\\ChannelLevelActivationStrategy constructor expects~'
Expand Down
3 changes: 2 additions & 1 deletion src/AddFormatterTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down Expand Up @@ -35,6 +35,7 @@ trait AddFormatterTrait

/**
* @param array<array<string, array<string, mixed>|bool|string>|FormatterInterface>|null $options
* @phpstan-param HandlerInterface&FormattableHandlerInterface $handler
* @phpstan-param array{formatter?: (bool|FormatterInterface|array{enabled?: bool, type?: string, options?: array<mixed>})}|null $options
*
* @throws ServiceNotCreatedException
Expand Down
3 changes: 2 additions & 1 deletion src/AddProcessorTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down Expand Up @@ -35,6 +35,7 @@ trait AddProcessorTrait

/**
* @param array<array<string, array<string, mixed>|bool|string>|callable>|null $options
* @phpstan-param HandlerInterface&ProcessableHandlerInterface $handler
* @phpstan-param array{processors?: (callable|array{enabled?: bool, type?: string, options?: array<mixed>})}|null $options
*
* @throws ServiceNotCreatedException
Expand Down
2 changes: 1 addition & 1 deletion src/ConfigProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/CreateFormatterTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/CreateProcessorTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/ChromePHPFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/ElasticaFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/ElasticsearchFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/FlowdockFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/FluentdFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/GelfMessageFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/HtmlFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/JsonFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
13 changes: 7 additions & 6 deletions src/Formatter/LineFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down Expand Up @@ -40,6 +40,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
$maxNormalizeDepth = NormalizerFormatterFactory::DEFAULT_NORMALIZER_DEPTH;
$maxNormalizeItemCount = NormalizerFormatterFactory::DEFAULT_NORMALIZER_ITEM_COUNT;
$prettyPrint = false;
$includeStacktraces = false;

if (is_array($options)) {
if (array_key_exists('format', $options)) {
Expand Down Expand Up @@ -69,14 +70,14 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
if (array_key_exists('prettyPrint', $options)) {
$prettyPrint = $options['prettyPrint'];
}
}

$formatter = new LineFormatter($format, $dateFormat, $allowInlineLineBreaks, $ignoreEmptyContextAndExtra);

if (is_array($options) && array_key_exists('includeStacktraces', $options)) {
$formatter->includeStacktraces($options['includeStacktraces']);
if (array_key_exists('includeStacktraces', $options)) {
$includeStacktraces = $options['includeStacktraces'];
}
}

$formatter = new LineFormatter($format, $dateFormat, $allowInlineLineBreaks, $ignoreEmptyContextAndExtra, $includeStacktraces);

$formatter->setMaxNormalizeDepth($maxNormalizeDepth);
$formatter->setMaxNormalizeItemCount($maxNormalizeItemCount);
$formatter->setJsonPrettyPrint($prettyPrint);
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/LogglyFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/LogmaticFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/LogstashFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/MongoDBFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/NormalizerFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/ScalarFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Formatter/WildfireFormatterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Handler/AmqpHandlerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion src/Handler/BrowserConsoleHandlerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* This file is part of the mimmi20/monolog-laminas-factory package.
*
* Copyright (c) 2021, Thomas Mueller <[email protected]>
* Copyright (c) 2021-2022, Thomas Mueller <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
Loading

0 comments on commit c86b201

Please sign in to comment.