SUPPORT-86536 - fixed mr comments

ypppa · Nov 30, 2023 · c915430 · c915430
1 parent 577761f
commit c915430
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -30,17 +30,14 @@
         "doctrine/annotations": "^v1.14"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5 || ^9.0",
-        "mockery/mockery": "^1.2.4",
+        "phpunit/phpunit": "^7.5 || ^9.5",
+        "mockery/mockery": "^1.3.6",
         "symfony/yaml": "^3.4.34|^4.3|^5.4|^6.0",
         "doctrine/doctrine-bundle": "^1.12.0|^2.1",
-        "doctrine/orm": "~2.5.14|^2.6.3"
+        "doctrine/orm": "^2.5.14"
     },
     "config": {
-        "bin-dir": "bin",
-        "allow-plugins": {
-            "ocramius/package-versions": false
-        }
+        "bin-dir": "bin"
     },
     "scripts": {
         "phpunit": "phpunit",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-    backupGlobals               = "false"
-    backupStaticAttributes      = "false"
-    colors                      = "true"
-    convertErrorsToExceptions   = "true"
-    convertNoticesToExceptions  = "true"
-    convertWarningsToExceptions = "true"
-    processIsolation            = "false"
-    stopOnFailure               = "false"
-    bootstrap                   = "tests/bootstrap.php" >
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         convertDeprecationsToExceptions="false"
+         colors="true">
 
     <testsuites>
         <testsuite name="Project Test Suite">

diff --git a/tests/Functional/FunctionalTestCase.php b/tests/Functional/FunctionalTestCase.php
@@ -40,10 +40,7 @@ protected function tearDown(): void
     {
         $container = $this->kernel->getContainer();
         $this->kernel->shutdown();
-        if (
-            $container instanceof ResettableContainerInterface
-            || $container instanceof ResetInterface
-        ) {
+        if ($container instanceof ResettableContainerInterface || $container instanceof ResetInterface) {
             $container->reset();
         }