diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 6952c90a40..0000000000 --- a/Gruntfile.js +++ /dev/null @@ -1,25 +0,0 @@ -module.exports = function (grunt) { - grunt.initConfig({ - jshint: { - options: { - node: true, - maxerr: 200, - browser: true, - devel: true, - unused: true - }, - files: { - src: [ - 'Gruntfile.js', - 'html/js/eccube.js', - 'html/user_data/packages/admin/js/breadcrumbs.js', - 'html/user_data/packages/admin/js/eccube.admin.js', - 'html/user_data/packages/admin/js/layout_design.js ', - 'html/user_data/packages/sphone/js/eccube.sphone.js', - ] - } - } - }); - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.registerTask('default', [ 'jshint' ]); -}; diff --git a/Procfile b/Procfile new file mode 100644 index 0000000000..ed0af073d6 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: $(composer config bin-dir)/heroku-php-apache2 html/ diff --git a/README.md b/README.md index 443bf5c6cc..fed7b1087e 100644 --- a/README.md +++ b/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) --- diff --git a/app.json b/app.json new file mode 100644 index 0000000000..91ba7c6ce5 --- /dev/null +++ b/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" + } + ] +} diff --git a/composer.json b/composer.json index bb47cac3db..9d228a4f72 100644 --- a/composer.json +++ b/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" : "*", diff --git a/composer.lock b/composer.lock index 363e2788a9..44e0411d3c 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "18128fe24f8dac7a6a40c1daa9858dc8", + "content-hash": "8d598a6770b1028ee74b690ef032bd9f", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -3400,7 +3400,11 @@ }, "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": ">=5.3.9", + "ext-mbstring": "*", + "ext-gd": "*" + }, "platform-dev": [], "platform-overrides": { "php": "5.4" diff --git a/html/.htaccess b/html/.htaccess index 0e45931441..b75d73c0c0 100644 --- a/html/.htaccess +++ b/html/.htaccess @@ -1,5 +1,5 @@ # 基本は SC_Initial.php で設定するが、ini_setで反映されないものはここで設定する - + 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 + + diff --git a/package.json b/package.json deleted file mode 100644 index 3ba81d3531..0000000000 --- a/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "eccube", - "version": "0.0.0", - "description": "", - "main": "index.js", - "directories": { - "doc": "docs", - "test": "tests" - }, - "scripts": { - "test": "grunt test" - }, - "repository": { - "type": "git", - "url": "git://github.com/nobuhiko/EC-CUBE.git" - }, - "author": "Nobuhiko Kimoto", - "license": "GPL", - "bugs": { - "url": "https://github.com/nobuhiko/EC-CUBE/issues" - }, - "homepage": "https://github.com/nobuhiko/EC-CUBE", - "devDependencies": { - "grunt": "~0.4.4", - "grunt-contrib-jshint": "~0.10.0" - } -} diff --git a/setup_heroku.php b/setup_heroku.php new file mode 100644 index 0000000000..8a96b21c24 --- /dev/null +++ b/setup_heroku.php @@ -0,0 +1,10 @@ +