fix, chore: maintenance (#56)

* fix: remove deprecation * chore: fix codestyle and standards * chore: update license * chore: refresh composer.json
ecphp · Oct 8, 2024 · ef17bdb · ef17bdb
1 parent f48d4a7
commit ef17bdb
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2019-2023, European Union.
+Copyright (c) 2019-2024, European Union.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/composer.json b/composer.json
@@ -12,16 +12,16 @@
     "require": {
         "php": ">= 8.1",
         "ergebnis/http-method": "^2.2",
-        "league/uri-components": "^2 || ^7",
+        "league/uri-components": "^7",
         "loophp/psr17": "^1.0.5",
         "php-http/client-common": "^2.6",
         "psr/cache": "^1.0.1 || ^2 || ^3",
         "psr/cache-implementation": "^1 || ^2",
-        "psr/http-client": "^1.0",
+        "psr/http-client": "^1",
         "psr/http-client-implementation": "^1",
         "psr/http-factory": "^1.0.1",
         "psr/http-factory-implementation": "^1",
-        "psr/http-message": "^1.1",
+        "psr/http-message": "^1.1 || ^2.0",
         "psr/http-message-implementation": "^1",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0"

diff --git a/spec/EcPhp/CasLib/Cas.php b/spec/EcPhp/CasLib/Cas.php
@@ -18,6 +18,8 @@
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
+use function sprintf;
+
 class Cas extends ObjectBehavior
 {
     public static function getHttpClientMock()

diff --git a/spec/EcPhp/CasLib/CasSpec.php b/spec/EcPhp/CasLib/CasSpec.php
@@ -39,17 +39,17 @@
 class CasSpec extends ObjectBehavior
 {
     /**
-     * @var \Psr\Cache\CacheItemPoolInterface
+     * @var CacheItemPoolInterface
      */
     protected $cache;
 
     /**
-     * @var \Psr\Cache\CacheItemInterface
+     * @var CacheItemInterface
      */
     protected $cacheItem;
 
     /**
-     * @param \PhpSpec\Wrapper\Collaborator|\Psr\Cache\CacheItemPoolInterface $cache
+     * @param \PhpSpec\Wrapper\Collaborator|CacheItemPoolInterface $cache
      *
      * @throws \Psr\Cache\InvalidArgumentException
      */
@@ -345,7 +345,7 @@ public function it_can_detect_wrong_url(CacheItemPoolInterface $cache)
             'base_url' => '',
             'protocol' => [
                 'serviceValidate' => [
-                    'path' => '\?&!@# // \\ http:// foo bar',
+                    'path' => '\?&!@# // \ http:// foo bar',
                     'default_parameters' => [
                         'format' => 'XML',
                     ],

diff --git a/src/Exception/CasException.php b/src/Exception/CasException.php
@@ -14,6 +14,8 @@
 use Exception;
 use Throwable;
 
+use function sprintf;
+
 final class CasException extends Exception implements CasExceptionInterface
 {
     public static function emptyResponseBodyFailure(): self

diff --git a/src/Exception/CasHandlerException.php b/src/Exception/CasHandlerException.php
@@ -18,6 +18,8 @@
 use Psr\Http\Message\ResponseInterface;
 use Throwable;
 
+use function sprintf;
+
 final class CasHandlerException extends Exception implements CasExceptionInterface
 {
     public static function authenticationFailure(AuthenticationFailure $response): self

diff --git a/src/Exception/CasResponseBuilderException.php b/src/Exception/CasResponseBuilderException.php
@@ -13,6 +13,8 @@
 
 use Exception;
 
+use function sprintf;
+
 final class CasResponseBuilderException extends Exception implements CasExceptionInterface
 {
     public static function invalidResponseType(): self

diff --git a/src/Handler/Handler.php b/src/Handler/Handler.php
@@ -22,6 +22,7 @@
 
 use function array_key_exists;
 use function is_string;
+use function sprintf;
 
 abstract class Handler
 {

diff --git a/src/Utils/Uri.php b/src/Utils/Uri.php
@@ -54,7 +54,7 @@ public static function getParams(UriInterface $uri): array
         $pairs = [];
 
         try {
-            $pairs = Query::createFromUri($uri)->pairs();
+            $pairs = Query::fromUri($uri)->pairs();
         } catch (Throwable $exception) {
             // Ignore the exception.
         }
@@ -69,7 +69,7 @@ public static function getParams(UriInterface $uri): array
     }
 
     /**
-     * Check wether an URI has the requested parameters.
+     * Check whether an URI has the requested parameters.
      *
      * @param UriInterface $uri
      *   The URI.