v5.0

.github/prepare-test.sh

@@ -4,18 +4,20 @@ __DIR__=$(cd `dirname $0`; pwd)
 
 cd $__DIR__
 
-if [[ `expr $PHP_DOCKER_VERSION \< 7` -eq 0 ]]; then
+if [[ `expr $PHP_DOCKER_VERSION \< 7.1` -eq 0 ]]; then
   export PHP_DOCKER_FILE="php.dockerfile"
 else
-  export PHP_DOCKER_FILE="php-5.dockerfile"
+  export PHP_DOCKER_FILE="php-low.dockerfile"
 fi
 
 containerName=$1
 
 docker-compose up -d $containerName \
 && docker exec $containerName php -v \
 && docker exec $containerName php -m \
-&& docker exec $containerName composer -V \
+&& docker exec $containerName php --ri curl
+docker exec $containerName php --ri swoole
+docker exec $containerName composer -V \
 && docker ps -a
 
 n=0

.github/print-logs.php

@@ -0,0 +1,16 @@
+<?php
+
+$dir = dirname(__DIR__) . '/tests/server/';
+
+foreach ([
+    $dir . 'Http/log.log',
+    $dir . 'Http2/log.log',
+    $dir . 'WebSocket/log.log',
+] as $fileName)
+{
+    echo '[',$fileName,']', \PHP_EOL;
+    if (is_file($fileName))
+    {
+        echo file_get_contents($fileName), \PHP_EOL;
+    }
+}

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [5.5, 5.6, 7.0, 7.1]
+        php: ["7.1"]
 
     env:
       PHP_DOCKER_VERSION: ${{ matrix.php }}
@@ -24,6 +24,10 @@ jobs:
       - name: test
         run: docker exec php composer test
 
+      - name: Print logs
+        if: failure()
+        run: php .github/print-logs.php
+
   ci-curl-swoole:
     runs-on: ubuntu-20.04
 
@@ -32,6 +36,9 @@ jobs:
       matrix:
         swoole:
           [
+            5.1-php8.0,
+            5.1-php8.1,
+            5.1-php8.2,
             5.0-php8.0,
             5.0-php8.1,
             5.0-php8.2,
@@ -54,3 +61,7 @@ jobs:
 
       - name: test
         run: docker exec swoole composer test
+
+      - name: Print logs
+        if: failure()
+        run: php .github/print-logs.php

.github/workflows/phpcs.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swoole: [4.6-php7.4]
+        swoole: [5.0-php8.2]
 
     env:
       SWOOLE_DOCKER_VERSION: ${{ matrix.swoole }}
@@ -20,7 +20,7 @@ jobs:
       - name: Prepare
         run: |
           ./.github/prepare-test.sh swoole
-          docker exec swoole composer require friendsofphp/php-cs-fixer:^2.19 --dev
+          docker exec swoole composer require php-cs-fixer/shim:~3.35.0 --dev
 
       - name: Test
         run: docker exec swoole ./vendor/bin/php-cs-fixer fix --dry-run --diff

.github/workflows/phpstan.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swoole: [4.6-php7.4]
+        swoole: [5.0-php8.2]
 
     env:
       SWOOLE_DOCKER_VERSION: ${{ matrix.swoole }}
@@ -20,7 +20,7 @@ jobs:
       - name: Prepare
         run: |
           ./.github/prepare-test.sh swoole
-          docker exec swoole composer require phpstan/phpstan:^0.12.91 --dev
+          docker exec swoole composer require phpstan/phpstan:~1.10.0 --dev
 
       - name: Test
         run: docker exec swoole ./vendor/bin/phpstan analyse --memory-limit 1G

.php-cs-fixer.dist.php

@@ -0,0 +1,114 @@
+<?php
+
+if (!file_exists(__DIR__ . '/src'))
+{
+    exit(0);
+}
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@Symfony'                   => true,
+        '@Symfony:risky'             => true,
+        'php_unit_dedicate_assert'   => ['target' => '5.6'],
+        'array_syntax'               => ['syntax' => 'short'],
+        'array_indentation'          => true,
+        'binary_operator_spaces'     => [
+            'operators' => [
+                '=>' => 'align_single_space',
+            ],
+        ],
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'fopen_flags'                   => false,
+        'protected_to_private'          => false,
+        'native_constant_invocation'    => true,
+        'single_quote'                  => true,
+        'single_space_around_construct' => [
+            'constructs_followed_by_a_single_space' => [
+                'abstract',
+                'as',
+                'attribute',
+                'break',
+                'case',
+                'catch',
+                'class',
+                'clone',
+                'comment',
+                'const',
+                'const_import',
+                'continue',
+                'do',
+                'echo',
+                'else',
+                'elseif',
+                'enum',
+                'extends',
+                'final',
+                'finally',
+                'for',
+                'foreach',
+                'function',
+                'function_import',
+                'global',
+                'goto',
+                'if',
+                'implements',
+                'include',
+                'include_once',
+                'instanceof',
+                'insteadof',
+                'interface',
+                'match',
+                'named_argument',
+                // 'namespace', // 兼容性移除
+                'new',
+                'open_tag_with_echo',
+                'php_doc',
+                'php_open',
+                'print',
+                'private',
+                'protected',
+                'public',
+                'readonly',
+                'require',
+                'require_once',
+                'return',
+                'static',
+                'switch',
+                'throw',
+                'trait',
+                'try',
+                'type_colon',
+                'use',
+                'use_lambda',
+                'use_trait',
+                'var',
+                'while',
+                'yield',
+                'yield_from',
+            ],
+        ],
+        'control_structure_continuation_position' => [
+            'position' => 'next_line',
+        ],
+        'curly_braces_position'            => [
+            'control_structures_opening_brace' => 'next_line_unless_newline_at_signature_end',
+        ],
+        'no_superfluous_phpdoc_tags'   => false,
+        'single_line_comment_style'    => false,
+        'combine_nested_dirname'       => false,
+        'backtick_to_shell_exec'       => false,
+        'visibility_required'          => false,
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude(__DIR__ . '/vendor')
+            ->in(__DIR__ . '/.github')
+            ->in(__DIR__ . '/src')
+            ->in(__DIR__ . '/examples')
+            ->in(__DIR__ . '/tests')
+            ->append([__FILE__])
+    )
+;

