Skip to content

Commit

Permalink
Bump to SF 4.4 & PHPUnit version 8 (#970)
Browse files Browse the repository at this point in the history
  • Loading branch information
mazsudo authored Jan 29, 2020
1 parent ca13b36 commit ae84fa3
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:
- SYMFONY_DEPRECATIONS_HELPER=max[self]=0
- TARGET=test
- UPSTREAM_URL=https://github.com/sonata-project/SonataDoctrineORMAdminBundle.git
- PHPUNIT_VERSION=7
- PHPUNIT_VERSION=8

matrix:
fast_finish: true
Expand All @@ -45,9 +45,9 @@ matrix:
- php: '7.2'
env: COMPOSER_FLAGS="--prefer-lowest"
- php: '7.3'
env: SYMFONY=3.4.*
env: SYMFONY=4.4.*
- php: '7.3'
env: SYMFONY='dev-master as 3.4.x-dev'
env: SYMFONY='dev-master as 4.4.x-dev'
- php: '7.3'
env: SONATA_CORE=3.*
- php: '7.3'
Expand All @@ -59,10 +59,10 @@ matrix:
- php: '7.3'
env: SYMFONY_DEPRECATIONS_HELPER=0
allow_failures:
- php: 7.4snapshot
- php: 7.4
- php: nightly
- env: SYMFONY_DEPRECATIONS_HELPER=0
- env: SYMFONY='dev-master as 3.4.x-dev'
- env: SYMFONY='dev-master as 4.4.x-dev'
- env: SONATA_CORE='dev-master as 3.x-dev'
- env: SONATA_ADMIN='dev-master as 3.x-dev'

Expand Down
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
"sonata-project/admin-bundle": "^3.29",
"sonata-project/core-bundle": "^3.14",
"sonata-project/exporter": "^1.11.0 || ^2.0",
"symfony/config": "^3.4 || ^4.2",
"symfony/console": "^3.4 || ^4.2",
"symfony/dependency-injection": "^3.4 || ^4.2",
"symfony/doctrine-bridge": "^3.4 || ^4.2",
"symfony/form": "^3.4 || ^4.2",
"symfony/framework-bundle": "^3.4 || ^4.2",
"symfony/http-foundation": "^3.4 || ^4.2",
"symfony/http-kernel": "^3.4 || ^4.2",
"symfony/options-resolver": "^3.4 || ^4.2",
"symfony/security-acl": "^2.8 || ^3.0"
"symfony/config": "^4.4",
"symfony/console": "^4.4",
"symfony/dependency-injection": "^4.4",
"symfony/doctrine-bridge": "^4.4",
"symfony/form": "^4.4",
"symfony/framework-bundle": "^4.4",
"symfony/http-foundation": "^4.4",
"symfony/http-kernel": "^4.4",
"symfony/options-resolver": "^4.4",
"symfony/security-acl": "^3.0"
},
"conflict": {
"simplethings/entity-audit-bundle": ">=2.0",
Expand All @@ -50,8 +50,8 @@
},
"require-dev": {
"simplethings/entity-audit-bundle": "^0.9 || ^1.0",
"sonata-project/block-bundle": "^3.11",
"symfony/phpunit-bridge": "^4.3"
"sonata-project/block-bundle": "^3.17",
"symfony/phpunit-bridge": "^5.0"
},
"suggest": {
"simplethings/entity-audit-bundle": "If you want to support for versioning of entities and their associations."
Expand Down
2 changes: 1 addition & 1 deletion tests/Builder/ShowBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ShowBuilderTest extends TestCase
private $admin;
private $modelManager;

public function setUp(): void
protected function setUp(): void
{
$this->guesser = $this->prophesize(TypeGuesserInterface::class);

Expand Down
2 changes: 1 addition & 1 deletion tests/Guesser/TypeGuesserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class TypeGuesserTest extends TestCase
private $modelManager;
private $guesser;

public function setUp(): void
protected function setUp(): void
{
$this->modelManager = $this->prophesize(ModelManager::class);
$this->guesser = new TypeGuesser();
Expand Down
2 changes: 1 addition & 1 deletion tests/Model/AuditReaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class AuditReaderTest extends TestCase
private $simpleThingsAuditReader;
private $auditReader;

public function setUp(): void
protected function setUp(): void
{
$this->simpleThingsAuditReader = $this->prophesize(SimpleThingsAuditReader::class);
$this->auditReader = new AuditReader($this->simpleThingsAuditReader->reveal());
Expand Down

0 comments on commit ae84fa3

Please sign in to comment.