Skip to content

Commit a9d9f61

Browse files
smegheadsmeghead
committed
fix: Avoid calling the array_merge function in the loop process
1 parent 99462c7 commit a9d9f61

File tree

5 files changed

+53
-109
lines changed

5 files changed

+53
-109
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
### Bug fix
4+
5+
* Avoid calling the `array_merge` function in the loop process
6+
37
## v1.3.0 (2024-06-02)
48

59
### Features

‎src/DiagramElement/Package.php‎

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,8 @@ public function dump(int $level = 0): array
8989
$this->getLogicalName()
9090
);
9191
}
92-
foreach ($this->entries as $e) {
93-
$lines = array_merge($lines, $e->dump($level + 1));
94-
}
95-
foreach ($this->children as $n) {
96-
$lines = array_merge($lines, $n->dump($level + 1));
97-
}
92+
$lines = array_merge($lines, ...array_map(fn($e) => $e->dump($level + 1), $this->entries));
93+
$lines = array_merge($lines, ...array_map(fn($n) => $n->dump($level + 1), $this->children));
9894
if ($this->name !== 'ROOT') {
9995
$lines[] = sprintf('%s}', $indent);
10096
}
@@ -124,9 +120,7 @@ public function dumpPackages(int $level = 1): array
124120
end($targetElements)
125121
);
126122
}
127-
foreach ($this->children as $n) {
128-
$lines = array_merge($lines, $n->dumpPackages($level + 1));
129-
}
123+
$lines = array_merge($lines, ...array_map(fn($n) => $n->dumpPackages($level + 1), $this->children));
130124
$lines[] = sprintf('%s}', $indent);
131125
return $lines;
132126
}
@@ -137,15 +131,9 @@ public function dumpPackages(int $level = 1): array
137131
public function getArrows(): array
138132
{
139133
$arrows = [];
140-
foreach ($this->entries as $e) {
141-
$arrows = array_merge($arrows, $e->getArrows());
142-
}
143-
foreach ($this->children as $n) {
144-
$arrows = array_merge($arrows, $n->getArrows());
145-
}
146-
foreach ($this->entries as $n) {
147-
$arrows = array_merge($arrows, $n->getUsingArrows());
148-
}
134+
$arrows = array_merge($arrows, ...array_map(fn($e) => $e->getArrows(), $this->entries));
135+
$arrows = array_merge($arrows, ...array_map(fn($n) => $n->getArrows(), $this->children));
136+
$arrows = array_merge($arrows, ...array_map(fn($n) => $n->getUsingArrows(), $this->entries));
149137

150138
return $arrows;
151139
}
@@ -156,9 +144,7 @@ public function getArrows(): array
156144
public function getEntries(): array
157145
{
158146
$entries = $this->entries;
159-
foreach ($this->children as $n) {
160-
$entries = array_merge($entries, $n->getEntries());
161-
}
147+
$entries = array_merge($entries, ...array_map(fn($n) => $n->getEntries(), $this->children));
162148
return $entries;
163149
}
164150

@@ -169,14 +155,10 @@ public function getEntries(): array
169155
public function getUses(array $acc): array
170156
{
171157
$uses = [];
172-
foreach ($this->entries as $e) {
173-
$uses = array_merge($uses, $e->getClass()->getUses());
174-
}
158+
$uses = array_merge($uses, ...array_map(fn($e) => $e->getClass()->getUses(), $this->entries));
175159
$package = empty($this->package) ? sprintf('%s.%s', implode('.', $this->parents), $this->name) : $this->package;
176160
$acc[$package] = $uses;
177-
foreach ($this->children as $n) {
178-
$acc = array_merge($acc, $n->getUses($acc));
179-
}
161+
$acc = array_merge($acc, ...array_map(fn($n) => $n->getUses($acc), $this->children));
180162
return $acc;
181163
}
182164

