Skip to content

Commit d710c1a

Browse files
Refactor
1 parent d164da8 commit d710c1a

File tree

6 files changed

+30
-32
lines changed

6 files changed

+30
-32
lines changed

src/Directory.php

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php declare(strict_types=1);
2+
/*
3+
* This file is part of phpunit/php-code-coverage.
4+
*
5+
* (c) Sebastian Bergmann <[email protected]>
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*/
10+
namespace SebastianBergmann\CodeCoverage;
11+
12+
final class Directory
13+
{
14+
public static function create(string $directory): bool
15+
{
16+
return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
17+
}
18+
}

src/Report/Clover.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace SebastianBergmann\CodeCoverage\Report;
1111

1212
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Directory;
1314
use SebastianBergmann\CodeCoverage\Node\File;
1415
use SebastianBergmann\CodeCoverage\RuntimeException;
1516

@@ -236,7 +237,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
236237
$buffer = $xmlDocument->saveXML();
237238

238239
if ($target !== null) {
239-
if (!$this->createDirectory(\dirname($target))) {
240+
if (!Directory::create(\dirname($target))) {
240241
throw new \RuntimeException(\sprintf('Directory "%s" was not created', \dirname($target)));
241242
}
242243

@@ -252,9 +253,4 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
252253

253254
return $buffer;
254255
}
255-
256-
private function createDirectory(string $directory): bool
257-
{
258-
return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
259-
}
260256
}

src/Report/Crap4j.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace SebastianBergmann\CodeCoverage\Report;
1111

1212
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Directory;
1314
use SebastianBergmann\CodeCoverage\Node\File;
1415
use SebastianBergmann\CodeCoverage\RuntimeException;
1516

@@ -116,7 +117,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
116117
$buffer = $document->saveXML();
117118

118119
if ($target !== null) {
119-
if (!$this->createDirectory(\dirname($target))) {
120+
if (!Directory::create(\dirname($target))) {
120121
throw new \RuntimeException(\sprintf('Directory "%s" was not created', \dirname($target)));
121122
}
122123

@@ -149,9 +150,4 @@ private function roundValue(float $value): float
149150
{
150151
return \round($value, 2);
151152
}
152-
153-
private function createDirectory(string $directory): bool
154-
{
155-
return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
156-
}
157153
}

src/Report/Html/Facade.php

+4-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace SebastianBergmann\CodeCoverage\Report\Html;
1111

1212
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Directory as DirectoryUtil;
1314
use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
1415
use SebastianBergmann\CodeCoverage\RuntimeException;
1516

@@ -89,7 +90,7 @@ public function process(CodeCoverage $coverage, string $target): void
8990
$id = $node->getId();
9091

9192
if ($node instanceof DirectoryNode) {
92-
if (!$this->createDirectory($target . $id)) {
93+
if (!DirectoryUtil::create($target . $id)) {
9394
throw new \RuntimeException(\sprintf('Directory "%s" was not created', $target . $id));
9495
}
9596

@@ -98,7 +99,7 @@ public function process(CodeCoverage $coverage, string $target): void
9899
} else {
99100
$dir = \dirname($target . $id);
100101

101-
if (!$this->createDirectory($dir)) {
102+
if (!DirectoryUtil::create($dir)) {
102103
throw new \RuntimeException(\sprintf('Directory "%s" was not created', $dir));
103104
}
104105

@@ -144,7 +145,7 @@ private function getDirectory(string $directory): string
144145
$directory .= \DIRECTORY_SEPARATOR;
145146
}
146147

147-
if (!$this->createDirectory($directory)) {
148+
if (!DirectoryUtil::create($directory)) {
148149
throw new RuntimeException(
149150
\sprintf(
150151
'Directory "%s" does not exist.',
@@ -155,9 +156,4 @@ private function getDirectory(string $directory): string
155156

156157
return $directory;
157158
}
158-
159-
private function createDirectory(string $directory): bool
160-
{
161-
return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
162-
}
163159
}

src/Report/PHP.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace SebastianBergmann\CodeCoverage\Report;
1111

1212
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Directory;
1314
use SebastianBergmann\CodeCoverage\RuntimeException;
1415

1516
/**
@@ -40,7 +41,7 @@ public function process(CodeCoverage $coverage, ?string $target = null): string
4041
);
4142

4243
if ($target !== null) {
43-
if (!$this->createDirectory(\dirname($target))) {
44+
if (!Directory::create(\dirname($target))) {
4445
throw new \RuntimeException(\sprintf('Directory "%s" was not created', \dirname($target)));
4546
}
4647

@@ -56,9 +57,4 @@ public function process(CodeCoverage $coverage, ?string $target = null): string
5657

5758
return $buffer;
5859
}
59-
60-
private function createDirectory(string $directory): bool
61-
{
62-
return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
63-
}
6460
}

src/Report/Xml/Facade.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace SebastianBergmann\CodeCoverage\Report\Xml;
1111

1212
use SebastianBergmann\CodeCoverage\CodeCoverage;
13+
use SebastianBergmann\CodeCoverage\Directory as DirectoryUtil;
1314
use SebastianBergmann\CodeCoverage\Node\AbstractNode;
1415
use SebastianBergmann\CodeCoverage\Node\Directory as DirectoryNode;
1516
use SebastianBergmann\CodeCoverage\Node\File as FileNode;
@@ -89,7 +90,7 @@ private function initTargetDirectory(string $directory): void
8990
"'$directory' exists but is not writable."
9091
);
9192
}
92-
} elseif (!$this->createDirectory($directory)) {
93+
} elseif (!DirectoryUtil::create($directory)) {
9394
throw new RuntimeException(
9495
"'$directory' could not be created."
9596
);
@@ -280,9 +281,4 @@ private function saveDocument(\DOMDocument $document, string $name): void
280281
/* @see https://bugs.php.net/bug.php?id=79191 */
281282
\file_put_contents($filename, $document->saveXML());
282283
}
283-
284-
private function createDirectory(string $directory): bool
285-
{
286-
return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
287-
}
288284
}

0 commit comments

Comments
 (0)