Skip to content

Commit d21eea1

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #368 from mauriciofauth/members-camel-case
Rename class members to use camel case format
2 parents 73105fa + 6664f6a commit d21eea1

File tree

379 files changed

+5465
-5468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+5465
-5468
lines changed

‎phpcs.xml.dist‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
2020
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
2121
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
22-
<exclude name="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps"/>
2322
</rule>
2423

2524
<rule ref="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition"/>

‎phpstan-baseline.neon‎

Lines changed: 88 additions & 88 deletions
Large diffs are not rendered by default.

‎psalm-baseline.xml‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<code>$arrayKey</code>
99
</InvalidScalarArgument>
1010
<MixedArrayOffset occurrences="1">
11-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;value]</code>
11+
<code>Parser::$statementParsers[$token-&gt;value]</code>
1212
</MixedArrayOffset>
1313
<MixedPropertyTypeCoercion occurrences="1">
1414
<code>$unknown</code>
@@ -88,7 +88,7 @@
8888
<code>$ret-&gt;alias</code>
8989
</MixedAssignment>
9090
<MixedOperand occurrences="4">
91-
<code>$component-&gt;compare_values[$i]</code>
91+
<code>$component-&gt;compareValues[$i]</code>
9292
<code>$component-&gt;results[$i]</code>
9393
<code>$component-&gt;results[$i]</code>
9494
<code>$token-&gt;value</code>
@@ -108,10 +108,10 @@
108108
<code>$token-&gt;value</code>
109109
</MixedArgument>
110110
<MixedArrayOffset occurrences="1">
111-
<code>static::$ALLOWED_KEYWORDS[$token-&gt;value]</code>
111+
<code>static::$allowedKeywords[$token-&gt;value]</code>
112112
</MixedArrayOffset>
113113
<MixedArrayTypeCoercion occurrences="1">
114-
<code>static::$ALLOWED_KEYWORDS[$token-&gt;value]</code>
114+
<code>static::$allowedKeywords[$token-&gt;value]</code>
115115
</MixedArrayTypeCoercion>
116116
<MixedInferredReturnType occurrences="1">
117117
<code>string</code>
@@ -172,12 +172,12 @@
172172
<code>Context::escape($fields)</code>
173173
</MixedArgumentTypeCoercion>
174174
<MixedArrayOffset occurrences="2">
175-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
176-
<code>self::$ALLOWED_KEYWORDS[$token-&gt;keyword]</code>
175+
<code>Parser::$statementParsers[$token-&gt;keyword]</code>
176+
<code>self::$allowedKeywords[$token-&gt;keyword]</code>
177177
</MixedArrayOffset>
178178
<MixedArrayTypeCoercion occurrences="2">
179-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
180-
<code>self::$ALLOWED_KEYWORDS[$token-&gt;keyword]</code>
179+
<code>Parser::$statementParsers[$token-&gt;keyword]</code>
180+
<code>self::$allowedKeywords[$token-&gt;keyword]</code>
181181
</MixedArrayTypeCoercion>
182182
<MixedAssignment occurrences="6">
183183
<code>$field</code>
@@ -293,8 +293,8 @@
293293
<code>ArrayObj::parse($parser, $list)-&gt;values</code>
294294
</PossiblyInvalidPropertyFetch>
295295
<PossiblyNullArgument occurrences="2">
296-
<code>$component-&gt;fields_options</code>
297-
<code>$component-&gt;lines_options</code>
296+
<code>$component-&gt;fieldsOptions</code>
297+
<code>$component-&gt;linesOptions</code>
298298
</PossiblyNullArgument>
299299
<PossiblyNullOperand occurrences="1">
300300
<code>$component-&gt;dest</code>
@@ -308,16 +308,16 @@
308308
<code>$this</code>
309309
</InvalidArgument>
310310
<MixedArrayOffset occurrences="4">
311-
<code>static::$JOINS[$token-&gt;keyword]</code>
312-
<code>static::$JOINS[$token-&gt;keyword]</code>
313-
<code>static::$JOINS[$token-&gt;keyword]</code>
314-
<code>static::$JOINS[$token-&gt;keyword]</code>
311+
<code>static::$joins[$token-&gt;keyword]</code>
312+
<code>static::$joins[$token-&gt;keyword]</code>
313+
<code>static::$joins[$token-&gt;keyword]</code>
314+
<code>static::$joins[$token-&gt;keyword]</code>
315315
</MixedArrayOffset>
316316
<MixedArrayTypeCoercion occurrences="4">
317-
<code>static::$JOINS[$token-&gt;keyword]</code>
318-
<code>static::$JOINS[$token-&gt;keyword]</code>
319-
<code>static::$JOINS[$token-&gt;keyword]</code>
320-
<code>static::$JOINS[$token-&gt;keyword]</code>
317+
<code>static::$joins[$token-&gt;keyword]</code>
318+
<code>static::$joins[$token-&gt;keyword]</code>
319+
<code>static::$joins[$token-&gt;keyword]</code>
320+
<code>static::$joins[$token-&gt;keyword]</code>
321321
</MixedArrayTypeCoercion>
322322
<MixedAssignment occurrences="2">
323323
<code>$expr-&gt;type</code>
@@ -327,14 +327,14 @@
327327
<code>$component</code>
328328
</MoreSpecificImplementedParamType>
329329
<PossiblyFalseOperand occurrences="1">
330-
<code>array_search($c-&gt;type, static::$JOINS)</code>
330+
<code>array_search($c-&gt;type, static::$joins)</code>
331331
</PossiblyFalseOperand>
332332
<PossiblyInvalidPropertyAssignmentValue occurrences="1">
333333
<code>ArrayObj::parse($parser, $list)</code>
334334
</PossiblyInvalidPropertyAssignmentValue>
335335
<PossiblyNullArrayOffset occurrences="2">
336-
<code>static::$JOINS</code>
337-
<code>static::$JOINS</code>
336+
<code>static::$joins</code>
337+
<code>static::$joins</code>
338338
</PossiblyNullArrayOffset>
339339
<PossiblyNullPropertyAssignmentValue occurrences="5">
340340
<code>$expr</code>
@@ -609,104 +609,104 @@
609609
</file>
610610
<file src="src/Context.php">
611611
<InvalidPropertyFetch occurrences="1">
612-
<code>$context::$KEYWORDS</code>
612+
<code>$context::$keywords</code>
613613
</InvalidPropertyFetch>
614614
<MixedArgument occurrences="1">
615615
<code>$value</code>
616616
</MixedArgument>
617617
<MixedAssignment occurrences="3">
618618
<code>$value</code>
619-
<code>self::$KEYWORDS</code>
620-
<code>static::$MODE</code>
619+
<code>self::$keywords</code>
620+
<code>static::$mode</code>
621621
</MixedAssignment>
622622
<MixedInferredReturnType occurrences="2">
623623
<code>int|null</code>
624624
<code>int|null</code>
625625
</MixedInferredReturnType>
626626
<MixedOperand occurrences="2">
627627
<code>constant('static::SQL_MODE_' . $m)</code>
628-
<code>static::$KEYWORDS[$str]</code>
628+
<code>static::$keywords[$str]</code>
629629
</MixedOperand>
630630
<MixedReturnStatement occurrences="2">
631-
<code>static::$KEYWORDS[$str]</code>
632-
<code>static::$OPERATORS[$str]</code>
631+
<code>static::$keywords[$str]</code>
632+
<code>static::$operators[$str]</code>
633633
</MixedReturnStatement>
634634
</file>
635635
<file src="src/Contexts/ContextMariaDb100000.php">
636636
<NonInvariantDocblockPropertyType occurrences="1">
637-
<code>$KEYWORDS</code>
637+
<code>$keywords</code>
638638
</NonInvariantDocblockPropertyType>
639639
<PropertyTypeCoercion occurrences="1"/>
640640
</file>
641641
<file src="src/Contexts/ContextMariaDb100100.php">
642642
<NonInvariantDocblockPropertyType occurrences="1">
643-
<code>$KEYWORDS</code>
643+
<code>$keywords</code>
644644
</NonInvariantDocblockPropertyType>
645645
<PropertyTypeCoercion occurrences="1"/>
646646
</file>
647647
<file src="src/Contexts/ContextMariaDb100200.php">
648648
<NonInvariantDocblockPropertyType occurrences="1">
649-
<code>$KEYWORDS</code>
649+
<code>$keywords</code>
650650
</NonInvariantDocblockPropertyType>
651651
<PropertyTypeCoercion occurrences="1"/>
652652
</file>
653653
<file src="src/Contexts/ContextMariaDb100300.php">
654654
<NonInvariantDocblockPropertyType occurrences="1">
655-
<code>$KEYWORDS</code>
655+
<code>$keywords</code>
656656
</NonInvariantDocblockPropertyType>
657657
<PropertyTypeCoercion occurrences="1"/>
658658
</file>
659659
<file src="src/Contexts/ContextMariaDb100400.php">
660660
<NonInvariantDocblockPropertyType occurrences="1">
661-
<code>$KEYWORDS</code>
661+
<code>$keywords</code>
662662
</NonInvariantDocblockPropertyType>
663663
<PropertyTypeCoercion occurrences="1"/>
664664
</file>
665665
<file src="src/Contexts/ContextMariaDb100500.php">
666666
<NonInvariantDocblockPropertyType occurrences="1">
667-
<code>$KEYWORDS</code>
667+
<code>$keywords</code>
668668
</NonInvariantDocblockPropertyType>
669669
<PropertyTypeCoercion occurrences="1"/>
670670
</file>
671671
<file src="src/Contexts/ContextMariaDb100600.php">
672672
<NonInvariantDocblockPropertyType occurrences="1">
673-
<code>$KEYWORDS</code>
673+
<code>$keywords</code>
674674
</NonInvariantDocblockPropertyType>
675675
<PropertyTypeCoercion occurrences="1"/>
676676
</file>
677677
<file src="src/Contexts/ContextMySql50000.php">
678678
<NonInvariantDocblockPropertyType occurrences="1">
679-
<code>$KEYWORDS</code>
679+
<code>$keywords</code>
680680
</NonInvariantDocblockPropertyType>
681681
<PropertyTypeCoercion occurrences="1"/>
682682
</file>
683683
<file src="src/Contexts/ContextMySql50100.php">
684684
<NonInvariantDocblockPropertyType occurrences="1">
685-
<code>$KEYWORDS</code>
685+
<code>$keywords</code>
686686
</NonInvariantDocblockPropertyType>
687687
<PropertyTypeCoercion occurrences="1"/>
688688
</file>
689689
<file src="src/Contexts/ContextMySql50500.php">
690690
<NonInvariantDocblockPropertyType occurrences="1">
691-
<code>$KEYWORDS</code>
691+
<code>$keywords</code>
692692
</NonInvariantDocblockPropertyType>
693693
<PropertyTypeCoercion occurrences="1"/>
694694
</file>
695695
<file src="src/Contexts/ContextMySql50600.php">
696696
<NonInvariantDocblockPropertyType occurrences="1">
697-
<code>$KEYWORDS</code>
697+
<code>$keywords</code>
698698
</NonInvariantDocblockPropertyType>
699699
<PropertyTypeCoercion occurrences="1"/>
700700
</file>
701701
<file src="src/Contexts/ContextMySql50700.php">
702702
<NonInvariantDocblockPropertyType occurrences="1">
703-
<code>$KEYWORDS</code>
703+
<code>$keywords</code>
704704
</NonInvariantDocblockPropertyType>
705705
<PropertyTypeCoercion occurrences="1"/>
706706
</file>
707707
<file src="src/Contexts/ContextMySql80000.php">
708708
<NonInvariantDocblockPropertyType occurrences="1">
709-
<code>$KEYWORDS</code>
709+
<code>$keywords</code>
710710
</NonInvariantDocblockPropertyType>
711711
<PropertyTypeCoercion occurrences="1"/>
712712
</file>
@@ -875,10 +875,10 @@
875875
<code>new $class($this, $this-&gt;list)</code>
876876
</InvalidStringClass>
877877
<MixedArrayOffset occurrences="1">
878-
<code>static::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
878+
<code>static::$statementParsers[$token-&gt;keyword]</code>
879879
</MixedArrayOffset>
880880
<MixedArrayTypeCoercion occurrences="1">
881-
<code>static::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
881+
<code>static::$statementParsers[$token-&gt;keyword]</code>
882882
</MixedArrayTypeCoercion>
883883
<ParamNameMismatch occurrences="1">
884884
<code>$msg</code>
@@ -932,25 +932,25 @@
932932
<MixedArrayAccess occurrences="7">
933933
<code>$clause[0]</code>
934934
<code>$clause[1]</code>
935-
<code>Parser::$KEYWORD_PARSERS[$name]['class']</code>
936-
<code>Parser::$KEYWORD_PARSERS[$name]['field']</code>
937-
<code>Parser::$KEYWORD_PARSERS[$tokenValue]['class']</code>
938-
<code>Parser::$KEYWORD_PARSERS[$tokenValue]['field']</code>
939-
<code>Parser::$KEYWORD_PARSERS[$tokenValue]['options']</code>
935+
<code>Parser::$keywordParsers[$name]['class']</code>
936+
<code>Parser::$keywordParsers[$name]['field']</code>
937+
<code>Parser::$keywordParsers[$tokenValue]['class']</code>
938+
<code>Parser::$keywordParsers[$tokenValue]['field']</code>
939+
<code>Parser::$keywordParsers[$tokenValue]['options']</code>
940940
</MixedArrayAccess>
941941
<MixedArrayOffset occurrences="8">
942942
<code>$parsedClauses[$token-&gt;value]</code>
943943
<code>$parsedClauses[$token-&gt;value]</code>
944-
<code>Parser::$KEYWORD_PARSERS[$token-&gt;value]</code>
945-
<code>Parser::$KEYWORD_PARSERS[$tokenValue]</code>
946-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
947-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;value]</code>
948-
<code>static::$CLAUSES[$token-&gt;value]</code>
949-
<code>static::$OPTIONS[$token-&gt;value]</code>
944+
<code>Parser::$keywordParsers[$token-&gt;value]</code>
945+
<code>Parser::$keywordParsers[$tokenValue]</code>
946+
<code>Parser::$statementParsers[$token-&gt;keyword]</code>
947+
<code>Parser::$statementParsers[$token-&gt;value]</code>
948+
<code>static::$clauses[$token-&gt;value]</code>
949+
<code>static::$statementOptions[$token-&gt;value]</code>
950950
</MixedArrayOffset>
951951
<MixedArrayTypeCoercion occurrences="2">
952-
<code>Parser::$KEYWORD_PARSERS[$tokenValue]</code>
953-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
952+
<code>Parser::$keywordParsers[$tokenValue]</code>
953+
<code>Parser::$statementParsers[$token-&gt;keyword]</code>
954954
</MixedArrayTypeCoercion>
955955
<MixedAssignment occurrences="5">
956956
<code>$class</code>
@@ -1100,9 +1100,9 @@
11001100
<code>ArrayObj::parse($parser, $list)</code>
11011101
</PossiblyInvalidPropertyAssignmentValue>
11021102
<PossiblyNullOperand occurrences="5">
1103-
<code>$this-&gt;fields_options</code>
1104-
<code>$this-&gt;file_name</code>
1105-
<code>$this-&gt;lines_rows</code>
1103+
<code>$this-&gt;fieldsOptions</code>
1104+
<code>$this-&gt;fileName</code>
1105+
<code>$this-&gt;linesRows</code>
11061106
<code>$this-&gt;options</code>
11071107
<code>$this-&gt;table</code>
11081108
</PossiblyNullOperand>
@@ -1122,12 +1122,12 @@
11221122
<code>Expression::parse($parser, $list, [])</code>
11231123
</ImplicitToStringCast>
11241124
<MixedAssignment occurrences="2">
1125-
<code>$this-&gt;end_option</code>
1126-
<code>$this-&gt;log_type</code>
1125+
<code>$this-&gt;endOption</code>
1126+
<code>$this-&gt;logType</code>
11271127
</MixedAssignment>
11281128
<PossiblyNullOperand occurrences="2">
1129-
<code>$this-&gt;end_expr</code>
1130-
<code>$this-&gt;log_type</code>
1129+
<code>$this-&gt;endExpr</code>
1130+
<code>$this-&gt;logType</code>
11311131
</PossiblyNullOperand>
11321132
</file>
11331133
<file src="src/Statements/RenameStatement.php">
@@ -1150,7 +1150,7 @@
11501150
</file>
11511151
<file src="src/Statements/SelectStatement.php">
11521152
<NonInvariantDocblockPropertyType occurrences="1">
1153-
<code>$END_OPTIONS</code>
1153+
<code>$statementEndOptions</code>
11541154
</NonInvariantDocblockPropertyType>
11551155
</file>
11561156
<file src="src/Statements/SetStatement.php">
@@ -1161,7 +1161,7 @@
11611161
<code>$options</code>
11621162
</NonInvariantDocblockPropertyType>
11631163
<PossiblyNullArgument occurrences="2">
1164-
<code>$this-&gt;end_options</code>
1164+
<code>$this-&gt;endOptions</code>
11651165
<code>$this-&gt;set</code>
11661166
</PossiblyNullArgument>
11671167
</file>
@@ -1374,22 +1374,22 @@
13741374
<code>$newFormats[$j][$name]</code>
13751375
</MixedArrayAssignment>
13761376
<MixedArrayOffset occurrences="9">
1377-
<code>JoinKeyword::$JOINS[$list-&gt;tokens[$list-&gt;idx - 2]-&gt;value]</code>
1378-
<code>JoinKeyword::$JOINS[$list-&gt;tokens[$list-&gt;idx - 4]-&gt;value]</code>
1379-
<code>JoinKeyword::$JOINS[$list-&gt;tokens[$list-&gt;idx - 6]-&gt;value]</code>
1380-
<code>JoinKeyword::$JOINS[$prev-&gt;value]</code>
1381-
<code>Parser::$KEYWORD_PARSERS[$token-&gt;keyword]</code>
1382-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
1383-
<code>self::$INLINE_CLAUSES[$lastClause]</code>
1384-
<code>self::$INLINE_CLAUSES[$lastClause]</code>
1385-
<code>self::$SHORT_CLAUSES[$lastClause]</code>
1377+
<code>JoinKeyword::$joins[$list-&gt;tokens[$list-&gt;idx - 2]-&gt;value]</code>
1378+
<code>JoinKeyword::$joins[$list-&gt;tokens[$list-&gt;idx - 4]-&gt;value]</code>
1379+
<code>JoinKeyword::$joins[$list-&gt;tokens[$list-&gt;idx - 6]-&gt;value]</code>
1380+
<code>JoinKeyword::$joins[$prev-&gt;value]</code>
1381+
<code>Parser::$keywordParsers[$token-&gt;keyword]</code>
1382+
<code>Parser::$statementParsers[$token-&gt;keyword]</code>
1383+
<code>self::$inlineClauses[$lastClause]</code>
1384+
<code>self::$inlineClauses[$lastClause]</code>
1385+
<code>self::$shortClauses[$lastClause]</code>
13861386
</MixedArrayOffset>
13871387
<MixedArrayTypeCoercion occurrences="5">
1388-
<code>Parser::$KEYWORD_PARSERS[$token-&gt;keyword]</code>
1389-
<code>Parser::$STATEMENT_PARSERS[$token-&gt;keyword]</code>
1390-
<code>self::$INLINE_CLAUSES[$lastClause]</code>
1391-
<code>self::$INLINE_CLAUSES[$lastClause]</code>
1392-
<code>self::$SHORT_CLAUSES[$lastClause]</code>
1388+
<code>Parser::$keywordParsers[$token-&gt;keyword]</code>
1389+
<code>Parser::$statementParsers[$token-&gt;keyword]</code>
1390+
<code>self::$inlineClauses[$lastClause]</code>
1391+
<code>self::$inlineClauses[$lastClause]</code>
1392+
<code>self::$shortClauses[$lastClause]</code>
13931393
</MixedArrayTypeCoercion>
13941394
<MixedAssignment occurrences="22">
13951395
<code>$blocksIndentation[]</code>

0 commit comments

Comments
 (0)