Skip to content

Commit 68e666f

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-laravel-telescope-installation
# Conflicts: # tests/InitCommandTest.php
2 parents b5b60b0 + e9c17c4 commit 68e666f

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

src/Commands/InitCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public function handle(): void
130130
}
131131

132132
foreach ($this->composerCommands as $composerCommand) {
133-
shell_exec($composerCommand);
133+
shell_exec("{$composerCommand} --ansi");
134134
}
135135

136136
$this->call('telescope:install');

tests/InitCommandTest.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public function testRunWithoutAdminAndReadmeCreation()
3333
$this->mockFilePutContent();
3434

3535
$this->mockShellExec(
36-
['arguments' => 'composer require ronasit/laravel-helpers'],
37-
['arguments' => 'composer require ronasit/laravel-swagger'],
38-
['arguments' => 'composer require --dev ronasit/laravel-entity-generator'],
39-
['arguments' => 'composer require laravel/telescope'],
36+
['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
37+
['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
38+
['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
39+
['arguments' => 'composer require laravel/telescope --ansi'],
4040
);
4141

4242
$this
@@ -73,10 +73,10 @@ public function testRunWithAdminAndWithoutReadmeCreation()
7373
);
7474

7575
$this->mockShellExec(
76-
['arguments' => 'composer require ronasit/laravel-helpers'],
77-
['arguments' => 'composer require ronasit/laravel-swagger'],
78-
['arguments' => 'composer require --dev ronasit/laravel-entity-generator'],
79-
['arguments' => 'composer require laravel/telescope'],
76+
['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
77+
['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
78+
['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
79+
['arguments' => 'composer require laravel/telescope --ansi'],
8080
);
8181

8282
$this
@@ -156,10 +156,10 @@ public function testRunWithAdminAndDefaultReadmeCreation()
156156

157157
$this->mockShellExec(
158158
['arguments' => 'git ls-remote --get-url origin', 'result' => 'https://github.com/ronasit/laravel-helpers.git'],
159-
['arguments' => 'composer require ronasit/laravel-helpers'],
160-
['arguments' => 'composer require ronasit/laravel-swagger'],
161-
['arguments' => 'composer require --dev ronasit/laravel-entity-generator'],
162-
['arguments' => 'composer require laravel/telescope'],
159+
['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
160+
['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
161+
['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
162+
['arguments' => 'composer require laravel/telescope --ansi'],
163163
);
164164

165165
$this
@@ -278,10 +278,10 @@ public function testRunWithAdminAndPartialReadmeCreation()
278278
);
279279

280280
$this->mockShellExec(
281-
['arguments' => 'composer require ronasit/laravel-helpers'],
282-
['arguments' => 'composer require ronasit/laravel-swagger'],
283-
['arguments' => 'composer require --dev ronasit/laravel-entity-generator'],
284-
['arguments' => 'composer require laravel/telescope'],
281+
['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
282+
['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
283+
['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
284+
['arguments' => 'composer require laravel/telescope --ansi'],
285285
);
286286

287287
$this
@@ -404,12 +404,12 @@ public function testRunWithAdminAndFullReadmeCreationAndRemovingInitializatorIns
404404

405405
$this->mockShellExec(
406406
['arguments' => 'git ls-remote --get-url origin', 'result' => 'https://github.com/ronasit/laravel-helpers.git'],
407-
['arguments' => 'composer require ronasit/laravel-helpers'],
408-
['arguments' => 'composer require ronasit/laravel-swagger'],
409-
['arguments' => 'composer require --dev ronasit/laravel-entity-generator'],
410-
['arguments' => 'composer require laravel/telescope'],
411-
['arguments' => 'composer require ronasit/laravel-media'],
412-
['arguments' => 'composer remove --dev ronasit/laravel-project-initializator'],
407+
['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
408+
['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
409+
['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
410+
['arguments' => 'composer require laravel/telescope --ansi'],
411+
['arguments' => 'composer require ronasit/laravel-media --ansi'],
412+
['arguments' => 'composer remove --dev ronasit/laravel-project-initializator --ansi'],
413413
);
414414

415415
$this

0 commit comments

Comments
 (0)