From dc4a73c0b9156c45d58c59a469ec7643562ef7c8 Mon Sep 17 00:00:00 2001 From: Valentin Udaltsov Date: Thu, 22 Feb 2024 16:24:35 +0300 Subject: [PATCH] Sort methods alphabetically in TypeVisitor --- .TypeVisitor.php-cs-fixer.dist.php | 23 +++++++++ .php-cs-fixer.dist.php | 11 ++--- composer.json | 5 +- src/TypeVisitor.php | 78 +++++++++++++++--------------- 4 files changed, 70 insertions(+), 47 deletions(-) create mode 100644 .TypeVisitor.php-cs-fixer.dist.php diff --git a/.TypeVisitor.php-cs-fixer.dist.php b/.TypeVisitor.php-cs-fixer.dist.php new file mode 100644 index 0000000..6b1a718 --- /dev/null +++ b/.TypeVisitor.php-cs-fixer.dist.php @@ -0,0 +1,23 @@ +append([ + __FILE__, + __DIR__ . '/src/TypeVisitor.php', +]); + +$config = (new Config()) + ->setFinder($finder) + ->setCacheFile(__DIR__ . '/var/' . basename(__FILE__) . '.cache'); + +(new PhpCsFixerCodingStandard())->applyTo($config); + +$rules = $config->getRules(); +$rules['ordered_class_elements']['sort_algorithm'] = 'alpha'; + +return $config->setRules($rules); diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 01ec297..6f3e13b 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -7,13 +7,10 @@ use PHPyh\CodingStandard\PhpCsFixerCodingStandard; $finder = Finder::create() - ->in([ - __DIR__ . '/src', - __DIR__ . '/tests', - ]) - ->append([ - __FILE__, - ]); + ->in(__DIR__ . '/src') + ->notName(['TypeVisitor.php']) + ->append([__FILE__]) + ->append(Finder::create()->in(__DIR__ . '/tests')); $config = (new Config()) ->setFinder($finder) diff --git a/composer.json b/composer.json index 0e1071b..079295a 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,10 @@ "sort-packages": true }, "scripts": { - "fixcs": "vendor/bin/php-cs-fixer fix --diff --verbose", + "fixcs": [ + "vendor/bin/php-cs-fixer fix --verbose", + "vendor/bin/php-cs-fixer fix --config=.TypeVisitor.php-cs-fixer.dist.php --verbose" + ], "pre-command-run": "mkdir -p var", "psalm": "psalm --show-info --no-diff", "test": "phpunit" diff --git a/src/TypeVisitor.php b/src/TypeVisitor.php index c8157b9..7649cc5 100644 --- a/src/TypeVisitor.php +++ b/src/TypeVisitor.php @@ -11,122 +11,122 @@ interface TypeVisitor { /** @return TReturn */ - public function visitNever(NeverType $type): mixed; + public function visitAlias(AliasType $type): mixed; /** @return TReturn */ - public function visitVoid(VoidType $type): mixed; + public function visitAnyLiteral(AnyLiteralType $type): mixed; /** @return TReturn */ - public function visitNull(NullType $type): mixed; + public function visitArray(ArrayType $type): mixed; /** @return TReturn */ - public function visitNonEmpty(NonEmptyType $type): mixed; + public function visitArrayShape(ArrayShapeType $type): mixed; /** @return TReturn */ - public function visitLiteral(LiteralType $type): mixed; + public function visitBool(BoolType $type): mixed; /** @return TReturn */ - public function visitAnyLiteral(AnyLiteralType $type): mixed; + public function visitCallable(CallableType $type): mixed; /** @return TReturn */ - public function visitClassStringLiteral(ClassStringLiteralType $type): mixed; + public function visitClassConstant(ClassConstantType $type): mixed; /** @return TReturn */ - public function visitBool(BoolType $type): mixed; + public function visitClassString(ClassStringType $type): mixed; /** @return TReturn */ - public function visitIntRange(IntRangeType $type): mixed; + public function visitClassStringLiteral(ClassStringLiteralType $type): mixed; /** @return TReturn */ - public function visitIntMask(IntMaskType $type): mixed; + public function visitClosure(ClosureType $type): mixed; /** @return TReturn */ - public function visitIntMaskOf(IntMaskOfType $type): mixed; + public function visitConditional(ConditionalType $type): mixed; /** @return TReturn */ - public function visitInt(IntType $type): mixed; + public function visitConstant(ConstantType $type): mixed; /** @return TReturn */ public function visitFloat(FloatType $type): mixed; /** @return TReturn */ - public function visitNumericString(NumericStringType $type): mixed; + public function visitInt(IntType $type): mixed; /** @return TReturn */ - public function visitNamedClassString(NamedClassStringType $type): mixed; + public function visitIntersection(IntersectionType $type): mixed; /** @return TReturn */ - public function visitClassString(ClassStringType $type): mixed; + public function visitIntMask(IntMaskType $type): mixed; /** @return TReturn */ - public function visitTruthyString(TruthyStringType $type): mixed; + public function visitIntMaskOf(IntMaskOfType $type): mixed; /** @return TReturn */ - public function visitString(StringType $type): mixed; + public function visitIntRange(IntRangeType $type): mixed; /** @return TReturn */ - public function visitList(ListType $type): mixed; + public function visitIterable(IterableType $type): mixed; /** @return TReturn */ - public function visitArrayShape(ArrayShapeType $type): mixed; + public function visitKeyOf(KeyOfType $type): mixed; /** @return TReturn */ - public function visitArray(ArrayType $type): mixed; + public function visitList(ListType $type): mixed; /** @return TReturn */ - public function visitIterable(IterableType $type): mixed; + public function visitLiteral(LiteralType $type): mixed; /** @return TReturn */ - public function visitNamedObject(NamedObjectType $type): mixed; + public function visitMixed(MixedType $type): mixed; /** @return TReturn */ - public function visitStatic(StaticType $type): mixed; + public function visitNamedClassString(NamedClassStringType $type): mixed; /** @return TReturn */ - public function visitObjectShape(ObjectShapeType $type): mixed; + public function visitNamedObject(NamedObjectType $type): mixed; /** @return TReturn */ - public function visitObject(ObjectType $type): mixed; + public function visitNever(NeverType $type): mixed; /** @return TReturn */ - public function visitResource(ResourceType $type): mixed; + public function visitNonEmpty(NonEmptyType $type): mixed; /** @return TReturn */ - public function visitClosure(ClosureType $type): mixed; + public function visitNull(NullType $type): mixed; /** @return TReturn */ - public function visitCallable(CallableType $type): mixed; + public function visitNumericString(NumericStringType $type): mixed; /** @return TReturn */ - public function visitConstant(ConstantType $type): mixed; + public function visitObject(ObjectType $type): mixed; /** @return TReturn */ - public function visitClassConstant(ClassConstantType $type): mixed; + public function visitObjectShape(ObjectShapeType $type): mixed; /** @return TReturn */ - public function visitKeyOf(KeyOfType $type): mixed; + public function visitOffset(OffsetType $type): mixed; /** @return TReturn */ - public function visitValueOf(ValueOfType $type): mixed; + public function visitResource(ResourceType $type): mixed; /** @return TReturn */ - public function visitOffset(OffsetType $type): mixed; + public function visitStatic(StaticType $type): mixed; /** @return TReturn */ - public function visitTemplate(TemplateType $type): mixed; + public function visitString(StringType $type): mixed; /** @return TReturn */ - public function visitConditional(ConditionalType $type): mixed; + public function visitTemplate(TemplateType $type): mixed; /** @return TReturn */ - public function visitAlias(AliasType $type): mixed; + public function visitTruthyString(TruthyStringType $type): mixed; /** @return TReturn */ - public function visitIntersection(IntersectionType $type): mixed; + public function visitUnion(UnionType $type): mixed; /** @return TReturn */ - public function visitUnion(UnionType $type): mixed; + public function visitValueOf(ValueOfType $type): mixed; /** @return TReturn */ - public function visitMixed(MixedType $type): mixed; + public function visitVoid(VoidType $type): mixed; }