@@ -239,12 +221,8 @@ public function dumpDivisions(int $level = 0): array
239221
$this->getLogicalName()
240222
);
241223
}
242-
foreach ($this->entries as $e) {
243-
$lines = array_merge($lines, $e->dumpDivisions($level + 1));
244-
}
245-
foreach ($this->children as $n) {
246-
$lines = array_merge($lines, $n->dumpDivisions($level + 1));
247-
}
224+
$lines = array_merge($lines, ...array_map(fn($e) => $e->dumpDivisions($level + 1), $this->entries));
225+
$lines = array_merge($lines, ...array_map(fn($n) => $n->dumpDivisions($level + 1), $this->children));
248226
if ($this->name !== 'ROOT') {
249227
$lines[] = sprintf('%s}', $indent);
250228
}

‎test/PackageSvgLinkTest.php‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@ public function testDump_SvgLink_Classes(): void
3737
foreach ($files as $f) {
3838
$filename = sprintf('%s/namespace/%s', $this->fixtureDir, $f);
3939
$classes = PhpReader::parseFile($directory, $filename, $options);
40-
foreach ($classes as $c) {
41-
$entries = array_merge($entries, [new Entry('product', $c->getInfo(), $options)]);
42-
}
40+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
4341
}
44-
$rel = new Relation($entries, $options);
42+
$rel = new Relation(array_merge(...$entries), $options);
4543

4644
$expected = <<<EOS
4745
@startuml class-diagram
@@ -75,11 +73,9 @@ public function testDump_SvgLink_Interfaces(): void
7573
foreach ($files as $f) {
7674
$filename = sprintf('%s/%s', $directory, $f);
7775
$classes = PhpReader::parseFile($directory, $filename, $options);
78-
foreach ($classes as $c) {
79-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
80-
}
76+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
8177
}
82-
$rel = new Relation($entries, $options);
78+
$rel = new Relation(array_merge(...$entries), $options);
8379
$expected = <<<EOS
8480
@startuml class-diagram
8581
skinparam svgLinkTarget _blank
@@ -110,11 +106,9 @@ public function testDump_SvgLink_ClassesWithoutNamespace(): void
110106
foreach ($files as $f) {
111107
$filename = sprintf('%s/%s', $directory, $f);
112108
$classes = PhpReader::parseFile($directory, $filename, $options);
113-
foreach ($classes as $c) {
114-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
115-
}
109+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
116110
}
117-
$rel = new Relation($entries, $options);
111+
$rel = new Relation(array_merge(...$entries), $options);
118112

119113
$expected = <<<EOS
120114
@startuml class-diagram

‎test/PackageTest.php‎

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ public function testInitialize(): void
3737
foreach ($files as $f) {
3838
$filename = sprintf('%s/%s', $directory, $f);
3939
$classes = PhpReader::parseFile($directory, $filename, $options);
40-
foreach ($classes as $c) {
41-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
42-
}
40+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
4341
}
4442

45-
$rel = new Relation($entries, $options);
43+
$rel = new Relation(array_merge(...$entries), $options);
4644
$namespace = $rel->getPackage();
4745

4846
$this->assertInstanceOf(Package::class, $namespace, 'namespace instance');
@@ -72,11 +70,9 @@ public function testDump(): void
7270
foreach ($files as $f) {
7371
$filename = sprintf('%s/namespace/%s', $this->fixtureDir, $f);
7472
$classes = PhpReader::parseFile($directory, $filename, $options);
75-
foreach ($classes as $c) {
76-
$entries = array_merge($entries, [new Entry('product', $c->getInfo(), $options)]);
77-
}
73+
$entries[] = array_map(fn($c) => new Entry('product', $c->getInfo(), $options), $classes);
7874
}
79-
$rel = new Relation($entries, $options);
75+
$rel = new Relation(array_merge(...$entries), $options);
8076

