Skip to content

Commit 631815e

Browse files
authored
Merge pull request #685 from murtukov/reconfigure_travis_ci
Reconfigure Travis-CI
2 parents 5a5c491 + 8d0cd09 commit 631815e

File tree

74 files changed

+54
-646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+54
-646
lines changed

.php_cs.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ return PhpCsFixer\Config::create()
2121
'general_phpdoc_annotation_remove' => ['author', 'category', 'copyright', 'created', 'license', 'package', 'since', 'subpackage', 'version'],
2222
'native_function_invocation' => true,
2323
'fully_qualified_strict_types' => true,
24+
'single_line_throw' => false,
2425
]
2526
)
2627
->setFinder($finder)

.travis.yml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ before_install:
2222
- if [ "${SYMFONY_VERSION}" != "" ]; then perl -pi -e 's#"(symfony/.*)":\s*".*"#"$1":"'"${SYMFONY_VERSION}"'"#' composer.json; fi;
2323
- if [ "${PHPUNIT_VERSION}" != "" ]; then composer req "phpunit/phpunit:${PHPUNIT_VERSION}" --dev --no-update; fi;
2424
- if [ "${VALIDATOR}" = "0" ]; then composer remove "symfony/validator" --dev --no-update; fi;
25-
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
2625
- composer selfupdate
2726
- if [ $GRAPHQLPHP_VERSION ]; then composer require "webonyx/graphql-php:${GRAPHQLPHP_VERSION}" --dev --no-update; fi;
2827

@@ -32,45 +31,40 @@ script: composer test
3231

3332
jobs:
3433
include:
35-
- php: 7.2
36-
env: SYMFONY_VERSION=4.3.* PHPUNIT_VERSION=^7.2
37-
- php: 7.3
38-
env: SYMFONY_VERSION=4.3.* VALIDATOR=0
39-
- php: 7.3
40-
env: SYMFONY_VERSION=4.3.* USE_EXPERIMENTAL_EXECUTOR=1
41-
- php: 7.3
42-
env: SYMFONY_VERSION=4.4.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
43-
- php: 7.3
44-
env: SYMFONY_VERSION=5.0.* SYMFONY_DEPRECATIONS_HELPER=max[total]=0
4534
- php: 7.4snapshot
4635
env: SYMFONY_VERSION=4.3.*
4736
- php: nightly
4837
env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs
4938

5039
- stage: Code Quality
51-
php: 7.2
40+
php: 7.4
5241
env: COVERAGE SYMFONY_VERSION=4.4.*
5342
before_script:
54-
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
55-
- if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
56-
script: bin/phpunit --color=always -v --debug -d xdebug.max_nesting_level=1000 --coverage-clover=build/logs/clover.xml
43+
- pecl install pcov
44+
# TODO: after deleting the 'lib' folder remove the 'pcov.exclude' and 'pcov.directory' options
45+
script: > # break command into 5 lines
46+
php
47+
-d pcov.enabled=1
48+
-d pcov.directory=.
49+
-d pcov.exclude="/(vendor|tests)/"
50+
bin/phpunit --color=always -v --debug --coverage-clover=build/logs/clover.xml
5751
after_script:
58-
- wget https://scrutinizer-ci.com/ocular.phar && travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
59-
- composer require "satooshi/php-coveralls:^1.0" && travis_retry php bin/coveralls -v
52+
- wget https://scrutinizer-ci.com/ocular.phar && travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
53+
- composer require "satooshi/php-coveralls:^1.0" && travis_retry php bin/coveralls -v
6054

6155
- stage: Code Quality
62-
php: 7.2
56+
php: 7.4
6357
env: STATIC_ANALYSIS SYMFONY_VERSION=4.3.*
6458
install: travis_retry composer install --prefer-dist
6559
script: composer static-analysis
6660

6761
- stage: Code Quality
68-
php: 7.2
62+
php: 7.4
6963
env: CODING_STANDARDS
7064
script: composer check-cs
7165

