diff --git a/lib/composer/ClassLoader.php b/lib/composer/ClassLoader.php
index 0cd6055d1..afef3fa2a 100644
--- a/lib/composer/ClassLoader.php
+++ b/lib/composer/ClassLoader.php
@@ -149,7 +149,7 @@ class ClassLoader
 
     /**
      * @return string[] Array of classname => path
-     * @psalm-var array<string, string>
+     * @psalm-return array<string, string>
      */
     public function getClassMap()
     {
diff --git a/lib/composer/InstalledVersions.php b/lib/composer/InstalledVersions.php
index 7c5502ca4..d50e0c9fc 100644
--- a/lib/composer/InstalledVersions.php
+++ b/lib/composer/InstalledVersions.php
@@ -24,8 +24,21 @@ use Composer\Semver\VersionParser;
  */
 class InstalledVersions
 {
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     */
     private static $installed;
+
+    /**
+     * @var bool|null
+     */
     private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     */
     private static $installedByVendor = array();
 
     /**
diff --git a/lib/composer/autoload_real.php b/lib/composer/autoload_real.php
index 661cd2543..9a33b711c 100644
--- a/lib/composer/autoload_real.php
+++ b/lib/composer/autoload_real.php
@@ -60,11 +60,16 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
     }
 }
 
+/**
+ * @param string $fileIdentifier
+ * @param string $file
+ * @return void
+ */
 function composerRequire0018331147de7601e7552f7da8e3bb8b($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+        require $file;
     }
 }
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index 37876bd7c..64f2ae5ec 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '134736dce5289b252d1017b3a2f3bbb03b6e63a8',
+        'reference' => 'caf939bf5835556317f457cd33e666e2de1d7815',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '134736dce5289b252d1017b3a2f3bbb03b6e63a8',
+            'reference' => 'caf939bf5835556317f457cd33e666e2de1d7815',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
@@ -268,8 +268,8 @@
         'psr/container-implementation' => array(
             'dev_requirement' => false,
             'provided' => array(
-                0 => '1.0',
-                1 => '^1.0',
+                0 => '^1.0',
+                1 => '1.0',
             ),
         ),
         'psr/http-message' => array(
diff --git a/lib/laminas/laminas-servicemanager/bin/generate-deps-for-config-factory b/lib/laminas/laminas-servicemanager/bin/generate-deps-for-config-factory
old mode 100644
new mode 100755
diff --git a/lib/laminas/laminas-servicemanager/bin/generate-factory-for-class b/lib/laminas/laminas-servicemanager/bin/generate-factory-for-class
old mode 100644
new mode 100755
diff --git a/sources/Controller/OAuth/OAuthAjaxController.php b/sources/Controller/OAuth/OAuthAjaxController.php
index 908765c88..8788c0d16 100644
--- a/sources/Controller/OAuth/OAuthAjaxController.php
+++ b/sources/Controller/OAuth/OAuthAjaxController.php
@@ -36,7 +36,8 @@ class OAuthAjaxController extends Controller
 		$sAdditional = utils::ReadParam('additional', '', false, 'raw');
 
 		$sRedirectUrlQuery = parse_url($sRedirectUrl)['query'];
-		$aOAuthResultDisplayClasses = utils::GetClassesForInterface('Combodo\iTop\Core\Authentication\Client\OAuth\IOAuthClientResultDisplay', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]'));
+		// TODO: Needs to handle mail to ticket part too
+		$aOAuthResultDisplayClasses = ['\Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientResultDisplayConf'];
 		$aAdditional = [];
 		parse_str($sAdditional, $aAdditional);
 
diff --git a/sources/Controller/OAuth/OAuthWizardController.php b/sources/Controller/OAuth/OAuthWizardController.php
index b2e53641a..13866ca0a 100644
--- a/sources/Controller/OAuth/OAuthWizardController.php
+++ b/sources/Controller/OAuth/OAuthWizardController.php
@@ -43,6 +43,7 @@ class OAuthWizardController extends Controller
 			'redirect_uri'  => ['type' => 'text', 'label' => Dict::S('UI:OAuth:Wizard:Form:Input:RedirectUri:Label'), 'read_only' => true, 'value' => OAuthClientProviderAbstract::GetRedirectUri()],
 		];
 
+		// TODO: Needs to handle mail to ticket part too
 		$aParams['aAdditionalBlocks'] = [
 			OAuthClientResultDisplayConf::GetResultDisplayTemplate(),
 		];
diff --git a/templates/pages/backoffice/oauth/Wizard.html.twig b/templates/pages/backoffice/oauth/Wizard.html.twig
index 5d4a2555f..c707ea6d2 100644
--- a/templates/pages/backoffice/oauth/Wizard.html.twig
+++ b/templates/pages/backoffice/oauth/Wizard.html.twig
@@ -33,7 +33,7 @@
                                         type="{{ aInput.type }}"
                                         id="wizard_input_{{ sName }}"
                                         name="{{ sName }}"
-                                        {% if aInput.real_only %} readonly {% endif %}
+                                        {% if aInput.read_only %} readonly {% endif %}
                                         value="{{ aInput.value }}"
                                 >
                             </div>
diff --git a/templates/pages/backoffice/oauth/Wizard.ready.js.twig b/templates/pages/backoffice/oauth/Wizard.ready.js.twig
index e33478887..b0362f346 100644
--- a/templates/pages/backoffice/oauth/Wizard.ready.js.twig
+++ b/templates/pages/backoffice/oauth/Wizard.ready.js.twig
@@ -8,7 +8,7 @@ const oOnOauthSuccess = function (event){
     $.post(
             '{{ sAjaxUri }}',
             {
-                operation: 'get_display_authentication_results',
+                operation: 'GetDisplayAuthenticationResults',
                 provider: $('[name="provider"]:checked').val(),
                 client_id: $('[name="client_id"]').val(),
                 client_secret: $('[name="client_secret"]').val(),