Merge pull request #211 from acelaya-forks/feature/update-deps

Update dependencies
shlinkio · Feb 4, 2024 · 3c7313d · 3c7313d
2 parents 06ddce0 + ee30b11
commit 3c7313d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+### Added
+* *Nothing*
+
+### Changed
+* Update dependencies
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* *Nothing*
+
+
 ## [8.7.0] - 2023-12-26
 ### Added
 * Add config option to enable/disable QR codes for disables short URLs.

diff --git a/composer.json b/composer.json
@@ -16,21 +16,21 @@
         "laminas/laminas-config": "^3.9",
         "laminas/laminas-config-aggregator": "^1.14",
         "laminas/laminas-servicemanager": "^3.22",
-        "laminas/laminas-stdlib": "^3.18",
-        "shlinkio/shlink-config": "^2.4",
-        "symfony/console": "^6.3",
-        "symfony/filesystem": "^6.3",
-        "symfony/process": "^6.3"
+        "laminas/laminas-stdlib": "^3.19",
+        "shlinkio/shlink-config": "^2.5",
+        "symfony/console": "^7.0 || ^6.4",
+        "symfony/filesystem": "^7.0 || ^6.4",
+        "symfony/process": "^7.0 || ^6.4"
     },
     "require-dev": {
         "devster/ubench": "^2.1",
-        "infection/infection": "^0.27.7",
+        "infection/infection": "^0.27.9",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^10.4",
+        "phpunit/phpunit": "^10.5",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~2.3.0",
-        "symfony/var-dumper": "^6.3"
+        "symfony/var-dumper": "^7.0 || ^6.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Command/InitCommand.php b/src/Command/InitCommand.php
@@ -47,7 +47,7 @@ protected function configure(): void
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): ?int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $config = new ShlinkInitConfig(
             initializeDb: ! $this->skipInitDb->get($input),

diff --git a/src/Command/SetOptionCommand.php b/src/Command/SetOptionCommand.php
@@ -76,7 +76,7 @@ protected function interact(InputInterface $input, OutputInterface $output): voi
         }
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): ?int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         $optionTitle = $io->choice('What config option do you want to change', array_keys($this->groups));

diff --git a/test/Service/ShlinkAssetsHandlerTest.php b/test/Service/ShlinkAssetsHandlerTest.php
@@ -40,7 +40,7 @@ public function cachedConfigIsDeletedIfExists(bool $appExists, bool $routesExist
         ]);
         $this->filesystem->expects($this->exactly($expectedRemoveCalls))->method('remove')->with(
             $this->stringContains('data/cache'),
-        )->willReturn(null);
+        );
 
         $this->assetsHandler->dropCachedConfigIfAny($this->io);
     }