Merge 7e273d3 into 84a3205

nucleos · Aug 5, 2019 · 1e979be · 1e979be
2 parents 84a3205 + 7e273d3
commit 1e979be
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
         "doctrine/doctrine-cache-bundle": "^1.3",
         "guzzlehttp/guzzle": "^6.3",
         "heise/shariff": "^8.0",
-        "sonata-project/admin-bundle": "^3.48",
-        "sonata-project/block-bundle": "^3.15",
+        "sonata-project/admin-bundle": "^3.51",
+        "sonata-project/block-bundle": "^3.16.1",
         "sonata-project/core-bundle": "^3.17",
         "symfony/config": "^3.4 || ^4.2",
         "symfony/dependency-injection": "^3.4 || ^4.2",

diff --git a/tests/DependencyInjection/Core23ShariffExtensionTest.php b/tests/DependencyInjection/Core23ShariffExtensionTest.php
@@ -47,7 +47,7 @@ public function testLoadFacebook(): void
         ]);
     }
 
-    protected function getContainerExtensions()
+    protected function getContainerExtensions(): array
     {
         return [
             new Core23ShariffExtension(),

diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -7,8 +7,5 @@
         "phpstan/phpstan-phpunit": "^0.11",
         "phpstan/phpstan-strict-rules": "^0.11",
         "phpstan/phpstan-symfony": "^0.11"
-    },
-    "conflict": {
-        "phpunit/phpunit": ">=8.0"
     }
 }
diff --git a/vendor-bin/test/composer.json b/vendor-bin/test/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
-        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
-        "phpunit/phpunit": "^7.4",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "phpunit/phpunit": "^8.2",
         "symfony/phpunit-bridge": "^4.1"
     }
 }