Formatting; make some tests less annoying across platforms

Stillat · Dec 10, 2023 · 1cd2be3 · 1cd2be3
1 parent d08b70e
commit 1cd2be3
Show file tree

Hide file tree

Showing 18 changed files with 71 additions and 69 deletions.
diff --git a/src/Compiler/AppendState.php b/src/Compiler/AppendState.php
@@ -13,9 +13,9 @@ class AppendState
      * @param  string  $value The node's compiled value.
      */
     public function __construct(public AbstractNode $node,
-                                public int $beforeLineNumber,
-                                public int $afterLineNumber,
-                                public string $value)
+        public int $beforeLineNumber,
+        public int $afterLineNumber,
+        public string $value)
     {
     }
 }
diff --git a/src/Compiler/Compiler.php b/src/Compiler/Compiler.php
@@ -49,13 +49,13 @@
 
 class Compiler
 {
-    use CompilesEchos, CompilesLayouts, CompilesClasses,
-        CompilesConditionals, CompilesAuthorizations, CompilesComponents,
+    use CompilesAuthorizations, CompilesClasses, CompilesComponents,
+        CompilesConditionals, CompilesCustomDirectives, CompilesEchos,
         CompilesErrors, CompilesFragments, CompilesHelpers, CompilesIncludes,
-        CompilesInjections, CompilesJs, CompilesJson, CompilesTranslations,
-        CompilesStacks, CompilesRawPhp, CompilesLoops, ReflectsClosures,
-        ManagesCustomDirectives, ManagesCustomConditions, CompilesCustomDirectives,
-        InteractsWithBladeErrors, CompilesVerbatim, CompilesStyles;
+        CompilesInjections, CompilesJs, CompilesJson, CompilesLayouts,
+        CompilesLoops, CompilesRawPhp, CompilesStacks, CompilesStyles,
+        CompilesTranslations, CompilesVerbatim, InteractsWithBladeErrors,
+        ManagesCustomConditions, ManagesCustomDirectives, ReflectsClosures;
 
     private LoopVariablesExtractor $loopExtractor;
 
@@ -727,7 +727,7 @@ public function compileString(string $template): string
                 }
             } elseif ($node instanceof PhpTagNode) {
                 $this->appendToBuffer($node, $node->content);
-            } elseif ($node instanceof  PhpBlockNode) {
+            } elseif ($node instanceof PhpBlockNode) {
                 $this->appendToBuffer($node, '<?php '.trim($node->innerContent).' ?>');
             } elseif ($node instanceof VerbatimNode) {
                 $this->appendToBuffer($node, $node->innerContent);

diff --git a/src/Document/Document.php b/src/Document/Document.php
@@ -29,9 +29,9 @@
 
 class Document
 {
-    use Macroable, QueriesGeneralNodes, ManagesDocumentStructures,
-        ManagesTextExtraction, InteractsWithBladeErrors,
-        ManagesDocumentValidation;
+    use InteractsWithBladeErrors, Macroable, ManagesDocumentStructures,
+        ManagesDocumentValidation, ManagesTextExtraction,
+        QueriesGeneralNodes;
 
     private ?Utf8StringIterator $docString = null;
 
@@ -312,7 +312,7 @@ public function syncFromParser(DocumentParser $parser): Document
      * @param  string[]  $customComponentTags A list of custom component tag names.
      * @param  DocumentOptions|null  $documentOptions Custom document options, if any.
      */
-    public static function fromText(string $document, ?string $filePath = null, array $customComponentTags = [], ?DocumentOptions $documentOptions = null): Document
+    public static function fromText(string $document, string $filePath = null, array $customComponentTags = [], DocumentOptions $documentOptions = null): Document
     {
         $parser = DocumentParserFactory::makeDocumentParser();
 

diff --git a/src/Document/NodeUtilities/QueriesGeneralNodes.php b/src/Document/NodeUtilities/QueriesGeneralNodes.php
@@ -12,8 +12,8 @@
 
 trait QueriesGeneralNodes
 {
-    use QueriesComponents, QueriesComponents,
-        QueriesGenerics, QueriesComments,
+    use QueriesComments, QueriesComponents,
+        QueriesComponents, QueriesGenerics,
         QueriesRelativeNodes, QueriesStructures;
 
     private bool $hasResolvedStructures = false;

diff --git a/src/Document/Structures/Concerns/ResolvesStructureDocuments.php b/src/Document/Structures/Concerns/ResolvesStructureDocuments.php
@@ -10,7 +10,7 @@ trait ResolvesStructureDocuments
     private function resolveStructureDocuments(array $nodes): void
     {
         foreach ($nodes as $node) {
-            if (! ($node instanceof DirectiveNode || $node instanceof  ComponentNode)) {
+            if (! ($node instanceof DirectiveNode || $node instanceof ComponentNode)) {
                 continue;
             }
             if ($node->isClosedBy == null) {

diff --git a/src/Document/Structures/StructurePairAnalyzer.php b/src/Document/Structures/StructurePairAnalyzer.php
@@ -17,9 +17,9 @@
 
 class StructurePairAnalyzer
 {
-    use ScansForClosingPairs, ManagesDirectiveIndexes, ManagesConditionMetaData,
-        PairsConditionalStructures, ConstructsConditions, ConstructsForElse,
-        ConstructsSwitchStatements, ResolvesStructureDocuments, PairsComponentTags;
+    use ConstructsConditions, ConstructsForElse, ConstructsSwitchStatements,
+        ManagesConditionMetaData, ManagesDirectiveIndexes, PairsComponentTags,
+        PairsConditionalStructures, ResolvesStructureDocuments, ScansForClosingPairs;
 
     private Document $document;
 

diff --git a/src/Errors/ConstructContext.php b/src/Errors/ConstructContext.php
@@ -31,7 +31,7 @@ enum ConstructContext
 
     public static function fromNode(AbstractNode $node): ConstructContext
     {
-        if ($node instanceof  DirectiveNode) {
+        if ($node instanceof DirectiveNode) {
             if ($node->getIsConditionDirective()) {
                 return ConstructContext::Condition;
             }

diff --git a/src/Nodes/ArgumentGroupNode.php b/src/Nodes/ArgumentGroupNode.php
@@ -96,7 +96,7 @@ public function getArgValues(): Collection
         return collect((new ArgStringSplitter())->split($this->innerContent));
     }
 
-    public function clone(?DirectiveNode $newOwner = null): ArgumentGroupNode
+    public function clone(DirectiveNode $newOwner = null): ArgumentGroupNode
     {
         $ownerToSet = $this->owner;
 

diff --git a/src/Nodes/Components/ComponentNode.php b/src/Nodes/Components/ComponentNode.php
@@ -13,7 +13,7 @@
 
 class ComponentNode extends AbstractNode
 {
-    use ManagesComponentParameters, ManagesComponentMetaData, ContainsDocumentText;
+    use ContainsDocumentText, ManagesComponentMetaData, ManagesComponentParameters;
 
     public string $componentPrefix = 'x';
 

diff --git a/src/Validation/PhpSyntaxValidator.php b/src/Validation/PhpSyntaxValidator.php
@@ -49,7 +49,7 @@ protected function resetState(): void
      * @param  Document  $document The document instance.
      * @param  int|null  $originalLine An optional line number that will be used instead of any reported PHP line numbers.
      */
-    public function checkDocument(Document $document, ?int $originalLine = null): PhpSyntaxValidationResult
+    public function checkDocument(Document $document, int $originalLine = null): PhpSyntaxValidationResult
     {
         $this->resetState();
         $syntaxResult = new PhpSyntaxValidationResult();
@@ -107,7 +107,7 @@ public function checkDocument(Document $document, ?int $originalLine = null): Ph
      * @param  string  $content The value to check.
      * @param  int|null  $originalLine An optional line number that will be used instead of any reported PHP line number.
      */
-    public function checkString(string $content, ?int $originalLine = null): PhpSyntaxValidationResult
+    public function checkString(string $content, int $originalLine = null): PhpSyntaxValidationResult
     {
         return $this->checkDocument(Document::fromText($content), $originalLine);
     }

diff --git a/src/Validation/Validators/ComponentShorthandVariableParameterValidator.php b/src/Validation/Validators/ComponentShorthandVariableParameterValidator.php
@@ -23,7 +23,7 @@ class ComponentShorthandVariableParameterValidator extends AbstractNodeValidator
      */
     public function validate(AbstractNode $node): ValidationResult|array|null
     {
-        if (! $node instanceof  ComponentNode || ! $node->hasParameters()) {
+        if (! $node instanceof ComponentNode || ! $node->hasParameters()) {
             return null;
         }
 

diff --git a/src/Validation/Validators/InconsistentDirectiveCasingValidator.php b/src/Validation/Validators/InconsistentDirectiveCasingValidator.php
@@ -12,7 +12,7 @@
 
 class InconsistentDirectiveCasingValidator extends AbstractNodeValidator
 {
-    use CanIgnoreDirectives, AcceptsCustomDirectives;
+    use AcceptsCustomDirectives, CanIgnoreDirectives;
 
     protected array $coreDirectives = [];
 

diff --git a/src/Validation/Validators/NoArgumentsValidator.php b/src/Validation/Validators/NoArgumentsValidator.php
@@ -12,7 +12,7 @@
 
 class NoArgumentsValidator extends AbstractNodeValidator
 {
-    use CanIgnoreDirectives, AcceptsCustomDirectives;
+    use AcceptsCustomDirectives, CanIgnoreDirectives;
 
     /**
      * @var string[]

diff --git a/src/Validation/Validators/RequiredArgumentsValidator.php b/src/Validation/Validators/RequiredArgumentsValidator.php
@@ -12,7 +12,7 @@
 
 class RequiredArgumentsValidator extends AbstractNodeValidator
 {
-    use CanIgnoreDirectives, AcceptsCustomDirectives;
+    use AcceptsCustomDirectives, CanIgnoreDirectives;
 
     /**
      * @var string[]

diff --git a/src/Workspaces/Workspace.php b/src/Workspaces/Workspace.php
@@ -19,8 +19,8 @@
 
 class Workspace
 {
-    use ValidatesWorkspaces, ProxiesDocumentCalls, ManagesWorkspaceErrors,
-        CompilesWorkspace;
+    use CompilesWorkspace, ManagesWorkspaceErrors, ProxiesDocumentCalls,
+        ValidatesWorkspaces;
 
     /**
      * Indicates if the workspace should resolve structures on document instances.