From 59ceaa813b7b431ab9b150edab83e8fd1e80e993 Mon Sep 17 00:00:00 2001 From: Peter Aba Date: Sat, 6 Mar 2021 16:49:14 +0100 Subject: [PATCH] Vendor updates --- composer.lock | 155 +++++++++--------- docker | 2 +- src/Http/Controllers/Admin/Execute/File.php | 6 +- .../Admin/Execute/FileCategory.php | 6 +- .../Admin/Execute/FileDownload.php | 6 +- src/Http/Controllers/Admin/Form/File.php | 6 +- .../Controllers/Admin/Form/FileCategory.php | 6 +- src/Http/Controllers/Admin/Grid/File.php | 6 +- .../Controllers/Admin/Grid/FileCategory.php | 6 +- .../Controllers/Admin/Grid/FileDownload.php | 6 +- 10 files changed, 100 insertions(+), 105 deletions(-) diff --git a/composer.lock b/composer.lock index 3b1f716..829ac7d 100644 --- a/composer.lock +++ b/composer.lock @@ -12,12 +12,12 @@ "source": { "type": "git", "url": "https://github.com/abterphp/admin.git", - "reference": "8e3d822933f21b9fc2e383f9d3fb859599a7323f" + "reference": "36534aaa603634ffbaba27bcf20209a3a3db7b28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/abterphp/admin/zipball/8e3d822933f21b9fc2e383f9d3fb859599a7323f", - "reference": "8e3d822933f21b9fc2e383f9d3fb859599a7323f", + "url": "https://api.github.com/repos/abterphp/admin/zipball/36534aaa603634ffbaba27bcf20209a3a3db7b28", + "reference": "36534aaa603634ffbaba27bcf20209a3a3db7b28", "shasum": "" }, "require": { @@ -56,7 +56,7 @@ "issues": "https://github.com/abterphp/admin/issues", "source": "https://github.com/abterphp/admin/tree/main" }, - "time": "2021-02-28T23:57:39+00:00" + "time": "2021-03-06T15:36:19+00:00" }, { "name": "abterphp/framework", @@ -64,12 +64,12 @@ "source": { "type": "git", "url": "https://github.com/abterphp/framework.git", - "reference": "6e94c024e5156c7a8faf5c7f5662cff764aac21f" + "reference": "9c59f2c55c98c1fee3781918e99720695da85d29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/abterphp/framework/zipball/6e94c024e5156c7a8faf5c7f5662cff764aac21f", - "reference": "6e94c024e5156c7a8faf5c7f5662cff764aac21f", + "url": "https://api.github.com/repos/abterphp/framework/zipball/9c59f2c55c98c1fee3781918e99720695da85d29", + "reference": "9c59f2c55c98c1fee3781918e99720695da85d29", "shasum": "" }, "require": { @@ -134,7 +134,7 @@ "issues": "https://github.com/abterphp/framework/issues", "source": "https://github.com/abterphp/framework/tree/main" }, - "time": "2021-02-28T23:50:31+00:00" + "time": "2021-03-06T14:20:14+00:00" }, { "name": "abterphp/website", @@ -142,12 +142,12 @@ "source": { "type": "git", "url": "https://github.com/abterphp/website.git", - "reference": "3db2bc4d9a8532a06223de889f89bce5b29b3b9a" + "reference": "b0f0af11301bece062f9f9779c9e00628253e680" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/abterphp/website/zipball/3db2bc4d9a8532a06223de889f89bce5b29b3b9a", - "reference": "3db2bc4d9a8532a06223de889f89bce5b29b3b9a", + "url": "https://api.github.com/repos/abterphp/website/zipball/b0f0af11301bece062f9f9779c9e00628253e680", + "reference": "b0f0af11301bece062f9f9779c9e00628253e680", "shasum": "" }, "require": { @@ -187,7 +187,7 @@ "issues": "https://github.com/abterphp/website/issues", "source": "https://github.com/abterphp/website/tree/main" }, - "time": "2021-03-01T00:00:56+00:00" + "time": "2021-03-06T14:57:49+00:00" }, { "name": "bjeavons/zxcvbn-php", @@ -2172,16 +2172,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.5", + "version": "v6.2.6", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7" + "reference": "d2791ff0b73247cdc2096b14f5580aba40c12bff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7", - "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d2791ff0b73247cdc2096b14f5580aba40c12bff", + "reference": "d2791ff0b73247cdc2096b14f5580aba40c12bff", "shasum": "" }, "require": { @@ -2231,7 +2231,7 @@ ], "support": { "issues": "https://github.com/swiftmailer/swiftmailer/issues", - "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.5" + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.6" }, "funding": [ { @@ -2243,7 +2243,7 @@ "type": "tidelift" } ], - "time": "2021-01-12T09:35:59+00:00" + "time": "2021-03-05T12:08:49+00:00" }, { "name": "symfony/expression-language", @@ -4437,27 +4437,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -4470,7 +4465,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -4484,9 +4479,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/container/tree/1.1.1" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/event-dispatcher", @@ -5626,16 +5621,16 @@ }, { "name": "symfony/config", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "50e0e1314a3b2609d32b6a5a0d0fb5342494c4ab" + "reference": "212d54675bf203ff8aef7d8cee8eecfb72f4a263" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/50e0e1314a3b2609d32b6a5a0d0fb5342494c4ab", - "reference": "50e0e1314a3b2609d32b6a5a0d0fb5342494c4ab", + "url": "https://api.github.com/repos/symfony/config/zipball/212d54675bf203ff8aef7d8cee8eecfb72f4a263", + "reference": "212d54675bf203ff8aef7d8cee8eecfb72f4a263", "shasum": "" }, "require": { @@ -5684,7 +5679,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.2.3" + "source": "https://github.com/symfony/config/tree/v5.2.4" }, "funding": [ { @@ -5700,20 +5695,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:15:41+00:00" + "time": "2021-02-23T23:58:19+00:00" }, { "name": "symfony/console", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a" + "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/89d4b176d12a2946a1ae4e34906a025b7b6b135a", - "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a", + "url": "https://api.github.com/repos/symfony/console/zipball/d6d0cc30d8c0fda4e7b213c20509b0159a8f4556", + "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556", "shasum": "" }, "require": { @@ -5781,7 +5776,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.2.3" + "source": "https://github.com/symfony/console/tree/v5.2.4" }, "funding": [ { @@ -5797,20 +5792,20 @@ "type": "tidelift" } ], - "time": "2021-01-28T22:06:19+00:00" + "time": "2021-02-23T10:08:49+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "62f72187be689540385dce6c68a5d4c16f034139" + "reference": "f7d89110c55d88620dc811f342f94393b8a045d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/62f72187be689540385dce6c68a5d4c16f034139", - "reference": "62f72187be689540385dce6c68a5d4c16f034139", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f7d89110c55d88620dc811f342f94393b8a045d4", + "reference": "f7d89110c55d88620dc811f342f94393b8a045d4", "shasum": "" }, "require": { @@ -5828,7 +5823,7 @@ }, "provide": { "psr/container-implementation": "1.0", - "symfony/service-implementation": "1.0" + "symfony/service-implementation": "1.0|2.0" }, "require-dev": { "symfony/config": "^5.1", @@ -5868,7 +5863,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.2.3" + "source": "https://github.com/symfony/dependency-injection/tree/v5.2.4" }, "funding": [ { @@ -5884,7 +5879,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T12:56:27+00:00" + "time": "2021-03-04T15:41:09+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5955,16 +5950,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367" + "reference": "d08d6ec121a425897951900ab692b612a61d6240" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4f9760f8074978ad82e2ce854dff79a71fe45367", - "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d08d6ec121a425897951900ab692b612a61d6240", + "reference": "d08d6ec121a425897951900ab692b612a61d6240", "shasum": "" }, "require": { @@ -6020,7 +6015,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4" }, "funding": [ { @@ -6036,7 +6031,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:36:42+00:00" + "time": "2021-02-18T17:12:37+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -6119,16 +6114,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "262d033b57c73e8b59cd6e68a45c528318b15038" + "reference": "710d364200997a5afde34d9fe57bd52f3cc1e108" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/262d033b57c73e8b59cd6e68a45c528318b15038", - "reference": "262d033b57c73e8b59cd6e68a45c528318b15038", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/710d364200997a5afde34d9fe57bd52f3cc1e108", + "reference": "710d364200997a5afde34d9fe57bd52f3cc1e108", "shasum": "" }, "require": { @@ -6161,7 +6156,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.2.3" + "source": "https://github.com/symfony/filesystem/tree/v5.2.4" }, "funding": [ { @@ -6177,20 +6172,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:01:46+00:00" + "time": "2021-02-12T10:38:38+00:00" }, { "name": "symfony/finder", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4adc8d172d602008c204c2e16956f99257248e03" + "reference": "0d639a0943822626290d169965804f79400e6a04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03", - "reference": "4adc8d172d602008c204c2e16956f99257248e03", + "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04", + "reference": "0d639a0943822626290d169965804f79400e6a04", "shasum": "" }, "require": { @@ -6222,7 +6217,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.2.3" + "source": "https://github.com/symfony/finder/tree/v5.2.4" }, "funding": [ { @@ -6238,11 +6233,11 @@ "type": "tidelift" } ], - "time": "2021-01-28T22:06:19+00:00" + "time": "2021-02-15T18:55:04+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -6291,7 +6286,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.2.3" + "source": "https://github.com/symfony/options-resolver/tree/v5.2.4" }, "funding": [ { @@ -6701,7 +6696,7 @@ }, { "name": "symfony/process", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -6743,7 +6738,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.2.3" + "source": "https://github.com/symfony/process/tree/v5.2.4" }, "funding": [ { @@ -6842,7 +6837,7 @@ }, { "name": "symfony/stopwatch", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -6884,7 +6879,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.2.3" + "source": "https://github.com/symfony/stopwatch/tree/v5.2.4" }, "funding": [ { @@ -6904,16 +6899,16 @@ }, { "name": "symfony/string", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "c95468897f408dd0aca2ff582074423dd0455122" + "reference": "4e78d7d47061fa183639927ec40d607973699609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122", - "reference": "c95468897f408dd0aca2ff582074423dd0455122", + "url": "https://api.github.com/repos/symfony/string/zipball/4e78d7d47061fa183639927ec40d607973699609", + "reference": "4e78d7d47061fa183639927ec40d607973699609", "shasum": "" }, "require": { @@ -6967,7 +6962,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.3" + "source": "https://github.com/symfony/string/tree/v5.2.4" }, "funding": [ { @@ -6983,7 +6978,7 @@ "type": "tidelift" } ], - "time": "2021-01-25T15:14:59+00:00" + "time": "2021-02-16T10:20:28+00:00" }, { "name": "theseer/tokenizer", diff --git a/docker b/docker index 1b6d716..9d86779 160000 --- a/docker +++ b/docker @@ -1 +1 @@ -Subproject commit 1b6d716642c1813174300959401b041f596e9ef7 +Subproject commit 9d86779462254593095b0377aa943166c1f41e5f diff --git a/src/Http/Controllers/Admin/Execute/File.php b/src/Http/Controllers/Admin/Execute/File.php index 3f96924..788d11e 100644 --- a/src/Http/Controllers/Admin/Execute/File.php +++ b/src/Http/Controllers/Admin/Execute/File.php @@ -26,25 +26,25 @@ class File extends ExecuteAbstract * File constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param RepoService $repoService * @param ISession $session */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, RepoService $repoService, ISession $session ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $repoService, $session ); diff --git a/src/Http/Controllers/Admin/Execute/FileCategory.php b/src/Http/Controllers/Admin/Execute/FileCategory.php index b009c85..205513c 100644 --- a/src/Http/Controllers/Admin/Execute/FileCategory.php +++ b/src/Http/Controllers/Admin/Execute/FileCategory.php @@ -26,25 +26,25 @@ class FileCategory extends ExecuteAbstract * FileCategory constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param RepoService $repoService * @param ISession $session */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, RepoService $repoService, ISession $session ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $repoService, $session ); diff --git a/src/Http/Controllers/Admin/Execute/FileDownload.php b/src/Http/Controllers/Admin/Execute/FileDownload.php index 4d9fa53..a7675a3 100644 --- a/src/Http/Controllers/Admin/Execute/FileDownload.php +++ b/src/Http/Controllers/Admin/Execute/FileDownload.php @@ -26,25 +26,25 @@ class FileDownload extends ExecuteAbstract * FileDownload constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param RepoService $repoService * @param ISession $session */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, RepoService $repoService, ISession $session ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $repoService, $session ); diff --git a/src/Http/Controllers/Admin/Form/File.php b/src/Http/Controllers/Admin/Form/File.php index 7ebde0f..d02f1b4 100644 --- a/src/Http/Controllers/Admin/Form/File.php +++ b/src/Http/Controllers/Admin/Form/File.php @@ -39,9 +39,9 @@ class File extends FormAbstract * File constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param Repo $repo * @param ISession $session * @param FormFactory $formFactory @@ -50,9 +50,9 @@ class File extends FormAbstract */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, Repo $repo, ISession $session, FormFactory $formFactory, @@ -61,9 +61,9 @@ public function __construct( ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $repo, $session, $formFactory, diff --git a/src/Http/Controllers/Admin/Form/FileCategory.php b/src/Http/Controllers/Admin/Form/FileCategory.php index 73534a8..f850dc7 100644 --- a/src/Http/Controllers/Admin/Form/FileCategory.php +++ b/src/Http/Controllers/Admin/Form/FileCategory.php @@ -38,9 +38,9 @@ class FileCategory extends FormAbstract * FileCategory constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param Repo $repo * @param ISession $session * @param FormFactory $formFactory @@ -49,9 +49,9 @@ class FileCategory extends FormAbstract */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, Repo $repo, ISession $session, FormFactory $formFactory, @@ -60,9 +60,9 @@ public function __construct( ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $repo, $session, $formFactory, diff --git a/src/Http/Controllers/Admin/Grid/File.php b/src/Http/Controllers/Admin/Grid/File.php index 6cd7c92..2c96152 100644 --- a/src/Http/Controllers/Admin/Grid/File.php +++ b/src/Http/Controllers/Admin/Grid/File.php @@ -29,27 +29,27 @@ class File extends GridAbstract * File constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param AssetManager $assets * @param RepoGrid $repoGrid * @param IEventDispatcher $eventDispatcher */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, AssetManager $assets, RepoGrid $repoGrid, IEventDispatcher $eventDispatcher ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $assets, $repoGrid, $eventDispatcher diff --git a/src/Http/Controllers/Admin/Grid/FileCategory.php b/src/Http/Controllers/Admin/Grid/FileCategory.php index 893a302..69805db 100644 --- a/src/Http/Controllers/Admin/Grid/FileCategory.php +++ b/src/Http/Controllers/Admin/Grid/FileCategory.php @@ -29,27 +29,27 @@ class FileCategory extends GridAbstract * FileCategory constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param AssetManager $assets * @param RepoGrid $repoGrid * @param IEventDispatcher $eventDispatcher */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, AssetManager $assets, RepoGrid $repoGrid, IEventDispatcher $eventDispatcher ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $assets, $repoGrid, $eventDispatcher diff --git a/src/Http/Controllers/Admin/Grid/FileDownload.php b/src/Http/Controllers/Admin/Grid/FileDownload.php index 84bd66d..652ff4c 100644 --- a/src/Http/Controllers/Admin/Grid/FileDownload.php +++ b/src/Http/Controllers/Admin/Grid/FileDownload.php @@ -29,27 +29,27 @@ class FileDownload extends GridAbstract * FileDownload constructor. * * @param FlashService $flashService + * @param LoggerInterface $logger * @param ITranslator $translator * @param UrlGenerator $urlGenerator - * @param LoggerInterface $logger * @param AssetManager $assets * @param RepoGrid $repoGrid * @param IEventDispatcher $eventDispatcher */ public function __construct( FlashService $flashService, + LoggerInterface $logger, ITranslator $translator, UrlGenerator $urlGenerator, - LoggerInterface $logger, AssetManager $assets, RepoGrid $repoGrid, IEventDispatcher $eventDispatcher ) { parent::__construct( $flashService, + $logger, $translator, $urlGenerator, - $logger, $assets, $repoGrid, $eventDispatcher