Make PHP-CS happy

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 8b4fd909c7355b60d17769d49b0d78edd57bf6f2..80c3ff5addb961f5d2754a9ca5ca49ba07ed90a5 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -179,20 +179,20 @@ class Install extends BaseModule
 
                                $status = $this->installer->checkEnvironment($this->baseUrl, $php_path);
 
-                               $tpl    = Renderer::getMarkupTemplate('install/01_checks.tpl');
+                               $tpl = Renderer::getMarkupTemplate('install/01_checks.tpl');
                                $output .= Renderer::replaceMacros($tpl, [
-                                       '$title'       => $install_title,
-                                       '$pass'        => $this->t('System check'),
-                                       '$required'    => $this->t('Required'),
-                                       '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
+                                       '$title'                              => $install_title,
+                                       '$pass'                               => $this->t('System check'),
+                                       '$required'                           => $this->t('Required'),
+                                       '$requirement_not_satisfied'          => $this->t('Requirement not satisfied'),
                                        '$optional_requirement_not_satisfied' => $this->t('Optional requirement not satisfied'),
-                                       '$ok'          => $this->t('OK'),
-                                       '$checks'      => $this->installer->getChecks(),
-                                       '$passed'      => $status,
-                                       '$see_install' => $this->t('Please see the file "doc/INSTALL.md".'),
-                                       '$next'        => $this->t('Next'),
-                                       '$reload'      => $this->t('Check again'),
-                                       '$php_path'    => $php_path,
+                                       '$ok'                                 => $this->t('OK'),
+                                       '$checks'                             => $this->installer->getChecks(),
+                                       '$passed'                             => $status,
+                                       '$see_install'                        => $this->t('Please see the file "doc/INSTALL.md".'),
+                                       '$next'                               => $this->t('Next'),
+                                       '$reload'                             => $this->t('Check again'),
+                                       '$php_path'                           => $php_path,
                                ]);
                                break;
 
@@ -201,62 +201,62 @@ class Install extends BaseModule
                                        new Uri($this->configCache->get('system', 'url')) :
                                        $this->baseUrl;
 
