Skip to content
This repository has been archived by the owner on Feb 26, 2023. It is now read-only.

Use phpunit 8 #12

Merged
merged 5 commits into from
Aug 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"require": {
"php": "^7.2",
"ext-json": "*",
"doctrine/cache": "^1.7",
"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",
"doctrine/cache": "^1.8",
"doctrine/doctrine-cache-bundle": "^1.3.5",
"guzzlehttp/guzzle": "^6.3.3",
"heise/shariff": "^8.2",
"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",
Expand All @@ -43,7 +43,7 @@
"symfony/twig-bundle": "^3.4 || ^4.2"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
"bamarni/composer-bin-plugin": "^1.3",
"sllh/composer-lint": "^1.0"
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion tests/DependencyInjection/Core23ShariffExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function testLoadFacebook(): void
]);
}

protected function getContainerExtensions()
protected function getContainerExtensions(): array
{
return [
new Core23ShariffExtension(),
Expand Down
3 changes: 0 additions & 3 deletions vendor-bin/phpstan/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions vendor-bin/test/composer.json
Original file line number Diff line number Diff line change
@@ -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"
}
}