Skip to content

Commit 60d240c

Browse files
committed
fix: update return types and simplify conditions
1 parent a5ce1ef commit 60d240c

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/Console/Command/System/CheckCommand.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private function getMysqlVersionViaPdo(): ?string
238238
/**
239239
* Get database configuration from environment variables
240240
*
241-
* @return array
241+
* @return array<string, string>
242242
*/
243243
private function getDatabaseConfig(): array
244244
{
@@ -500,7 +500,7 @@ private function checkSearchEngineConnections(): ?string
500500
/**
501501
* Get potential search engine hosts
502502
*
503-
* @return array
503+
* @return string[]
504504
*/
505505
private function getSearchEngineHosts(): array
506506
{
@@ -531,7 +531,7 @@ private function getSearchEngineHosts(): array
531531
/**
532532
* Format search engine version output
533533
*
534-
* @param array $info
534+
* @param array<string, mixed> $info
535535
* @return string
536536
*/
537537
private function formatSearchEngineVersion(array $info): string
@@ -549,7 +549,7 @@ private function formatSearchEngineVersion(array $info): string
549549
* Test Elasticsearch connection and return version info
550550
*
551551
* @param string $url
552-
* @return array|bool
552+
* @return array<string, mixed>|false
553553
*/
554554
private function testElasticsearchConnection(string $url)
555555
{
@@ -573,7 +573,7 @@ private function testElasticsearchConnection(string $url)
573573
* Try to connect using Magento's HTTP client
574574
*
575575
* @param string $url
576-
* @return array|null
576+
* @return array<string, mixed>|null
577577
*/
578578
private function tryMagentoHttpClient(string $url): ?array
579579
{
@@ -603,7 +603,7 @@ private function tryMagentoHttpClient(string $url): ?array
603603
/**
604604
* Get important PHP extensions
605605
*
606-
* @return array
606+
* @return array<int, array<int, string>>
607607
*/
608608
private function getImportantPhpExtensions(): array
609609
{
@@ -757,8 +757,8 @@ private function getSystemEnvironmentValue(string $name): ?string
757757
{
758758
// Use ini_get for certain system variables as a safer alternative
759759
if (in_array($name, ['memory_limit', 'max_execution_time'])) {
760-
$value = ini_get($name);
761-
if ($value !== false) {
760+
$value = (string)ini_get($name);
761+
if ($value !== '') {
762762
return $value;
763763
}
764764
}

src/Console/Command/Theme/BuildCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ private function getServerVar(string $name): ?string
492492
private function setEnvVar(string $name, string $value): void
493493
{
494494
// Validate input parameters
495-
if (empty($name) || !is_string($name)) {
495+
if (empty($name) ) {
496496
return;
497497
}
498498

src/Console/Command/Theme/CleanCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ private function getServerVar(string $name): ?string
638638
*/
639639
private function setEnvVar(string $name, string $value): void
640640
{
641-
if (empty($name) || !is_string($name)) {
641+
if (empty($name) ) {
642642
return;
643643
}
644644

src/Model/TemplateEngine/Decorator/InspectorHints.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private function getParentBlockName(BlockInterface $block): string
188188
{
189189
if ($block instanceof AbstractBlock) {
190190
$parent = $block->getParentBlock();
191-
if ($parent && method_exists($parent, 'getNameInLayout')) {
191+
if ($parent instanceof AbstractBlock) {
192192
return $parent->getNameInLayout() ?: '';
193193
}
194194
}
@@ -204,7 +204,7 @@ private function getParentBlockName(BlockInterface $block): string
204204
*/
205205
private function getBlockAlias(BlockInterface $block): string
206206
{
207-
if ($block instanceof AbstractBlock && method_exists($block, 'getNameInLayout')) {
207+
if ($block instanceof AbstractBlock) {
208208
return $block->getNameInLayout() ?: '';
209209
}
210210

src/Model/TemplateEngine/Plugin/InspectorHints.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function __construct(
5959
* @param TemplateEngineFactory $subject
6060
* @param TemplateEngineInterface $invocationResult
6161
* @return TemplateEngineInterface
62-
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
62+
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
6363
*/
6464
public function afterCreate(
6565
TemplateEngineFactory $subject,

0 commit comments

Comments
 (0)