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.

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

4.1 Experience #76

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 31 additions & 24 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=d38c7c968a23be776f69cc8c470e09d0
APP_SECRET=fe51bd1120525b528fe48b1d1263b63d
###< symfony/framework-bundle ###

###> symfony/mailer ###
# MAILER_DSN=smtp://localhost
# MAILER_DSN=null://null
###< symfony/mailer ###

###> doctrine/doctrine-bundle ###
Expand All @@ -42,12 +42,13 @@ HTTPCACHE_PURGE_SERVER=http://localhost:80
HTTPCACHE_VARNISH_INVALIDATE_TOKEN=
# Uncomment following line if you want to enable translation-aware behavior for HTTP cache.
# HTTPCACHE_TRANSLATION_AWARE_ENABLED=true
TRUSTED_PROXIES=127.0.0.1
CACHE_POOL=cache.tagaware.filesystem
# When using Redis or memcached adapter, you can configure it using DSN:
# - 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
CACHE_NAMESPACE=ibexa
DATABASE_CHARSET=utf8mb4
DATABASE_COLLATION=utf8mb4_unicode_520_ci
# Needed by Doctrine Bundle / ORM to prevent it from opening a connection during situations where there is no service yet.
Expand All @@ -57,6 +58,7 @@ SESSION_HANDLER_ID=session.handler.native_file
SESSION_SAVE_PATH=%kernel.project_dir%/var/sessions/%kernel.environment%
SOLR_DSN=http://localhost:8983/solr
SOLR_CORE=collection1
IBEXA_EDITION=oss
###< ibexa/oss ###

###> ibexa/content ###
Expand All @@ -70,6 +72,7 @@ HTTPCACHE_PURGE_SERVER=http://localhost:80
HTTPCACHE_VARNISH_INVALIDATE_TOKEN=
# Uncomment following line if you want to enable translation-aware behavior for HTTP cache.
# HTTPCACHE_TRANSLATION_AWARE_ENABLED=true
TRUSTED_PROXIES=127.0.0.1
CACHE_POOL=cache.tagaware.filesystem
# When using Redis or memcached adapter, you can configure it using DSN:
# - https://symfony.com/doc/4.4/components/cache/adapters/redis_adapter.html#configure-the-connection
Expand All @@ -84,10 +87,10 @@ DATABASE_VERSION=mariadb-10.3.0
SESSION_HANDLER_ID=session.handler.native_file
SESSION_SAVE_PATH=%kernel.project_dir%/var/sessions/%kernel.environment%
SOLR_CORE=collection1
# Enable recommendations by setting valid id, key and uri
RECOMMENDATION_CUSTOMER_ID=0
RECOMMENDATION_LICENSE_KEY=
RECOMMENDATION_HOST_URI=
# Enable Personalization by setting valid id, key and uri
PERSONALIZATION_CUSTOMER_ID=0
PERSONALIZATION_LICENSE_KEY=
PERSONALIZATION_HOST_URI=
ELASTICSEARCH_DSN=http://localhost:9200
# Enable fastly by setting valid service_id and key
# In order for this to work you also need to have EzSystemsPlatformFastlyCacheBundle installed
Expand All @@ -99,9 +102,10 @@ SISO_SEARCH_SOLR_CORE=collection1
# Do not add 'solr' to the path. It is automatically added by SolariumBundle
SISO_SEARCH_SOLR_PATH=
# SolariumBundle Solr DSN configuration
# Note that the /solr suffix will be appended automatically to eZ Platform Solr Search Engine Bundle configuration
# Note that the /solr suffix will be appended automatically to Ibexa Solr Search Engine Bundle configuration
SOLR_DSN=http://${SISO_SEARCH_SOLR_HOST}:${SISO_SEARCH_SOLR_PORT}${SISO_SEARCH_SOLR_PATH}
JMS_PAYMENT_SECRET=def00000706ea7318427e72fcea2c8ceb86773a4310e35119c48e3029196acfead1ba8cc898f48d1ef9cb3f7ebe191ab46eaf67ec94a2b6bd17c079ac7277de0175b9e3e
IBEXA_EDITION=content
###< ibexa/content ###

