Merge remote-tracking branch 'upstream/4.2-dev' into j4/plugins/checkfiles

Author: laoneo

plugins/system/webauthn/src/Extension/Webauthn.php

@@ -47,15 +47,35 @@
  */
 final class Webauthn extends CMSPlugin implements SubscriberInterface
 {
-	use CoreEventAware;
-
-	/**
-	 * Autoload the language files
-	 *
-	 * @var    boolean
-	 * @since  __DEPLOY_VERSION__
-	 */
-	protected $autoloadLanguage = true;
+    // Add WebAuthn buttons
+    use AdditionalLoginButtons;
+
+    // AJAX request handlers
+    use AjaxHandler;
+    use AjaxHandlerInitCreate;
+    use AjaxHandlerCreate;
+    use AjaxHandlerSaveLabel;
+    use AjaxHandlerDelete;
+    use AjaxHandlerChallenge;
+    use AjaxHandlerLogin;
+
+    // Utility methods for setting the events' return values
+    use EventReturnAware;
+    use CoreEventAware;
+
+    // Custom user profile fields
+    use UserProfileFields;
+
+    // Handle user profile deletion
+    use UserDeletion;
+
+    /**
+     * Autoload the language files
+     *
+     * @var    boolean
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $autoloadLanguage = true;
 
 	/**
 	 * Should I try to detect and register legacy event listeners?
@@ -75,42 +95,21 @@ final class Webauthn extends CMSPlugin implements SubscriberInterface
 	 */
 	protected $authenticationHelper;
 
-	// AJAX request handlers
-	use AjaxHandler;
-	use AjaxHandlerInitCreate;
-	use AjaxHandlerCreate;
-	use AjaxHandlerSaveLabel;
-	use AjaxHandlerDelete;
-	use AjaxHandlerChallenge;
-	use AjaxHandlerLogin;
-
-	// Custom user profile fields
-	use UserProfileFields;
-
-	// Handle user profile deletion
-	use UserDeletion;
-
-	// Add WebAuthn buttons
-	use AdditionalLoginButtons;
-
-	// Utility methods for setting the events' return values
-	use EventReturnAware;
-
-	/**
-	 * Constructor. Loads the language files as well.
-	 *
-	 * @param   DispatcherInterface  $subject    The object to observe
-	 * @param   array                $config     An optional associative array of configuration
-	 *                                           settings. Recognized key values include 'name',
-	 *                                           'group', 'params', 'language (this list is not meant
-	 *                                           to be comprehensive).
-	 * @param   Authentication|null  $authHelper The WebAuthn helper object
-	 *
-	 * @since  4.0.0
-	 */
-	public function __construct(&$subject, array $config = [], Authentication $authHelper = null)
-	{
-		parent::__construct($subject, $config);
+    /**
+     * Constructor. Loads the language files as well.
+     *
+     * @param   DispatcherInterface  $subject    The object to observe
+     * @param   array                $config     An optional associative array of configuration
+     *                                           settings. Recognized key values include 'name',
+     *                                           'group', 'params', 'language (this list is not meant
+     *                                           to be comprehensive).
+     * @param   Authentication|null  $authHelper The WebAuthn helper object
+     *
+     * @since  4.0.0
+     */
+    public function __construct(&$subject, array $config = [], Authentication $authHelper = null)
+    {
+        parent::__construct($subject, $config);
 
 		/**
 		 * Note: Do NOT try to load the language in the constructor. This is called before Joomla initializes the