Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.2"
- "8.5"

services:
mysql:
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.2"

services:
mysql:
Expand Down
5 changes: 3 additions & 2 deletions Tests/FunctionalTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\Config\Definition\Processor;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Tester\ApplicationTester;
use Symfony\Component\HttpKernel\KernelInterface;
use TheCodingMachine\FluidSchema\TdbmFluidSchema;
Expand Down Expand Up @@ -151,12 +152,12 @@ public function testEndToEnd(): void
$application->setAutoExit(false);

$applicationTester = new ApplicationTester($application);
$applicationTester->run(['command' => 'tdbm:generate']);
$applicationTester->run(['command' => 'tdbm:generate'], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
Comment thread
homersimpsons marked this conversation as resolved.
Outdated
$this->assertStringContainsString('Finished regenerating DAOs and beans', $applicationTester->getDisplay());
$this->assertFileExists(__DIR__ . '/../tdbm.lock.yml');

$applicationTester = new ApplicationTester($application);
$applicationTester->run(['command' => 'tdbm:generate:other']);
$applicationTester->run(['command' => 'tdbm:generate:other'], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
$this->assertStringContainsString('Finished regenerating DAOs and beans', $applicationTester->getDisplay());
$this->assertFileExists(__DIR__ . '/../tdbm.other.lock.yml');
}
Expand Down
3 changes: 1 addition & 2 deletions Utils/DoctrineCacheClearer.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ public function __construct(FlushableCache $cache)

/**
* Clears any caches necessary.
* @param string $cacheDir
*/
public function clear($cacheDir): void
public function clear(string $cacheDir): void
{
$this->cache->flushAll();
}
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
],
"require" : {
"php": "^8.0",
"thecodingmachine/tdbm": "~6.0.0",
"thecodingmachine/tdbm": "dev-chore/symfony-7 as 6.0.0",
Comment thread
homersimpsons marked this conversation as resolved.
Outdated
"doctrine/doctrine-bundle": "^2.2.2",
"doctrine/orm": "^2",
"symfony/http-kernel": "^5.0 || ^6.0"
"symfony/http-kernel": "^5.0 || ^6.0 || ^7.0"
},
"require-dev": {
"roave/security-advisories": "dev-latest",
"symfony/security-bundle": "^5 || ^6",
"symfony/yaml": "^5 || ^6",
"symfony/security-bundle": "^5 || ^6 || ^7",
"symfony/yaml": "^5 || ^6 || ^7",
"phpunit/phpunit": "^9.5",
"phpstan/phpstan": "^2.0",
"thecodingmachine/tdbm-fluid-schema-builder": "^1.0 || ^2.0",
"symfony/framework-bundle": "^5.1 || ^6"
"symfony/framework-bundle": "^5.1 || ^6 || ^7"
},
"scripts": {
"phpstan": "phpstan analyse TdbmBundle.php DependencyInjection/ Utils/ --level=8 --no-progress"
Expand Down