8177
$expected = <<<EOS
8278
@startuml class-diagram
@@ -109,11 +105,9 @@ public function testDump2(): void
109105
foreach ($files as $f) {
110106
$filename = sprintf('%s/%s', $directory, $f);
111107
$classes = PhpReader::parseFile($directory, $filename, $options);
112-
foreach ($classes as $c) {
113-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
114-
}
108+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
115109
}
116-
$rel = new Relation($entries, $options);
110+
$rel = new Relation(array_merge(...$entries), $options);
117111
$expected = <<<EOS
118112
@startuml class-diagram
119113
package product as product {
@@ -144,11 +138,9 @@ public function testDump3(): void
144138
foreach ($files as $f) {
145139
$filename = sprintf('%s/%s', $directory, $f);
146140
$classes = PhpReader::parseFile($directory, $filename, $options);
147-
foreach ($classes as $c) {
148-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
149-
}
141+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
150142
}
151-
$rel = new Relation($entries, $options);
143+
$rel = new Relation(array_merge(...$entries), $options);
152144
$expected = <<<EOS
153145
@startuml class-diagram
154146
package product as product {
@@ -173,11 +165,9 @@ public function testDump4(): void
173165
foreach ($files as $f) {
174166
$filename = sprintf('%s/%s', $directory, $f);
175167
$classes = PhpReader::parseFile($directory, $filename, $options);
176-
foreach ($classes as $c) {
177-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
178-
}
168+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
179169
}
180-
$rel = new Relation($entries, $options);
170+
$rel = new Relation(array_merge(...$entries), $options);
181171
$expected = <<<EOS
182172
@startuml class-diagram
183173
package product as product {
@@ -203,11 +193,9 @@ public function testDump5(): void
203193
foreach ($files as $f) {
204194
$filename = sprintf('%s/%s', $directory, $f);
205195
$classes = PhpReader::parseFile($directory, $filename, $options);
206-
foreach ($classes as $c) {
207-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
208-
}
196+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
209197
}
210-
$rel = new Relation($entries, $options);
198+
$rel = new Relation(array_merge(...$entries), $options);
211199
$expected = <<<EOS
212200
@startuml class-diagram
213201
package product as product {
@@ -234,11 +222,9 @@ public function testDump6(): void
234222
foreach ($files as $f) {
235223
$filename = sprintf('%s/%s', $directory, $f);
236224
$classes = PhpReader::parseFile($directory, $filename, $options);
237-
foreach ($classes as $c) {
238-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
239-
}
225+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
240226
}
241-
$rel = new Relation($entries, $options);
227+
$rel = new Relation(array_merge(...$entries), $options);
242228
$expected = <<<EOS
243229
@startuml class-diagram
244230
package product as product {
@@ -270,11 +256,9 @@ public function testDump7(): void
270256
foreach ($files as $f) {
271257
$filename = sprintf('%s/%s', $directory, $f);
272258
$classes = PhpReader::parseFile($directory, $filename, $options);
273-
foreach ($classes as $c) {
274-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
275-
}
259+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
276260
}
277-
$rel = new Relation($entries, $options);
261+
$rel = new Relation(array_merge(...$entries), $options);
278262

279263
$expected = <<<EOS
280264
@startuml class-diagram
@@ -306,11 +290,9 @@ public function testDumpPackage1(): void
306290
foreach ($files as $f) {
307291
$filename = sprintf('%s/%s', $directory, $f);
308292
$classes = PhpReader::parseFile($directory, $filename, $options);
309-
foreach ($classes as $c) {
310-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
311-
}
293+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
312294
}
313-
$rel = new Relation($entries, $options);
295+
$rel = new Relation(array_merge(...$entries), $options);
314296

315297
$expected = <<<EOS
316298
@startuml package-related-diagram
@@ -340,11 +322,9 @@ public function testDumpPackage_bothSideArrows(): void
340322
foreach ($files as $f) {
341323
$filename = sprintf('%s/%s', $directory, $f);
342324
$classes = PhpReader::parseFile($directory, $filename, $options);
343-
foreach ($classes as $c) {
344-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
345-
}
325+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
346326
}
347-
$rel = new Relation($entries, $options);
327+
$rel = new Relation(array_merge(...$entries), $options);
348328
$expected = <<<EOS
349329
@startuml package-related-diagram
350330
package hoge.fuga as fuga {

‎test/RelationTest.php‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ public function testInitialize(): void
3232
foreach ($files as $f) {
3333
$filename = sprintf('%s/%s', $directory, $f);
3434
$classes = PhpReader::parseFile($directory, $filename, $options);
35-
foreach ($classes as $c) {
36-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
37-
}
35+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
3836
}
39-
$rel = new Relation($entries, $options);
37+
$rel = new Relation(array_merge(...$entries), $options);
4038

4139
$this->assertNotNull($rel, 'initialize Relation');
4240
}
@@ -54,11 +52,9 @@ public function testGetRelations1(): void
5452
foreach ($files as $f) {
5553
$filename = sprintf('%s/%s', $directory, $f);
5654
$classes = PhpReader::parseFile($directory, $filename, $options);
57-
foreach ($classes as $c) {
58-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
59-
}
55+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
6056
}
61-
$rel = new Relation($entries, $options);
57+
$rel = new Relation(array_merge(...$entries), $options);
6258
$relations = $rel->getRelations();
6359

6460
$this->assertSame(3, count($relations), 'count');
@@ -78,11 +74,9 @@ public function testGetRelations_in_code_dependency(): void
7874
foreach ($files as $f) {
7975
$filename = sprintf('%s/%s', $directory, $f);
8076
$classes = PhpReader::parseFile($directory, $filename, $options);
81-
foreach ($classes as $c) {
82-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
83-
}
77+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
8478
}
85-
$rel = new Relation($entries, $options);
79+
$rel = new Relation(array_merge(...$entries), $options);
8680
$relations = $rel->getRelations();
8781

8882
$this->assertSame(2, count($relations), 'count');
@@ -103,11 +97,9 @@ public function testGetRelations2(): void
10397
foreach ($files as $f) {
10498
$filename = sprintf('%s/%s', $directory, $f);
10599
$classes = PhpReader::parseFile($directory, $filename, $options);
106-
foreach ($classes as $c) {
107-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
108-
}
100+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
109101
}
110-
$rel = new Relation($entries, $options);
102+
$rel = new Relation(array_merge(...$entries), $options);
111103
$relations = $rel->getRelations();
112104

113105
$this->assertSame(3, count($relations), 'count');
@@ -128,11 +120,9 @@ public function testGetRelations_array_expression_in_doc(): void
128120
foreach ($files as $f) {
129121
$filename = sprintf('%s/%s', $directory, $f);
130122
$classes = PhpReader::parseFile($directory, $filename, $options);
131-
foreach ($classes as $c) {
132-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
133-
}
123+
$entries[] = array_map(fn ($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
134124
}
135-
$rel = new Relation($entries, $options);
125+
$rel = new Relation(array_merge(...$entries), $options);
136126
$relations = $rel->getRelations();
137127

138128
$this->assertSame(2, count($relations), 'count');
@@ -152,11 +142,9 @@ public function testGetRelations_extends1(): void
152142
foreach ($files as $f) {
153143
$filename = sprintf('%s/%s', $directory, $f);
154144
$classes = PhpReader::parseFile($directory, $filename, $options);
155-
foreach ($classes as $c) {
156-
$entries = array_merge($entries, [new Entry(dirname($f), $c->getInfo(), $options)]);
157-
}
145+
$entries[] = array_map(fn($c) => new Entry(dirname($f), $c->getInfo(), $options), $classes);
158146
}
159-
$rel = new Relation($entries, $options);
147+
$rel = new Relation(array_merge(...$entries), $options);
160148
$relations = $rel->getRelations();
161149

162150
$this->assertSame(1, count($relations), 'count');

0 commit comments

Comments
 (0)