Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DevKit updates for 3.x branch #5846

Merged
merged 5 commits into from
Jan 30, 2020
Merged

DevKit updates for 3.x branch #5846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61d9045
DevKit updates
SonataCI Jan 25, 2020
fa6c6c7
DevKit updates
SonataCI Jan 30, 2020
8bd32f6
Bump SonataCoreBundle and symfony-dependency-injection-test
franmomu Jan 30, 2020
aa616c7
Fix some tests type arguments
franmomu Jan 30, 2020
d936b0a
Applied fixes from FlintCI (#5856)
soullivaneuh Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
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/SonataAdminBundle.git
- PHPUNIT_VERSION=7
- PHPUNIT_VERSION=8

matrix:
fast_finish: true
Expand All @@ -47,7 +47,7 @@ matrix:
- php: '7.3'
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 @@ -62,7 +62,7 @@ matrix:
- php: 7.4snapshot
- 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_BLOCK='dev-master as 3.x-dev'

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"doctrine/inflector": "^1.1",
"knplabs/knp-menu-bundle": "^2.2.2",
"sonata-project/block-bundle": "^3.18",
"sonata-project/core-bundle": "^3.17.0",
"sonata-project/core-bundle": "^3.18.0",
"sonata-project/exporter": "^1.11.0 || ^2.0",
"symfony/asset": "^4.3",
"symfony/config": "^4.3",
Expand Down Expand Up @@ -64,7 +64,7 @@
},
"require-dev": {
"jms/translation-bundle": "^1.4",
"matthiasnoback/symfony-dependency-injection-test": "^3.1",
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
"sonata-project/intl-bundle": "^2.4",
"symfony/browser-kit": "^4.3",
"symfony/css-selector": "^4.3",
Expand Down
4 changes: 2 additions & 2 deletions tests/Controller/CRUDControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ protected function setUp(): void
->method('generateUrl')
->willReturnCallback(

static function ($name, array $parameters = [], $absolute = false) {
static function ($name, array $parameters = []) {
$result = $name;
if (!empty($parameters)) {
$result .= '?'.http_build_query($parameters);
Expand All @@ -390,7 +390,7 @@ static function ($name, array $parameters = [], $absolute = false) {
->method('generateObjectUrl')
->willReturnCallback(

static function (string $name, $object, array $parameters = [], bool $absolute = false): string {
static function (string $name, $object, array $parameters = []): string {
$result = \get_class($object).'_'.$name;
if (!empty($parameters)) {
$result .= '?'.http_build_query($parameters);
Expand Down
4 changes: 2 additions & 2 deletions tests/Mapper/BaseGroupedMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public function testEndException(): void
$this->baseGroupedMapper->end();
}

public function labelDataProvider()
public function labelDataProvider(): array
{
return [
'nominal use case not translated' => [false, 'fooGroup1', null, 'fooGroup1'],
Expand All @@ -216,7 +216,7 @@ public function labelDataProvider()
/**
* @dataProvider labelDataProvider
*/
public function testLabel(string $translated, string $name, ?string $label, string $expectedLabel): void
public function testLabel(bool $translated, string $name, ?string $label, string $expectedLabel): void
{
$container = $this->baseGroupedMapper
->getAdmin()
Expand Down