From fa87861361954be3a5b9f184af111b4fe322646f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?=
 <gudin.evgeny@gmail.com>
Date: Fri, 5 Oct 2018 23:26:35 +0300
Subject: [PATCH] Add symfony `4.0`

---
 composer.json                                 | 20 ++++++++++++----
 .../Resources/config/services.xml             | 16 ++++++-------
 .../Tests/Application/config/config.yml       | 23 ++++++++-----------
 3 files changed, 34 insertions(+), 25 deletions(-)

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 @@
     </parameters>
 
     <services>
-        <service id="krtv_single_sign_on_identity_provider.routing.loader" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Routing\SsoRoutesLoader">
+        <service id="krtv_single_sign_on_identity_provider.routing.loader" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Routing\SsoRoutesLoader" public="true">
             <tag name="routing.loader"/>
             <argument/> <!-- sso host -->
             <argument/> <!-- sso login path -->
             <argument/> <!-- sso logout path -->
         </service>
 
-        <service id="krtv_single_sign_on_identity_provider.security.authentication.otp_manager.orm" class="Krtv\SingleSignOn\Manager\ORM\OneTimePasswordManager">
+        <service id="krtv_single_sign_on_identity_provider.security.authentication.otp_manager.orm" class="Krtv\SingleSignOn\Manager\ORM\OneTimePasswordManager" public="true">
             <argument type="service" id="doctrine.orm.entity_manager"/>
             <argument type="string">Krtv\Bundle\SingleSignOnIdentityProviderBundle\Entity\OneTimePassword</argument>
         </service>
 
-        <service id="krtv_single_sign_on_identity_provider.manager.service_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\ServiceManager">
+        <service id="krtv_single_sign_on_identity_provider.manager.service_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\ServiceManager" public="true">
             <argument type="service" id="request_stack" />
             <argument type="service" id="session" />
             <argument type="string">%krtv_single_sign_on_identity_provider.security.firewall_id%</argument> <!-- main firewall id -->
@@ -28,27 +28,27 @@
             <argument type="collection" /> <!-- options -->
         </service>
 
-        <service id="krtv_single_sign_on_identity_provider.manager.logout_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\LogoutManager">
+        <service id="krtv_single_sign_on_identity_provider.manager.logout_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\LogoutManager" public="true">
             <argument type="service" id="krtv_single_sign_on_identity_provider.manager.service_manager" />
             <argument type="service" id="session" />
             <argument type="service" id="router" />
         </service>
 
-        <service id="krtv_single_sign_on_identity_provider.event_listener.service_subscriber" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\EventListener\TargetPathSubscriber">
+        <service id="krtv_single_sign_on_identity_provider.event_listener.service_subscriber" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\EventListener\TargetPathSubscriber" public="true">
             <argument type="service" id="krtv_single_sign_on_identity_provider.manager.service_manager" />
             <argument type="service" id="krtv_single_sign_on_identity_provider.uri_signer" />
             <tag name="kernel.event_subscriber" />
         </service>
 
-        <service id="krtv_single_sign_on_identity_provider.security.authentication.encoder" class="Krtv\SingleSignOn\Encoder\OneTimePasswordEncoder">
+        <service id="krtv_single_sign_on_identity_provider.security.authentication.encoder" class="Krtv\SingleSignOn\Encoder\OneTimePasswordEncoder" public="true">
             <argument/> <!-- secret -->
         </service>
 
-        <service id="krtv_single_sign_on_identity_provider.uri_signer" class="Symfony\Component\HttpKernel\UriSigner">
+        <service id="krtv_single_sign_on_identity_provider.uri_signer" class="Symfony\Component\HttpKernel\UriSigner" public="true">
             <argument/> <!-- secret -->
         </service>
 
-        <service id="krtv_single_sign_on_identity_provider.security.http_utils" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Security\Http\HttpUtils">
+        <service id="krtv_single_sign_on_identity_provider.security.http_utils" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Security\Http\HttpUtils" public="true">
             <argument type="service" id="krtv_single_sign_on_identity_provider.uri_signer"/>
             <argument type="service" id="security.http_utils"/>
             <argument type="string">%krtv_single_sign_on_identity_provider.otp_parameter%</argument>
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:  '/'