Merge pull request #199 from nobuhiko/fix197

fix #197 Archive_Tarの更新
EC-CUBE · Jul 30, 2018 · b6a3fe7 · b6a3fe7
2 parents 210da18 + bc53e11
commit b6a3fe7
Show file tree

Hide file tree

Showing 2 changed files with 215 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,6 @@
         "ext-gd": "*",
         "smarty/smarty": "*",
         "pear-pear.php.net/PEAR" : "*",
-        "pear-pear.php.net/Archive_Tar" : "*",
         "pear-pear.php.net/Mail" : "*",
         "pear-pear.php.net/Cache_Lite" : "*",
         "pear-pear.php.net/File_SearchReplace" : "*",
@@ -49,7 +48,8 @@
         "pear-pear.php.net/XML_Util" : "*",
         "mobiledetect/mobiledetectlib": "^2.8",
         "setasign/fpdf": "1.7",
-        "setasign/fpdi-fpdf": "1.6"
+        "setasign/fpdi-fpdf": "1.6",
+        "pear/archive_tar": "^1.4.3"
     },
     "autoload": {
         "classmap": [

diff --git a/composer.lock b/composer.lock