Skip to content

Commit 160279f

Browse files
BaptouuuuBaptouuuu
authored
Merge pull request #17 from Innmind/cs
Code style
2 parents 4dac69a + c41a8fb commit 160279f

18 files changed

Lines changed: 79 additions & 140 deletions

File tree

‎src/EnvironmentPath.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
*/
99
final class EnvironmentPath
1010
{
11-
private string $value;
12-
13-
private function __construct(string $value)
14-
{
15-
$this->value = $value;
11+
private function __construct(
12+
private string $value,
13+
) {
1614
}
1715

1816
/**

‎src/Facade/Cpu/LinuxFacade.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@
2525
*/
2626
final class LinuxFacade
2727
{
28-
private Processes $processes;
29-
30-
public function __construct(Processes $processes)
31-
{
32-
$this->processes = $processes;
28+
public function __construct(
29+
private Processes $processes,
30+
) {
3331
}
3432

3533
/**

‎src/Facade/Cpu/OSXFacade.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@
2525
*/
2626
final class OSXFacade
2727
{
28-
private Processes $processes;
29-
30-
public function __construct(Processes $processes)
31-
{
32-
$this->processes = $processes;
28+
public function __construct(
29+
private Processes $processes,
30+
) {
3331
}
3432

3533
/**

‎src/Facade/Memory/LinuxFacade.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ final class LinuxFacade
3232
'SwapCached' => 'swap',
3333
];
3434

35-
private Processes $processes;
36-
37-
public function __construct(Processes $processes)
38-
{
39-
$this->processes = $processes;
35+
public function __construct(
36+
private Processes $processes,
37+
) {
4038
}
4139

4240
/**

‎src/Facade/Memory/OSXFacade.php‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@
2424
*/
2525
final class OSXFacade
2626
{
27-
private Processes $processes;
28-
private EnvironmentPath $path;
29-
30-
public function __construct(Processes $processes, EnvironmentPath $path)
31-
{
32-
$this->processes = $processes;
33-
$this->path = $path;
27+
public function __construct(
28+
private Processes $processes,
29+
private EnvironmentPath $path,
30+
) {
3431
}
3532

3633
/**

src/Server/Disk/LoggerDisk.php renamed to src/Server/Disk/Logger.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313
};
1414
use Psr\Log\LoggerInterface;
1515

16-
final class LoggerDisk implements Disk
16+
final class Logger implements Disk
1717
{
18-
private Disk $disk;
19-
private LoggerInterface $logger;
20-
21-
private function __construct(Disk $disk, LoggerInterface $logger)
22-
{
23-
$this->disk = $disk;
24-
$this->logger = $logger;
18+
private function __construct(
19+
private Disk $disk,
20+
private LoggerInterface $logger,
21+
) {
2522
}
2623

2724
/**

src/Server/Disk/UnixDisk.php renamed to src/Server/Disk/Unix.php

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
Monoid\Concat,
2424
};
2525

26-
final class UnixDisk implements Disk
26+
final class Unix implements Disk
2727
{
2828
private static array $columns = [
2929
'Size' => 'size',
@@ -34,11 +34,9 @@ final class UnixDisk implements Disk
3434
'Mounted' => 'mountPoint',
3535
];
3636

37-
private Processes $processes;
38-
39-
private function __construct(Processes $processes)
40-
{
41-
$this->processes = $processes;
37+
private function __construct(
38+
private Processes $processes,
39+
) {
4240
}
4341

4442
/**
@@ -68,10 +66,9 @@ public function volumes(): Set
6866
->fold(new Concat),
6967
)
7068
->map($this->parse(...))
71-
->match(
72-
static fn($volumes) => $volumes,
73-
static fn() => Set::of(),
74-
);
69+
->toSequence()
70+
->toSet()
71+
->flatMap(static fn($volumes) => $volumes);
7572
}
7673

7774
#[\Override]

‎src/Server/Memory/Bytes.php‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Innmind\Server\Status\Server\Memory;
55

6+
use Innmind\IO\Stream\Size;
67
use Innmind\Validation\Is;
78
use Innmind\Immutable\{
89
Str,
@@ -50,29 +51,7 @@ public function toInt(): int
5051

5152
public function toString(): string
5253
{
53-
return match (true) {
54-
$this->value < self::BYTES => $this->value.'B',
55-
$this->value < self::KILOBYTES => \sprintf(
56-
'%sKB',
57-
\round($this->value/self::BYTES, 3),
58-
),
59-
$this->value < self::MEGABYTES => \sprintf(
60-
'%sMB',
61-
\round($this->value/self::KILOBYTES, 3),
62-
),
63-
$this->value < self::GIGABYTES => \sprintf(
64-
'%sGB',
65-
\round($this->value/self::MEGABYTES, 3),
66-
),
67-
$this->value < self::TERABYTES => \sprintf(
68-
'%sTB',
69-
\round($this->value/self::GIGABYTES, 3),
70-
),
71-
$this->value < self::PETABYTES => \sprintf(
72-
'%sPB',
73-
\round($this->value/self::TERABYTES, 3),
74-
),
75-
};
54+
return Size::of($this->value)->toString();
7655
}
7756

7857
/**

src/Server/Processes/LoggerProcesses.php renamed to src/Server/Processes/Logger.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
};
1616
use Psr\Log\LoggerInterface;
1717

18-
final class LoggerProcesses implements Processes
18+
final class Logger implements Processes
1919
{
20-
private Processes $processes;
21-
private LoggerInterface $logger;
22-
23-
private function __construct(Processes $processes, LoggerInterface $logger)
24-
{
25-
$this->processes = $processes;
26-
$this->logger = $logger;
20+
private function __construct(
21+
private Processes $processes,
22+
private LoggerInterface $logger,
23+
) {
2724
}
2825

2926
/**

src/Server/Processes/UnixProcesses.php renamed to src/Server/Processes/Unix.php

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,12 @@
2626
Monoid\Concat,
2727
};
2828

29-
final class UnixProcesses implements Processes
29+
final class Unix implements Processes
3030
{
31-
private Clock $clock;
32-
private Control\Processes $processes;
33-
34-
private function __construct(Clock $clock, Control\Processes $processes)
35-
{
36-
$this->clock = $clock;
37-
$this->processes = $processes;
31+
private function __construct(
32+
private Clock $clock,
33+
private Control\Processes $processes,
34+
) {
3835
}
3936

4037
/**
@@ -54,10 +51,9 @@ public function all(): Set
5451
->withShortOption('eo', $this->format()),
5552
)
5653
->map($this->parse(...))
57-
->match(
58-
static fn($processes) => $processes,
59-
static fn() => Set::of(),
60-
);
54+
->toSequence()
55+
->toSet()
56+
->flatMap(static fn($processes) => $processes);
6157
}
6258

6359
#[\Override]
@@ -140,26 +136,17 @@ private function parse(Str $output): Set
140136
->get(4)
141137
->keep(Is::string()->nonEmpty()->asPredicate())
142138
->map(Command::of(...));
139+
$start = Maybe::just(
140+
$this->clock->at($start, Format::of('D M j H:i:s Y')),
141+
);
143142

144-
return Maybe::all($user, $pid, $percentage, $memory, $command)
145-
->map(fn(User $user, Pid $pid, Percentage $percentage, Memory $memory, Command $command) => Process::of(
146-
$pid,
147-
$user,
148-
$percentage,
149-
$memory,
150-
$this->clock->at($start, Format::of('D M j H:i:s Y')),
151-
$command,
152-
));
143+
return Maybe::all($pid, $user, $percentage, $memory, $start, $command)
144+
->map(Process::of(...));
153145
});
154146

155-
/** @var Set<Process> */
156-
return $processes->reduce(
157-
Set::of(),
158-
static fn(Set $processes, Maybe $process): Set => $process->match(
159-
static fn(Process $process) => ($processes)($process),
160-
static fn() => $processes,
161-
),
162-
);
147+
return $processes
148+
->flatMap(static fn($process) => $process->toSequence()) // discard process that failed to be parsed
149+
->toSet();
163150
}
164151

165152
private function format(): string

0 commit comments

Comments
 (0)