-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #173 from christopherhero/update_sylius1.10
update sylius 1.10
- Loading branch information
Showing
21 changed files
with
366 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ APP_SECRET=EDITME | |
| # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url | ||
| # For a sqlite database, use: "sqlite:///%kernel.project_dir%/var/data.db" | ||
| # Set "serverVersion" to your server version to avoid edge-case exceptions and extra database calls | ||
| DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db | ||
| DATABASE_URL=mysql://root:[email protected]/sylius_elasticsearch_%kernel.environment% | ||
| ###< doctrine/doctrine-bundle ### | ||
|
|
||
| ###> lexik/jwt-authentication-bundle ### | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| api_platform: | ||
| resource: . | ||
| type: api_platform | ||
| prefix: /api |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +0,0 @@ | ||
| _errors: | ||
| resource: '@TwigBundle/Resources/config/routing/errors.xml' | ||
| prefix: /_error | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?php | ||
|
|
||
| return [ | ||
| BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true], | ||
| SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true], | ||
| ]; |
12 changes: 12 additions & 0 deletions
12
tests/Application/config/sylius/1.10/packages/dev/jms_serializer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| jms_serializer: | ||
| visitors: | ||
| json_serialization: | ||
| options: | ||
| - JSON_PRETTY_PRINT | ||
| - JSON_UNESCAPED_SLASHES | ||
| - JSON_PRESERVE_ZERO_FRACTION | ||
| json_deserialization: | ||
| options: | ||
| - JSON_PRETTY_PRINT | ||
| - JSON_UNESCAPED_SLASHES | ||
| - JSON_PRESERVE_ZERO_FRACTION |
4 changes: 4 additions & 0 deletions
4
tests/Application/config/sylius/1.10/packages/jms_serializer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| jms_serializer: | ||
| visitors: | ||
| xml_serialization: | ||
| format_output: '%kernel.debug%' |
10 changes: 10 additions & 0 deletions
10
tests/Application/config/sylius/1.10/packages/prod/jms_serializer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| jms_serializer: | ||
| visitors: | ||
| json_serialization: | ||
| options: | ||
| - JSON_UNESCAPED_SLASHES | ||
| - JSON_PRESERVE_ZERO_FRACTION | ||
| json_deserialization: | ||
| options: | ||
| - JSON_UNESCAPED_SLASHES | ||
| - JSON_PRESERVE_ZERO_FRACTION |
138 changes: 138 additions & 0 deletions
138
tests/Application/config/sylius/1.10/packages/security.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| parameters: | ||
| sylius.security.admin_regex: "^/admin" | ||
| sylius.security.shop_regex: "^/(?!admin|new-api|api/.*|api$|media/.*)[^/]++" | ||
| sylius.security.new_api_route: "/new-api" | ||
| sylius.security.new_api_regex: "^%sylius.security.new_api_route%" | ||
|
|
||
| security: | ||
| always_authenticate_before_granting: true | ||
| providers: | ||
| sylius_admin_user_provider: | ||
| id: sylius.admin_user_provider.email_or_name_based | ||
| sylius_api_admin_user_provider: | ||
| id: sylius.admin_user_provider.email_or_name_based | ||
| sylius_shop_user_provider: | ||
| id: sylius.shop_user_provider.email_or_name_based | ||
| sylius_api_shop_user_provider: | ||
| id: sylius.shop_user_provider.email_or_name_based | ||
| sylius_api_chain_provider: | ||
| chain: | ||
| providers: [sylius_api_shop_user_provider, sylius_api_admin_user_provider] | ||
|
|
||
| encoders: | ||
| Sylius\Component\User\Model\UserInterface: argon2i | ||
| firewalls: | ||
| admin: | ||
| switch_user: true | ||
| context: admin | ||
| pattern: "%sylius.security.admin_regex%" | ||
| provider: sylius_admin_user_provider | ||
| form_login: | ||
| provider: sylius_admin_user_provider | ||
| login_path: sylius_admin_login | ||
| check_path: sylius_admin_login_check | ||
| failure_path: sylius_admin_login | ||
| default_target_path: sylius_admin_dashboard | ||
| use_forward: false | ||
| use_referer: true | ||
| csrf_token_generator: security.csrf.token_manager | ||
| csrf_parameter: _csrf_admin_security_token | ||
| csrf_token_id: admin_authenticate | ||
| remember_me: | ||
| secret: "%env(APP_SECRET)%" | ||
| path: /admin | ||
| name: APP_ADMIN_REMEMBER_ME | ||
| lifetime: 31536000 | ||
| remember_me_parameter: _remember_me | ||
| logout: | ||
| path: sylius_admin_logout | ||
| target: sylius_admin_login | ||
| anonymous: true | ||
|
|
||
| new_api_admin_user: | ||
| pattern: "%sylius.security.new_api_route%/admin-user-authentication-token" | ||
| provider: sylius_admin_user_provider | ||
| stateless: true | ||
| anonymous: true | ||
| json_login: | ||
| check_path: "%sylius.security.new_api_route%/admin-user-authentication-token" | ||
| username_path: email | ||
| password_path: password | ||
| success_handler: lexik_jwt_authentication.handler.authentication_success | ||
| failure_handler: lexik_jwt_authentication.handler.authentication_failure | ||
| guard: | ||
| authenticators: | ||
| - lexik_jwt_authentication.jwt_token_authenticator | ||
|
|
||
| new_api_shop_user: | ||
| pattern: "%sylius.security.new_api_route%/shop-user-authentication-token" | ||
| provider: sylius_shop_user_provider | ||
| stateless: true | ||
| anonymous: true | ||
| json_login: | ||
| check_path: "%sylius.security.new_api_route%/shop-user-authentication-token" | ||
| username_path: email | ||
| password_path: password | ||
| success_handler: lexik_jwt_authentication.handler.authentication_success | ||
| failure_handler: lexik_jwt_authentication.handler.authentication_failure | ||
| guard: | ||
| authenticators: | ||
| - lexik_jwt_authentication.jwt_token_authenticator | ||
|
|
||
| new_api: | ||
| pattern: "%sylius.security.new_api_regex%/*" | ||
| provider: sylius_api_chain_provider | ||
| stateless: true | ||
| anonymous: lazy | ||
| guard: | ||
| authenticators: | ||
| - lexik_jwt_authentication.jwt_token_authenticator | ||
|
|
||
| shop: | ||
| switch_user: { role: ROLE_ALLOWED_TO_SWITCH } | ||
| context: shop | ||
| pattern: "%sylius.security.shop_regex%" | ||
| provider: sylius_shop_user_provider | ||
| form_login: | ||
| success_handler: sylius.authentication.success_handler | ||
| failure_handler: sylius.authentication.failure_handler | ||
| provider: sylius_shop_user_provider | ||
| login_path: sylius_shop_login | ||
| check_path: sylius_shop_login_check | ||
| failure_path: sylius_shop_login | ||
| default_target_path: sylius_shop_homepage | ||
| use_forward: false | ||
| use_referer: true | ||
| csrf_token_generator: security.csrf.token_manager | ||
| csrf_parameter: _csrf_shop_security_token | ||
| csrf_token_id: shop_authenticate | ||
| remember_me: | ||
| secret: "%env(APP_SECRET)%" | ||
| name: APP_SHOP_REMEMBER_ME | ||
| lifetime: 31536000 | ||
| remember_me_parameter: _remember_me | ||
| logout: | ||
| path: sylius_shop_logout | ||
| target: sylius_shop_login | ||
| invalidate_session: false | ||
| success_handler: sylius.handler.shop_user_logout | ||
| anonymous: true | ||
|
|
||
| dev: | ||
| pattern: ^/(_(profiler|wdt)|css|images|js)/ | ||
| security: false | ||
|
|
||
| access_control: | ||
| - { path: "%sylius.security.admin_regex%/_partial", role: IS_AUTHENTICATED_ANONYMOUSLY, ips: [127.0.0.1, ::1] } | ||
| - { path: "%sylius.security.admin_regex%/_partial", role: ROLE_NO_ACCESS } | ||
| - { path: "%sylius.security.shop_regex%/_partial", role: IS_AUTHENTICATED_ANONYMOUSLY, ips: [127.0.0.1, ::1] } | ||
| - { path: "%sylius.security.shop_regex%/_partial", role: ROLE_NO_ACCESS } | ||
|
|
||
| - { path: "%sylius.security.admin_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY } | ||
| - { path: "%sylius.security.shop_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY } | ||
|
|
||
| - { path: "%sylius.security.shop_regex%/register", role: IS_AUTHENTICATED_ANONYMOUSLY } | ||
| - { path: "%sylius.security.shop_regex%/verify", role: IS_AUTHENTICATED_ANONYMOUSLY } | ||
|
|
||
| - { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS } | ||
| - { path: "%sylius.security.shop_regex%/account", role: ROLE_USER } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| imports: | ||
| - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" } |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| imports: | ||
| - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" } |
Oops, something went wrong.