Merge branch 'master' into 3.2-merge

# Conflicts:
#	.github/workflows/test.yml
#	src/command/composer.json
#	src/serializer/src/Contract/CacheableSupportsMethodInterface.php
#	src/validation/src/ValidationRuleParser.php

Author: limingxinleo

.gitattributes

@@ -1,2 +1,3 @@
 /tests export-ignore
 /.github export-ignore
+/types export-ignore

src/Application.php

@@ -40,8 +40,11 @@ class Application
 
     protected array $providers = [];
 
-    public function __construct(protected Config $conf)
+    protected Config $conf;
+
+    public function __construct(Config $config)
     {
+        $this->conf = $config;
     }
 
     public function __get($name)

src/Provider/V2/AuthProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v2;
+namespace Hyperf\Nacos\Provider\V2;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Nacos\AbstractProvider;

src/Provider/V2/ConfigProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v2;
+namespace Hyperf\Nacos\Provider\V2;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Nacos\AbstractProvider;

src/Provider/V2/InstanceProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v2;
+namespace Hyperf\Nacos\Provider\V2;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Codec\Json;

src/Provider/V2/OperatorProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v2;
+namespace Hyperf\Nacos\Provider\V2;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Nacos\AbstractProvider;

src/Provider/V2/ServiceProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v2;
+namespace Hyperf\Nacos\Provider\V2;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Nacos\AbstractProvider;

src/Provider/V3/AuthProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v3;
+namespace Hyperf\Nacos\Provider\V3;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Nacos\AbstractProvider;

src/Provider/V3/ConfigProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v3;
+namespace Hyperf\Nacos\Provider\V3;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Nacos\AbstractProvider;

src/Provider/V3/InstanceProvider.php

@@ -10,7 +10,7 @@
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 
-namespace Hyperf\Nacos\Provider\v3;
+namespace Hyperf\Nacos\Provider\V3;
 
 use GuzzleHttp\RequestOptions;
 use Hyperf\Codec\Json;