wip: 5.x

Author: alexislefebvre

.github/workflows/tests.yml

@@ -17,13 +17,10 @@ jobs:
         symfony-version: ['^6.4']
         phpunit-version: ['^9.6']
         include:
-          - php-version: 8.0
-            symfony-version: "^5.4"
+          - php-version: 8.1
+            symfony-version: "^6.4"
             phpunit-version: '^9.6'
             composer-flags: "--prefer-lowest"
-          - php-version: 8.1
-            symfony-version: "^5.4"
-            phpunit-version: "^10.0"
           - php-version: 8.1
             symfony-version: "^6.4"
             phpunit-version: "^10.0"
@@ -98,11 +95,6 @@ jobs:
           symfony/yaml=${{ matrix.symfony-version }}
           phpunit/phpunit=${{ matrix.phpunit-version }}
 
-      # This is needed to fix builds where the `annotation_reader` service may not be set up if
-      # the doctrine/annotations package is not in the production dependencies
-      - name: Move doctrine/annotations v1/v2 to require (non-dev) for PHP 8+
-        run: composer require --no-update "doctrine/annotations:^1.8.0|^2.0"
-
       - name: Install Composer dependencies
         if: matrix.composer-flags == ''
         run: composer install

README.md

@@ -15,7 +15,6 @@ Documentation
 * [Basic usage](doc/basic.md)
 * [Command test](doc/command.md)
 * [Logged client](doc/logged.md)
-* [Query counter](doc/query.md)
 * [Examples](doc/examples.md)
 * [Caveats](doc/caveats.md)
 * [Contributing](doc/contributing.md)

composer.json

@@ -17,31 +17,29 @@
     "require": {
         "php": "^8.0",
         "phpunit/phpunit": "^9.6 || ^10.0 || ^11.0 || ^12.0",
-        "symfony/browser-kit": "^5.4 || ^6.4 || ^7.0 || ^8.0",
-        "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0"
+        "symfony/browser-kit": "^6.4 || ^7.0 || ^8.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0 || ^8.0"
     },
     "require-dev": {
         "ext-json": "*",
-        "doctrine/annotations": "^1.3 || ^2.0",
         "doctrine/doctrine-bundle": "^2.11 || ^3.1.0",
         "doctrine/orm": "^2.7 || ^3.0",
         "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0",
-        "symfony/css-selector": "^5.4 || ^6.4 || ^7.0 || ^8.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.4 || ^7.0 || ^8.0",
-        "symfony/form": "^5.4 || ^6.4 || ^7.0 || ^8.0",
-        "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/css-selector": "^6.4 || ^7.0 || ^8.0",
+        "symfony/doctrine-bridge": "^6.4 || ^7.0 || ^8.0",
+        "symfony/form": "^6.4 || ^7.0 || ^8.0",
+        "symfony/http-kernel": "^6.4 || ^7.0 || ^8.0",
         "symfony/monolog-bundle": "^3.4 || ^4.0",
-        "symfony/security-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0",
-        "symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0",
-        "symfony/validator": "^5.4 || ^6.4 || ^7.0 || ^8.0",
-        "symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/security-bundle": "^6.4 || ^7.0 || ^8.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0 || ^8.0",
+        "symfony/validator": "^6.4 || ^7.0 || ^8.0",
+        "symfony/yaml": "^6.4 || ^7.0 || ^8.0",
         "twig/twig": "^2.0 || ^3.8"
     },
     "conflict": {
         "symfony/framework-bundle": "4.3.0"
     },
     "suggest": {
-        "doctrine/annotations": "Required to use the @QueryCount(…) annotation",
         "liip/test-fixtures-bundle": "Efficient loading of Doctrine fixtures in functional test-cases for Symfony applications"
     },
     "autoload": {
@@ -59,7 +57,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.x-dev"
+            "dev-master": "5.x-dev"
         }
     },
     "scripts": {

doc/examples.md

@@ -103,4 +103,4 @@ class ExampleFunctionalTest extends WebTestCase
 }
 ```
 
-← [Query counter](./query.md) • [Caveats](./caveats.md) →
+← [Examples](./examples.md) • [Caveats](./caveats.md) →

doc/logged.md

@@ -95,4 +95,4 @@ security:
 
 For more details, you can check the implementation of `WebTestCase` in that bundle.
 
-← [Command test](./command.md) • [Query counter](./query.md) →
+← [Command test](./command.md) • [Examples](./examples.md) →

doc/query.md

@@ -36,14 +36,6 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->children()
                 ->scalarNode('command_verbosity')->defaultValue('normal')->end()
                 ->booleanNode('command_decoration')->defaultTrue()->end()
-                ->arrayNode('query')
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->scalarNode('max_query_count')
-                            ->defaultNull()
-                        ->end()
-                    ->end()
-                ->end()
                 ->arrayNode('authentication')
                     ->addDefaultsIfNotSet()
                     ->children()

src/Annotations/QueryCount.php

@@ -35,6 +35,7 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         foreach ($config as $key => $value) {
+            // TODO: cleanup
             // If the node is an array,
             // e.g. "liip_functional_test.query.max_query_count",
             // set the value as
@@ -50,8 +51,5 @@ public function load(array $configs, ContainerBuilder $container): void
                 $container->setParameter($this->getAlias().'.'.$key, $value);
             }
         }
-
-        $definition = $container->getDefinition('liip_functional_test.query.count_client');
-        $definition->setShared(false);
     }
 }