Skip to content

Commit 53925bf

Browse files
murtukovmurtukov
authored
Merge branch 'master' into feature/generator
2 parents 99792d1 + 631815e commit 53925bf

File tree

70 files changed

+43
-529
lines changed

Some content is hidden

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

70 files changed

+43
-529
lines changed

‎.travis.yml

Lines changed: 10 additions & 6 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

@@ -41,12 +40,17 @@ jobs:
4140
php: 7.4
4241
env: COVERAGE SYMFONY_VERSION=4.4.*
4342
before_script:
44-
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
45-
- if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
46-
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
4751
after_script:
48-
- wget https://scrutinizer-ci.com/ocular.phar && travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
49-
- 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
5054

5155
- stage: Code Quality
5256
php: 7.4

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"test -f phpbench.phar || wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey",
7878
"@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\"}'"
7979
],
80-
"install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.3/php-cs-fixer.phar -O php-cs-fixer.phar",
80+
"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",
8181
"fix-cs": [
8282
"@install-cs",
8383
"@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi"

‎phpstan-baseline.neon

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -675,26 +675,6 @@ parameters:
675675
count: 1
676676
path: src/Transformer/ArgumentsTransformer.php
677677

678-
-
679-
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\\.$#"
680-
count: 1
681-
path: src/Validator/InputValidator.php
682-
683-
-
684-
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\\.$#"
685-
count: 1
686-
path: src/Validator/InputValidator.php
687-
688-
-
689-
message: "#^Array \\(array\\<Symfony\\\\Component\\\\Validator\\\\Mapping\\\\ClassMetadataInterface\\>\\) does not accept Symfony\\\\Component\\\\Validator\\\\Mapping\\\\MetadataInterface\\.$#"
690-
count: 1
691-
path: src/Validator/InputValidator.php
692-
693-
-
694-
message: "#^PHPDoc tag @param has invalid value \\(\\$parent\\)\\: Unexpected token \"\\$parent\", expected TOKEN_IDENTIFIER at offset 113$#"
695-
count: 1
696-
path: src/Validator/InputValidator.php
697-
698678
-
699679
message: "#^Array \\(array\\<Symfony\\\\Component\\\\Validator\\\\Mapping\\\\PropertyMetadata\\>\\) does not accept Overblog\\\\GraphQLBundle\\\\Validator\\\\Mapping\\\\PropertyMetadata\\.$#"
700680
count: 1
@@ -970,26 +950,6 @@ parameters:
970950
count: 1
971951
path: tests/Functional/Upload/UploadTest.php
972952

973-
-
974-
message: "#^PHPDoc tag @param has invalid value \\(\\$payload\\)\\: Unexpected token \"\\$payload\", expected TOKEN_IDENTIFIER at offset 140$#"
975-
count: 1
976-
path: tests/Functional/Validator/StaticValidator.php
977-
978-
-
979-
message: "#^PHPDoc tag @param has invalid value \\(\\$value\\)\\: Unexpected token \"\\$value\", expected TOKEN_IDENTIFIER at offset 44$#"
980-
count: 1
981-
path: tests/Functional/Validator/StaticValidator.php
982-
983-
-
984-
message: "#^PHPDoc tag @param has invalid value \\(\\$object\\)\\: Unexpected token \"\\$object\", expected TOKEN_IDENTIFIER at offset 44$#"
985-
count: 1
986-
path: tests/Functional/Validator/StaticValidator.php
987-
988-
-
989-
message: "#^PHPDoc tag @param has invalid value \\(\\$payload\\)\\: Unexpected token \"\\$payload\", expected TOKEN_IDENTIFIER at offset 141$#"
990-
count: 1
991-
path: tests/Functional/Validator/StaticValidator.php
992-
993953
-
994954
message: "#^Cannot call method getCursor\\(\\) on Overblog\\\\GraphQLBundle\\\\Relay\\\\Connection\\\\Output\\\\Edge\\|false\\.$#"
995955
count: 1
@@ -1259,3 +1219,8 @@ parameters:
12591219
message: "#^Return type \\(void\\) of method Overblog\\\\GraphQLBundle\\\\CacheWarmer\\\\CompileCacheWarmer::warmUp.*$#"
12601220
count: 2
12611221
path: src/CacheWarmer/CompileCacheWarmer.php
1222+
1223+
-
1224+
message: "#^Array \\(array<Symfony\\\\Component\\\\Validator\\\\Mapping\\\\ClassMetadataInterface>\\) does not accept Symfony\\\\Component\\\\Validator\\\\Mapping\\\\MetadataInterface\\.$#"
1225+
count: 1
1226+
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)