Skip to content

Commit b23825f

Browse files
authored
Merge pull request #688 from mcg-web/fix-travis-build
Increase php memory for composer with php 5.6
2 parents c01ba47 + 93a14f7 commit b23825f

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
include:
3333
- stage: Test
3434
php: 5.6
35-
env: COMPOSER_UPDATE_FLAGS=--prefer-lowest SYMFONY_DEPRECATIONS_HELPER=disabled GRAPHQLPHP_VERSION=^0.11.2
35+
env: COMPOSER_MEMORY_LIMIT=-1 COMPOSER_UPDATE_FLAGS=--prefer-lowest SYMFONY_DEPRECATIONS_HELPER=disabled GRAPHQLPHP_VERSION=^0.11.2
3636
- php: 5.6
3737
env: SYMFONY_VERSION=3.1.* SYMFONY_DEPRECATIONS_HELPER=disabled GRAPHQLPHP_VERSION=0.12
3838
- php: 7.0

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
"scripts": {
6868
"test": "bin/phpunit --color=always -v --debug",
6969
"static-analysis": [
70-
"@composer req --ansi --dev 'phpstan/phpstan:^0.10.3' 'phpstan/phpstan-phpunit:^0.10.0'",
70+
"@composer req --ansi --dev --no-update 'phpstan/phpstan:^0.11' 'phpstan/phpstan-phpunit:*'",
71+
"@composer update --ansi",
7172
"phpstan analyse --ansi",
7273
"@composer rem --ansi --dev phpstan/phpstan phpstan/phpstan-phpunit"
7374
],

tests/Resolver/ResolverTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public function testDefaultResolveFn($fieldName, $source, $expected)
2323
$this->assertSame($expected, Resolver::defaultResolveFn($source, [], [], $info));
2424
}
2525

26+
/**
27+
* @group legacy
28+
*/
2629
public function testSetObjectOrArrayValue()
2730
{
2831
$object = new \stdClass();

0 commit comments

Comments
 (0)