Merge branch '0.12'

mcg-web · mcg-web · commit 505c07f5e1ec · 2019-11-29T08:37:38.000+01:00
diff --git a/src/Resources/config/commands.yaml b/src/Resources/config/commands.yaml
@@ -4,7 +4,7 @@ services:
 
     Overblog\GraphQLBundle\Command\GraphQLDumpSchemaCommand:
         arguments:
-            - "%kernel.root_dir%"
+            - "%kernel.cache_dir%/../.."
             - '@Overblog\GraphQLBundle\Request\Executor'
         tags:
             - { name: console.command, command: graphql:dump-schema, alias: "graph:dump-schema" }
diff --git a/tests/Functional/App/TestKernel.php b/tests/Functional/App/TestKernel.php
@@ -88,15 +88,4 @@ private function basePath()
     {
         return \sys_get_temp_dir().'/OverblogGraphQLBundle/'.Kernel::VERSION.'/'.($this->testCase ? $this->testCase.'/' : '');
     }
-
-    protected function build(ContainerBuilder $container): void
-    {
-        if (!$container->hasParameter('kernel.root_dir')) {
-            $container->setParameter('kernel.root_dir', $this->getRootDir());
-        }
-
-        if (!$container->hasParameter('kernel.project_dir')) {
-            $container->setParameter('kernel.project_dir', $this->getProjectDir());
-        }
-    }
 }
diff --git a/tests/Functional/App/config/access/config.yml b/tests/Functional/App/config/access/config.yml
@@ -14,11 +14,11 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/access/mapping"
+                    dir: "%kernel.project_dir%/config/access/mapping"
                 # include the same files twice
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/access/mapping"
+                    dir: "%kernel.project_dir%/config/access/mapping"
 
 services:
     overblog_graphql.test.private:
diff --git a/tests/Functional/App/config/argumentWrapper/config.yml b/tests/Functional/App/config/argumentWrapper/config.yml
@@ -12,7 +12,7 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/argumentWrapper/mapping"
+                    dir: "%kernel.project_dir%/config/argumentWrapper/mapping"
 services:
     expression_function_instance_of:
         class: Symfony\Component\ExpressionLanguage\ExpressionFunction
diff --git a/tests/Functional/App/config/config.yml b/tests/Functional/App/config/config.yml
@@ -2,7 +2,7 @@ framework:
     test: ~
     secret: test
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/config/routing.yml"
     profiler:
         enabled: false
 
diff --git a/tests/Functional/App/config/connection/config.yml b/tests/Functional/App/config/connection/config.yml
@@ -12,6 +12,6 @@ overblog_graphql:
             types:
                 -
                     type: yml
-                    dir: "%kernel.root_dir%/config/connection/mapping"
+                    dir: "%kernel.project_dir%/config/connection/mapping"
     services:
         promise_adapter: "overblog_graphql.react.promise_adapter"
diff --git a/tests/Functional/App/config/customScalar/config.yml b/tests/Functional/App/config/customScalar/config.yml
@@ -11,4 +11,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/customScalar/mapping"
+                    dir: "%kernel.project_dir%/config/customScalar/mapping"
diff --git a/tests/Functional/App/config/definition/config.yml b/tests/Functional/App/config/definition/config.yml
@@ -9,4 +9,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/definition/mapping"
+                    dir: "%kernel.project_dir%/config/definition/mapping"
diff --git a/tests/Functional/App/config/disableIntrospection/config.yml b/tests/Functional/App/config/disableIntrospection/config.yml
@@ -14,4 +14,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/queryComplexity/mapping"
+                    dir: "%kernel.project_dir%/config/queryComplexity/mapping"
diff --git a/tests/Functional/App/config/exception/config.yml b/tests/Functional/App/config/exception/config.yml
@@ -16,4 +16,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: '%kernel.root_dir%/config/exception/mapping'
+                    dir: '%kernel.project_dir%/config/exception/mapping'
diff --git a/tests/Functional/App/config/global/config.yml b/tests/Functional/App/config/global/config.yml
@@ -19,4 +19,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/global/mapping"
+                    dir: "%kernel.project_dir%/config/global/mapping"
diff --git a/tests/Functional/App/config/inheritance/config.yml b/tests/Functional/App/config/inheritance/config.yml
@@ -11,4 +11,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/inheritance/mapping"
+                    dir: "%kernel.project_dir%/config/inheritance/mapping"
diff --git a/tests/Functional/App/config/multipleQueries/config.yml b/tests/Functional/App/config/multipleQueries/config.yml
@@ -12,4 +12,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/multipleQueries/mapping"
+                    dir: "%kernel.project_dir%/config/multipleQueries/mapping"
diff --git a/tests/Functional/App/config/multipleSchema/config.yml b/tests/Functional/App/config/multipleSchema/config.yml
@@ -17,5 +17,5 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/multipleSchema/mapping"
+                    dir: "%kernel.project_dir%/config/multipleSchema/mapping"
                     suffix: ~
