Skip to content

Commit b815a31

Browse files
vardumpervardumper
committed
chore: attended phpstan errors, deprectaed older enums
1 parent aadc887 commit b815a31

178 files changed

Lines changed: 303 additions & 410 deletions

File tree

Some content is hidden

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

‎clover.xml‎

Lines changed: 33 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage generated="1767138812">
3-
<project timestamp="1767138812" name="Clover Coverage">
2+
<coverage generated="1767140032">
3+
<project timestamp="1767140032" name="Clover Coverage">
44
<package name="Html\Delegator">
55
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Delegator/HTMLDocumentDelegator.php">
66
<class name="Html\Delegator\HTMLDocumentDelegator" namespace="Html\Delegator">
@@ -787,54 +787,6 @@
787787
<line num="20" type="stmt" count="1"/>
788788
<metrics loc="23" ncloc="16" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="2" coveredelements="2"/>
789789
</file>
790-
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeButtonEnum.php">
791-
<class name="Html\Enum\TypeButtonEnum" namespace="Html\Enum">
792-
<metrics complexity="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="2" coveredelements="2"/>
793-
</class>
794-
<line num="22" type="method" name="getQualifiedName" visibility="public" complexity="1" crap="1" count="1"/>
795-
<line num="24" type="stmt" count="1"/>
796-
<metrics loc="27" ncloc="17" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="2" coveredelements="2"/>
797-
</file>
798-
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeInputEnum.php">
799-
<class name="Html\Enum\TypeInputEnum" namespace="Html\Enum">
800-
<metrics complexity="2" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
801-
</class>
802-
<line num="42" type="method" name="getQualifiedName" visibility="public" complexity="1" crap="1" count="1"/>
803-
<line num="44" type="stmt" count="1"/>
804-
<line num="47" type="method" name="getDefault" visibility="public" complexity="1" crap="1" count="1"/>
805-
<line num="49" type="stmt" count="1"/>
806-
<metrics loc="52" ncloc="40" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
807-
</file>
808-
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeOlEnum.php">
809-
<class name="Html\Enum\TypeOlEnum" namespace="Html\Enum">
810-
<metrics complexity="2" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
811-
</class>
812-
<line num="25" type="method" name="getQualifiedName" visibility="public" complexity="1" crap="1" count="1"/>
813-
<line num="27" type="stmt" count="1"/>
814-
<line num="30" type="method" name="getDefault" visibility="public" complexity="1" crap="1" count="1"/>
815-
<line num="32" type="stmt" count="1"/>
816-
<metrics loc="35" ncloc="23" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
817-
</file>
818-
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeScriptEnum.php">
819-
<class name="Html\Enum\TypeScriptEnum" namespace="Html\Enum">
820-
<metrics complexity="2" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
821-
</class>
822-
<line num="22" type="method" name="getQualifiedName" visibility="public" complexity="1" crap="1" count="1"/>
823-
<line num="24" type="stmt" count="1"/>
824-
<line num="27" type="method" name="getDefault" visibility="public" complexity="1" crap="1" count="1"/>
825-
<line num="29" type="stmt" count="1"/>
826-
<metrics loc="32" ncloc="20" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
827-
</file>
828-
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeStyleEnum.php">
829-
<class name="Html\Enum\TypeStyleEnum" namespace="Html\Enum">
830-
<metrics complexity="2" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
831-
</class>
832-
<line num="21" type="method" name="getQualifiedName" visibility="public" complexity="1" crap="1" count="1"/>
833-
<line num="23" type="stmt" count="1"/>
834-
<line num="26" type="method" name="getDefault" visibility="public" complexity="1" crap="1" count="1"/>
835-
<line num="28" type="stmt" count="1"/>
836-
<metrics loc="31" ncloc="19" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
837-
</file>
838790
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/ValignEnum.php">
839791
<class name="Html\Enum\ValignEnum" namespace="Html\Enum">
840792
<metrics complexity="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="1" coveredstatements="1" elements="2" coveredelements="2"/>
@@ -854,6 +806,31 @@
854806
<metrics loc="33" ncloc="19" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
855807
</file>
856808
</package>
809+
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeButtonEnum.php">
810+
<line num="17" type="stmt" count="1"/>
811+
<line num="18" type="stmt" count="1"/>
812+
<metrics loc="20" ncloc="11" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="2" coveredelements="2"/>
813+
</file>
814+
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeInputEnum.php">
815+
<line num="14" type="stmt" count="1"/>
816+
<line num="15" type="stmt" count="1"/>
817+
<metrics loc="17" ncloc="11" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="2" coveredelements="2"/>
818+
</file>
819+
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeOlEnum.php">
820+
<line num="14" type="stmt" count="1"/>
821+
<line num="15" type="stmt" count="1"/>
822+
<metrics loc="17" ncloc="11" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="2" coveredelements="2"/>
823+
</file>
824+
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeScriptEnum.php">
825+
<line num="14" type="stmt" count="1"/>
826+
<line num="15" type="stmt" count="1"/>
827+
<metrics loc="17" ncloc="11" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="2" coveredelements="2"/>
828+
</file>
829+
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Enum/TypeStyleEnum.php">
830+
<line num="14" type="stmt" count="1"/>
831+
<line num="15" type="stmt" count="1"/>
832+
<metrics loc="17" ncloc="11" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="2" coveredelements="2"/>
833+
</file>
857834
<package name="Html\Helper">
858835
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Helper/CommentHelper.php">
859836
<class name="Html\Helper\CommentHelper" namespace="Html\Helper">
@@ -1035,7 +1012,7 @@
10351012
<metrics loc="1" ncloc="1" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
10361013
</file>
10371014
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Interface/HTMLDocumentDelegatorInterface.php">
1038-
<metrics loc="32" ncloc="29" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
1015+
<metrics loc="34" ncloc="31" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
10391016
</file>
10401017
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Interface/HTMLElementDelegatorInterface.php">
10411018
<metrics loc="55" ncloc="52" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
@@ -3787,9 +3764,9 @@
37873764
</file>
37883765
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Trait/GlobalAttribute/AutofocusTrait.php">
37893766
<class name="Html\Trait\GlobalAttribute\AutofocusTrait" namespace="Html\Trait\GlobalAttribute">
3790-
<metrics complexity="8" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="11" coveredstatements="10" elements="13" coveredelements="11"/>
3767+
<metrics complexity="7" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="11" coveredstatements="10" elements="13" coveredelements="11"/>
37913768
</class>
3792-
<line num="18" type="method" name="setAutofocus" visibility="public" complexity="7" crap="7.05" count="4"/>
3769+
<line num="18" type="method" name="setAutofocus" visibility="public" complexity="6" crap="6.04" count="4"/>
37933770
<line num="21" type="stmt" count="4"/>
37943771
<line num="22" type="stmt" count="2"/>
37953772
<line num="23" type="stmt" count="1"/>
@@ -3806,9 +3783,9 @@
38063783
</file>
38073784
<file name="/home/erik-poehler/Sites/ExtendedHTMLDocument/src/Trait/GlobalAttribute/ClassTrait.php">
38083785
<class name="Html\Trait\GlobalAttribute\ClassTrait" namespace="Html\Trait\GlobalAttribute">
3809-
<metrics complexity="10" methods="6" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="16" coveredstatements="15" elements="22" coveredelements="20"/>
3786+
<metrics complexity="9" methods="6" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="16" coveredstatements="15" elements="22" coveredelements="20"/>
38103787
</class>
3811-
<line num="15" type="method" name="setClass" visibility="public" complexity="5" crap="5" count="7"/>
3788+
<line num="15" type="method" name="setClass" visibility="public" complexity="4" crap="4" count="7"/>
38123789
<line num="18" type="stmt" count="7"/>
38133790
<line num="20" type="stmt" count="1"/>
38143791
<line num="21" type="stmt" count="1"/>
@@ -4113,6 +4090,6 @@
41134090
<metrics loc="43" ncloc="37" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="13" coveredstatements="13" elements="15" coveredelements="15"/>
41144091
</file>
41154092
</package>
4116-
<metrics files="121" loc="8923" ncloc="7054" classes="113" methods="347" coveredmethods="299" conditionals="0" coveredconditionals="0" statements="3047" coveredstatements="2801" elements="3394" coveredelements="3100"/>
4093+
<metrics files="121" loc="8836" ncloc="6992" classes="108" methods="338" coveredmethods="290" conditionals="0" coveredconditionals="0" statements="3048" coveredstatements="2802" elements="3386" coveredelements="3092"/>
41174094
</project>
41184095
</coverage>

