Merge branch 'improve/php7' into php7.2

.coveralls.yml

@@ -1,5 +1,4 @@
 # for php-coveralls
 # see also. https://coveralls.io
-src_dir: data
 coverage_clover: reports/coverage/coverage.xml
 json_path: reports/coverage/coveralls-upload.json

.travis.yml

@@ -1,34 +1,50 @@
 # for travis-ci
 # see also. https://travis-ci.org
 language: php
-sudo: required
+sudo: false
 php:
-  #- 5.3.3
-  #- 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
 
-matrix:
-  fast_finish: true
-
 env:
     global:
         - DBNAME=myapp_test HTTP_URL=http://localhost:8085/ HTTPS_URL=https://localhost:8085/
     matrix:
-        - DB=mysql USER=root DBPASS=' ' DBUSER=root 
-        - DB=pgsql USER=postgres DBPASS=password DBUSER=postgres 
+        - DB=mysql USER=root DBPASS=' ' DBUSER=root
+        - DB=pgsql USER=postgres DBPASS=password DBUSER=postgres
+        - DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true # Use for coverage report
+
+matrix:
+  fast_finish: true
+  exclude:
+    - php: 5.4
+      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
+    - php: 5.5
+      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
+    - php: 5.6
+      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.2
+      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
+  allow_failures:
+    # Use for coverage report
+    - php: 7.1
+      env: DB=pgsql USER=postgres DBPASS=password DBUSER=postgres COVERAGE=true
 
 before_script:
+    ## see https://github.com/symfony/symfony/blob/e0bdc0c35e9afdb3bee8af172f90e9648c4012fc/.travis.yml#L92-L97
+  - phpenv config-rm xdebug.ini || true
+  - echo "opcache.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - echo "apc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer self-update || true
-  - if [[ $TRAVIS_PHP_VERSION == '5.3.3' ]]; then composer install --dev --no-interaction --prefer-source ; fi
-  - if [[ $TRAVIS_PHP_VERSION != '5.3.3' ]]; then composer install --dev --no-interaction ; fi
+  - composer install --dev --no-interaction -o --apcu-autoloader
   - sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh appveyor; fi"
-  - cp tests/require.php.jenkins tests/require.php
   - cat ./data/config/config.php
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
@@ -37,12 +53,13 @@ before_script:
 
 script:
   - mkdir -p reports/coverage
-  - php data/vendor/bin/phpunit -c phpunit.xml.dist
-  - php data/vendor/bin/codecept run --env travis --steps
+  - if [ ! $COVERAGE ] ; then php data/vendor/bin/phpunit -c phpunit.xml.dist ; fi
+  - if [ $COVERAGE ] ; then phpdbg -qrr data/vendor/bin/phpunit -c phpunit.xml.dist ; fi
+  - if [ ! $COVERAGE ] ; then php data/vendor/bin/codecept run --env travis --steps ; fi
 
 after_script:
-  - php data/vendor/bin/coveralls -v
-  - cat ./data/logs/error.log
+  - if [ $COVERAGE ] ; then php data/vendor/bin/coveralls -v ; fi
+  - tail -n 100 ./data/logs/error.log
 
 # Cache folder, you can delete cache from Travis CI web interface
 cache:

README.md

