Skip to content

Add Symfony 7 support #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
homersimpsons merged 5 commits into from
Jun 16, 2026
+14 −18
Merged

Add Symfony 7 support #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1007d66
Add Symfony 7 support
Jun 12, 2026
6293f73
:green_heart: Increase from PHP8.0 to lowest supproted PHP version (8…
homersimpsons Jun 15, 2026
71337ef
bump tdbm update and fix verbosity
mugash Jun 15, 2026
ce2e2c3
Pin tdbm to ~6.1.0 and simplify generate command tests
mugash Jun 16, 2026
9e64379
:green_heart: Fix always-true phpstan, test against MySQL8
homersimpsons Jun 16, 2026
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
14 changes: 6 additions & 8 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.2"
- "8.5"

services:
mysql:
image: "mysql:5.7"
image: "mysql:8"
env:
MYSQL_ALLOW_EMPTY_PASSWORD: true
MYSQL_ROOT_PASSWORD:
MYSQL_ROOT_PASSWORD: ""
ports:
- "3306:3306"

Expand Down Expand Up @@ -52,11 +53,8 @@ jobs:
- name: "Run PHPUnit"
run: "vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.xml"

- name: "Upload Code Coverage"
if: ${{ matrix.php-version == '7.4' }}
uses: "codecov/codecov-action@v1"

- name: "Run a static analysis with phpstan/phpstan"
if: ${{ matrix.php-version == '8.2' }}
run: "composer phpstan -- --error-format=checkstyle | cs2pr"

phpunit-prefer-lowest:
Expand All @@ -66,7 +64,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.2"

services:
mysql:
Expand Down
1 change: 0 additions & 1 deletion DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public function getConfigTreeBuilder(): TreeBuilder
{
$treeBuilder = new TreeBuilder('tdbm');
$rootNode = $treeBuilder->getRootNode();
assert($rootNode instanceof ArrayNodeDefinition);

$rootNodeChildren = $rootNode->children();
$this->buildServiceNode($rootNodeChildren);
Expand Down
4 changes: 2 additions & 2 deletions Tests/FunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ public function testEndToEnd(): void

$applicationTester = new ApplicationTester($application);
$applicationTester->run(['command' => 'tdbm:generate']);
$this->assertStringContainsString('Finished regenerating DAOs and beans', $applicationTester->getDisplay());
$this->assertSame(0, $applicationTester->getStatusCode());
$this->assertFileExists(__DIR__ . '/../tdbm.lock.yml');

$applicationTester = new ApplicationTester($application);
$applicationTester->run(['command' => 'tdbm:generate:other']);
$this->assertStringContainsString('Finished regenerating DAOs and beans', $applicationTester->getDisplay());
$this->assertSame(0, $applicationTester->getStatusCode());
$this->assertFileExists(__DIR__ . '/../tdbm.other.lock.yml');
}

Expand Down
3 changes: 1 addition & 2 deletions Utils/DoctrineCacheClearer.php
View file
Open in desktop
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
View file
Open in desktop
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": "~6.1.0",
"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
Loading