From d88785118337ae395eac03236a20d5979de77938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Freitag?= Date: Tue, 18 May 2021 09:22:07 +0200 Subject: [PATCH] Prefer string $file over 1-element array in script() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The string syntax is more obvious. There should be one (and preferably only one) way of doing things. Signed-off-by: François Freitag --- apps/dav/templates/settings-admin-caldav.php | 4 +--- .../templates/settings/personal/security/authtokens.php | 4 +--- .../templates/settings/personal/security/webauthn.php | 4 +--- apps/systemtags/templates/admin.php | 4 +--- apps/user_ldap/templates/renewpassword.php | 4 +--- .../lib/Listener/LoadAdditionalSettingsScriptsListener.php | 4 +--- core/templates/installation.php | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index bf1e5a0fda..75d44c23a3 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -21,9 +21,7 @@ * */ -script('dav', [ - 'settings-admin-caldav' -]); +script('dav', 'settings-admin-caldav'); /** @var \OCP\IL10N $l */ /** @var array $_ */ diff --git a/apps/settings/templates/settings/personal/security/authtokens.php b/apps/settings/templates/settings/personal/security/authtokens.php index 1db0d91fe6..e90698f5ea 100644 --- a/apps/settings/templates/settings/personal/security/authtokens.php +++ b/apps/settings/templates/settings/personal/security/authtokens.php @@ -22,9 +22,7 @@ declare(strict_types=1); * */ -script('settings', [ - 'vue-settings-personal-security', -]); +script('settings', 'vue-settings-personal-security'); ?> diff --git a/apps/settings/templates/settings/personal/security/webauthn.php b/apps/settings/templates/settings/personal/security/webauthn.php index 268e06aef7..74e219a521 100644 --- a/apps/settings/templates/settings/personal/security/webauthn.php +++ b/apps/settings/templates/settings/personal/security/webauthn.php @@ -22,9 +22,7 @@ declare(strict_types=1); * */ -script('settings', [ - 'vue-settings-personal-webauthn', -]); +script('settings', 'vue-settings-personal-webauthn'); ?> diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php index 27fad5bc47..33e5f2b061 100644 --- a/apps/systemtags/templates/admin.php +++ b/apps/systemtags/templates/admin.php @@ -19,9 +19,7 @@ * */ -script('core', [ - 'dist/systemtags', -]); +script('core', 'dist/systemtags'); script('systemtags', 'admin'); style('systemtags', 'settings'); diff --git a/apps/user_ldap/templates/renewpassword.php b/apps/user_ldap/templates/renewpassword.php index dca7a459c8..752327ce87 100644 --- a/apps/user_ldap/templates/renewpassword.php +++ b/apps/user_ldap/templates/renewpassword.php @@ -1,8 +1,6 @@ diff --git a/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php b/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php index f852dea6a2..b01afbdade 100644 --- a/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php +++ b/apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php @@ -40,9 +40,7 @@ class LoadAdditionalSettingsScriptsListener implements IEventListener { class_exists(Template::class, true); } - script('core', [ - 'dist/systemtags', - ]); + script('core', 'dist/systemtags'); script(Application::APP_ID, [ 'workflowengine', diff --git a/core/templates/installation.php b/core/templates/installation.php index b9ab19f035..5bdf8b0cc9 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -1,7 +1,5 @@ '> '>