Merge remote-tracking branch 'upstream/improve/php7' into fix197

Procfile

@@ -0,0 +1 @@
+web: $(composer config bin-dir)/heroku-php-apache2 html/

README.md

@@ -2,6 +2,7 @@
 [![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)
+[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
 
 ---
 

app.json

@@ -0,0 +1,23 @@
+{
+    "name": "EC-CUBE2",
+    "description": "EC-CUBE2 on Heroku",
+    "website": "https://github.com/EC-CUBE/eccube-2_13",
+    "repository": "https://github.com/EC-CUBE/eccube-2_13",
+    "keywords": ["php", "ec", "e-commerce", "ec-cube"],
+    "scripts": {
+        "postdeploy": "php ./setup_heroku.php"
+    },
+    "addons": [
+        {
+            "plan": "heroku-postgresql",
+            "options": {
+                "version": "9.6"
+            }
+        }
+    ],
+    "buildpacks": [
+        {
+            "url": "heroku/php"
+        }
+    ]
+}

composer.json

@@ -11,7 +11,7 @@
         "issues": "https://github.com/EC-CUBE/eccube-2_13/issues"
     },
     "config": {
-        "disable-tls": true,
+        "disable-tls": false,
         "secure-http": false,
         "vendor-dir": "data/vendor",
         "platform": {
@@ -29,6 +29,9 @@
         "codeception/codeception": "*"
     },
     "require": {
+        "php": ">=5.3.9",
+        "ext-mbstring": "*",
+        "ext-gd": "*",
         "smarty/smarty": "*",
         "pear-pear.php.net/PEAR" : "*",
         "pear-pear.php.net/Mail" : "*",

html/.htaccess

@@ -1,5 +1,5 @@
 # 基本は SC_Initial.php で設定するが、ini_setで反映されないものはここで設定する
-
+<IfModule mod_php5.c>
 php_value mbstring.language Japanese
 php_flag mbstring.encoding_translation off
 php_value output_handler none
@@ -13,3 +13,5 @@ php_value mbstring.internal_encoding UTF-8
 php_value upload_max_filesize 5M
 #php_value post_max_size 8M
 php_flag register_globals off
+</IfModule>
+

setup_heroku.php

@@ -0,0 +1,10 @@
+<?php
+putenv("DB=pgsql");
+putenv("DBSERVER=".getenv('DB_HOST'));
+putenv("DBNAME=".getenv('DB_DATABASE'));
+putenv("USER=".getenv('DB_USERNAME'));
+putenv("DBPASS=".getenv('DB_PASSWORD'));
+putenv("HTTP_URL=http://".getenv('HEROKU_APP_NAME').".herokuapp.com");
+putenv("HTTPS_URL=http://".getenv('HEROKU_APP_NAME').".herokuapp.com");
+
+exec("sh ./eccube_install.sh postgres");