Merge pull request #294 from NaokiTsuchiya/update-symfony-client

bearsunday · Apr 26, 2024 · e1ea748 · e1ea748
2 parents 0a3cd1d + e3a4ec7
commit e1ea748
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -8,4 +8,5 @@ on:
 jobs:
   sa:
     uses: ray-di/.github/.github/workflows/static-analysis.yml@v2
-    has_crc_config: true
+    with:
+      has_crc_config: true
diff --git a/php-require-checker.config.json → composer-require-checker.json b/php-require-checker.config.json → composer-require-checker.json
@@ -4,7 +4,7 @@
     "static", "self", "parent",
     "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
     "Attribute", "ReflectionAttribute", "Stringable",
-    "BEAR\\Resource\\HalLink", "BEAR\\Resource\\NullReverseLink", "BEAR\\Resource\\ReverseLinkInterface",
+    "BEAR\\Resource\\HalLink", "BEAR\\Resource\\NullReverseLink", "BEAR\\Resource\\ReverseLinkInterface", "BEAR\\Resource\\Module\\AnnotationModule",
     "Doctrine\\Common\\Annotations\\Reader", "Doctrine\\Common\\Annotations\\AnnotationReader"
   ]
 }
diff --git a/composer.json b/composer.json
@@ -23,8 +23,8 @@
         "ray/di": "^2.13",
         "ray/web-param-module": "^2.1.1",
         "rize/uri-template": "^0.3",
-        "symfony/http-client": "^5.2",
-        "symfony/http-client-contracts": "^2.3",
+        "symfony/http-client": "^5.2 || ^6.0 || ^7.0",
+        "symfony/http-client-contracts": "^2.3 || ^3.0",
         "nikic/php-parser": "^4.10",
         "symfony/polyfill-php81": "^1.23"
     },

diff --git a/src/HttpResourceObject.php b/src/HttpResourceObject.php
@@ -102,6 +102,7 @@ public function __toString(): string
         return $this->response->getContent();
     }
 
+    /** @SuppressWarnings(PHPMD.CamelCaseMethodName) */
     public function _invokeRequest(InvokerInterface $invoker, AbstractRequest $request): ResourceObject
     {
         unset($invoker);

diff --git a/src/InvokeRequestInterface.php b/src/InvokeRequestInterface.php
@@ -10,6 +10,8 @@ interface InvokeRequestInterface
      * Invokes a request using the given invoker and request objects.
      *
      * @return ResourceObject The resulting resource object returned from the request invocation.
+     *
+     * @SuppressWarnings(PHPMD.CamelCaseMethodName)
      */
     public function _invokeRequest(InvokerInterface $invoker, AbstractRequest $request): ResourceObject;
 }
diff --git a/src/ResourceObject.php b/src/ResourceObject.php
@@ -264,6 +264,8 @@ public function __clone()
 
     /**
      * {@inheritDoc}
+     *
+     * @SuppressWarnings(PHPMD.CamelCaseMethodName)
      */
     public function _invokeRequest(InvokerInterface $invoker, AbstractRequest $request): ResourceObject
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -264,6 +264,8 @@ public function __clone() @@
         /**
          * {@inheritDoc}
+         *
+         * @SuppressWarnings(PHPMD.CamelCaseMethodName)
          */
         public function _invokeRequest(InvokerInterface $invoker, AbstractRequest $request): ResourceObject
         {
@@ Expand Down @@