Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Composer update #4396

Merged
merged 7 commits into from
Feb 25, 2020
Merged

Composer update #4396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e98987
Doctrine DBAL 2.9.3 Support, Resolve #4387
nanasess Nov 26, 2019
cbf1cc5
Fix rollback
nanasess Nov 26, 2019
caf57bf
Apply composer update
nanasess Nov 27, 2019
3e97e6c
result_cache_driver: array を追加
nanasess Nov 27, 2019
71aefe5
PHPUnit の環境変数を test に変更
nanasess Nov 28, 2019
7da3abf
Add SYMFONY_DEPRECATIONS_HELPER=weak to env
nanasess Dec 9, 2019
cab9441
Scrutinizer のエラー修正
nanasess Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@ php:
- 7.4snapshot

env:
- DATABASE_URL=mysql://root:@localhost/cube4_dev DATABASE_SERVER_VERSION=5
- DATABASE_URL=postgres://postgres:password@localhost/cube4_dev DATABASE_SERVER_VERSION=9
- DATABASE_URL=sqlite:///var/eccube.db DATABASE_SERVER_VERSION=3 COVERAGE=1
global:
- SYMFONY_DEPRECATIONS_HELPER=weak
matrix:
- DATABASE_URL=mysql://root:@localhost/cube4_dev DATABASE_SERVER_VERSION=5
- DATABASE_URL=postgres://postgres:password@localhost/cube4_dev DATABASE_SERVER_VERSION=9
- DATABASE_URL=sqlite:///var/eccube.db DATABASE_SERVER_VERSION=3 COVERAGE=1

matrix:
allow_failures:
Expand All @@ -50,7 +53,6 @@ before_install: &php_setup |
echo "date.timezone=Asia/Tokyo" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

eccube_setup: &eccube_setup |
echo "APP_ENV=codeception" > .env
bin/console doctrine:database:create --env=dev
bin/console doctrine:schema:create --env=dev
bin/console eccube:fixtures:load --env=dev
Expand All @@ -61,6 +63,7 @@ package_api_setup: &package_api_setup |

install:
- &composer_install composer install --dev --no-interaction -o --apcu-autoloader
- echo "APP_ENV=test" > .env
- *eccube_setup

script:
Expand Down Expand Up @@ -104,6 +107,7 @@ jobs:
- docker run -d -p 1080:1080 -p 1025:1025 --name mailcatcher schickling/mailcatcher
install:
- *composer_install
- echo "APP_ENV=codeception" > .env
- *eccube_setup
php: 7.3
env: GROUP=admin01 APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025
Expand Down
5 changes: 5 additions & 0 deletions app/config/eccube/packages/dev/doctrine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# https://github.com/symfony/demo/blob/master/config/packages/prod/doctrine.yaml
# https://symfony.com/doc/master/bundles/DoctrineBundle/configuration.html
doctrine:
orm:
result_cache_driver: array
5 changes: 5 additions & 0 deletions app/config/eccube/packages/test/doctrine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# https://github.com/symfony/demo/blob/master/config/packages/prod/doctrine.yaml
# https://symfony.com/doc/master/bundles/DoctrineBundle/configuration.html
doctrine:
orm:
result_cache_driver: array
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"doctrine/collections": "^1.5",
"doctrine/common": "^2.9",
"doctrine/data-fixtures": "^1.3",
"doctrine/dbal": "^2.8",
"doctrine/dbal": "^2.9",
"doctrine/doctrine-bundle": "^1.9",
"doctrine/doctrine-cache-bundle": "^1.3",
"doctrine/doctrine-fixtures-bundle": "^3.0",
Expand Down Expand Up @@ -109,7 +109,7 @@
"bheller/images-generator": "^1.0",
"captbaritone/mailcatcher-codeception-module": "^1.2",
"codeception/codeception": "~2.4.5",
"dama/doctrine-test-bundle": "^4.0",
"dama/doctrine-test-bundle": "^5.0",
"easycorp/easy-log-handler": "^1.0",
"fzaninotto/faker": "^1.7",
"mikey179/vfsstream": "^1.6",
Expand Down
Loading