Support PHP versions: From 5.5 up to 8.1

Author: yndu13

.github/workflows/ci_higher_than_or_equal_to_7.2.yml

@@ -0,0 +1,59 @@
+name: HighVersion CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10.x
+
+    - name: Install Proxy
+      run: npm install o_o -g --registry=https://registry.npm.taobao.org
+
+    - name: Start Proxy
+      run: o_o &
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: mbstring, intl
+        ini-values: post_max_size=256M, max_execution_time=180
+        coverage: xdebug        
+        tools: php-cs-fixer, phpunit
+    
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    - name: Run test case
+      run: composer test4HighVersion
+      env:
+        REGION_ID: ${{ secrets.REGION_ID }}
+        ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
+        ACCESS_KEY_SECRET: ${{ secrets.ACCESS_KEY_SECRET }}
+        PRIVATE_KEY_LINE_1: ${{ secrets.PRIVATE_KEY_LINE_1 }}
+        PUBLIC_KEY_ID: ${{ secrets.PUBLIC_KEY_ID }}
+        IMAGE_SEARCH_ACCESS_KEY_ID: ${{ secrets.IMAGE_SEARCH_ACCESS_KEY_ID }}
+        IMAGE_SEARCH_ACCESS_KEY_SECRET: ${{ secrets.IMAGE_SEARCH_ACCESS_KEY_SECRET }}
+        IMAGE_SEARCH_INSTANCE_NAME: ${{ secrets.IMAGE_SEARCH_INSTANCE_NAME }}
+    
+    - name: CodeCov
+      run: bash <(curl -s https://codecov.io/bash)

.github/workflows/ci.yml renamed to .github/workflows/ci_lower_than_php7.2.yml

@@ -1,4 +1,4 @@
-name: CI
+name: LowVersion CI
 
 on:
   push:
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['5.6', '7.0', '7.1']
 
     steps:
     - name: Checkout
@@ -44,13 +44,16 @@ jobs:
       run: composer install --prefer-dist --no-progress --no-suggest
 
     - name: Run test case
-      run: test -z $ACCESS_KEY_ID -a -z $ACCESS_KEY_SECRET || composer test
+      run: composer test4LowVersion
       env:
         REGION_ID: ${{ secrets.REGION_ID }}
         ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
         ACCESS_KEY_SECRET: ${{ secrets.ACCESS_KEY_SECRET }}
         PRIVATE_KEY_LINE_1: ${{ secrets.PRIVATE_KEY_LINE_1 }}
         PUBLIC_KEY_ID: ${{ secrets.PUBLIC_KEY_ID }}
+        IMAGE_SEARCH_ACCESS_KEY_ID: ${{ secrets.IMAGE_SEARCH_ACCESS_KEY_ID }}
+        IMAGE_SEARCH_ACCESS_KEY_SECRET: ${{ secrets.IMAGE_SEARCH_ACCESS_KEY_SECRET }}
+        IMAGE_SEARCH_INSTANCE_NAME: ${{ secrets.IMAGE_SEARCH_INSTANCE_NAME }}
 
     - name: CodeCov
       run: bash <(curl -s https://codecov.io/bash)

.travis.yml

@@ -9,6 +9,8 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
+  - 8.1
   - hhvm-3.24
   - nightly
 env:

appveyor.yml

@@ -29,13 +29,14 @@ install:
   - echo extension=php_sockets.dll >> C:\tools\phpci\php\php.ini
   - echo extension=php_curl.dll >> C:\tools\phpci\php\php.ini
   - cd %APPVEYOR_BUILD_FOLDER%
+  - composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer false
   - composer install --prefer-dist --no-progress
   # Install Proxy
   - npm install o_o -g
 
 test_script:
   # Start Proxy
-  - ps: o_o &
+  - ps: Start-Process -FilePath "o_o" -NoNewWindow
   # Test
   - cd %APPVEYOR_BUILD_FOLDER%
   - vendor\bin\phpunit --colors=always

composer.json

@@ -35,9 +35,8 @@
     "ext-simplexml": "*",
     "ext-xmlwriter": "*",
     "guzzlehttp/guzzle": "^6.3|^7.0",
-    "danielstjules/stringy": "^3.1",
     "mtdowling/jmespath.php": "^2.5",
-    "adbario/php-dot-notation": "^2.2",
+    "adbario/php-dot-notation": "^2.4.1",
     "clagiordano/weblibs-configmanager": "^1.0"
   },
   "require-dev": {
@@ -49,7 +48,7 @@
     "drupal/coder": "^8.3",
     "symfony/dotenv": "^3.4",
     "league/climate": "^3.2.4",
-    "phpunit/phpunit": "^5.7.27|^6.1",
+    "phpunit/phpunit": "^5.7|^6.6|^7.5|^8.5|^9.5",
     "monolog/monolog": "^1.24",
     "composer/composer": "^1.8",
     "mikey179/vfsstream": "^1.6",
@@ -73,7 +72,10 @@
   },
   "config": {
     "preferred-install": "dist",
-    "optimize-autoloader": true
+    "optimize-autoloader": true,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
@@ -95,13 +97,29 @@
     "test": [
       "phpunit --colors=always"
     ],
-    "unit": [
+    "test4HighVersion": [
+      "@clearCache",
+      "phpunit --testsuite=Test4HighVersion --colors=always"
+    ],
+    "test4LowVersion": [
+      "@clearCache",
+      "phpunit --testsuite=Test4LowVersion --colors=always"
+    ],
+    "unit4HighVersion": [
+      "@clearCache",
+      "phpunit --testsuite=Unit4HighVersion --colors=always"
+    ],
+    "unit4LowVersion": [
+      "@clearCache",
+      "phpunit --testsuite=Unit4LowVersion --colors=always"
+    ],
+    "feature4HighVersion": [
       "@clearCache",
-      "phpunit --testsuite=Unit --colors=always"
+      "phpunit --testsuite=Feature4HighVersion --colors=always"
     ],
-    "feature": [
+    "feature4LowVersion": [
       "@clearCache",
-      "phpunit --testsuite=Feature --colors=always"
+      "phpunit --testsuite=Feature4LowVersion --colors=always"
     ],
     "coverage": "open cache/coverage/index.html",
     "clearCache": "rm -rf cache/*",

phpunit.xml

@@ -8,19 +8,32 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         logIncompleteSkipped="true"
          testSuiteLoaderFile="phpunit/src/Runner/StandardTestSuiteLoader.php">
 
     <testsuites>
         <testsuite name="All">
             <directory>tests</directory>
         </testsuite>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
+        <testsuite name="Test4HighVersion">
+            <directory>./tests/HigherthanorEqualtoVersion7_2</directory>
+        </testsuite>
+        <testsuite name="Test4LowVersion">
+            <directory>./tests/LowerthanVersion7_2</directory>
+        </testsuite>
+        <testsuite name="Unit4HighVersion">
+            <directory suffix="Test.php">./tests/HigherthanorEqualtoVersion7_2/Unit</directory>
+        </testsuite>
+
+        <testsuite name="Feature4HighVersion">
+            <directory suffix="Test.php">./tests/HigherthanorEqualtoVersion7_2/Feature</directory>
+        </testsuite>
+
+        <testsuite name="Unit4LowVersion">
+            <directory suffix="Test.php">./tests/LowerthanVersion7_2/Unit</directory>
         </testsuite>
 
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
+        <testsuite name="Feature4LowVersion">
+            <directory suffix="Test.php">./tests/LowerthanVersion7_2/Feature</directory>
         </testsuite>
     </testsuites>
 

src/Credentials/Providers/EcsRamRoleProvider.php

@@ -3,7 +3,7 @@
 namespace AlibabaCloud\Client\Credentials\Providers;
 
 use Exception;
-use Stringy\Stringy;
+use AlibabaCloud\Client\Support\Stringy;
 use AlibabaCloud\Client\SDK;
 use AlibabaCloud\Client\Result\Result;
 use Psr\Http\Message\ResponseInterface;
@@ -112,7 +112,7 @@ public function getResponse()
         try {
             return RpcRequest::createClient()->request('GET', $url, $options);
         } catch (GuzzleException $exception) {
-            if (Stringy::create($exception->getMessage())->contains('timed')) {
+            if (Stringy::contains($exception->getMessage(), 'timed')) {
                 $message = 'Timeout or instance does not belong to Alibaba Cloud';
             } else {
                 $message = $exception->getMessage();

src/Exception/ServerException.php

@@ -2,7 +2,7 @@
 
 namespace AlibabaCloud\Client\Exception;
 
-use Stringy\Stringy;
+use AlibabaCloud\Client\Support\Stringy;
 use RuntimeException;
 use AlibabaCloud\Client\SDK;
 use AlibabaCloud\Client\Result\Result;
@@ -83,7 +83,7 @@ private function resolvePropertiesByReturn()
     private function distinguishSignatureErrors()
     {
         if ($this->result->getRequest()
-            && Stringy::create($this->errorMessage)->contains($this->result->getRequest()->stringToSign())) {
+            && Stringy::contains($this->errorMessage, $this->result->getRequest()->stringToSign())) {
             $this->errorCode    = 'InvalidAccessKeySecret';
             $this->errorMessage = 'Specified Access Key Secret is not valid.';
         }

src/Functions.php

@@ -3,7 +3,7 @@
 namespace AlibabaCloud\Client;
 
 use Closure;
-use Stringy\Stringy;
+use AlibabaCloud\Client\Support\Stringy;
 use League\CLImate\CLImate;
 use AlibabaCloud\Client\Exception\ClientException;
 
@@ -60,7 +60,7 @@ function inOpenBasedir($filename, $throwException = false)
 function inDir($filename, array $dirs)
 {
     foreach ($dirs as $dir) {
-        if (!Stringy::create($dir)->endsWith(DIRECTORY_SEPARATOR)) {
+        if (!Stringy::endsWith($dir, DIRECTORY_SEPARATOR)) {
             $dir .= DIRECTORY_SEPARATOR;
         }
 

src/Log/LogFormatter.php

@@ -37,14 +37,14 @@ class LogFormatter
      */
     public function __construct($template)
     {
-        parent::__construct($template);
+        // parent::__construct($template);
         self::$logStartTime = microtime(true);
         $this->template     = $template;
         $timezone           = new DateTimeZone(date_default_timezone_get() ?: 'UTC');
         if (PHP_VERSION_ID < 70100) {
             self::$ts = DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)), $timezone);
         } else {
-            self::$ts = new DateTime(null, $timezone);
+            self::$ts = new DateTime('now', $timezone);
         }
     }