Merge pull request #197 from renatomefi/fix/travis-scrutinizer

Improving scrutinizer handling on travis

Author: mcg-web

.travis.yml

@@ -17,7 +17,7 @@ matrix:
         - php: 7.0
           env: SYMFONY_VERSION=3.2.*
         - php: 7.1
-          env: SYMFONY_VERSION=3.3.* PHPUNIT_FLAGS="-d xdebug.max_nesting_level=1000 --coverage-clover=build/logs/clover.xml"
+          env: SYMFONY_VERSION=3.3.* SCRUTINIZER=true
         - php: 7.1
           env: GRAPHQLPHP_VERSION=0.10.0
         - php: hhvm
@@ -31,17 +31,17 @@ cache:
         - $HOME/.php_cs.cache
 
 before_install:
-    - if [[ "$TRAVIS_PHP_VERSION" != "7.1" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini || true; fi
+    - if [[ ${SCRUTINIZER} != true && ${TRAVIS_PHP_VERSION} != "hhvm" ]]; then phpenv config-rm xdebug.ini || true; fi
     - composer selfupdate
-    - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" "symfony/framework-bundle:${SYMFONY_VERSION}" --dev --no-update; fi;
-    - if [ "$GRAPHQLPHP_VERSION" != "" ]; then composer require "webonyx/graphql-php:${GRAPHQLPHP_VERSION}" --dev --no-update; fi;
+    - if [ $SYMFONY_VERSION ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" "symfony/framework-bundle:${SYMFONY_VERSION}" --dev --no-update; fi;
+    - if [ $GRAPHQLPHP_VERSION ]; then composer require "webonyx/graphql-php:${GRAPHQLPHP_VERSION}" --dev --no-update; fi;
 
 install: composer update --prefer-source --no-interaction --optimize-autoloader
 
 script:
-    - bin/phpunit --debug ${PHPUNIT_FLAGS}
-    - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then bin/php-cs-fixer fix --diff --dry-run -v; fi;
+    - bin/phpunit --debug $( if [ $SCRUTINIZER = true ]; then echo "-d xdebug.max_nesting_level=1000 --coverage-clover=build/logs/clover.xml"; fi; )
+    - if [ ${TRAVIS_PHP_VERSION} == "7.0" ]; then bin/php-cs-fixer fix --diff --dry-run -v; fi;
 
 after_script:
-    - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
-    - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then composer require "satooshi/php-coveralls:^1.0" && travis_retry php bin/coveralls -v; fi
+    - if [ ${SCRUTINIZER} = true ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
+    - if [ ${SCRUTINIZER} = true ]; then composer require "satooshi/php-coveralls:^1.0" && travis_retry php bin/coveralls -v; fi

Resolver/TypeResolver.php

@@ -89,7 +89,7 @@ private function hasNeedListOfWrapper($alias)
             $got = $alias[strlen($alias) - 1];
             if (']' !== $got) {
                 throw new UnresolvableException(
-                    sprintf('Malformed ListOf wrapper type "%s" expected "]" but got .', $alias, json_encode($got))
+                    sprintf('Malformed ListOf wrapper type "%s" expected "]" but got "%s".', $alias, json_encode($got))
                 );
             }
 

Tests/Resolver/TypeResolverTest.php

@@ -66,6 +66,7 @@ public function testResolveUnknownType()
 
     /**
      * @expectedException \Overblog\GraphQLBundle\Resolver\UnresolvableException
+     * @expectedExceptionMessage Malformed ListOf wrapper type "[Tata" expected "]" but got ""a"".
      */
     public function testWrongListOfWrappingType()
     {