Merge pull request #19 from EC-CUBE/chihiro-adachi-patch-1

3.0.17対応

.travis.yml

@@ -19,12 +19,15 @@ env:
     PLUGIN_CODE=CategoryContent
   matrix:
     # ec-cube master
-    - ECCUBE_VERSION=master DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
-    - ECCUBE_VERSION=master DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
-    - ECCUBE_VERSION=master DB=sqlite
+    - ECCUBE_VERSION=3.1 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
+    - ECCUBE_VERSION=3.1 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
+    - ECCUBE_VERSION=3.1 DB=sqlite
     # ec-cube 3.0.16
     - ECCUBE_VERSION=3.0.16 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
     - ECCUBE_VERSION=3.0.16 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
+    # ec-cube 3.0.17
+    - ECCUBE_VERSION=3.0.17 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
+    - ECCUBE_VERSION=3.0.17 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
 matrix:
   fast_finish: true
   include:
@@ -33,17 +36,17 @@ matrix:
   exclude:
   allow_failures:
     - php: 5.3
-      env: ECCUBE_VERSION=master DB=sqlite
+      env: ECCUBE_VERSION=3.1 DB=sqlite
     - php: 5.4
-      env: ECCUBE_VERSION=master DB=sqlite
+      env: ECCUBE_VERSION=3.1 DB=sqlite
     - php: 5.5
-      env: ECCUBE_VERSION=master DB=sqlite
+      env: ECCUBE_VERSION=3.1 DB=sqlite
     - php: 5.6
-      env: ECCUBE_VERSION=master DB=sqlite
+      env: ECCUBE_VERSION=3.1 DB=sqlite
     - php: 7.0
-      env: ECCUBE_VERSION=master DB=sqlite
+      env: ECCUBE_VERSION=3.1 DB=sqlite
     - php: 7.1
-      env: ECCUBE_VERSION=master DB=sqlite
+      env: ECCUBE_VERSION=3.1 DB=sqlite
 
 install:
   - gem install mime-types -v 2.99.1
@@ -56,7 +59,8 @@ before_script:
   - git clone https://github.com/EC-CUBE/ec-cube.git
   - cd ec-cube
   # checkout version
-  - sh -c "if [ ! '${ECCUBE_VERSION}' = 'master' ]; then  git checkout -b ${ECCUBE_VERSION} refs/tags/${ECCUBE_VERSION}; fi"
+  - sh -c "if [ '${ECCUBE_VERSION}' = '3.1' ]; then  git checkout -b ${ECCUBE_VERSION} origin/${ECCUBE_VERSION}; fi"
+  - sh -c "if [ ! '${ECCUBE_VERSION}' = '3.1' ]; then  git checkout -b ${ECCUBE_VERSION} refs/tags/${ECCUBE_VERSION}; fi"
   # update composer
   - composer selfupdate
   - composer install --dev --no-interaction -o

appveyor.yml

@@ -37,7 +37,7 @@ install:
   - git clone https://github.com/EC-CUBE/ec-cube.git %BASE_DIR%
   - cd %BASE_DIR%
   # checkout version
-  #- sh -c "if [ ! '%ECCUBE_VERSION%' = 'master' ]; then  git checkout -b %ECCUBE_VERSION% refs/tags/%ECCUBE_VERSION%; fi"
+  - git checkout origin/3.1
   # see https://github.com/phpmd/phpmd/blob/master/appveyor.yml#L10-L13
   - cinst -y OpenSSL.Light --version 1.1.1
   - SET PATH=C:\Program Files\OpenSSL;%PATH%
@@ -59,6 +59,7 @@ install:
   - echo extension=php_pdo_pgsql.dll >> C:\tools\php71\php.ini
   - echo extension=php_curl.dll >> C:\tools\php71\php.ini
   - echo extension=php_fileinfo.dll >> C:\tools\php71\php.ini
+  - echo extension=php_intl.dll >> C:\tools\php56\php.ini
   - echo output_buffering = Off >> C:\tools\php71\php.ini
   - echo default_charset = UTF-8 >> C:\tools\php71\php.ini
   - echo mbstring.language = Japanese >> C:\tools\php71\php.ini