Merge pull request #3 from nanasess/nobuhiko-add-test-222

Fix locale to PHP7 for Windows
EC-CUBE · Mar 28, 2019 · 40d42a3 · 40d42a3
2 parents fe3e826 + 46fa05e
commit 40d42a3
Show file tree

Hide file tree

Showing 1,125 changed files with 3,262 additions and 3,537 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 env:
     global:
@@ -29,11 +30,13 @@ matrix:
       env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
     - php: 7.0
       env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
+    - php: 7.1
+      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
     - php: 7.2
       env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
   allow_failures:
     # Use for coverage report
-    - php: 7.1
+    - php: 7.3
       env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 
 before_script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -33,7 +33,7 @@ services:
 
 # Install scripts. (runs after repo cloning)
 install:
-  - cinst -y OpenSSL.Light
+  - cinst -y OpenSSL.Light --version 1.1.1
   - SET PATH=C:\Program Files\OpenSSL;%PATH%
   - sc config wuauserv start= auto
   - net start wuauserv
@@ -49,9 +49,9 @@ install:
   #- set PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin
   #- mingw-get install mingw-developer-toolkit
   ## Set PHP.
-  - cinst php --allow-empty-checksums
-  - SET PATH=C:\tools\php72\;%PATH%
-  - cd c:\tools\php72
+  - cinst php --allow-empty-checksums --version 7.3
+  - SET PATH=C:\tools\php73\;%PATH%
+  - cd c:\tools\php73
   - copy php.ini-production php.ini
   - echo date.timezone="Asia/Tokyo" >> php.ini
   - echo extension_dir=ext >> php.ini

diff --git a/composer.json b/composer.json
@@ -11,45 +11,35 @@
         "issues": "https://github.com/EC-CUBE/eccube-2_13/issues"
     },
     "config": {
-        "disable-tls": false,
-        "secure-http": false,
         "vendor-dir": "data/vendor",
         "platform": {
             "php": "5.4"
-        }
+        },
+        "optimize-autoloader": true,
+        "sort-packages": true
     },
-    "repositories": [
-        {
-            "type": "pear",
-            "url": "http://pear.php.net/"
-        }
-    ],
     "require-dev": {
         "satooshi/php-coveralls": "1.0",
         "codeception/codeception": "*"
     },
     "require": {
         "php": ">=5.3.9",
-        "ext-mbstring": "*",
         "ext-gd": "*",
-        "smarty/smarty": "*",
-        "pear-pear.php.net/PEAR" : "*",
-        "pear-pear.php.net/Mail" : "*",
-        "pear-pear.php.net/Cache_Lite" : "*",
-        "pear-pear.php.net/File_SearchReplace" : "*",
-        "pear-pear.php.net/MDB2_Driver_mysqli" : "1.5.0b4",
-        "pear-pear.php.net/MDB2_Driver_pgsql" : "1.5.0b4",
-        "pear-pear.php.net/MDB2" : "2.5.0-beta5 as 2.5.0",
-        "pear-pear.php.net/Net_UserAgent_Mobile" : "*",
-        "pear-pear.php.net/Services_JSON" : "*",
-        "pear-pear.php.net/Text_Password" : "*",
-        "pear-pear.php.net/XML_Parser" : "*",
-        "pear-pear.php.net/XML_Serializer" : "*",
-        "pear-pear.php.net/XML_Util" : "*",
+        "ext-mbstring": "*",
+        "bondas83/mdb2_driver_mysqli": "^1.5",
         "mobiledetect/mobiledetectlib": "^2.8",
+        "nanasess/mdb2_driver_pgsql": "^1.5",
+        "pear/archive_tar": "^1.4.3",
+        "pear/mail": "*",
+        "pear/pear-core-minimal": "^1.10",
+        "pear/text_password": "*",
+        "pear/xml_parser": "*",
+        "pear/xml_serializer": "*",
+        "pear/xml_util": "*",
         "setasign/fpdf": "1.7",
         "setasign/fpdi-fpdf": "1.6",
-        "pear/archive_tar": "^1.4.3"
+        "silverorange/mdb2": "2.5.2-b.5",
+        "smarty/smarty": "*"
     },
     "autoload": {
         "classmap": [