composer.json

@@ -2,8 +2,8 @@
     "name": "yurunsoft/yurun-http",
     "description": "YurunHttp 是开源的 PHP HTTP 类库，支持链式操作，简单易用。支持 Curl、Swoole，支持 Http、Http2、WebSocket！",
     "require": {
-        "php": ">=5.5.0",
-        "psr/http-message": "~1.0",
+        "php": ">=7.1",
+        "psr/http-message": "~1.0|~2.0",
         "psr/log": "~1.0|~2.0|~3.0"
     },
     "require-dev": {

examples/http2Client.php

@@ -23,7 +23,8 @@
         {
             $response = $client->recv();
             var_dump($response->body());
-        } while ($response->success);
+        }
+        while ($response->success);
     });
 
     // 客户端请求和响应获取
@@ -52,7 +53,8 @@
         {
             ++$returnCount;
         }
-    } while ($returnCount < $count);
+    }
+    while ($returnCount < $count);
 
     $client->close();
 });

examples/psr7Ex.php

@@ -77,7 +77,7 @@ function test()
                         ->withAttribute(Attributes::DOWNLOAD_SPEED, 30000)
                         // 上传限速，单位：字节，仅Curl有效
                         ->withAttribute(Attributes::UPLOAD_SPEED, 30000)
-                        ;
+    ;
     $response = YurunHttp::send($request);
     var_dump($response);
 }

src/HttpRequest.php

@@ -63,7 +63,7 @@ class HttpRequest
      *
      * @var callable|null
      */
-    public $retryCallback = null;
+    public $retryCallback;
 
     /**
      * 是否使用代理，默认false.
@@ -175,7 +175,7 @@ class HttpRequest
      *
      * @var string
      */
-    public $certPassword = null;
+    public $certPassword;
 
     /**
      * certType规定的私钥的加密类型，支持的密钥类型为"PEM"(默认值)、"DER"和"ENG".
@@ -196,7 +196,7 @@ class HttpRequest
      *
      * @var string
      */
-    public $keyPassword = null;
+    public $keyPassword;
 
     /**
      * 请求方法.
@@ -217,7 +217,7 @@ class HttpRequest
      *
      * @var bool|null
      */
-    public $connectionPool = null;
+    public $connectionPool;
 
     /**
      * 代理认证方式.
@@ -654,7 +654,7 @@ public function ua($userAgent)
      */
     public function retry($retry, $callback = null)
     {
-        $this->retry = $retry < 0 ? 0 : $retry;   //至少请求1次，即重试0次
+        $this->retry = $retry < 0 ? 0 : $retry;   // 至少请求1次，即重试0次
         $this->retryCallback = $callback;
 
         return $this;
@@ -951,7 +951,7 @@ public function buildRequest($url = null, $requestBody = null, $method = null, $
                             ->withAttribute(Attributes::RETRY, $this->retry)
                             ->withAttribute(Attributes::RETRY_CALLBACK, $this->retryCallback)
                             ->withProtocolVersion($this->protocolVersion)
-                            ;
+        ;
         foreach ($this->proxy as $name => $value)
         {
             $request = $request->withAttribute('proxy.' . $name, $value);