diff --git a/tests/Functional/App/config/mutation/config.yml b/tests/Functional/App/config/mutation/config.yml
@@ -14,4 +14,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/mutation/mapping"
+                    dir: "%kernel.project_dir%/config/mutation/mapping"
diff --git a/tests/Functional/App/config/node/config.yml b/tests/Functional/App/config/node/config.yml
@@ -20,5 +20,5 @@ overblog_graphql:
             auto_discover: true
             types:
                 -
-                    dir: "%kernel.root_dir%/config/node/mapping"
+                    dir: "%kernel.project_dir%/config/node/mapping"
                     suffix: _type
diff --git a/tests/Functional/App/config/plural/config.yml b/tests/Functional/App/config/plural/config.yml
@@ -17,4 +17,4 @@ overblog_graphql:
             types:
                 -
                     type: xml
-                    dir: "%kernel.root_dir%/config/plural/mapping"
+                    dir: "%kernel.project_dir%/config/plural/mapping"
diff --git a/tests/Functional/App/config/public/config.yml b/tests/Functional/App/config/public/config.yml
@@ -10,4 +10,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/public/mapping"
+                    dir: "%kernel.project_dir%/config/public/mapping"
diff --git a/tests/Functional/App/config/queryComplexity/config.yml b/tests/Functional/App/config/queryComplexity/config.yml
@@ -14,4 +14,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/queryComplexity/mapping"
+                    dir: "%kernel.project_dir%/config/queryComplexity/mapping"
diff --git a/tests/Functional/App/config/queryComplexityEnv/config.yml b/tests/Functional/App/config/queryComplexityEnv/config.yml
@@ -17,4 +17,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/queryComplexity/mapping"
+                    dir: "%kernel.project_dir%/config/queryComplexity/mapping"
diff --git a/tests/Functional/App/config/queryMaxDepth/config.yml b/tests/Functional/App/config/queryMaxDepth/config.yml
@@ -14,4 +14,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/queryMaxDepth/mapping"
+                    dir: "%kernel.project_dir%/config/queryMaxDepth/mapping"
diff --git a/tests/Functional/App/config/queryMaxDepthEnv/config.yml b/tests/Functional/App/config/queryMaxDepthEnv/config.yml
@@ -17,4 +17,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/queryMaxDepth/mapping"
+                    dir: "%kernel.project_dir%/config/queryMaxDepth/mapping"
diff --git a/tests/Functional/App/config/schemaLanguage/config.yml b/tests/Functional/App/config/schemaLanguage/config.yml
@@ -19,7 +19,7 @@ overblog_graphql:
             types:
                 -
                     type: graphql
-                    dir: "%kernel.root_dir%/config/schemaLanguage/mapping"
+                    dir: "%kernel.project_dir%/config/schemaLanguage/mapping"
                     suffix: ~
 
 services:
diff --git a/tests/Functional/App/config/upload/config.yml b/tests/Functional/App/config/upload/config.yml
@@ -13,4 +13,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/upload/mapping"
+                    dir: "%kernel.project_dir%/config/upload/mapping"
diff --git a/tests/Functional/App/config/validation/config.yml b/tests/Functional/App/config/validation/config.yml
@@ -12,4 +12,4 @@ overblog_graphql:
             types:
                 -
                     type: yaml
-                    dir: "%kernel.root_dir%/config/validation/mapping"
+                    dir: "%kernel.project_dir%/config/validation/mapping"