‎src/Command/BatchGeneratorCommand.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class BatchGeneratorCommand extends Command
3030

3131
private const HTML_DEFINITION_PATH = __DIR__ . '/../Resources/specifications/html5-with-aria.yaml';
3232

33+
/** @phpstan-ignore-next-line */
3334
private ?array $data = null;
3435

3536
private SymfonyStyle $io;
@@ -74,15 +75,15 @@ public function __invoke(
7475
$templateGenerators = $this->getGenerators($generators);
7576
foreach ($templateGenerators as $name => $generatorInstance) {
7677
foreach ($elements as $className) {
77-
/** @var class-string<\Html\Interface\HTMLElementInterface> $className */
78+
/** @var class-string<\Html\Interface\HTMLElementDelegatorInterface> $className */
7879
$elementInstance = $className::create($dom);
7980
$output = $generatorInstance->render($elementInstance);
8081
if ($output === null) {
8182
$this->io->warning("Generator '{$name}' returned no output for element '{$className}'.");
8283
continue;
8384
}
8485
$elementShortName = (new ReflectionClass($className))->getShortName();
85-
$fileName = $elementInstance::QUALIFIED_NAME . '.' . $generatorInstance->getExtension();
86+
$fileName = $elementInstance::getQualifiedName() . '.' . $generatorInstance->getExtension();
8687
$level = $this->determineLevel($className);
8788

8889
// For twig-component, use bundle structure: src/{Twig|Resources}/{Block|Inline|Void}
@@ -92,12 +93,12 @@ public function __invoke(
9293
. \DIRECTORY_SEPARATOR . 'src'
9394
. \DIRECTORY_SEPARATOR . 'Resources'
9495
. \DIRECTORY_SEPARATOR . $level
95-
. \DIRECTORY_SEPARATOR . $elementInstance::QUALIFIED_NAME;
96+
. \DIRECTORY_SEPARATOR . $elementInstance::getQualifiedName();
9697
} else {
9798
$componentDir = rtrim($dest, \DIRECTORY_SEPARATOR)
9899
. \DIRECTORY_SEPARATOR . $name
99100
. \DIRECTORY_SEPARATOR . $level
100-
. \DIRECTORY_SEPARATOR . $elementInstance::QUALIFIED_NAME;
101+
. \DIRECTORY_SEPARATOR . $elementInstance::getQualifiedName();
101102
}
102103

103104
if (! is_dir($componentDir)) {
@@ -115,7 +116,7 @@ public function __invoke(
115116
// Generate PHP component class for twig-component generator
116117
if ($name === 'twig-component' && method_exists($generatorInstance, 'renderComponentClass')) {
117118
$componentClass = $generatorInstance->renderComponentClass($elementInstance);
118-
$componentName = $this->getSafeComponentClassName(ucfirst($elementInstance::QUALIFIED_NAME));
119+
$componentName = $this->getSafeComponentClassName(ucfirst($elementInstance::getQualifiedName()));
119120

120121
// PHP classes go in src/Twig/{Block|Inline|Void}
121122
$levelCap = ucfirst($level);

‎src/Command/CreateClassCommand.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,10 @@ private function getGlobalAttributes(array $allowedGlobalAttributes): string
193193
$traitNames = [];
194194
foreach ($allowedGlobalAttributes as $attribute) {
195195
$traitName = \ucwords(\str_replace(['-', '*'], '', $attribute)) . 'Trait';
196-
if ($traitName !== null) {
197-
if (! in_array("Html\Trait\GlobalAttribute", $this->uses, true)) {
198-
$this->uses[] = "Html\Trait\GlobalAttribute";
199-
}
200-
$traitNames[] = $traitName;
196+
if (! in_array("Html\Trait\GlobalAttribute", $this->uses, true)) {
197+
$this->uses[] = "Html\Trait\GlobalAttribute";
201198
}
199+
$traitNames[] = $traitName;
202200
}
203201

204202
if (empty($traitNames)) {

0 commit comments

Comments
 (0)