@@ -1,5 +1,6 @@
 # EC-CUBE 2.13系 / 2.17系(開発中)
 [![Build Status](https://travis-ci.org/EC-CUBE/eccube-2_13.svg)](https://travis-ci.org/EC-CUBE/eccube-2_13)
+[![Build status](https://ci.appveyor.com/api/projects/status/4k58ucq2smwc4h7n/branch/master?svg=true)](https://ci.appveyor.com/project/ECCUBE/eccube-2-13/branch/master)
 [![Coverage Status](https://coveralls.io/repos/EC-CUBE/eccube-2_13/badge.png)](https://coveralls.io/r/EC-CUBE/eccube-2_13)
 
 ---

appveyor.yml

@@ -41,7 +41,7 @@ install:
   #- set PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin
   #- mingw-get install mingw-developer-toolkit
   ## Set PHP.
-  - cinst php -version 5.6.17
+  - cinst php -version 5.6.17 --allow-empty-checksums
   - SET PATH=C:\tools\php\;%PATH%
   - copy C:\tools\php\php.ini-production C:\tools\php\php.ini
   - echo date.timezone="Asia/Tokyo" >> C:\tools\php\php.ini

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": [

data/Smarty/templates/admin/contents/index.tpl

@@ -136,6 +136,8 @@
                 <td><a href="#" onclick="eccube.fnFormModeSubmit('move','delete','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">削除</a></td>
                 <td>
                     <!--{if count($arrNews) != 1}-->
+                    <!--{assign var=news_id value="`$arrNews[data].news_id`"}-->
+                    <!--{if $arrErr[$news_id] != ""}--><span class="attention"><!--{$arrErr[$news_id]}--></span><!--{/if}-->
                     <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />番目へ<a href="?" onclick="eccube.fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">移動</a><br />
                     <!--{/if}-->
                     <!--{if $smarty.section.data.iteration != 1}-->

data/Smarty/templates/admin/products/product_class.tpl

@@ -295,7 +295,7 @@
                         <!--{/foreach}-->
                     </td>
                     <td class="center">
-                        <!--{assign var=key value="down_filename}-->
+                        <!--{assign var=key value="down_filename"}-->
                         <!--{if $arrErr[$key][$index]}-->
                             <span class="attention"><!--{$arrErr[$key][$index]}--></span>
                         <!--{/if}-->

data/Smarty/templates/default/cart/index.tpl

@@ -38,7 +38,7 @@
             <!--{/if}-->
         <!--{/if}-->
 
-        <p class="totalmoney_area">
+        <div class="totalmoney_area">
             <!--{* カゴの中に商品がある場合にのみ表示 *}-->
             <!--{if count($cartKeys) > 1}-->
                 <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]|h}--><!--{if !$smarty.foreach.cartKey.last}-->、<!--{/if}--><!--{/foreach}-->は同時購入できません。<br />
@@ -53,7 +53,7 @@
             <!--{if strlen($tpl_message) != 0}-->
                 <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
             <!--{/if}-->
-        </p>
+        </div>
 
         <!--{if count($cartItems) > 0}-->
             <!--{foreach from=$cartKeys item=key}-->

data/Smarty/templates/sphone/products/detail.tpl

@@ -88,7 +88,7 @@
 
             <!--{* 画像の縦横倍率を算出 *}-->
             <!--{assign var=detail_image_size value=200}-->
-            <!--{assign var=main_image_factor value="`$arrFile[$key].width/$detail_image_size"`}-->
+            <!--{assign var=main_image_factor value=$arrFile[$key].width/$detail_image_size}-->
             <!--{if $arrProduct.main_large_image|strlen >= 1}-->
                 <a rel="external" class="expansion" href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct.main_large_image|h}-->" target="_blank">
                     <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct.main_image|h}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile.main_image.width/$main_image_factor}-->" height="<!--{$arrFile.main_image.height/$main_image_factor}-->" /></a>
@@ -421,4 +421,3 @@
 </section>
 
 <!--{include file= 'frontparts/search_area.tpl'}-->
-

data/app_initial.php

@@ -21,6 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+// Flexible SSLへの対応
+if( isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && 'https' == $_SERVER['HTTP_X_FORWARDED_PROTO'] ){
+    $_SERVER['HTTPS'] = 1;
+    $_SERVER['SERVER_PORT'] = 443;
+}
+
 if (!defined('CLASS_REALDIR')) {
     /** クラスパス */
     define('CLASS_REALDIR', DATA_REALDIR . "class/");

data/class/SC_CartSession.php

@@ -233,9 +233,6 @@ public function getAllProductsPoint($productTypeId)
                 }
                 $point_rate = $this->cartSession[$productTypeId][$i]['point_rate'];
 
-                if (!isset($this->cartSession[$productTypeId][$i]['id'][0])) {
-                    $this->cartSession[$productTypeId][$i]['id'][0] = '';
-                }
                 $point = SC_Utils_Ex::sfPrePoint($price, $point_rate);
                 $total+= ($point * $quantity);
             }
@@ -300,7 +297,7 @@ public function getPrevURL()
     public function delProductKey($keyname, $val, $productTypeId)
     {
         $max = $this->getMax($productTypeId);
-        for ($i = 0; $i < $max; $i++) {
+        for ($i = 0; $i <= $max; $i++) {
             if ($this->cartSession[$productTypeId][$i][$keyname] == $val) {
                 unset($this->cartSession[$productTypeId][$i]);
             }

data/class/SC_CheckError.php

@@ -1762,4 +1762,18 @@ public function numelicCheck($string)
 
         return strlen($string) > 0 && !ctype_digit($string);
     }
+
+    // 都道府県マスタに存在する値かチェック
+    public function PREF_CHECK($value)
+    {
+        $disp = $value[0];
+        $key = $value[1];
+
+        $pref_id = $this->arrParam[$key];
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+        $exists = $objQuery->exists('mtb_pref', 'id = ?', array($pref_id));
+        if (!$exists) {
+            $this->arrErr[$key] = '※ ' . $disp . 'が不正な値です。<br />';
+        }
+    }
 }