From 13e8f186c2da3ed8ffa39df232870fe004db7bfd Mon Sep 17 00:00:00 2001
From: Jeremiah VALERIE <jeremiah@over-blog.com>
Date: Mon, 11 Jul 2016 11:26:30 +0200
Subject: [PATCH] * connection builder now accepts extra args * fix some
 deprecated error "PHPUnit_Framework_TestCase::getMock() is deprecated, use
 PHPUnit_Framework_TestCase::createMock() or
 PHPUnit_Framework_TestCase::getMockBuilder() instead" * graphql route use
 json like default _format

---
 Relay/Connection/Output/ConnectionBuilder.php | 8 ++------
 Resources/config/routing/graphql.yml          | 1 +
 Tests/DIContainerMockTrait.php                | 9 ++++++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Relay/Connection/Output/ConnectionBuilder.php b/Relay/Connection/Output/ConnectionBuilder.php
index 16cd6fb68..e031af5b0 100644
--- a/Relay/Connection/Output/ConnectionBuilder.php
+++ b/Relay/Connection/Output/ConnectionBuilder.php
@@ -12,7 +12,6 @@
 namespace Overblog\GraphQLBundle\Relay\Connection\Output;
 
 use Overblog\GraphQLBundle\Definition\Argument;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Class ConnectionBuilder.
@@ -178,7 +177,7 @@ public static function getOffsetWithDefault($cursor, $defaultOffset)
         }
         $offset = static::cursorToOffset($cursor);
 
-        return !is_numeric($offset) ?  $defaultOffset : (int) $offset;
+        return !is_numeric($offset) ? $defaultOffset : (int) $offset;
     }
 
     /**
@@ -207,9 +206,6 @@ public static function cursorToOffset($cursor)
 
     private static function getOptionsWithDefaults(array $options, array $defaults)
     {
-        $arraySliceResolver = new OptionsResolver();
-        $arraySliceResolver->setDefaults($defaults);
-
-        return $arraySliceResolver->resolve($options);
+        return $options + $defaults;
     }
 }
diff --git a/Resources/config/routing/graphql.yml b/Resources/config/routing/graphql.yml
index be1005c03..0333a21c6 100644
--- a/Resources/config/routing/graphql.yml
+++ b/Resources/config/routing/graphql.yml
@@ -2,3 +2,4 @@ overblog_graphql_endpoint:
     path: /
     defaults:
         _controller: OverblogGraphQLBundle:Graph:endpoint
+        _format: "json"
diff --git a/Tests/DIContainerMockTrait.php b/Tests/DIContainerMockTrait.php
index 79f825b25..007388b89 100644
--- a/Tests/DIContainerMockTrait.php
+++ b/Tests/DIContainerMockTrait.php
@@ -11,11 +11,18 @@
 
 namespace Overblog\GraphQLBundle\Tests;
 
+/**
+ * Class DIContainerMockTrait
+ *
+ * @method \PHPUnit_Framework_MockObject_MockBuilder getMockBuilder (string $className)
+ */
 trait DIContainerMockTrait
 {
     private function getDIContainerMock(array $services = [], array $parameters = [])
     {
-        $container = $this->getMock('Symfony\\Component\\DependencyInjection\\Container', ['get', 'getParameter', 'has']);
+        $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')
+            ->setMethods(['get', 'getParameter', 'has'])
+            ->getMock();
 
         $getMethod = $container->expects($this->any())->method('get');