Skip to content

Commit

Permalink
fix: Remove enums for compatibility with PHP 8
Browse files Browse the repository at this point in the history
  • Loading branch information
jose-bittacora committed Dec 4, 2024
1 parent 1e4dc27 commit 885f619
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
15 changes: 7 additions & 8 deletions src/DiagramElement/RelationsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ public function filterRelations(array $relation_expressions): array
}

if ([] !== $fromClasses) {
$output = array_merge($output, $this->filterClasses($fromClasses, DependenciesDirection::OUT));
$output = array_merge($output, $this->filterClasses($fromClasses, 'out'));
$this->removeUnlinked = true;
}

if ([] !== $toClasses) {
$output = array_merge($output, $this->filterClasses($toClasses, DependenciesDirection::IN));
$output = array_merge($output, $this->filterClasses($toClasses, 'in'));
$this->removeUnlinked = true;
}

Expand All @@ -62,10 +62,9 @@ public function addRemoveUnlinkedDirective(array $relation_expressions): array

/**
* @param array<string> $filteredClasses
* @param DependenciesDirection $direction
* @return array<string>
*/
public function filterClasses(array $filteredClasses, DependenciesDirection $direction): array
public function filterClasses(array $filteredClasses, string $direction): array
{
$currentDepth = 0;
/** @var array<string> $matches */
Expand All @@ -74,7 +73,7 @@ public function filterClasses(array $filteredClasses, DependenciesDirection $dir
$oldMatches = $matches;
foreach ($matches as $match) {
$parts = explode(' ', trim($match));
$filteredClasses[] = $direction === DependenciesDirection::OUT ?
$filteredClasses[] = $direction === 'out' ?
end($parts) :
array_shift($parts)
;
Expand All @@ -96,12 +95,12 @@ public function filterClasses(array $filteredClasses, DependenciesDirection $dir
return $matches;
}

function getFilteringRegex(string $filteredClass, DependenciesDirection $direction): string
function getFilteringRegex(string $filteredClass, string $direction): string
{
$filteredClass = str_replace('*', '.*?', $filteredClass);
return match ($direction) {

Check failure on line 101 in src/DiagramElement/RelationsFilter.php

View workflow job for this annotation

GitHub Actions / PHP 8.0 Test

Match expression does not handle remaining value: string

Check failure on line 101 in src/DiagramElement/RelationsFilter.php

View workflow job for this annotation

GitHub Actions / PHP 8.1 Test

Match expression does not handle remaining value: string

Check failure on line 101 in src/DiagramElement/RelationsFilter.php

View workflow job for this annotation

GitHub Actions / PHP 8.2 Test

Match expression does not handle remaining value: string

Check failure on line 101 in src/DiagramElement/RelationsFilter.php

View workflow job for this annotation

GitHub Actions / PHP 8.3 Test

Match expression does not handle remaining value: string

Check failure on line 101 in src/DiagramElement/RelationsFilter.php

View workflow job for this annotation

GitHub Actions / PHP 8.4 Test

Match expression does not handle remaining value: string
DependenciesDirection::IN => "/.*?> ({$filteredClass}$|[\w_]+{$filteredClass}$)/",
DependenciesDirection::OUT => "/^({$filteredClass}|^[\w_]+{$filteredClass}) .*?>.*?/",
'in' => "/.*?> ({$filteredClass}$|[\w_]+{$filteredClass}$)/",
'out' => "/^({$filteredClass}|^[\w_]+{$filteredClass}) .*?>.*?/",
};
}
}
8 changes: 0 additions & 8 deletions src/Enums/DependenciesDirection.php

This file was deleted.

0 comments on commit 885f619

Please sign in to comment.