Merge branch 'master' into s6

Author: Chi-teck

composer.json

@@ -37,8 +37,8 @@
         "twig/twig": "^2.12 || ^3.1"
     },
     "require-dev": {
-        "chi-teck/drupal-coder-extension": "^1.0",
-        "drupal/coder": "^8.3.13",
+        "chi-teck/drupal-coder-extension": "^1.1.1",
+        "drupal/coder": "^8.3.14",
         "friendsoftwig/twigcs": "^5.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.4",

phpcs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <ruleset name="Drupal Code Generator">
   <description>Drupal Code Generator coding standard</description>
+  <config name="installed_paths" value="vendor/slevomat/coding-standard" />
   <arg name="colors"/>
   <file>./scripts</file>
   <file>./src</file>
@@ -22,10 +23,12 @@
   </rule>
   <rule ref="vendor/chi-teck/drupal-coder-extension/DrupalExtended74">
     <exclude-pattern>./tests/sut</exclude-pattern>
+    <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
+    <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
   </rule>
   <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
     <properties>
-      <property name="declareOnFirstLine"/>
+      <property name="declareOnFirstLine" value="true"/>
       <property name="spacesCountAroundEqualsSign" value="0"/>
     </properties>
     <exclude-pattern>./tests/sut</exclude-pattern>

src/Helper/DrupalContext.php

@@ -258,6 +258,7 @@ public function getServiceDefinition(string $service_id): ?array {
     $services = $this->container
       ->get('kernel')
       ->getCachedContainerDefinition();
+    // @phpcs:disable DrupalPractice.FunctionCalls.InsecureUnserialize.InsecureUnserialize
     return isset($services['services'][$service_id]) ?
       \unserialize($services['services'][$service_id]) : NULL;
   }

src/Logger/ConsoleLogger.php

@@ -117,6 +117,7 @@ private function interpolate(string $message, array $context): string {
         $replacements["{{$key}}"] = $value->format(\DateTime::RFC3339);
       }
       elseif (\is_object($value)) {
+        // @phpcs:disable SlevomatCodingStandard.Classes.ModernClassNameReference.ClassNameReferencedViaFunctionCall
         $replacements["{{$key}}"] = '[object ' . \get_class($value) . ']';
       }
       else {