Merge branch 'feature/php-misc' into 'master'

More native typing, use some new PHP stuff

See merge request tt-rss/tt-rss!88

1 files changed, 3 insertions, 3 deletions

diff --git a/include/controls.php b/include/controls.php
index 5c6174e3d..8932dd048 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -56,21 +56,21 @@
 	 * @param array<string, mixed> $attributes
 	 */
    function number_spinner_tag(string $name, string $value, array $attributes = [], string $id = ""): string {
-      return input_tag($name, $value, "text", array_merge(["dojoType" => "dijit.form.NumberSpinner"], $attributes), $id);
+      return input_tag($name, $value, 'text', ['dojoType' => 'dijit.form.NumberSpinner', ...$attributes], $id);
    }
 
 	/**
 	 * @param array<string, mixed> $attributes
 	 */
    function submit_tag(string $value, array $attributes = []): string {
-      return button_tag($value, "submit", array_merge(["class" => "alt-primary"], $attributes));
+      return button_tag($value, 'submit', ['class' => 'alt-primary', ...$attributes]);
    }
 
 	/**
 	 * @param array<string, mixed> $attributes
 	 */
    function cancel_dialog_tag(string $value, array $attributes = []): string {
-      return button_tag($value, "", array_merge(["onclick" => "App.dialogOf(this).hide()"], $attributes));
+      return button_tag($value, '', ['onclick' => 'App.dialogOf(this).hide()', ...$attributes]);
    }
 
 	/**