|
75 | 75 | continue; |
76 | 76 | } |
77 | 77 | if (in_array($outerLayerOfDependency, array_keys($layersTrack), true)) { |
78 | | - $innerDependenciesTrack[$j][$subLayer->selector->getName()] = $name; |
| 78 | + $innerDependenciesTrack[$j][$subLayer->selector->getName()] = $dependency->getName(); |
79 | 79 | continue; |
80 | 80 | } |
81 | 81 | $dependenciesTrack[$name] = $k; |
| 82 | + $trackedRelations[$j][] = $k; |
| 83 | + $k++; |
82 | 84 | continue; |
83 | 85 | } |
84 | 86 | if (!array_key_exists($name, $dependenciesTrack)) { |
|
97 | 99 | $content .= "}\n\n"; // End the main layer block |
98 | 100 | } |
99 | 101 |
|
| 102 | +$depricatedComponentIds = []; |
100 | 103 | if (array_key_exists('deprecated', $architectureDefinition)) { |
101 | 104 | foreach ($architectureDefinition['deprecated'] as $layerData) { |
102 | 105 | $layer = Layer::fromArray($layerData); |
|
107 | 110 | $nameSpaces = explode('\\', $name); |
108 | 111 | $className = $nameSpaces[count($nameSpaces) - 1]; |
109 | 112 | $content .= " Component(\"e$number\", \"Deprecated $className\", \"$name\")\n"; |
| 113 | + $depricatedComponentIds[] = $number; |
110 | 114 | } else { |
111 | 115 | if (str_starts_with($name, 'App')) { |
112 | 116 | continue; |
|
147 | 151 | foreach($connections as $sourceComponent => $dependency) { |
148 | 152 | $nameSpaces = explode('\\', $dependency); |
149 | 153 | foreach ($componentsTrack as $component => $externalNumber) { |
150 | | - if (count($nameSpaces) < 3) { |
151 | | - if ($component === $dependency) { |
| 154 | + if (count($nameSpaces) < 3 || count_chars($nameSpaces[2]) < 2) { |
| 155 | + $componentOuterLayer = 'App\\' . explode('\\', $component)[1]; |
| 156 | + if ($componentOuterLayer === $dependency) { |
152 | 157 | $trackedInnerRelations[$componentNumber][] = $externalNumber; |
153 | 158 | } |
154 | 159 | continue; |
|
165 | 170 |
|
166 | 171 | foreach($trackedRelations as $number => $externalNumbers) { |
167 | 172 | foreach(array_unique($externalNumbers) as $externalNumber) { |
168 | | - if (!in_array($externalNumber, $externalComponentsTrack, true)) { |
| 173 | + if (!in_array($externalNumber, $externalComponentsTrack, true) && |
| 174 | + !in_array($externalNumber, $depricatedComponentIds, true)) { |
169 | 175 | var_dump("Missing external Component nr $externalNumber"); |
170 | 176 | continue; |
171 | 177 | } |
172 | 178 | $relations .= "Rel(c$number, e$externalNumber, \"Can depend on\", \"DI\")\n"; |
173 | | - $relations .= "UpdateRelStyle(c$number, e$externalNumber, \$textColor=\"red\", \$offsetY=\"-40\")\n"; |
| 179 | + if (in_array($externalNumber, $depricatedComponentIds, true)) { |
| 180 | + $relations .= "UpdateRelStyle(c$number, e$externalNumber, \$textColor=\"red\", \$offsetY=\"-40\")\n"; |
| 181 | + } |
174 | 182 | } |
175 | 183 | } |
176 | 184 |
|
|
0 commit comments