diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 6da993f..1e37a12 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -12,11 +12,8 @@ jobs: strategy: matrix: operating-system: [ ubuntu-latest ] - php: [ '8.1', '8.2' ] - symfony: ['5.4.*', '6.3.*', '7.1.*'] - exclude: - - php: '8.1' - symfony: '7.1.*' + php: ['8.4' ] + symfony: ['7.4.*', '8.0.*'] steps: - uses: actions/checkout@main diff --git a/Makefile b/Makefile index 9b7d40c..bd3bc28 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,10 @@ help: @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' composer-install: ## composer install - docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $${SSH_AUTH_SOCK}:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent --volume $$(pwd):/srv/app prooph/composer:8.1 install + docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $$(pwd):/srv/app composer:2.9 install + +composer-update: ## composer update + docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $$(pwd):/srv/app composer:2.9 update phpunit: ## phpunit - docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $${SSH_AUTH_SOCK}:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent --volume $$(pwd):/srv/app --entrypoint="" prooph/composer:8.1 vendor/bin/phpunit + docker run --rm -it -w="/srv/app" --volume $$(pwd)/.config/composer:/root/.config/composer --volume $$(pwd):/srv/app --entrypoint="" composer:2.9 vendor/bin/phpunit diff --git a/composer.json b/composer.json index 2a4f5ad..a74bbb7 100644 --- a/composer.json +++ b/composer.json @@ -4,16 +4,15 @@ "require-dev": { "symfony/class-loader": "2.3.*", "nyholm/symfony-bundle-test": "^3.0", - "phpunit/phpunit": "^10.3" + "phpunit/phpunit": "^12.5" }, "require": { - "php": "^8.1", - "symfony/framework-bundle": "^5.4|^6.3|^7.1", - "doctrine/doctrine-bundle": "^2.12", + "php": "^8.4", + "symfony/framework-bundle": "^7.1|^8.0", + "doctrine/doctrine-bundle": "^2.12|^3.0", "doctrine/orm": "^3.0", - "doctrine/annotations": "^2.0", - "symfony/serializer": "^5.4|^6.3|^7.1", - "symfony/property-access": "^5.4|^6.3|^7.1" + "symfony/serializer": "^7.1|^8.0", + "symfony/property-access": "^7.1|^8.0" }, "autoload": { "psr-4": { diff --git a/src/DependencyInjection/DoctrineRelationVisualizerExtension.php b/src/DependencyInjection/DoctrineRelationVisualizerExtension.php index 0462bb6..d20cba3 100644 --- a/src/DependencyInjection/DoctrineRelationVisualizerExtension.php +++ b/src/DependencyInjection/DoctrineRelationVisualizerExtension.php @@ -9,7 +9,7 @@ class DoctrineRelationVisualizerExtension extends Extension { - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); diff --git a/tests/config.yml b/tests/config.yml index 0d03114..9c803fa 100644 --- a/tests/config.yml +++ b/tests/config.yml @@ -1,9 +1,10 @@ doctrine: dbal: driver: pdo_pgsql + server_version: '16' orm: - auto_generate_proxy_classes: true auto_mapping: true + enable_native_lazy_objects: true mappings: App: is_bundle: false