Skip to content

Commit 4910afa

Browse files
committed
Merge branch '0.11'
2 parents 7e06b51 + 2fedef6 commit 4910afa

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

.php_cs.dist

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ return PhpCsFixer\Config::create()
1818
'binary_operator_spaces' => ['align_double_arrow' => false, 'align_equals' => false],
1919
'general_phpdoc_annotation_remove' => ['author', 'category', 'copyright', 'created', 'license', 'package', 'since', 'subpackage', 'version'],
2020
'native_function_invocation' => true,
21+
'fully_qualified_strict_types' => true,
22+
'native_constant_invocation' => true,
2123
]
2224
)
2325
->setFinder($finder)

src/Config/Processor/BuilderProcessor.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private static function processFieldBuilders(array $fields)
101101
@\trigger_error(
102102
'The builder short syntax (Field: Builder => Field: {builder: Builder}) is deprecated as of 0.7 and will be removed in 0.12. '.
103103
'It will be replaced by the field type short syntax (Field: Type => Field: {type: Type})',
104-
E_USER_DEPRECATED
104+
\E_USER_DEPRECATED
105105
);
106106
$fieldBuilderName = $field;
107107
}
@@ -151,7 +151,7 @@ private static function getBuilder($name, $type)
151151
if (isset($builderClassMap[$newName])) {
152152
@\trigger_error(
153153
\sprintf('The "%s" %s builder is deprecated as of 0.7 and will be removed in 0.12. Use "%s" instead.', $name, $type, $newName),
154-
E_USER_DEPRECATED
154+
\E_USER_DEPRECATED
155155
);
156156

157157
return $builders[$type][$newName] = new $builderClassMap[$newName]();

src/Definition/ConfigProcessor/PublicFieldsFilterConfigProcessor.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function ($field, $fieldName) {
1919

2020
return $exposed;
2121
},
22-
ARRAY_FILTER_USE_BOTH
22+
\ARRAY_FILTER_USE_BOTH
2323
);
2424
}
2525

src/DependencyInjection/Compiler/TaggedServiceMappingPass.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function ($methodCall) {
111111
'Autowire method "%s::setContainer" for custom tagged (type, resolver or mutation) services is deprecated as of 0.9 and will be removed in 1.0.',
112112
ContainerAwareInterface::class
113113
),
114-
E_USER_DEPRECATED
114+
\E_USER_DEPRECATED
115115
);
116116
$solutionDefinition->addMethodCall('setContainer', [new Reference('service_container')]);
117117
}

src/Request/BatchParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private function getParsedBody(Request $request)
5858
case static::CONTENT_TYPE_JSON:
5959
$parsedBody = \json_decode($request->getContent(), true);
6060

61-
if (JSON_ERROR_NONE !== \json_last_error()) {
61+
if (\JSON_ERROR_NONE !== \json_last_error()) {
6262
throw new BadRequestHttpException('POST body sent invalid JSON');
6363
}
6464
break;

src/Request/Parser.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private function getParsedBody(Request $request)
4949

5050
$parsedBody = \json_decode($body, true);
5151

52-
if (JSON_ERROR_NONE !== \json_last_error()) {
52+
if (\JSON_ERROR_NONE !== \json_last_error()) {
5353
throw new BadRequestHttpException('POST body sent invalid JSON');
5454
}
5555
break;
@@ -106,7 +106,7 @@ private function getParams(Request $request, array $data = [])
106106
if (\is_string($variables)) {
107107
$variables = \json_decode($variables, true);
108108

109-
if (JSON_ERROR_NONE !== \json_last_error()) {
109+
if (\JSON_ERROR_NONE !== \json_last_error()) {
110110
throw new BadRequestHttpException('Variables are invalid JSON');
111111
}
112112
}

0 commit comments

Comments
 (0)