Merge pull request #88 from andrewnicols/GHAFix

Fixes for newly introduced GH Actions

Author: mnapoli

.github/workflows/ci.yml

@@ -18,9 +18,6 @@ jobs:
             matrix:
                 php: [ '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
                 dependency-version: [ '' ]
-                include:
-                    -   php: '7.3'
-                        dependency-version: '--prefer-lowest'
         steps:
             -   name: Checkout
                 uses: actions/checkout@v4
@@ -30,7 +27,7 @@ jobs:
                     php-version: ${{ matrix.php }}
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 with:
                     path: ~/.composer/cache
                     key: php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}
@@ -53,7 +50,7 @@ jobs:
                     tools: cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 with:
                     path: ~/.composer/cache
                     key: php-composer-locked-${{ hashFiles('composer.lock') }}

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 /composer.phar
 /composer.lock
+.phpcs-cache

.phpcs.xml.dist

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+    <arg name="extensions" value="php"/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <!-- Show sniff names -->
+    <arg value="s"/>
+
+    <file>src</file>
+
+    <rule ref="HardMode"/>
+
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint">
+        <exclude-pattern type="relative">src/CallableResolver.php</exclude-pattern>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint">
+        <exclude-pattern type="relative">src/CallableResolver.php</exclude-pattern>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix">
+        <severity>0</severity>
+    </rule>
+    <rule ref="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix">
+        <severity>0</severity>
+    </rule>
+
+</ruleset>

composer.json

@@ -21,6 +21,12 @@
     },
     "require-dev": {
         "laminas/laminas-diactoros": "^2.1",
-        "phpunit/phpunit": ">= 7.0 < 10"
+        "phpunit/phpunit": ">= 7.0 < 10",
+        "mnapoli/hard-mode": "^0.3.0"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

src/Bridge.php

@@ -3,6 +3,7 @@
 namespace DI\Bridge\Slim;
 
 use DI\Container;
+use Invoker\CallableResolver as InvokerCallableResolver;
 use Invoker\Invoker;
 use Invoker\ParameterResolver\AssociativeArrayResolver;
 use Invoker\ParameterResolver\Container\TypeHintContainerResolver;
@@ -11,7 +12,6 @@
 use Psr\Container\ContainerInterface;
 use Slim\App;
 use Slim\Factory\AppFactory;
-use \Invoker\CallableResolver as InvokerCallableResolver;
 use Slim\Interfaces\CallableResolverInterface;
 
 /**
@@ -22,7 +22,7 @@
  */
 class Bridge
 {
-    public static function create(ContainerInterface $container = null): App
+    public static function create(?ContainerInterface $container = null): App
     {
         $container = $container ?: new Container;
 
@@ -43,11 +43,11 @@ private static function createControllerInvoker(ContainerInterface $container):
     {
         $resolvers = [
             // Inject parameters by name first
-            new AssociativeArrayResolver(),
+            new AssociativeArrayResolver,
             // Then inject services by type-hints for those that weren't resolved
             new TypeHintContainerResolver($container),
             // Then fall back on parameters default values for optional route parameters
-            new DefaultValueResolver(),
+            new DefaultValueResolver,
         ];
 
         $invoker = new Invoker(new ResolverChain($resolvers), $container);

src/CallableResolver.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace DI\Bridge\Slim;
 
@@ -12,9 +12,7 @@
  */
 class CallableResolver implements AdvancedCallableResolverInterface
 {
-    /**
-     * @var \Invoker\CallableResolver
-     */
+    /** @var \Invoker\CallableResolver */
     private $callableResolver;
 
     public function __construct(\Invoker\CallableResolver $callableResolver)

src/ControllerInvoker.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace DI\Bridge\Slim;
 
@@ -9,23 +9,21 @@
 
 class ControllerInvoker implements InvocationStrategyInterface
 {
-    /**
-     * @var InvokerInterface
-     */
+    /** @var InvokerInterface */
     private $invoker;
 
     public function __construct(InvokerInterface $invoker)
     {
         $this->invoker = $invoker;
     }
+
     /**
      * Invoke a route callable.
      *
      * @param callable               $callable       The callable to invoke using the strategy.
      * @param ServerRequestInterface $request        The request object.
      * @param ResponseInterface      $response       The response object.
      * @param array                  $routeArguments The route's placeholder arguments
-     *
      * @return ResponseInterface|string The response from the callable.
      */
     public function __invoke(