Skip to content

Commit 3ca4ea9

Browse files
PKuhlmayclaude
andcommitted
[TASK] Fix mkdir and copy warnings in FileGenerator, RoundTrip and BaseFunctionalTest
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent d9e79b0 commit 3ca4ea9

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

Classes/Service/FileGenerator.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ public function build(Extension $extension): void
154154

155155
$this->generateComposerJson();
156156

157-
mkdir($this->extensionDirectory . 'Configuration', 0777, true);
157+
if (!is_dir($this->extensionDirectory . 'Configuration')) {
158+
mkdir($this->extensionDirectory . 'Configuration', 0777, true);
159+
}
158160

159161
$this->configurationDirectory = $this->extensionDirectory . 'Configuration/';
160162

@@ -316,7 +318,9 @@ protected function generateIconsFile(): void
316318
return;
317319
}
318320
try {
319-
mkdir($this->extensionDirectory . 'Configuration', 0777, true);
321+
if (!is_dir($this->extensionDirectory . 'Configuration')) {
322+
mkdir($this->extensionDirectory . 'Configuration', 0777, true);
323+
}
320324

321325
$fileContents = $this->renderTemplate(
322326
'Configuration/Icons.phpt',
@@ -857,7 +861,7 @@ protected function generateEmptyGitRepository(): void
857861
return;
858862
}
859863
$sourceDirectory = ExtensionManagementUtility::extPath('extension_builder') . 'Resources/Private/CodeTemplates/Git/';
860-
foreach (['objects/info', 'objects/pack', 'refs/heads', 'refs/tags'] as $item) {
864+
foreach (['info', 'objects/info', 'objects/pack', 'refs/heads', 'refs/tags'] as $item) {
861865
$this->mkdir_deep($targetDirectory . '/' . $item, '');
862866
}
863867
foreach (['config', 'description', 'HEAD', 'info/exclude'] as $item) {
@@ -1609,7 +1613,7 @@ protected function mkdir_deep(string $directory, string $deepDirectory): void
16091613
// skip creation
16101614
return;
16111615
}
1612-
if (!is_dir($deepDirectory) || ($this->roundTripEnabled && $overWriteMode < 2)) {
1616+
if (!is_dir($tmpBasePath . $subDirectory)) {
16131617
mkdir($tmpBasePath . $subDirectory, 0777, true);
16141618
}
16151619
$tmpBasePath .= $subDirectory . '/';

Classes/Service/RoundTrip.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,9 @@ protected static function log($message, $severity = 0, $data = []): void
15751575
public static function recurse_copy(string $src, string $dst): void
15761576
{
15771577
$dir = opendir($src);
1578-
mkdir($dst);
1578+
if (!is_dir($dst)) {
1579+
mkdir($dst);
1580+
}
15791581
while (false !== ($file = readdir($dir))) {
15801582
if ($file !== '.' && $file !== '..') {
15811583
if (is_dir($src . '/' . $file)) {

Tests/BaseFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected function setUp(): void
9191
$this->extension->expects(self::any())
9292
->method('getExtensionDir')
9393
->willReturn($dummyExtensionDir);
94-
if (is_dir($dummyExtensionDir)) {
94+
if (!is_dir($dummyExtensionDir)) {
9595
mkdir($dummyExtensionDir);
9696
}
9797

0 commit comments

Comments
 (0)