From 107715074653d4cb6fbb16e208aa52ee20327325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= Date: Sat, 28 Jul 2018 10:57:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Heroku=20button=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 25 --- Procfile | 1 + README.md | 1 + app.json | 23 +++ composer.json | 5 +- composer.lock | 461 ++++++++++++++++++++++++++++------------------- html/.htaccess | 4 +- package.json | 27 --- setup_heroku.php | 10 + 9 files changed, 320 insertions(+), 237 deletions(-) delete mode 100644 Gruntfile.js create mode 100644 Procfile create mode 100644 app.json delete mode 100644 package.json create mode 100644 setup_heroku.php 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 65151ebba4..2c53645bb3 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/Archive_Tar" : "*", diff --git a/composer.lock b/composer.lock index b59b81caa6..a85c514d04 100644 --- a/composer.lock +++ b/composer.lock @@ -1,30 +1,30 @@ { "_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": "a7e7f36f6f3d223b51d619c440dfd66d", + "content-hash": "8dadcb2495863ace0b8c1d963dee99e4", "packages": [ { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.26", + "version": "2.8.32", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297" + "reference": "ec69a0c381b5fe44547680d3c7db6ced08e5abb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297", - "reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/ec69a0c381b5fe44547680d3c7db6ced08e5abb3", + "reference": "ec69a0c381b5fe44547680d3c7db6ced08e5abb3", "shasum": "" }, "require": { "php": ">=5.0.0" }, "require-dev": { - "phpunit/phpunit": "*" + "phpunit/phpunit": "~4.8.35||~5.7" }, "type": "library", "autoload": { @@ -56,7 +56,7 @@ "mobile detector", "php mobile detect" ], - "time": "2017-08-29T18:23:54+00:00" + "time": "2018-06-03T13:13:04+00:00" }, { "name": "pear-pear.php.net/Archive_Tar", @@ -89,10 +89,10 @@ }, { "name": "pear-pear.php.net/Cache_Lite", - "version": "1.8.0", + "version": "1.8.2", "dist": { "type": "file", - "url": "http://pear.php.net/get/Cache_Lite-1.8.0.tgz", + "url": "http://pear.php.net/get/Cache_Lite-1.8.2.tgz", "reference": null, "shasum": null }, @@ -101,7 +101,7 @@ "php": ">=5.4.0.0" }, "replace": { - "pear-pear/cache_lite": "== 1.8.0.0" + "pear-pear/cache_lite": "== 1.8.2.0" }, "type": "pear-library", "autoload": { @@ -693,16 +693,16 @@ }, { "name": "smarty/smarty", - "version": "v3.1.31", + "version": "v3.1.32", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "c7d42e4a327c402897dd587871434888fde1e7a9" + "reference": "ac9d4b587e5bf53381e21881820a9830765cb459" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c7d42e4a327c402897dd587871434888fde1e7a9", - "reference": "c7d42e4a327c402897dd587871434888fde1e7a9", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ac9d4b587e5bf53381e21881820a9830765cb459", + "reference": "ac9d4b587e5bf53381e21881820a9830765cb459", "shasum": "" }, "require": { @@ -742,22 +742,22 @@ "keywords": [ "templating" ], - "time": "2016-12-14T21:57:25+00:00" + "time": "2018-04-24T14:53:33+00:00" } ], "packages-dev": [ { "name": "behat/gherkin", - "version": "v4.4.5", + "version": "v4.5.1", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74" + "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", + "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", "shasum": "" }, "require": { @@ -803,66 +803,62 @@ "gherkin", "parser" ], - "time": "2016-10-30T11:50:56+00:00" + "time": "2017-08-30T11:04:43+00:00" }, { "name": "codeception/codeception", - "version": "2.3.5", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "e807cd458eb9f7ae7464f33ad835a2f54aa73194" + "reference": "bca3547632556875f1cdd567d6057cc14fe472b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/e807cd458eb9f7ae7464f33ad835a2f54aa73194", - "reference": "e807cd458eb9f7ae7464f33ad835a2f54aa73194", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/bca3547632556875f1cdd567d6057cc14fe472b8", + "reference": "bca3547632556875f1cdd567d6057cc14fe472b8", "shasum": "" }, "require": { - "behat/gherkin": "~4.4.0", + "behat/gherkin": "^4.4.0", + "codeception/phpunit-wrapper": "^6.0.9|^7.0.6", + "codeception/stub": "^1.0", "ext-json": "*", "ext-mbstring": "*", "facebook/webdriver": ">=1.1.3 <2.0", "guzzlehttp/guzzle": ">=4.1.4 <7.0", "guzzlehttp/psr7": "~1.0", "php": ">=5.4.0 <8.0", - "phpunit/php-code-coverage": ">=2.2.4 <6.0", - "phpunit/phpunit": ">4.8.20 <7.0", - "phpunit/phpunit-mock-objects": ">2.3 <5.0", - "sebastian/comparator": ">1.1 <3.0", - "sebastian/diff": "^1.4", - "stecman/symfony-console-completion": "^0.7.0", - "symfony/browser-kit": ">=2.7 <4.0", - "symfony/console": ">=2.7 <4.0", - "symfony/css-selector": ">=2.7 <4.0", - "symfony/dom-crawler": ">=2.7.5 <4.0", - "symfony/event-dispatcher": ">=2.7 <4.0", - "symfony/finder": ">=2.7 <4.0", - "symfony/yaml": ">=2.7 <4.0" + "symfony/browser-kit": ">=2.7 <5.0", + "symfony/console": ">=2.7 <5.0", + "symfony/css-selector": ">=2.7 <5.0", + "symfony/dom-crawler": ">=2.7 <5.0", + "symfony/event-dispatcher": ">=2.7 <5.0", + "symfony/finder": ">=2.7 <5.0", + "symfony/yaml": ">=2.7 <5.0" }, "require-dev": { "codeception/specify": "~0.3", "facebook/graph-sdk": "~5.3", "flow/jsonpath": "~0.2", - "league/factory-muffin": "^3.0", - "league/factory-muffin-faker": "^1.0", - "mongodb/mongodb": "^1.0", "monolog/monolog": "~1.8", "pda/pheanstalk": "~3.0", "php-amqplib/php-amqplib": "~2.4", "predis/predis": "^1.0", "squizlabs/php_codesniffer": "~2.0", - "symfony/process": ">=2.7 <4.0", + "symfony/process": ">=2.7 <5.0", "vlucas/phpdotenv": "^2.4.0" }, "suggest": { + "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module", + "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests", "codeception/specify": "BDD-style code blocks", "codeception/verify": "BDD-style assertions", "flow/jsonpath": "For using JSONPath in REST module", "league/factory-muffin": "For DataFactory module", "league/factory-muffin-faker": "For Faker support in DataFactory module", "phpseclib/phpseclib": "for SFTP option in FTP Module", + "stecman/symfony-console-completion": "For BASH autocompletion", "symfony/phpunit-bridge": "For phpunit-bridge support" }, "bin": [ @@ -898,7 +894,86 @@ "functional testing", "unit testing" ], - "time": "2017-08-10T20:28:02+00:00" + "time": "2018-03-31T22:30:43+00:00" + }, + { + "name": "codeception/phpunit-wrapper", + "version": "6.0.10", + "source": { + "type": "git", + "url": "https://github.com/Codeception/phpunit-wrapper.git", + "reference": "7057e599d97b02b4efb009681a43b327dbce138a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7057e599d97b02b4efb009681a43b327dbce138a", + "reference": "7057e599d97b02b4efb009681a43b327dbce138a", + "shasum": "" + }, + "require": { + "phpunit/php-code-coverage": ">=2.2.4 <6.0", + "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0", + "sebastian/comparator": ">1.1 <3.0", + "sebastian/diff": ">=1.4 <4.0" + }, + "replace": { + "codeception/phpunit-wrapper": "*" + }, + "require-dev": { + "codeception/specify": "*", + "vlucas/phpdotenv": "^2.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\PHPUnit\\": "src\\" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Davert", + "email": "davert.php@resend.cc" + } + ], + "description": "PHPUnit classes used by Codeception", + "time": "2018-06-20T20:08:14+00:00" + }, + { + "name": "codeception/stub", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Stub.git", + "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805", + "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805", + "shasum": "" + }, + "require": { + "phpunit/phpunit-mock-objects": ">2.3 <7.0" + }, + "require-dev": { + "phpunit/phpunit": ">=4.8 <8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", + "time": "2018-05-17T09:31:08+00:00" }, { "name": "doctrine/instantiator", @@ -1098,21 +1173,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "5.3.1", + "version": "5.3.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8" + "reference": "f9acb4761844317e626a32259205bec1f1bc60d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/70f1fa53b71c4647bf2762c09068a95f77e12fb8", - "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f9acb4761844317e626a32259205bec1f1bc60d2", + "reference": "f9acb4761844317e626a32259205bec1f1bc60d2", "shasum": "" }, "require": { "guzzlehttp/ringphp": "^1.1", - "php": ">=5.4.0" + "php": ">=5.4.0", + "react/promise": "^2.2" }, "require-dev": { "ext-curl": "*", @@ -1146,7 +1222,7 @@ "rest", "web service" ], - "time": "2016-07-15T19:28:39+00:00" + "time": "2018-01-15T07:18:01+00:00" }, { "name": "guzzlehttp/psr7", @@ -1365,28 +1441,28 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.2", + "version": "1.7.6", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "type": "library", "extra": { @@ -1424,7 +1500,7 @@ "spy", "stub" ], - "time": "2017-09-04T11:05:03+00:00" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1490,16 +1566,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -1533,7 +1609,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -1627,16 +1703,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.11", + "version": "1.4.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", "shasum": "" }, "require": { @@ -1672,7 +1748,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27T10:12:30+00:00" + "time": "2017-12-04T08:55:13+00:00" }, { "name": "phpunit/phpunit", @@ -1901,16 +1977,16 @@ }, { "name": "react/promise", - "version": "v2.5.1", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "62785ae604c8d69725d693eb370e1d67e94c4053" + "reference": "f4edc2581617431aea50430749db55cc3fc031b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053", - "reference": "62785ae604c8d69725d693eb370e1d67e94c4053", + "url": "https://api.github.com/repos/reactphp/promise/zipball/f4edc2581617431aea50430749db55cc3fc031b3", + "reference": "f4edc2581617431aea50430749db55cc3fc031b3", "shasum": "" }, "require": { @@ -1943,7 +2019,7 @@ "promise", "promises" ], - "time": "2017-03-25T12:08:31+00:00" + "time": "2018-06-13T15:59:06+00:00" }, { "name": "satooshi/php-coveralls", @@ -2006,6 +2082,7 @@ "github", "test" ], + "abandoned": "php-coveralls/php-coveralls", "time": "2015-12-28T09:07:32+00:00" }, { @@ -2380,63 +2457,18 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2015-06-21T13:59:46+00:00" }, - { - "name": "stecman/symfony-console-completion", - "version": "0.7.0", - "source": { - "type": "git", - "url": "https://github.com/stecman/symfony-console-completion.git", - "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/5461d43e53092b3d3b9dbd9d999f2054730f4bbb", - "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/console": "~2.3 || ~3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Stecman\\Component\\Symfony\\Console\\BashCompletion\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Stephen Holdaway", - "email": "stephen@stecman.co.nz" - } - ], - "description": "Automatic BASH completion for Symfony Console Component based applications.", - "time": "2016-02-24T05:08:54+00:00" - }, { "name": "symfony/browser-kit", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "50cf5bfff540325d81ca2f2dc75ac2a5e446090d" + "reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/50cf5bfff540325d81ca2f2dc75ac2a5e446090d", - "reference": "50cf5bfff540325d81ca2f2dc75ac2a5e446090d", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02", + "reference": "11ccc2ebefba78c1bb0a2d2d2dd4b4e09a5fba02", "shasum": "" }, "require": { @@ -2480,25 +2512,26 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-07-12T12:59:33+00:00" + "time": "2018-03-19T21:11:56+00:00" }, { "name": "symfony/config", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "0b8541d18507d10204a08384640ff6df3c739ebe" + "reference": "93bdf96d0e3c9b29740bf9050e7a996b443c8436" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/0b8541d18507d10204a08384640ff6df3c739ebe", - "reference": "0b8541d18507d10204a08384640ff6df3c739ebe", + "url": "https://api.github.com/repos/symfony/config/zipball/93bdf96d0e3c9b29740bf9050e7a996b443c8436", + "reference": "93bdf96d0e3c9b29740bf9050e7a996b443c8436", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/filesystem": "~2.3|~3.0.0" + "symfony/filesystem": "~2.3|~3.0.0", + "symfony/polyfill-ctype": "~1.8" }, "require-dev": { "symfony/yaml": "~2.7|~3.0.0" @@ -2536,20 +2569,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:07:15+00:00" + "time": "2018-05-01T22:52:40+00:00" }, { "name": "symfony/console", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253" + "reference": "42a0adc7dd656ca2e360285eb6d822df9ce0b160" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c0807a2ca978e64d8945d373a9221a5c35d1a253", - "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253", + "url": "https://api.github.com/repos/symfony/console/zipball/42a0adc7dd656ca2e360285eb6d822df9ce0b160", + "reference": "42a0adc7dd656ca2e360285eb6d822df9ce0b160", "shasum": "" }, "require": { @@ -2563,7 +2596,7 @@ "symfony/process": "~2.1|~3.0.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/process": "" }, @@ -2597,20 +2630,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-08-27T14:29:03+00:00" + "time": "2018-07-09T12:58:09+00:00" }, { "name": "symfony/css-selector", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "ba3204654efa779691fac9e948a96b4a7067e4ab" + "reference": "3cdc270724e4666006118283c700a4d7f9cbe264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/ba3204654efa779691fac9e948a96b4a7067e4ab", - "reference": "ba3204654efa779691fac9e948a96b4a7067e4ab", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/3cdc270724e4666006118283c700a4d7f9cbe264", + "reference": "3cdc270724e4666006118283c700a4d7f9cbe264", "shasum": "" }, "require": { @@ -2650,20 +2683,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:31:55+00:00" + "time": "2018-03-10T18:19:36+00:00" }, { "name": "symfony/debug", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "efc9656dcb227e1459905d5aa51e43dfec76e752" + "reference": "a26ddce7fe4e884097d72435653bc7e703411f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/efc9656dcb227e1459905d5aa51e43dfec76e752", - "reference": "efc9656dcb227e1459905d5aa51e43dfec76e752", + "url": "https://api.github.com/repos/symfony/debug/zipball/a26ddce7fe4e884097d72435653bc7e703411f26", + "reference": "a26ddce7fe4e884097d72435653bc7e703411f26", "shasum": "" }, "require": { @@ -2707,24 +2740,25 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-08-27T14:29:03+00:00" + "time": "2018-06-22T15:01:26+00:00" }, { "name": "symfony/dom-crawler", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "2d902344b9902a0189408ab5d9e84fa4b233fcfc" + "reference": "7475ced406cb11837e4113ee2e1047cd2eac07c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2d902344b9902a0189408ab5d9e84fa4b233fcfc", - "reference": "2d902344b9902a0189408ab5d9e84fa4b233fcfc", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7475ced406cb11837e4113ee2e1047cd2eac07c7", + "reference": "7475ced406cb11837e4113ee2e1047cd2eac07c7", "shasum": "" }, "require": { "php": ">=5.3.9", + "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { @@ -2763,20 +2797,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-08-15T13:30:53+00:00" + "time": "2018-07-04T21:33:50+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d" + "reference": "9b69aad7d4c086dc94ebade2d5eb9145da5dac8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1377400fd641d7d1935981546aaef780ecd5bf6d", - "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9b69aad7d4c086dc94ebade2d5eb9145da5dac8c", + "reference": "9b69aad7d4c086dc94ebade2d5eb9145da5dac8c", "shasum": "" }, "require": { @@ -2823,24 +2857,25 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-06-02T07:47:27+00:00" + "time": "2018-04-06T07:35:03+00:00" }, { "name": "symfony/filesystem", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2" + "reference": "5cfc856c5b665ef5de0df796e98c54bef0fe595b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/714b1036010c354ae2b25d7f9ca27e14e265e9f2", - "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/5cfc856c5b665ef5de0df796e98c54bef0fe595b", + "reference": "5cfc856c5b665ef5de0df796e98c54bef0fe595b", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { @@ -2872,20 +2907,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-11T07:12:11+00:00" + "time": "2018-07-09T13:24:25+00:00" }, { "name": "symfony/finder", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad" + "reference": "995cd7c28a0778cece02e2133b4d813dc509dfc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4f4e84811004e065a3bb5ceeb1d9aa592630f9ad", - "reference": "4f4e84811004e065a3bb5ceeb1d9aa592630f9ad", + "url": "https://api.github.com/repos/symfony/finder/zipball/995cd7c28a0778cece02e2133b4d813dc509dfc3", + "reference": "995cd7c28a0778cece02e2133b4d813dc509dfc3", "shasum": "" }, "require": { @@ -2921,20 +2956,75 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-06-01T20:52:29+00:00" + "time": "2018-06-19T11:07:17+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.5.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -2946,7 +3036,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -2980,20 +3070,20 @@ "portable", "shim" ], - "time": "2017-06-14T15:44:48+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/stopwatch", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "e02577b841394a78306d7b547701bb7bb705bad5" + "reference": "57021208ad9830f8f8390c1a9d7bb390f32be89e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e02577b841394a78306d7b547701bb7bb705bad5", - "reference": "e02577b841394a78306d7b547701bb7bb705bad5", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/57021208ad9830f8f8390c1a9d7bb390f32be89e", + "reference": "57021208ad9830f8f8390c1a9d7bb390f32be89e", "shasum": "" }, "require": { @@ -3029,24 +3119,25 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:07:15+00:00" + "time": "2018-01-03T07:36:31+00:00" }, { "name": "symfony/yaml", - "version": "v2.8.27", + "version": "v2.8.43", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5" + "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", - "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5", + "url": "https://api.github.com/repos/symfony/yaml/zipball/51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff", + "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { @@ -3078,7 +3169,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-01T20:52:29+00:00" + "time": "2018-05-01T22:52:40+00:00" } ], "aliases": [ @@ -3097,7 +3188,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..a5ce88136c --- /dev/null +++ b/setup_heroku.php @@ -0,0 +1,10 @@ + Date: Sat, 28 Jul 2018 14:47:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=95=E6=95=B0=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup_heroku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_heroku.php b/setup_heroku.php index a5ce88136c..8a96b21c24 100644 --- a/setup_heroku.php +++ b/setup_heroku.php @@ -7,4 +7,4 @@ 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"); +exec("sh ./eccube_install.sh postgres");