sync with nette/application 3.1.4+ (#31)

nextras · Oct 9, 2021 · d4618db · d4618db
1 parent f284c86
commit d4618db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.2', '7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }}
 

diff --git a/composer.json b/composer.json
@@ -11,8 +11,8 @@
 		}
 	],
 	"require": {
-		"php": "^7.1 || ^8.0",
-		"nette/application": "^3.0.3",
+		"php": "^7.2 || ^8.0",
+		"nette/application": "^3.1.4",
 		"nette/utils": "^3.0"
 	},
 	"require-dev": {

diff --git a/src/SecuredLinksControlTrait.php b/src/SecuredLinksControlTrait.php
@@ -17,12 +17,11 @@ trait SecuredLinksControlTrait
 	/**
 	 * {@inheritdoc}
 	 */
-	public function link(string $destination, $args = []): string
+	public function link(string $destination, ...$args): string
 	{
-		if (!is_array($args)) {
-			$args = func_get_args();
-			array_shift($args);
-		}
+		$args = count($args) === 1 && is_array($args[0] ?? null)
+			? $args[0]
+			: $args;
 
 		$link = parent::link($destination, $args);
 		return $this->getPresenter()->createSecuredLink($this, $link, $destination);