Merge pull request #189 from nobuhiko/fix#143

fix #143 Composer への置き換え
EC-CUBE · Apr 20, 2018 · 3fc6ab3 · 3fc6ab3
2 parents 0644cb7 + 67d8265
commit 3fc6ab3
Show file tree

Hide file tree

Showing 298 changed files with 137 additions and 21,420 deletions.
diff --git a/composer.json b/composer.json
@@ -44,7 +44,9 @@
         "pear-pear.php.net/XML_Parser" : "*",
         "pear-pear.php.net/XML_Serializer" : "*",
         "pear-pear.php.net/XML_Util" : "*",
-        "mobiledetect/mobiledetectlib": "^2.8"
+        "mobiledetect/mobiledetectlib": "^2.8",
+        "setasign/fpdf": "1.7",
+        "setasign/fpdi-fpdf": "1.6"
     },
     "autoload": {
         "classmap": [

diff --git a/composer.lock b/composer.lock
diff --git a/data/class/helper/SC_Helper_FPDI.php b/data/class/helper/SC_Helper_FPDI.php
@@ -1,5 +1,5 @@
 <?php
-require DATA_REALDIR . 'module/fpdf/fpdf.php';
+#require DATA_REALDIR . 'module/fpdf/fpdf.php';
 require DATA_REALDIR . 'module/fpdi/japanese.php';
 
 // japanese.php のバグ回避

diff --git a/data/module/Compat/Compat.php b/data/module/Compat/Compat.php