Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Marek Nocoń committed Apr 8, 2020
2 parents c0e02af + cbb6156 commit 57a63e1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 14 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ CACHE_POOL=cache.tagaware.filesystem
# - https://symfony.com/doc/4.4/components/cache/adapters/redis_adapter.html#configure-the-connection
# - https://symfony.com/doc/4.4/components/cache/adapters/memcached_adapter.html#configure-the-connection
CACHE_DSN=localhost
CACHE_NAMESPACE=ezp

# eZ Platform HTTP Cache
HTTPCACHE_DEFAULT_TTL=86400
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@

.php~

/config/graphql/

/doc/docker/entrypoint/*/*.sql
/dfsdata

Expand Down
18 changes: 9 additions & 9 deletions behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ default:

Liuggio\Fastest\Behat\ListFeaturesExtension\Extension: ~

# Bex\Behat\ScreenshotExtension:
# active_image_drivers: cloudinary
# image_drivers:
# cloudinary:
# screenshot_directory: /tmp/behat-screenshot/
# cloud_name: ezplatformtravis
# preset: ezplatform
# mode: normal
# limit: 10
Bex\Behat\ScreenshotExtension:
active_image_drivers: cloudinary
image_drivers:
cloudinary:
screenshot_directory: /tmp/behat-screenshot/
cloud_name: ezplatformtravis
preset: ezplatform
mode: normal
limit: 10

Allure\Behat\AllureFormatterExtension: ~

Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,23 @@
"require-dev": {
"behat/behat": "^3.6",
"behat/mink": "^1.8",
"friends-of-behat/mink-extension": "^2.4",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "^1.4",
"friends-of-behat/symfony-extension": "^2.1@beta",
"bex/behat-screenshot": "^2.1",
"dmore/behat-chrome-extension": "^1.3",
"dmore/chrome-mink-driver": "^2.7",
"ezsystems/allure-behat": "^3.1@dev",
"ezsystems/allure-php-api": "^3.1@dev",
"ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev",
"ezsystems/behatbundle": "^8.0@dev",
"ezsystems/fastest": "^1.7",
"friends-of-behat/mink-extension": "^2.4",
"friends-of-behat/symfony-extension": "^2.1@beta",
"overblog/graphiql-bundle": "^0.2",
"phpunit/phpunit": "^8.2",
"symfony/debug-pack": "^1.0",
"symfony/maker-bundle": "^1.14",
"symfony/test-pack": "^1.0",
"phpunit/phpunit": "^8.2"
"symfony/test-pack": "^1.0"
},
"conflict": {
"doctrine/persistence": "1.3.2",
Expand Down
2 changes: 1 addition & 1 deletion config/packages/cache_pool/cache.redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# For further reading on setup with eZ Platform and Redis:
# https://doc.ezplatform.com/en/latest/guide/persistence_cache/#redis
parameters:
cache_namespace: ezp
cache_namespace: '%env(CACHE_NAMESPACE)%'
cache_dsn: '%env(CACHE_DSN)%'

services:
Expand Down

0 comments on commit 57a63e1

Please sign in to comment.