Skip to content

Commit

Permalink
Revert "chore(deps): update dependency friendsofphp/php-cs-fixer to v…
Browse files Browse the repository at this point in the history
…3.64.0 (#1605)"

This reverts commit 4cf4870.
  • Loading branch information
spawnia committed Sep 1, 2024
1 parent 4cf4870 commit 4c6ba54
Show file tree
Hide file tree
Showing 26 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"amphp/http-server": "^2.1",
"dms/phpunit-arraysubset-asserts": "dev-master",
"ergebnis/composer-normalize": "^2.28",
"friendsofphp/php-cs-fixer": "3.64.0",
"friendsofphp/php-cs-fixer": "3.63.2",
"mll-lab/php-cs-fixer-config": "^5",
"nyholm/psr7": "^1.5",
"phpbench/phpbench": "^1.2",
Expand Down
2 changes: 1 addition & 1 deletion src/Error/CoercionError.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static function make(
string $message,
?array $inputPath,
$invalidValue,
?\Throwable $previous = null,
?\Throwable $previous = null
): self {
$instance = new static($message, null, null, [], null, $previous);
$instance->inputPath = $inputPath;
Expand Down
2 changes: 1 addition & 1 deletion src/Error/Error.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function __construct(
?array $path = null,
?\Throwable $previous = null,
?array $extensions = null,
?array $unaliasedPath = null,
?array $unaliasedPath = null
) {
parent::__construct($message, 0, $previous);

Expand Down
2 changes: 1 addition & 1 deletion src/Executor/ExecutionContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function __construct(
array $variableValues,
array $errors,
callable $fieldResolver,
PromiseAdapter $promiseAdapter,
PromiseAdapter $promiseAdapter
) {
$this->schema = $schema;
$this->fragments = $fragments;
Expand Down
4 changes: 2 additions & 2 deletions src/Executor/Executor.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static function execute(
$contextValue = null,
?array $variableValues = null,
?string $operationName = null,
?callable $fieldResolver = null,
?callable $fieldResolver = null
): ExecutionResult {
$promiseAdapter = new SyncPromiseAdapter();

Expand Down Expand Up @@ -143,7 +143,7 @@ public static function promiseToExecute(
$contextValue = null,
?array $variableValues = null,
?string $operationName = null,
?callable $fieldResolver = null,
?callable $fieldResolver = null
): Promise {
$executor = (self::$implementationFactory)(
$promiseAdapter,
Expand Down
26 changes: 13 additions & 13 deletions src/Executor/ReferenceExecutor.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static function create(
$contextValue,
array $variableValues,
?string $operationName,
callable $fieldResolver,
callable $fieldResolver
): ExecutorImplementation {
$exeContext = static::buildExecutionContext(
$schema,
Expand Down Expand Up @@ -141,7 +141,7 @@ protected static function buildExecutionContext(
array $rawVariableValues,
?string $operationName,
callable $fieldResolver,
PromiseAdapter $promiseAdapter,
PromiseAdapter $promiseAdapter
) {
/** @var array<int, Error> $errors */
$errors = [];
Expand Down Expand Up @@ -394,7 +394,7 @@ protected function collectFields(
ObjectType $runtimeType,
SelectionSetNode $selectionSet,
\ArrayObject $fields,
\ArrayObject $visitedFragmentNames,
\ArrayObject $visitedFragmentNames
): \ArrayObject {
$exeContext = $this->exeContext;
foreach ($selectionSet->selections as $selection) {
Expand Down Expand Up @@ -606,7 +606,7 @@ protected function resolveField(
string $responseName,
array $path,
array $unaliasedPath,
$contextValue,
$contextValue
) {
$exeContext = $this->exeContext;

Expand Down Expand Up @@ -723,7 +723,7 @@ protected function resolveFieldValueOrError(
callable $resolveFn,
$rootValue,
ResolveInfo $info,
$contextValue,
$contextValue
) {
try {
// Build a map of arguments from the field.arguments AST, using the
Expand Down Expand Up @@ -765,7 +765,7 @@ protected function completeValueCatchingError(
array $path,
array $unaliasedPath,
$result,
$contextValue,
$contextValue
) {
// Otherwise, error protection is applied, logging the error and resolving
// a null value for this field if one is encountered.
Expand Down Expand Up @@ -859,7 +859,7 @@ protected function completeValue(
array $path,
array $unaliasedPath,
&$result,
$contextValue,
$contextValue
) {
// If result is an Error, throw a located error.
if ($result instanceof \Throwable) {
Expand Down Expand Up @@ -1002,7 +1002,7 @@ protected function completeListValue(
array $path,
array $unaliasedPath,
iterable &$results,
$contextValue,
$contextValue
) {
$itemType = $returnType->getWrappedType();

Expand Down Expand Up @@ -1078,7 +1078,7 @@ protected function completeAbstractValue(
array $path,
array $unaliasedPath,
&$result,
$contextValue,
$contextValue
) {
$typeCandidate = $returnType->resolveType($result, $contextValue, $info);

Expand Down Expand Up @@ -1211,7 +1211,7 @@ protected function completeObjectValue(
array $path,
array $unaliasedPath,
&$result,
$contextValue,
$contextValue
) {
// If there is an isTypeOf predicate function, call it with the
// current result. If isTypeOf returns false, then raise an error rather
Expand Down Expand Up @@ -1266,7 +1266,7 @@ protected function completeObjectValue(
protected function invalidReturnTypeError(
ObjectType $returnType,
$result,
\ArrayObject $fieldNodes,
\ArrayObject $fieldNodes
): Error {
$safeResult = Utils::printSafe($result);

Expand Down Expand Up @@ -1294,7 +1294,7 @@ protected function collectAndExecuteSubfields(
array $path,
array $unaliasedPath,
&$result,
$contextValue,
$contextValue
) {
$subFieldNodes = $this->collectSubFields($returnType, $fieldNodes);

Expand Down Expand Up @@ -1440,7 +1440,7 @@ protected function ensureValidRuntimeType(
$runtimeTypeOrName,
AbstractType $returnType,
ResolveInfo $info,
&$result,
&$result
): ObjectType {
$runtimeType = \is_string($runtimeTypeOrName)
? $this->exeContext->schema->getType($runtimeTypeOrName)
Expand Down
4 changes: 2 additions & 2 deletions src/GraphQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static function executeQuery(
?array $variableValues = null,
?string $operationName = null,
?callable $fieldResolver = null,
?array $validationRules = null,
?array $validationRules = null
): ExecutionResult {
$promiseAdapter = new SyncPromiseAdapter();

Expand Down Expand Up @@ -131,7 +131,7 @@ public static function promiseToExecute(
?array $variableValues = null,
?string $operationName = null,
?callable $fieldResolver = null,
?array $validationRules = null,
?array $validationRules = null
): Promise {
try {
$documentNode = $source instanceof DocumentNode
Expand Down
8 changes: 4 additions & 4 deletions src/Server/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ protected function promiseToExecuteOperation(
PromiseAdapter $promiseAdapter,
ServerConfig $config,
OperationParams $op,
bool $isBatch = false,
bool $isBatch = false
): Promise {
try {
if ($config->getSchema() === null) {
Expand Down Expand Up @@ -357,7 +357,7 @@ protected function resolveValidationRules(
ServerConfig $config,
OperationParams $params,
DocumentNode $doc,
string $operationType,
string $operationType
): ?array {
$validationRules = $config->getValidationRules();

Expand All @@ -379,7 +379,7 @@ protected function resolveRootValue(
ServerConfig $config,
OperationParams $params,
DocumentNode $doc,
string $operationType,
string $operationType
) {
$rootValue = $config->getRootValue();

Expand All @@ -395,7 +395,7 @@ protected function resolveContextValue(
ServerConfig $config,
OperationParams $params,
DocumentNode $doc,
string $operationType,
string $operationType
) {
$context = $config->getContext();

Expand Down
2 changes: 1 addition & 1 deletion src/Server/StandardServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function executeRequest($parsedBody = null)
public function processPsrRequest(
RequestInterface $request,
ResponseInterface $response,
StreamInterface $writableBodyStream,
StreamInterface $writableBodyStream
) {
$result = $this->executePsrRequest($request);

Expand Down
2 changes: 1 addition & 1 deletion src/Type/Definition/ResolveInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public function __construct(
$rootValue,
OperationDefinitionNode $operation,
array $variableValues,
array $unaliasedPath = [],
array $unaliasedPath = []
) {
$this->fieldDefinition = $fieldDefinition;
$this->fieldName = $fieldDefinition->name;
Expand Down
2 changes: 1 addition & 1 deletion src/Utils/ASTDefinitionBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function __construct(
array $typeDefinitionsMap,
array $typeExtensionsMap,
callable $resolveType,
?callable $typeConfigDecorator = null,
?callable $typeConfigDecorator = null
) {
$this->typeDefinitionsMap = $typeDefinitionsMap;
$this->typeExtensionsMap = $typeExtensionsMap;
Expand Down
26 changes: 13 additions & 13 deletions src/Utils/BreakingChangesFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static function findBreakingChanges(Schema $oldSchema, Schema $newSchema)
*/
public static function findRemovedTypes(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -119,7 +119,7 @@ public static function findRemovedTypes(
*/
public static function findTypesThatChangedKind(
Schema $schemaA,
Schema $schemaB,
Schema $schemaB
): array {
$schemaATypeMap = $schemaA->getTypeMap();
$schemaBTypeMap = $schemaB->getTypeMap();
Expand Down Expand Up @@ -191,7 +191,7 @@ private static function typeKindName(NamedType $type): string
*/
public static function findFieldsThatChangedTypeOnObjectOrInterfaceTypes(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -238,7 +238,7 @@ public static function findFieldsThatChangedTypeOnObjectOrInterfaceTypes(

private static function isChangeSafeForObjectOrInterfaceField(
Type $oldType,
Type $newType,
Type $newType
): bool {
if ($oldType instanceof NamedType) {
return // if they're both named types, see if their names are equivalent
Expand Down Expand Up @@ -275,7 +275,7 @@ private static function isChangeSafeForObjectOrInterfaceField(
*/
public static function findFieldsThatChangedTypeOnInputObjectTypes(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -350,7 +350,7 @@ public static function findFieldsThatChangedTypeOnInputObjectTypes(
/** @throws InvariantViolation */
private static function isChangeSafeForInputObjectFieldOrFieldArg(
Type $oldType,
Type $newType,
Type $newType
): bool {
if ($oldType instanceof NamedType) {
if (! $newType instanceof NamedType) {
Expand Down Expand Up @@ -394,7 +394,7 @@ private static function isChangeSafeForInputObjectFieldOrFieldArg(
*/
public static function findTypesRemovedFromUnions(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -434,7 +434,7 @@ public static function findTypesRemovedFromUnions(
*/
public static function findValuesRemovedFromEnums(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -476,7 +476,7 @@ public static function findValuesRemovedFromEnums(
*/
public static function findArgChanges(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -580,7 +580,7 @@ public static function findArgChanges(
*/
public static function findInterfacesRemovedFromObjectTypes(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -828,7 +828,7 @@ public static function findDangerousChanges(Schema $oldSchema, Schema $newSchema
*/
public static function findValuesAddedToEnums(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -865,7 +865,7 @@ public static function findValuesAddedToEnums(
*/
public static function findInterfacesAddedToObjectTypes(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down Expand Up @@ -912,7 +912,7 @@ public static function findInterfacesAddedToObjectTypes(
*/
public static function findTypesAddedToUnions(
Schema $oldSchema,
Schema $newSchema,
Schema $newSchema
): array {
$oldTypeMap = $oldSchema->getTypeMap();
$newTypeMap = $newSchema->getTypeMap();
Expand Down
6 changes: 3 additions & 3 deletions src/Utils/BuildSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class BuildSchema
public function __construct(
DocumentNode $ast,
?callable $typeConfigDecorator = null,
array $options = [],
array $options = []
) {
$this->ast = $ast;
$this->typeConfigDecorator = $typeConfigDecorator;
Expand Down Expand Up @@ -102,7 +102,7 @@ public function __construct(
public static function build(
$source,
?callable $typeConfigDecorator = null,
array $options = [],
array $options = []
): Schema {
$doc = $source instanceof DocumentNode
? $source
Expand Down Expand Up @@ -135,7 +135,7 @@ public static function build(
public static function buildAST(
DocumentNode $ast,
?callable $typeConfigDecorator = null,
array $options = [],
array $options = []
): Schema {
return (new self($ast, $typeConfigDecorator, $options))->buildSchema();
}
Expand Down
Loading

0 comments on commit 4c6ba54

Please sign in to comment.