diff --git a/composer.json b/composer.json index 4a04838..7738508 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,29 @@ "doctrine/orm": "~2.3", - "symfony/symfony": "~2.8|~3.0", + "symfony/framework-bundle": "~2.8|~3.0|~4.0", - "korotovsky/sso-library": "~0.3.0", + "symfony/security-bundle": "~3.1|~4.0", + + "symfony/templating": "~3.1|~4.0", + + "symfony/twig-bundle": "~3.1|~4.0", + + "symfony/form": "~3.1|~4.0", + + "symfony/console": "~3.1|~4.0", + + "korotovsky/sso-library": "~0.3.1", "ext-openssl": "*" }, "require-dev": { - "phpunit/phpunit": ">=4.4", + "phpunit/phpunit": "^5.7", "doctrine/doctrine-bundle": "~1.6", - "doctrine/doctrine-fixtures-bundle": "~2.3" + "doctrine/doctrine-fixtures-bundle": "~2.3", + + "symfony/var-dumper": "^3.4|^4.1" }, "autoload": { "psr-4": { diff --git a/src/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Resources/config/services.xml b/src/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Resources/config/services.xml index c2fe3c5..a5435ab 100644 --- a/src/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Resources/config/services.xml +++ b/src/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Resources/config/services.xml @@ -8,19 +8,19 @@ - + - + Krtv\Bundle\SingleSignOnIdentityProviderBundle\Entity\OneTimePassword - + %krtv_single_sign_on_identity_provider.security.firewall_id% @@ -28,27 +28,27 @@ - + - + - + - + - + %krtv_single_sign_on_identity_provider.otp_parameter% diff --git a/tests/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Tests/Application/config/config.yml b/tests/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Tests/Application/config/config.yml index 8825b23..322aac9 100644 --- a/tests/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Tests/Application/config/config.yml +++ b/tests/Krtv/Bundle/SingleSignOnIdentityProviderBundle/Tests/Application/config/config.yml @@ -7,9 +7,9 @@ framework: profiler: collect: false - secret: %secret% + secret: '%secret%' router: - resource: %kernel.root_dir%/config/routing.yml + resource: '%kernel.root_dir%/config/routing.yml' strict_requirements: ~ form: ~ @@ -19,12 +19,9 @@ framework: engines: - twig - trusted_proxies: ~ - session: ~ - security: access_decision_manager: - strategy: affirmative + strategy: affirmative providers: in_memory: @@ -50,7 +47,7 @@ security: path: /logout access_control: - - { host: %host%, path: ^/sso/login/$, role: IS_AUTHENTICATED_ANONYMOUSLY } + - { host: '%host%', path: ^/sso/login/$, role: IS_AUTHENTICATED_ANONYMOUSLY } doctrine: dbal: @@ -62,13 +59,13 @@ doctrine: auto_mapping: true krtv_single_sign_on_identity_provider: - host: %host% - host_scheme: %host.scheme% + host: '%host%' + host_scheme: '%host.scheme%' login_path: /sso/login/ logout_path: /sso/logout - services: %sso_active_services% + services: '%sso_active_services%' otp_parameter: _otp secret_parameter: secret @@ -94,6 +91,6 @@ parameters: - consumer1 - consumer2 - router.request_context.host: %host% - router.request_context.scheme: %host.scheme% - router.request_context.base_url: ~ + router.request_context.host: '%host%' + router.request_context.scheme: '%host.scheme%' + router.request_context.base_url: '/'