phpunit/phpunit:^10.5.38, laminas/laminas-coding-standard:^3.0, Apply…

… phpunit attribute migration Signed-off-by: fezfez <[email protected]> clean Signed-off-by: fezfez <[email protected]>
laminas · Dec 4, 2024 · e30480d · e30480d
1 parent a9867e4
commit e30480d
Show file tree

Hide file tree

Showing 95 changed files with 1,568 additions and 1,976 deletions.
diff --git a/.laminas-ci/phpunit.xml b/.laminas-ci/phpunit.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="./vendor/autoload.php"
+         colors="true"
+         cacheDirectory=".phpunit.cache"
+         failOnDeprecation="true"
+         failOnNotice="true"
+         failOnWarning="true"
+         failOnPhpunitDeprecation="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true">
   <coverage includeUncoveredFiles="true">
     <include>
       <directory suffix=".php">./src</directory>

diff --git a/composer.json b/composer.json
@@ -31,8 +31,8 @@
     },
     "require-dev": {
         "ext-curl": "*",
-        "laminas/laminas-coding-standard": "~2.4.0",
-        "phpunit/phpunit": "^9.6.21"
+        "laminas/laminas-coding-standard": "^3.0.1",
+        "phpunit/phpunit": "^10.5.38"
     },
     "suggest": {
         "paragonie/certainty": "For automated management of cacert.pem"

diff --git a/composer.lock b/composer.lock
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -16,11 +16,15 @@
     <file>src</file>
     <file>test</file>
     <exclude-pattern>*/_files/*</exclude-pattern>
+    <exclude-pattern>test/PhpEnvironment/Assets/*</exclude-pattern>
 
     <!-- Include all rules from Laminas Coding Standard -->
     <rule ref="LaminasCodingStandard"/>
 
     <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing">
         <exclude-pattern>src/</exclude-pattern>
     </rule>
+    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFallbackGlobalName">
+        <exclude-pattern>src/PhpEnvironment/Response.php</exclude-pattern>
+    </rule>
 </ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
-  <coverage includeUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="./vendor/autoload.php"
+         colors="true"
+         cacheDirectory=".phpunit.cache"
+         failOnDeprecation="true"
+         failOnNotice="true"
+         failOnWarning="true"
+         failOnPhpunitDeprecation="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true">
   <testsuites>
     <testsuite name="laminas-http Test Suite">
       <directory>./test/</directory>
@@ -39,4 +46,9 @@
     <env name="TESTS_LAMINAS_HTTP_CLIENT_HTTP_PROXY_USER" value=""/>
     <env name="TESTS_LAMINAS_HTTP_CLIENT_HTTP_PROXY_PASS" value=""/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Client.php b/src/Client.php
@@ -488,7 +488,6 @@ public function setRawBody($body)
     /**
      * Set the POST parameters
      *
-     * @param array $post
      * @return $this
      */
     public function setParameterPost(array $post)
@@ -500,7 +499,6 @@ public function setParameterPost(array $post)
     /**
      * Set the GET parameters
      *
-     * @param array $query
      * @return $this
      */
     public function setParameterGet(array $query)

diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
@@ -234,7 +234,6 @@ public function write($method, $uri, $httpVer = '1.1', $headers = [], $body = ''
      * @param string  $host
      * @param int $port
      * @param string  $httpVer
-     * @param array   $headers
      * @throws AdapterException\RuntimeException
      */
     protected function connectHandshake($host, $port = 443, $httpVer = '1.1', array &$headers = [])

diff --git a/src/Header/Accept.php b/src/Header/Accept.php
@@ -43,7 +43,6 @@ public function toString()
      *
      * @param  string $type
      * @param  int|float $priority
-     * @param  array $params
      * @return $this
      */
     public function addMediaType($type, $priority = 1, array $params = [])

diff --git a/src/Header/ContentTransferEncoding.php b/src/Header/ContentTransferEncoding.php
@@ -6,7 +6,7 @@
 use function strtolower;
 
 /**
- * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11 @todo find section
+ * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11 \@todo find section
  *
  * @throws Exception\InvalidArgumentException
  */

diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -189,7 +189,6 @@ public function getMediaType()
     /**
      * Set additional content-type parameters
      *
-     * @param  array $parameters
      * @return $this
      */
     public function setParameters(array $parameters)

diff --git a/src/Header/SetCookie.php b/src/Header/SetCookie.php
@@ -775,7 +775,6 @@ public function toString()
     }
 
     /**
-     * @param  array $headers
      * @return string
      * @throws Exception\RuntimeException
      */

diff --git a/src/PhpEnvironment/RemoteAddress.php b/src/PhpEnvironment/RemoteAddress.php
@@ -70,7 +70,6 @@ public function getUseProxy()
     /**
      * Set list of trusted proxy addresses
      *
-     * @param  array $trustedProxies
      * @return $this
      */
     public function setTrustedProxies(array $trustedProxies)

diff --git a/src/PhpEnvironment/Response.php b/src/PhpEnvironment/Response.php
@@ -8,7 +8,6 @@
 
 use function call_user_func;
 use function header;
-use function headers_sent;
 
 /**
  * HTTP Response for current PHP environment

diff --git a/test/Client/Adapter/CurlTest.php b/test/Client/Adapter/CurlTest.php
@@ -6,6 +6,7 @@
 
 use Laminas\Http\Client\Adapter\Curl;
 use Laminas\Uri\Uri;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function curl_getinfo;
@@ -16,8 +17,7 @@
 
 final class CurlTest extends TestCase
 {
-    /** @var Curl */
-    private $adapter;
+    private Curl $adapter;
 
     protected function setUp(): void
     {
@@ -28,7 +28,7 @@ protected function setUp(): void
     /**
      * @return iterable<non-empty-string,array{0:CURL_HTTP_VERSION_*,1:float}>
      */
-    public function floatHttpVersions(): iterable
+    public static function floatHttpVersions(): iterable
     {
         yield 'HTTP 1.0' => [CURL_HTTP_VERSION_1_0, 1.0];
         yield 'HTTP 1.1' => [CURL_HTTP_VERSION_1_1, 1.1];
@@ -37,7 +37,7 @@ public function floatHttpVersions(): iterable
     /**
      * @return iterable<non-empty-string,array{0:CURL_HTTP_VERSION_*,1:float}>
      */
-    public function httpVersions(): iterable
+    public static function httpVersions(): iterable
     {
         yield 'HTTP 1.0' => [CURL_HTTP_VERSION_1_0, '1.0'];
         yield 'HTTP 1.1' => [CURL_HTTP_VERSION_1_1, '1.1'];
@@ -46,9 +46,8 @@ public function httpVersions(): iterable
     /**
      * NOTE: This test is only needed for BC compatibility. The {@see \Laminas\Http\Client\Adapter\AdapterInterface}
      *       has a default for "string" but "float" was used in {@see Curl::write()} due to the lack of strict types.
-     *
-     * @dataProvider floatHttpVersions
      */
+    #[DataProvider('floatHttpVersions')]
     public function testWriteCanHandleFloatHttpVersion(int $expectedCurlOption, float $version): void
     {
         $this->adapter->connect('example.org');
@@ -58,9 +57,7 @@ public function testWriteCanHandleFloatHttpVersion(int $expectedCurlOption, floa
         self::assertEquals($expectedCurlOption, curl_getinfo($handle, CURLINFO_HTTP_VERSION));
     }
 
-    /**
-     * @dataProvider httpVersions
-     */
+    #[DataProvider('httpVersions')]
     public function testWriteCanHandleStringHttpVersion(int $expectedCurlOption, string $version): void
     {
         $this->adapter->connect('example.org');
-Original file line number
+Diff line change
@@ Expand Up / @@ -775,7 +775,6 @@ public function toString() @@
         }
         /**
-         * @param  array $headers
          * @return string
          * @throws Exception\RuntimeException
          */
@@ Expand Down @@