7266
- stage: Code Quality
73-
php: 7.2
67+
php: 7.4
7468
env: BENCHMARK
7569
script: composer bench
7670

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"test -f phpbench.phar || wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey",
8282
"@php phpbench.phar run -l dots --ansi -vvv --report='generator: \"table\", cols: [\"benchmark\", \"subject\", \"params\", \"best\", \"mean\", \"mode\", \"worst\", \"diff\"], break: [\"benchmark\"], sort: {mean: \"asc\"}'"
8383
],
84-
"install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.15.3/php-cs-fixer.phar -O php-cs-fixer.phar",
84+
"install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.4/php-cs-fixer.phar -O php-cs-fixer.phar",
8585
"fix-cs": [
8686
"@install-cs",
8787
"@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi",

phpstan-baseline.neon

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -765,26 +765,6 @@ parameters:
765765
count: 1
766766
path: src/Transformer/ArgumentsTransformer.php
767767

768-
-
769-
message: "#^Parameter \\#2 \\$type of method Overblog\\\\GraphQLBundle\\\\Validator\\\\InputValidator\\:\\:createCollectionNode\\(\\) expects GraphQL\\\\Type\\\\Definition\\\\InputObjectType\\|GraphQL\\\\Type\\\\Definition\\\\ObjectType, GraphQL\\\\Type\\\\Definition\\\\Type\\|null given\\.$#"
770-
count: 1
771-
path: src/Validator/InputValidator.php
772-
773-
-
774-
message: "#^Parameter \\#2 \\$type of method Overblog\\\\GraphQLBundle\\\\Validator\\\\InputValidator\\:\\:createObjectNode\\(\\) expects GraphQL\\\\Type\\\\Definition\\\\InputObjectType\\|GraphQL\\\\Type\\\\Definition\\\\ObjectType, GraphQL\\\\Type\\\\Definition\\\\Type\\|null given\\.$#"
775-
count: 1
776-
path: src/Validator/InputValidator.php
777-
778-
-
779-
message: "#^Array \\(array\\<Symfony\\\\Component\\\\Validator\\\\Mapping\\\\ClassMetadataInterface\\>\\) does not accept Symfony\\\\Component\\\\Validator\\\\Mapping\\\\MetadataInterface\\.$#"
780-
count: 1
781-
path: src/Validator/InputValidator.php
782-
783-
-
784-
message: "#^PHPDoc tag @param has invalid value \\(\\$parent\\)\\: Unexpected token \"\\$parent\", expected TOKEN_IDENTIFIER at offset 113$#"
785-
count: 1
786-
path: src/Validator/InputValidator.php
787-
788768
-
789769
message: "#^Array \\(array\\<Symfony\\\\Component\\\\Validator\\\\Mapping\\\\PropertyMetadata\\>\\) does not accept Overblog\\\\GraphQLBundle\\\\Validator\\\\Mapping\\\\PropertyMetadata\\.$#"
790770
count: 1
@@ -1060,26 +1040,6 @@ parameters:
10601040
count: 1
10611041
path: tests/Functional/Upload/UploadTest.php
10621042

1063-
-
1064-
message: "#^PHPDoc tag @param has invalid value \\(\\$payload\\)\\: Unexpected token \"\\$payload\", expected TOKEN_IDENTIFIER at offset 140$#"
1065-
count: 1
1066-
path: tests/Functional/Validator/StaticValidator.php
1067-
1068-
-
1069-
message: "#^PHPDoc tag @param has invalid value \\(\\$value\\)\\: Unexpected token \"\\$value\", expected TOKEN_IDENTIFIER at offset 44$#"
1070-
count: 1
1071-
path: tests/Functional/Validator/StaticValidator.php
1072-
1073-
-
1074-
message: "#^PHPDoc tag @param has invalid value \\(\\$object\\)\\: Unexpected token \"\\$object\", expected TOKEN_IDENTIFIER at offset 44$#"
1075-
count: 1
1076-
path: tests/Functional/Validator/StaticValidator.php
1077-
1078-
-
1079-
message: "#^PHPDoc tag @param has invalid value \\(\\$payload\\)\\: Unexpected token \"\\$payload\", expected TOKEN_IDENTIFIER at offset 141$#"
1080-
count: 1
1081-
path: tests/Functional/Validator/StaticValidator.php
1082-
10831043
-
10841044
message: "#^Cannot call method getCursor\\(\\) on Overblog\\\\GraphQLBundle\\\\Relay\\\\Connection\\\\Output\\\\Edge\\|false\\.$#"
10851045
count: 1
@@ -1310,4 +1270,7 @@ parameters:
13101270
count: 1
13111271
path: tests/Upload/Type/GraphQLUploadTypeTest.php
13121272

1313-
1273+
-
1274+
message: "#^Array \\(array<Symfony\\\\Component\\\\Validator\\\\Mapping\\\\ClassMetadataInterface>\\) does not accept Symfony\\\\Component\\\\Validator\\\\Mapping\\\\MetadataInterface\\.$#"
1275+
count: 1
1276+
path: src/Validator/InputValidator.php

src/CacheWarmer/CompileCacheWarmer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ class CompileCacheWarmer implements CacheWarmerInterface
1616
/**
1717
* CompileCacheWarmer constructor.
1818
*
19-
* @param TypeGenerator $typeGenerator
20-
* @param bool $compiled
19+
* @param bool $compiled
2120
*/
2221
public function __construct(TypeGenerator $typeGenerator, $compiled = true)
2322
{

src/Command/DebugCommand.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8383
return 0;
8484
}
8585

86-
/**
87-
* @param FluentResolverInterface $resolver
88-
* @param array $tableHeaders
89-
* @param SymfonyStyle $io
90-
*/
9186
private function renderTable(FluentResolverInterface $resolver, array $tableHeaders, SymfonyStyle $io): void
9287
{
9388
$tableRows = [];

src/Config/ObjectTypeDefinition.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ public function getDefinition()
4040

4141
/**
4242
* set empty fields.access with fieldsDefaultAccess values if is set?
43-
*
44-
* @param ArrayNodeDefinition $node
4543
*/
4644
private function treatFieldsDefaultAccess(ArrayNodeDefinition $node): void
4745
{
@@ -65,8 +63,6 @@ private function treatFieldsDefaultAccess(ArrayNodeDefinition $node): void
6563

6664
/**
6765
* set empty fields.public with fieldsDefaultPublic values if is set?
68-
*
69-
* @param ArrayNodeDefinition $node
7066
*/
7167
private function treatFieldsDefaultPublic(ArrayNodeDefinition $node): void
7268
{

0 commit comments

Comments
 (0)