Merge branch 'master' into annotations

Author: mcg-web

docs/security/fields-public-control.md

@@ -54,8 +54,8 @@ You can also use `config.fieldsDefaultPublic` to handle the setting globally on
 ```yaml
 AnObject:
     type: object
-    fieldsDefaultPublic: "@=service('my_service').isGranted(typeName, fieldName)"
     config:
+        fieldsDefaultPublic: "@=service('my_service').isGranted(typeName, fieldName)"
         fields:
             id:
                 type: "String!"

src/DependencyInjection/Compiler/GlobalVariablesPass.php

@@ -34,7 +34,7 @@ public function process(ContainerBuilder $container): void
                     $expressionLanguageDefinition->addMethodCall(
                         'addGlobalName',
                         [
-                            \sprintf('globalVariables->get(\'%s\')', $attributes['alias']),
+                            \sprintf('globalVariable->get(\'%s\')', $attributes['alias']),
                             $attributes['alias'],
                         ]
                     );