Merge 4842fbb into 440e8c9

thecodingmachine · Dec 1, 2020 · a85e1c7 · a85e1c7
2 parents 440e8c9 + 4842fbb
commit a85e1c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
   include:
       # Test the latest stable release
     - php: 7.2
-      env: PHPSTAN=true
+      env: PHPSTAN=true COMPOSER1=true
     - php: 7.4
       env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text" TESTNOSECURITYBUNDLE=true
 
@@ -38,6 +38,7 @@ matrix:
 
 before_install:
   - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
+  - if [[ $COMPOSER1 = true ]]; then composer selfupdate --1; fi
   - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
   - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
 

diff --git a/Controller/GraphqliteController.php b/Controller/GraphqliteController.php
@@ -44,11 +44,11 @@ class GraphqliteController
      */
     private $serverConfig;
 
-    public function __construct(ServerConfig $serverConfig, HttpMessageFactoryInterface $httpMessageFactory = null, ?int $debug = Debug::RETHROW_UNSAFE_EXCEPTIONS)
+    public function __construct(ServerConfig $serverConfig, HttpMessageFactoryInterface $httpMessageFactory = null, ?int $debug = null)
     {
         $this->serverConfig = $serverConfig;
         $this->httpMessageFactory = $httpMessageFactory ?: new PsrHttpFactory(new ServerRequestFactory(), new StreamFactory(), new UploadedFileFactory(), new ResponseFactory());
-        $this->debug = $debug ?? false;
+        $this->debug = $debug ?? $serverConfig->getDebug();
     }
 
     public function loadRoutes(): RouteCollection