update dependencies (#102)

mimmi20 · Nov 11, 2021 · 06c0848 · 06c0848
1 parent b8dd2fd
commit 06c0848
Show file tree

Hide file tree

Showing 20 changed files with 128 additions and 68 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -77,7 +77,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -129,7 +129,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -181,7 +181,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -231,7 +231,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -283,7 +283,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -337,7 +337,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -392,7 +392,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -460,7 +460,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -531,7 +531,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -602,7 +602,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"
@@ -670,7 +670,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2.3.5"
+        uses: "actions/checkout@v2.4.0"
 
       - name: "Install PHP"
         uses: "shivammathur/[email protected]"

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: "actions/checkout@v2.3.5"
+      - uses: "actions/checkout@v2.4.0"
       - uses: "micnncim/[email protected]"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
   },
   "require-dev": {
     "actived/microsoft-teams-notifier": "^1.1.0",
-    "aws/aws-sdk-php": "^3.199.7",
+    "aws/aws-sdk-php": "^3.202.0",
     "bartlett/monolog-callbackfilterhandler": "^2.0.0",
     "cmdisp/monolog-microsoft-teams": "^1.2.0",
     "doctrine/couchdb": "1.0.0-beta4",
@@ -35,9 +35,9 @@
     "php-amqplib/php-amqplib": "^3.1.0",
     "php-console/php-console": "^3.1.8",
     "phpstan/extension-installer": "^1.1.0",
-    "phpstan/phpstan": "^0.12.99",
-    "phpstan/phpstan-deprecation-rules": "^0.12.6",
-    "phpstan/phpstan-phpunit": "^0.12.22",
+    "phpstan/phpstan": "^1.1.2",
+    "phpstan/phpstan-deprecation-rules": "^1.0.0",
+    "phpstan/phpstan-phpunit": "^1.0.0",
     "phpunit/phpunit": "^9.5.10",
     "predis/predis": "^1.1.9",
     "rollbar/rollbar": "^2.1.0",

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-  level: max
+  level: 8
   parallel:
     maximumNumberOfProcesses: 1
     processTimeout: 200.0
@@ -13,20 +13,21 @@ parameters:
   checkGenericClassInNonGenericObjectType: false
   checkMissingIterableValueType: false
   treatPhpDocTypesAsCertain: false
-  implicitThrows: false
   exceptions:
+    implicitThrows: false
     checkedExceptionRegexes:
       - '#Exception#'
       - '#Throwable#'
     check:
       missingCheckedExceptionInThrows: true
       tooWideThrowType: true
   ignoreErrors:
-    - '~is not subtype of Throwable~'
+    - '~Dead catch~'
     - '~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~'
+    - '~overridden property~'
diff --git a/src/AddFormatterTrait.php b/src/AddFormatterTrait.php
@@ -13,6 +13,7 @@
 namespace Mimmi20\LoggerFactory;
 
 use Interop\Container\ContainerInterface;
+use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Monolog\Formatter\FormatterInterface;
@@ -21,7 +22,11 @@
 use Psr\Container\ContainerExceptionInterface;
 
 use function array_key_exists;
+use function assert;
+use function get_class;
+use function gettype;
 use function is_array;
+use function is_object;
 use function sprintf;
 
 trait AddFormatterTrait
@@ -30,7 +35,7 @@ trait AddFormatterTrait
 
     /**
      * @param array<array<string, array<string, mixed>|bool|string>|FormatterInterface>|null $options
-     * @phpstan-param array{formatter?: (bool|FormatterInterface|array{enabled?: bool, type?: string, options?: array})}|null $options
+     * @phpstan-param array{formatter?: (bool|FormatterInterface|array{enabled?: bool, type?: string, options?: array<mixed>})}|null $options
      *
      * @throws ServiceNotCreatedException
      * @throws ServiceNotFoundException
@@ -61,6 +66,15 @@ private function addFormatter(ContainerInterface $container, HandlerInterface $h
             );
         }
 
+        assert(
+            $monologFormatterPluginManager instanceof MonologHandlerPluginManager || $monologFormatterPluginManager instanceof AbstractPluginManager,
+            sprintf(
+                '$monologFormatterPluginManager should be an Instance of %s, but was %s',
+                AbstractPluginManager::class,
+                is_object($monologFormatterPluginManager) ? get_class($monologFormatterPluginManager) : gettype($monologFormatterPluginManager)
+            )
+        );
+
         $formatter = $this->createFormatter($options['formatter'], $monologFormatterPluginManager);
 
         if (null === $formatter) {

diff --git a/src/AddProcessorTrait.php b/src/AddProcessorTrait.php
@@ -13,6 +13,7 @@
 namespace Mimmi20\LoggerFactory;
 
 use Interop\Container\ContainerInterface;
+use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Monolog\Handler\HandlerInterface;
@@ -21,7 +22,11 @@
 
 use function array_key_exists;
 use function array_reverse;
+use function assert;
+use function get_class;
+use function gettype;
 use function is_array;
+use function is_object;
 use function sprintf;
 
 trait AddProcessorTrait
@@ -30,7 +35,7 @@ trait AddProcessorTrait
 
     /**
      * @param array<array<string, array<string, mixed>|bool|string>|callable>|null $options
-     * @phpstan-param array{processors?: (callable|array{enabled?: bool, type?: string, options?: array{mixed}})}|null $options
+     * @phpstan-param array{processors?: (callable|array{enabled?: bool, type?: string, options?: array<mixed>})}|null $options
      *
      * @throws ServiceNotCreatedException
      * @throws ServiceNotFoundException
@@ -55,6 +60,15 @@ private function addProcessor(ContainerInterface $container, HandlerInterface $h
             throw new ServiceNotFoundException(sprintf('Could not find service %s', MonologProcessorPluginManager::class), 0, $e);
         }
 
+        assert(
+            $monologProcessorPluginManager instanceof MonologHandlerPluginManager || $monologProcessorPluginManager instanceof AbstractPluginManager,
+            sprintf(
+                '$monologProcessorPluginManager should be an Instance of %s, but was %s',
+                AbstractPluginManager::class,
+                is_object($monologProcessorPluginManager) ? get_class($monologProcessorPluginManager) : gettype($monologProcessorPluginManager)
+            )
+        );
+
         foreach (array_reverse($options['processors']) as $processorConfig) {
             $processor = $this->createProcessor($processorConfig, $monologProcessorPluginManager);
 

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -193,7 +193,7 @@ final class ConfigProvider
      * Return general-purpose laminas-navigation configuration.
      *
      * @return array<string, array<string, array<int|string, string>>>
-     * @phpstan-return array{dependencies: array{aliases: array<string, class-string>, abstract_factories: array<int, class-string>, factories: array<class-string, class-string>}, monolog_handlers: array{aliases: array<string, class-string>, factories: array<class-string, class-string>}, monolog_processors: array{aliases: array<string, class-string>, factories: array<class-string, class-string>}, monolog_formatters: array{aliases: array<string, class-string>, factories: array<class-string, class-string>}, monolog: array{factories: array<class-string, class-string>}}
+     * @phpstan-return array{dependencies: array{aliases: array<string|class-string, class-string>, abstract_factories: array<int, class-string>, factories: array<class-string, class-string>}, monolog_handlers: array{aliases: array<string|class-string, class-string>, factories: array<class-string, class-string>}, monolog_processors: array{aliases: array<string|class-string, class-string>, factories: array<class-string, class-string>}, monolog_formatters: array{aliases: array<string|class-string, class-string>, factories: array<class-string, class-string>}, monolog: array{factories: array<class-string, class-string>}}
      */
     public function __invoke(): array
     {
@@ -210,7 +210,7 @@ public function __invoke(): array
      * Return application-level dependency configuration.
      *
      * @return array<string, array<int|string, string>>
-     * @phpstan-return array{aliases: array<string, class-string>, abstract_factories: array<int, class-string>, factories: array<class-string, class-string>}
+     * @phpstan-return array{aliases: array<string|class-string, class-string>, abstract_factories: array<int, class-string>, factories: array<class-string, class-string>}
      */
     public function getDependencyConfig(): array
     {
@@ -234,7 +234,7 @@ public function getDependencyConfig(): array
 
     /**
      * @return array<string, array<int|string, string>>
-     * @phpstan-return array{aliases: array<string, class-string>, factories: array<class-string, class-string>}
+     * @phpstan-return array{aliases: array<string|class-string, class-string>, factories: array<class-string, class-string>}
      */
     public function getMonologHandlerConfig(): array
     {
@@ -362,7 +362,7 @@ public function getMonologHandlerConfig(): array
 
     /**
      * @return array<string, array<int|string, string>>
-     * @phpstan-return array{aliases: array<string, class-string>, factories: array<class-string, class-string>}
+     * @phpstan-return array{aliases: array<string|class-string, class-string>, factories: array<class-string, class-string>}
      */
     public function getMonologProcessorConfig(): array
     {
@@ -400,7 +400,7 @@ public function getMonologProcessorConfig(): array
 
     /**
      * @return array<string, array<int|string, string>>
-     * @phpstan-return array{aliases: array<string, class-string>, factories: array<class-string, class-string>}
+     * @phpstan-return array{aliases: array<string|class-string, class-string>, factories: array<class-string, class-string>}
      */
     public function getMonologFormatterConfig(): array
     {

diff --git a/src/CreateFormatterTrait.php b/src/CreateFormatterTrait.php
@@ -19,13 +19,14 @@
 use Psr\Container\ContainerExceptionInterface;
 
 use function array_key_exists;
+use function assert;
 use function sprintf;
 
 trait CreateFormatterTrait
 {
     /**
      * @param array<string, array<string, mixed>|bool|string>|FormatterInterface $formatterConfig
-     * @phpstan-param FormatterInterface|array{enabled?: bool, type?: string, options?: array} $formatterConfig
+     * @phpstan-param FormatterInterface|array{enabled?: bool, type?: string, options?: array<mixed>} $formatterConfig
      *
      * @throws ServiceNotFoundException   if unable to resolve the service
      * @throws ServiceNotCreatedException if an exception is raised when creating a service
@@ -45,7 +46,7 @@ private function createFormatter($formatterConfig, AbstractPluginManager $monolo
         }
 
         try {
-            return $monologFormatterPluginManager->get(
+            $formatter = $monologFormatterPluginManager->get(
                 $formatterConfig['type'],
                 $formatterConfig['options'] ?? []
             );
@@ -56,5 +57,9 @@ private function createFormatter($formatterConfig, AbstractPluginManager $monolo
                 $e
             );
         }
+
+        assert(null === $formatter || $formatter instanceof FormatterInterface);
+
+        return $formatter;
     }
 }