-                               $tpl    = Renderer::getMarkupTemplate('install/02_base_config.tpl');
+                               $tpl = Renderer::getMarkupTemplate('install/02_base_config.tpl');
                                $output .= Renderer::replaceMacros($tpl, [
-                                       '$title'      => $install_title,
-                                       '$pass'       => $this->t('Base settings'),
-                                       '$basepath'   => ['system-basepath',
+                                       '$title'    => $install_title,
+                                       '$pass'     => $this->t('Base settings'),
+                                       '$basepath' => ['system-basepath',
                                                $this->t("Base path to installation"),
                                                $this->configCache->get('system', 'basepath'),
                                                $this->t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
                                                $this->t('Required')],
-                                       '$system_url'    => ['system-url',
+                                       '$system_url' => ['system-url',
                                                $this->t('The Friendica system URL'),
                                                (string)$baseUrl,
                                                $this->t("Overwrite this field in case the system URL determination isn't right, otherwise leave it as is."),
                                                $this->t('Required')],
-                                       '$php_path'   => $this->configCache->get('config', 'php_path'),
-                                       '$submit'     => $this->t('Submit'),
+                                       '$php_path' => $this->configCache->get('config', 'php_path'),
+                                       '$submit'   => $this->t('Submit'),
                                ]);
                                break;
 
                        case self::DATABASE_CONFIG:
-                               $tpl    = Renderer::getMarkupTemplate('install/03_database_config.tpl');
+                               $tpl = Renderer::getMarkupTemplate('install/03_database_config.tpl');
                                $output .= Renderer::replaceMacros($tpl, [
-                                       '$title'      => $install_title,
-                                       '$pass'       => $this->t('Database connection'),
-                                       '$info_01'    => $this->t('In order to install Friendica we need to know how to connect to your database.'),
-                                       '$info_02'    => $this->t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
-                                       '$info_03'    => $this->t('The database you specify below should already exist. If it does not, please create it before continuing.'),
-                                       '$required'   => $this->t('Required'),
+                                       '$title'                     => $install_title,
+                                       '$pass'                      => $this->t('Database connection'),
+                                       '$info_01'                   => $this->t('In order to install Friendica we need to know how to connect to your database.'),
+                                       '$info_02'                   => $this->t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+                                       '$info_03'                   => $this->t('The database you specify below should already exist. If it does not, please create it before continuing.'),
+                                       '$required'                  => $this->t('Required'),
                                        '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
-                                       '$checks'     => $this->installer->getChecks(),
-                                       '$basepath'   => $this->configCache->get('system', 'basepath'),
-                                       '$system_url' => $this->configCache->get('system', 'url'),
-                                       '$dbhost'     => ['database-hostname',
+                                       '$checks'                    => $this->installer->getChecks(),
+                                       '$basepath'                  => $this->configCache->get('system', 'basepath'),
+                                       '$system_url'                => $this->configCache->get('system', 'url'),
+                                       '$dbhost'                    => ['database-hostname',
                                                $this->t('Database Server Name'),
                                                $this->configCache->get('database', 'hostname'),
                                                '',
                                                $this->t('Required')],
-                                       '$dbuser'     => ['database-username',
+                                       '$dbuser' => ['database-username',
                                                $this->t('Database Login Name'),
                                                $this->configCache->get('database', 'username'),
                                                '',
                                                $this->t('Required'),
                                                'autofocus'],
-                                       '$dbpass'     => ['database-password',
+                                       '$dbpass' => ['database-password',
                                                $this->t('Database Login Password'),
                                                $this->configCache->get('database', 'password'),
                                                $this->t("For security reasons the password must not be empty"),
                                                $this->t('Required')],
-                                       '$dbdata'     => ['database-database',
+                                       '$dbdata' => ['database-database',
                                                $this->t('Database Name'),
                                                $this->configCache->get('database', 'database'),
                                                '',
                                                $this->t('Required')],
-                                       '$lbl_10'     => $this->t('Please select a default timezone for your website'),
-                                       '$php_path'   => $this->configCache->get('config', 'php_path'),
-                                       '$submit'     => $this->t('Submit')
+                                       '$lbl_10'   => $this->t('Please select a default timezone for your website'),
+                                       '$php_path' => $this->configCache->get('config', 'php_path'),
+                                       '$submit'   => $this->t('Submit')
                                ]);
                                break;
 
@@ -264,7 +264,7 @@ class Install extends BaseModule
                                /* Installed langs */
                                $lang_choices = $this->l10n->getAvailableLanguages();
 
-                               $tpl    = Renderer::getMarkupTemplate('install/04_site_settings.tpl');
+                               $tpl = Renderer::getMarkupTemplate('install/04_site_settings.tpl');
                                $output .= Renderer::replaceMacros($tpl, [
                                        '$title'      => $install_title,
                                        '$required'   => $this->t('Required'),
@@ -281,17 +281,19 @@ class Install extends BaseModule
                                                $this->configCache->get('config', 'admin_email'),
                                                $this->t('Your account email address must match this in order to use the web admin panel.'),
                                                $this->t('Required'), 'autofocus', 'email'],
-                                       '$timezone'   => Temporal::getTimezoneField('system-default_timezone',
+                                       '$timezone' => Temporal::getTimezoneField(
+                                               'system-default_timezone',
                                                $this->t('Please select a default timezone for your website'),
                                                $this->configCache->get('system', 'default_timezone'),
-                                               ''),
-                                       '$language'   => ['system-language',
+                                               ''
+                                       ),
+                                       '$language' => ['system-language',
                                                $this->t('System Language:'),
                                                $this->configCache->get('system', 'language'),
                                                $this->t('Set the default language for your Friendica installation interface and to send emails.'),
                                                $lang_choices],
-                                       '$php_path'   => $this->configCache->get('config', 'php_path'),
-                                       '$submit'     => $this->t('Submit')
+                                       '$php_path' => $this->configCache->get('config', 'php_path'),
+                                       '$submit'   => $this->t('Submit')
                                ]);
                                break;
 
@@ -299,19 +301,19 @@ class Install extends BaseModule
                                $db_return_text = "";
 
                                if (count($this->installer->getChecks()) == 0) {
-                                       $txt            = '<p style="font-size: 130%;">';
-                                       $txt            .= $this->t('Your Friendica site database has been installed.') . '<br />';
+                                       $txt = '<p style="font-size: 130%;">';
+                                       $txt .= $this->t('Your Friendica site database has been installed.') . '<br />';
                                        $db_return_text .= $txt;
                                }
 
-                               $tpl    = Renderer::getMarkupTemplate('install/05_finished.tpl');
+                               $tpl = Renderer::getMarkupTemplate('install/05_finished.tpl');
                                $output .= Renderer::replaceMacros($tpl, [
-                                       '$title'    => $install_title,
-                                       '$required' => $this->t('Required'),
+                                       '$title'                     => $install_title,
+                                       '$required'                  => $this->t('Required'),
                                        '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
-                                       '$checks'   => $this->installer->getChecks(),
-                                       '$pass'     => $this->t('Installation finished'),
-                                       '$text'     => $db_return_text . $this->whatNext(),
+                                       '$checks'                    => $this->installer->getChecks(),
+                                       '$pass'                      => $this->t('Installation finished'),
+                                       '$text'                      => $db_return_text . $this->whatNext(),
                                ]);
 
                                break;

diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index c10bf8d680ef17c9335b214b8fb77f3b7d9dd6ed..94e14c352115bf19423a85828125fd82ddb64d6c 100644 (file)
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -38,7 +38,7 @@ class AppSpecific extends BaseSettings
        {
                parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->pConfig = $pConfig;
+               $this->pConfig        = $pConfig;
                $this->systemMessages = $systemMessages;
 
                if (!$this->session->getLocalUserId()) {
@@ -81,7 +81,7 @@ class AppSpecific extends BaseSettings
                                        }
 
                                        break;
-                               case 'revoke_all' :
+                               case 'revoke_all':
                                        AppSpecificPassword::deleteAllForUser($this->session->getLocalUserId());
                                        $this->systemMessages->addInfo($this->t('App-specific passwords successfully revoked.'));
                                        $this->baseUrl->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
@@ -114,22 +114,22 @@ class AppSpecific extends BaseSettings
                        '$form_security_token'     => self::getFormSecurityToken('settings_2fa_app_specific'),
                        '$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
 
-                       '$title'                  => $this->t('Two-factor app-specific passwords'),
-                       '$help_label'             => $this->t('Help'),
-                       '$message'                => $this->t('<p>App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.</p>'),
-                       '$generated_message'      => $this->t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'),
+                       '$title'                           => $this->t('Two-factor app-specific passwords'),
+                       '$help_label'                      => $this->t('Help'),
+                       '$message'                         => $this->t('<p>App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.</p>'),
+                       '$generated_message'               => $this->t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'),
                        '$generated_app_specific_password' => $this->appSpecificPassword,
 
-                       '$description_label'      => $this->t('Description'),
-                       '$last_used_label'        => $this->t('Last Used'),
-                       '$revoke_label'           => $this->t('Revoke'),
-                       '$revoke_all_label'       => $this->t('Revoke All'),
+                       '$description_label' => $this->t('Description'),
+                       '$last_used_label'   => $this->t('Last Used'),
+                       '$revoke_label'      => $this->t('Revoke'),
+                       '$revoke_all_label'  => $this->t('Revoke All'),
 
-                       '$app_specific_passwords' => $appSpecificPasswords,
-                       '$generate_message'       => $this->t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'),
-                       '$generate_title'         => $this->t('Generate new app-specific password'),
+                       '$app_specific_passwords'        => $appSpecificPasswords,
+                       '$generate_message'              => $this->t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'),
+                       '$generate_title'                => $this->t('Generate new app-specific password'),
                        '$description_placeholder_label' => $this->t('Friendiqa on my Fairphone 2...'),
-                       '$generate_label' => $this->t('Generate'),
+                       '$generate_label'                => $this->t('Generate'),
                ]);
        }
 }