Skip to content

Commit 9f8ea78

Browse files
authored
Merge branch 'main' into refactor-init-readme-generator
2 parents 0fe6230 + eb56f2e commit 9f8ea78

File tree

7 files changed

+73
-224
lines changed

7 files changed

+73
-224
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"php-mock/php-mock-phpunit": "^2.10",
3333
"ext-json": "*",
3434
"ronasit/laravel-helpers": ">=3.5.7",
35-
"winter/laravel-config-writer": "^1.2"
35+
"winter/laravel-config-writer": ">=1.2.1"
3636
},
3737
"require-dev": {
3838
"fakerphp/faker": "^1.23.1",

composer.lock

Lines changed: 41 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Commands/InitCommand.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use RonasIT\ProjectInitializator\Enums\AppTypeEnum;
1313
use RonasIT\ProjectInitializator\Enums\AuthTypeEnum;
1414
use RonasIT\ProjectInitializator\Enums\RoleEnum;
15-
use RonasIT\ProjectInitializator\Extensions\ConfigWriter\ArrayFile;
15+
use Winter\LaravelConfigWriter\ArrayFile;
1616
use Winter\LaravelConfigWriter\EnvFile;
1717
use RonasIT\ProjectInitializator\Generators\ReadmeGenerator;
1818

@@ -477,15 +477,7 @@ protected function updateEnvFile(string $fileName, array $data): void
477477
{
478478
$env = EnvFile::open($fileName);
479479

480-
// TODO: After updating wintercms/laravel-config-writer, remove the key comparison check and keep only $env->addEmptyLine();
481-
$envKeys = array_column($env->getAst(), 'match');
482-
$dataKeys = array_keys($data);
483-
484-
$hasMissingKeys = count(array_intersect($dataKeys, $envKeys)) !== count($dataKeys);
485-
486-
if ($hasMissingKeys) {
487-
$env->addEmptyLine();
488-
}
480+
$env->addEmptyLine();
489481

490482
$env->set($data);
491483

src/Extensions/ConfigWriter/ArrayFile.php

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/Extensions/ConfigWriter/ArrayPrinter.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)