Original file line number	Diff line number	Diff line change
`@@ -88,15 +88,4 @@ private function basePath()`
`88`	`88`	`{`
`89`	`89`	`return \sys_get_temp_dir().'/OverblogGraphQLBundle/'.Kernel::VERSION.'/'.($this->testCase ? $this->testCase.'/' : '');`
`90`	`90`	`}`
`91`		`-`
`92`		`- protected function build(ContainerBuilder $container): void`
`93`		`- {`
`94`		`- if (!$container->hasParameter('kernel.root_dir')) {`
`95`		`- $container->setParameter('kernel.root_dir', $this->getRootDir());`
`96`		`- }`
`97`		`-`
`98`		`- if (!$container->hasParameter('kernel.project_dir')) {`
`99`		`- $container->setParameter('kernel.project_dir', $this->getProjectDir());`
`100`		`- }`
`101`		`- }`
`102`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ overblog_graphql:`
`14`	`14`	`types:`
`15`	`15`	`-`
`16`	`16`	`type: yaml`
`17`		`- dir: "%kernel.root_dir%/config/access/mapping"`
	`17`	`+ dir: "%kernel.project_dir%/config/access/mapping"`
`18`	`18`	`# include the same files twice`
`19`	`19`	`-`
`20`	`20`	`type: yaml`
`21`		`- dir: "%kernel.root_dir%/config/access/mapping"`
	`21`	`+ dir: "%kernel.project_dir%/config/access/mapping"`
`22`	`22`
`23`	`23`	`services:`
`24`	`24`	`overblog_graphql.test.private:`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ overblog_graphql:`
`12`	`12`	`types:`
`13`	`13`	`-`
`14`	`14`	`type: yaml`
`15`		`- dir: "%kernel.root_dir%/config/argumentWrapper/mapping"`
	`15`	`+ dir: "%kernel.project_dir%/config/argumentWrapper/mapping"`
`16`	`16`	`services:`
`17`	`17`	`expression_function_instance_of:`
`18`	`18`	`class: Symfony\Component\ExpressionLanguage\ExpressionFunction`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ overblog_graphql:`
`12`	`12`	`types:`
`13`	`13`	`-`
`14`	`14`	`type: yml`
`15`		`- dir: "%kernel.root_dir%/config/connection/mapping"`
	`15`	`+ dir: "%kernel.project_dir%/config/connection/mapping"`
`16`	`16`	`services:`
`17`	`17`	`promise_adapter: "overblog_graphql.react.promise_adapter"`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ overblog_graphql:`
`11`	`11`	`types:`
`12`	`12`	`-`
`13`	`13`	`type: yaml`
`14`		`- dir: "%kernel.root_dir%/config/customScalar/mapping"`
	`14`	`+ dir: "%kernel.project_dir%/config/customScalar/mapping"`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@ overblog_graphql:`
`9`	`9`	`types:`
`10`	`10`	`-`
`11`	`11`	`type: yaml`
`12`		`- dir: "%kernel.root_dir%/config/definition/mapping"`
	`12`	`+ dir: "%kernel.project_dir%/config/definition/mapping"`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ overblog_graphql:`
`14`	`14`	`types:`
`15`	`15`	`-`
`16`	`16`	`type: yaml`
`17`		`- dir: "%kernel.root_dir%/config/queryComplexity/mapping"`
	`17`	`+ dir: "%kernel.project_dir%/config/queryComplexity/mapping"`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ overblog_graphql:`
`16`	`16`	`types:`
`17`	`17`	`-`
`18`	`18`	`type: yaml`
`19`		`- dir: '%kernel.root_dir%/config/exception/mapping'`
	`19`	`+ dir: '%kernel.project_dir%/config/exception/mapping'`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ overblog_graphql:`
`19`	`19`	`types:`
`20`	`20`	`-`
`21`	`21`	`type: yaml`
`22`		`- dir: "%kernel.root_dir%/config/global/mapping"`
	`22`	`+ dir: "%kernel.project_dir%/config/global/mapping"`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ overblog_graphql:`
`12`	`12`	`types:`
`13`	`13`	`-`
`14`	`14`	`type: yaml`
`15`		`- dir: "%kernel.root_dir%/config/multipleQueries/mapping"`
	`15`	`+ dir: "%kernel.project_dir%/config/multipleQueries/mapping"`