Commit 408cf9da authored by Александр Плохих's avatar Александр Плохих 🌔
Browse files

Merge branch 'main' into 'STA-1046'

# Conflicts:
#   app/composer.json
parents 08f31a65 f1f9481f
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@
        "phpdocumentor/reflection-docblock": "^5.3",
        "phpstan/phpdoc-parser": "^1.28",
        "ramsey/uuid": "^4.7",
        "ramsey/collection": "^2.0",
        "symfony/asset": "6.4.*",
        "symfony/asset-mapper": "6.4.*",
        "symfony/console": "6.4.*",
@@ -96,7 +97,9 @@
        }
    },
    "require-dev": {
        "phpunit/phpunit": "^9.5",
        "dama/doctrine-test-bundle": "^8.0",
        "doctrine/doctrine-fixtures-bundle": "^3.6",
        "phpunit/phpunit": "^9.6",
        "symfony/browser-kit": "6.4.*",
        "symfony/css-selector": "6.4.*",
        "symfony/debug-bundle": "6.4.*",
+2 −0
Original line number Diff line number Diff line
@@ -13,4 +13,6 @@ return [
    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
    DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
];
+5 −0
Original line number Diff line number Diff line
when@test:
    dama_doctrine_test:
        enable_static_connection: true
        enable_static_meta_data_cache: true
        enable_static_query_cache: true
+4 −0
Original line number Diff line number Diff line
@@ -20,3 +20,7 @@ services:
            - '../src/DependencyInjection/'
            - '../src/Entity/'
            - '../src/Kernel.php'

    App\Tests\DataFixtures\:
        resource: '../tests/DataFixtures'
        tags: [ 'doctrine.fixture.orm' ]
 No newline at end of file
+2 −0
Original line number Diff line number Diff line
@@ -34,5 +34,7 @@
    </listeners>

    <extensions>
        <extension class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />

    </extensions>
</phpunit>
Loading