Merge branch 'refactor-curler'

Author: lkrms

.phive/phars.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.56" location="./tools/pretty-php" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.46.0" installed="3.52.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.60" location="./tools/pretty-php" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.46.0" installed="3.53.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="salient-labs/php-changelog" version="^1.0.0" installed="1.0.4" location="./tools/changelog" copy="true"/>
 </phive>

.php-cs-fixer.dist.php

@@ -39,6 +39,8 @@
             'template',
             'extends',
             'implements',
+            'phpstan-require-extends',
+            'phpstan-require-implements',
             'readonly',
             'var',
             'param',
@@ -52,6 +54,7 @@
             ['requires', 'dataProvider', 'backupGlobals'],
             ['template', 'template-covariant'],
             ['extends', 'implements'],
+            ['phpstan-require-extends', 'phpstan-require-implements'],
             ['readonly', 'var', 'phpstan-var', 'param', 'param-out', 'phpstan-param', 'return', 'phpstan-return', 'throws', 'phpstan-assert*', 'phpstan-ignore-next-line'],
             ['phpstan-*'],
         ]],

.vscode/php.code-snippets

@@ -5,7 +5,7 @@
 		"body": [
 			"<?php declare(strict_types=1);",
 			"",
-			"namespace ${TM_DIRECTORY/^.*\\\\/src\\\\/(Toolkit|(Sli|PHPStan))|^.*\\\\/(tests\\\\/(?:unit|fixtures|3rdparty)\\\\/(Toolkit|(Sli|PHPStan)))|\\\\/([a-zA-Z0-9]+)/${1:+Salient}${2:+\\\\}$2${4:+Salient}${3:+\\\\Tests}${5:+\\\\}$5${6:+\\\\}$6/g};",
+			"namespace ${TM_DIRECTORY/^.*\\\\/src\\\\/(Toolkit|(Sli))|^.*\\\\/(tests\\\\/(?:unit|fixtures|3rdparty)\\\\/(Toolkit|(Sli)))|\\\\/([a-zA-Z0-9]+)/${1:+Salient}${2:+\\\\}$2${4:+Salient}${3:+\\\\Tests}${5:+\\\\}$5${6:+\\\\}$6/g};",
 			"",
 			"${RELATIVE_FILEPATH/(?:.*(?:(\\\\/Contract\\\\/.*|Interface\\.php$)|(\\\\/Concern\\\\/.*|Trait\\.php$))|(^(?:.(?!\\\\/(?:Contract|Concern)\\\\/|(?:Interface|Trait)\\.php$))*$))/${1:+interface}${2:+trait}${3:+class}/} ${TM_FILENAME_BASE/[^a-zA-Z0-9]+//g} {",
 			"    $0",
@@ -17,7 +17,7 @@
 		"scope": "php",
 		"prefix": "namespace",
 		"body": [
-			"namespace ${TM_DIRECTORY/^.*\\\\/src\\\\/(Toolkit|(Sli|PHPStan))|^.*\\\\/(tests\\\\/(?:unit|fixtures|3rdparty)\\\\/(Toolkit|(Sli|PHPStan)))|\\\\/([a-zA-Z0-9]+)/${1:+Salient}${2:+\\\\}$2${4:+Salient}${3:+\\\\Tests}${5:+\\\\}$5${6:+\\\\}$6/g};"
+			"namespace ${TM_DIRECTORY/^.*\\\\/src\\\\/(Toolkit|(Sli))|^.*\\\\/(tests\\\\/(?:unit|fixtures|3rdparty)\\\\/(Toolkit|(Sli)))|\\\\/([a-zA-Z0-9]+)/${1:+Salient}${2:+\\\\}$2${4:+Salient}${3:+\\\\Tests}${5:+\\\\}$5${6:+\\\\}$6/g};"
 		]
 	}
 }

composer.json

@@ -49,12 +49,13 @@
         "sebastian/diff": "^4 || ^5"
     },
     "provide": {
-        "psr/event-dispatcher-implementation": "^1"
+        "psr/event-dispatcher-implementation": "^1",
+        "psr/http-factory-implementation": "^1",
+        "psr/http-message-implementation": "^1.1 || ^2"
     },
     "autoload": {
         "psr-4": {
-            "Salient\\": "src/Toolkit/",
-            "Salient\\PHPStan\\": "src/PHPStan/"
+            "Salient\\": "src/Toolkit/"
         },
         "classmap": [
             "stubs/"
@@ -66,7 +67,6 @@
     "autoload-dev": {
         "psr-4": {
             "Salient\\Sli\\": "src/Sli/",
-            "Salient\\Tests\\PHPStan\\": "tests/unit/PHPStan/",
             "Salient\\Tests\\": [
                 "tests/unit/Toolkit/",
                 "tests/fixtures/Toolkit/",

phpstan-baseline-7.4.neon

@@ -1,10 +1,10 @@
 services:
 	-
-		class: Salient\PHPStan\Core\Utility\Str\MethodReturnTypeExtension
+		class: Salient\PHPStan\Type\Core\GetCoalesceMethodReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 
 	-
-		class: Salient\PHPStan\Core\Utility\Get\MethodReturnTypeExtension
+		class: Salient\PHPStan\Type\Core\StrCoalesceMethodReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension

phpstan-baseline-8.3.neon

@@ -5,14 +5,21 @@
 use Salient\Core\AbstractDictionary;
 
 /**
- * Frequently-used MIME types
+ * @api
  *
  * @extends AbstractDictionary<string>
  */
 final class MimeType extends AbstractDictionary
 {
-    public const TEXT = 'text/plain';
     public const BINARY = 'application/octet-stream';
-    public const WWW_FORM = 'application/x-www-form-urlencoded';
+    public const FORM = 'application/x-www-form-urlencoded';
+    public const FORM_MULTIPART = 'multipart/form-data';
+    public const GZIP = 'application/gzip';
+    public const HTML = 'text/html';
     public const JSON = 'application/json';
+    public const JWT = 'application/jwt';
+    public const TEXT = 'text/plain';
+    public const XML = 'application/xml';
+    public const YAML = 'application/yaml';
+    public const ZIP = 'application/zip';
 }