###> ibexa/experience ###
Expand All @@ -115,6 +119,7 @@ HTTPCACHE_PURGE_SERVER=http://localhost:80
HTTPCACHE_VARNISH_INVALIDATE_TOKEN=
# Uncomment following line if you want to enable translation-aware behavior for HTTP cache.
# HTTPCACHE_TRANSLATION_AWARE_ENABLED=true
TRUSTED_PROXIES=127.0.0.1
CACHE_POOL=cache.tagaware.filesystem
# When using Redis or memcached adapter, you can configure it using DSN:
# - https://symfony.com/doc/4.4/components/cache/adapters/redis_adapter.html#configure-the-connection
Expand All @@ -129,9 +134,10 @@ DATABASE_VERSION=mariadb-10.3.0
SESSION_HANDLER_ID=session.handler.native_file
SESSION_SAVE_PATH=%kernel.project_dir%/var/sessions/%kernel.environment%
SOLR_CORE=collection1
# Enable recommendations by setting valid id, key and uri
RECOMMENDATION_CUSTOMER_ID=0
RECOMMENDATION_LICENSE_KEY=
# Enable Personalization by setting valid id, key and uri
PERSONALIZATION_CUSTOMER_ID=0
PERSONALIZATION_LICENSE_KEY=
PERSONALIZATION_HOST_URI=
ELASTICSEARCH_DSN=http://localhost:9200
# Enable fastly by setting valid service_id and key
# In order for this to work you also need to have EzSystemsPlatformFastlyCacheBundle installed
Expand All @@ -143,9 +149,10 @@ SISO_SEARCH_SOLR_CORE=collection1
# Do not add 'solr' to the path. It is automatically added by SolariumBundle
SISO_SEARCH_SOLR_PATH=
# SolariumBundle Solr DSN configuration
# Note that the /solr suffix will be appended automatically to eZ Platform Solr Search Engine Bundle configuration
# Note that the /solr suffix will be appended automatically to Ibexa Solr Search Engine Bundle configuration
SOLR_DSN=http://${SISO_SEARCH_SOLR_HOST}:${SISO_SEARCH_SOLR_PORT}${SISO_SEARCH_SOLR_PATH}
JMS_PAYMENT_SECRET=def00000706ea7318427e72fcea2c8ceb86773a4310e35119c48e3029196acfead1ba8cc898f48d1ef9cb3f7ebe191ab46eaf67ec94a2b6bd17c079ac7277de0175b9e3e
IBEXA_EDITION=experience
###< ibexa/experience ###

###> google/recaptcha ###
Expand All @@ -160,21 +167,19 @@ EWZ_RECAPTCHA_SITE_KEY=
EWZ_RECAPTCHA_SECRET=
###< excelwebzone/recaptcha-bundle ###

###> nelmio/solarium-bundle ###
SOLR_HOST=localhost
SOLR_CORE=example
###< nelmio/solarium-bundle ###

###> nelmio/cors-bundle ###
CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
###< nelmio/cors-bundle ###

###> symfony/swiftmailer-bundle ###
# For Gmail as a transport, use: "gmail://username:password@localhost"
# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
# Delivery is disabled by default via "null://localhost"
MAILER_URL=null://localhost
###< symfony/swiftmailer-bundle ###

###> lexik/jwt-authentication-bundle ###
JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
JWT_PASSPHRASE=9e36a8950a71c5a5873b69a41260d73d
JWT_PASSPHRASE=9ec2be9463c98e302314b63dadcd9245
###< lexik/jwt-authentication-bundle ###

###> symfony/lock ###
Expand All @@ -183,7 +188,9 @@ JWT_PASSPHRASE=9e36a8950a71c5a5873b69a41260d73d
LOCK_DSN=semaphore
###< symfony/lock ###

###> nelmio/solarium-bundle ###
SOLR_HOST=localhost
SOLR_CORE=example
###< nelmio/solarium-bundle ###
###> symfony/swiftmailer-bundle ###
# For Gmail as a transport, use: "gmail://username:password@localhost"
# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
# Delivery is disabled by default via "null://localhost"
MAILER_URL=null://localhost
###< symfony/swiftmailer-bundle ###
4 changes: 2 additions & 2 deletions .env.local.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SESSION_HANDLER_ID=ezplatform.core.session.handler.native_redis
SESSION_HANDLER_ID=ibexa.core.session.handler.native_redis
SESSION_SAVE_PATH=tcp://redis:6379

CACHE_POOL=cache.redis
Expand All @@ -9,7 +9,7 @@ HTTPCACHE_PURGE_TYPE=varnish
TRUSTED_PROXIES=172.27.0.1/24

DATABASE_VERSION=TODO
DATABASE_URL="mysql://root:root@mariadb/ezplatform?serverVersion=${DATABASE_VERSION}"
DATABASE_URL="mysql://root:root@mariadb/ibexa?serverVersion=${DATABASE_VERSION}"

SEARCH_ENGINE=TODO
SOLR_DSN=http://solr:8983/solr
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ auth.json
ide-twig.json
/config/graphql/
/public/assets/build/*
/public/assets/ezplatform/build/*
/public/assets/ibexa/build/*
/public/assets/richtext/build/*
/public/assets/translations/*
/src/Migrations/Ibexa/*
###< adriendupuis/ezplatform-ee-docker ###
Empty file modified bin/phpunit
100644 → 100755
Empty file.
12 changes: 5 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
{
"type": "project",
"license": ["proprietary"],
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
"php": ">=7.3",
"php": ">=7.4",
"ext-ctype": "*",
"ext-iconv": "*",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.4",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.11",
"ibexa/experience": "3.3.15",
"doctrine/orm": "^2.12",
"ibexa/experience": "4.1.2",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.2",
"phpstan/phpdoc-parser": "^1.4",
"sensio/framework-extra-bundle": "^6.1",
"symfony/asset": "5.4.*",
"symfony/console": "5.4.*",
Expand Down Expand Up @@ -110,7 +108,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"endpoint": "https://flex.ibexa.co",
"endpoint": "https://api.github.com/repos/ibexa/recipes/contents/index.json?ref=flex/main",
"require": "5.4.*"
}
},
Expand Down
Loading