Fixed merge conflicts

2025-02-25 18:45:27 -06:00 · 2017-10-23 13:28:09 +02:00
parent 91f08c9ead ccb9d5e83a
commit 781ca39938
8 changed files with 48 additions and 7 deletions
--- a/module/Core/config/dependencies.config.php
+++ b/module/Core/config/dependencies.config.php
@@ -42,7 +42,13 @@ return [
        NotFoundDelegate::class => [TemplateRendererInterface::class],

        // Services
-        Service\UrlShortener::class => ['httpClient', 'em', Cache::class, 'config.url_shortener.shortcode_chars'],
+        Service\UrlShortener::class => [
+            'httpClient',
+            'em',
+            Cache::class,
+            'config.url_shortener.validate_url',
+            'config.url_shortener.shortcode_chars',
+        ],
        Service\VisitsTracker::class => ['em'],
        Service\ShortUrlService::class => ['em'],
        Service\VisitService::class => ['em'],