Improved Arrays (#173)

aliyun · May 30, 2019 · eb7148a · eb7148a
1 parent 7e943f9
commit eb7148a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.5.8 - 2019-05-30
+- Improved `Arrays`.
+
+
 ## 1.5.7 - 2019-05-29
 - Improved `uuid`.
 

diff --git a/composer.json b/composer.json
@@ -38,8 +38,7 @@
         "danielstjules/stringy": "^3.1",
         "mtdowling/jmespath.php": "^2.4",
         "adbario/php-dot-notation": "^2.2",
-        "clagiordano/weblibs-configmanager": "^1.0",
-        "nette/utils": "^2.3"
+        "clagiordano/weblibs-configmanager": "^1.0"
     },
     "require-dev": {
         "ext-spl": "*",

diff --git a/src/AlibabaCloud.php b/src/AlibabaCloud.php
@@ -30,7 +30,7 @@ class AlibabaCloud
     /**
      * Version of the Client
      */
-    const VERSION = '1.5.7';
+    const VERSION = '1.5.8';
 
     /**
      * This static method can directly call the specific service.

diff --git a/src/Result/Result.php b/src/Result/Result.php
@@ -131,6 +131,7 @@ public function getRequest()
     }
 
     /**
+     * @codeCoverageIgnore
      * @return Response
      * @deprecated
      */

diff --git a/src/Support/Arrays.php b/src/Support/Arrays.php
@@ -7,7 +7,7 @@
  *
  * @package AlibabaCloud\Client\Support
  */
-class Arrays extends \Nette\Utils\Arrays
+class Arrays
 {
 
     /**

diff --git a/tests/Unit/Support/ArraysTest.php b/tests/Unit/Support/ArraysTest.php
@@ -20,21 +20,11 @@ public function testMerge()
 
         self::assertEquals(
             [
-                               0 => 'abc',
-                               1 => 'a',
-                               2 => 'b'
-                           ],
-                           $params
-        );
-
-        $params = Arrays::mergeTree($array1, $array2);
-
-        self::assertEquals(
-            [
-                               1 => 'abc',
-                               0 => 'a'
-                           ],
-                           $params
+                0 => 'abc',
+                1 => 'a',
+                2 => 'b'
+            ],
+            $params
         );
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,6 +131,7 @@ public function getRequest() @@
         }
         /**
+         * @codeCoverageIgnore
          * @return Response
          * @deprecated
          */
@@ Expand Down @@