diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a8b93ecd..2024adca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -123,12 +123,6 @@ Depending on the kind of contribution, maybe not all kinds of tests are needed, * Run `./indocker composer ci` to run all previous commands together. This command is run during the project's continuous integration. * Run `./indocker composer ci:parallel` to do the same as in previous case, but parallelizing non-conflicting tasks as much as possible. -> Note: Due to some limitations in the tooling used by shlink, the testing databases need to exist beforehand, both for db and api tests (except sqlite). -> -> However, they just need to be created empty, with no tables. Also, once created, they are automatically reset before every new execution. -> -> The testing database is always called `shlink_test`. You can create it using the database client of your choice. [DBeaver](https://dbeaver.io/) is a good multi-platform desktop database client which supports all the engines supported by shlink. - ## Pull request process **Important!**: Before starting to work on a pull request, make sure you always [open an issue](https://github.com/shlinkio/shlink/issues/new/choose) first. diff --git a/composer.json b/composer.json index 4d240acb..e0ffd0de 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "laminas/laminas-config-aggregator": "^1.7", "laminas/laminas-diactoros": "^2.8", "laminas/laminas-inputfilter": "^2.13", - "laminas/laminas-servicemanager": "^3.10", + "laminas/laminas-servicemanager": "^3.11.2", "laminas/laminas-stdlib": "^3.6", "lcobucci/jwt": "^4.1", "league/uri": "^6.4", @@ -74,7 +74,7 @@ "phpunit/phpunit": "^9.5", "roave/security-advisories": "dev-master", "shlinkio/php-coding-standard": "~2.2.0", - "shlinkio/shlink-test-utils": "^3.0", + "shlinkio/shlink-test-utils": "^3.0.1", "symfony/var-dumper": "^6.0", "veewee/composer-run-parallel": "^1.1" }, diff --git a/config/test/bootstrap_db_tests.php b/config/test/bootstrap_db_tests.php index 9f14c38d..0237d741 100644 --- a/config/test/bootstrap_db_tests.php +++ b/config/test/bootstrap_db_tests.php @@ -8,5 +8,5 @@ use Psr\Container\ContainerInterface; /** @var ContainerInterface $container */ $container = require __DIR__ . '/../container.php'; -$container->get(Helper\TestHelper::class)->createTestDb(); +$container->get(Helper\TestHelper::class)->createTestDb(['bin/cli', 'db:create'], ['bin/cli', 'db:migrate']); DbTest\DatabaseTestCase::setEntityManager($container->get('em'));