Skip to content

Commit c2415bf

Browse files
committed
Merge branch 'master' of github.com:laravel/installer into feat/add-spinner
2 parents df8dd25 + 4e355ef commit c2415bf

File tree

10 files changed

+256
-65
lines changed

10 files changed

+256
-65
lines changed

.github/ISSUE_TEMPLATE/2_Feature_request.md

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

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
blank_issues_enabled: false
22
contact_links:
3+
- name: Feature request
4+
url: https://github.com/laravel/installer/pulls
5+
about: 'For ideas or feature requests, send in a pull request'
36
- name: Support Questions & Other
47
url: https://laravel.com/docs/contributions#support-questions
58
about: 'This repository is only for reporting bugs. If you have a question or need help using the library, click:'

.github/SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If you discover a security vulnerability within Laravel, please send an email to
1515
```
1616
-----BEGIN PGP PUBLIC KEY BLOCK-----
1717
Version: OpenPGP v2.0.8
18-
Comment: https://sela.io/pgp/
18+
Comment: Report Security Vulnerabilities to taylor@laravel.com
1919
2020
xsFNBFugFSQBEACxEKhIY9IoJzcouVTIYKJfWFGvwFgbRjQWBiH3QdHId5vCrbWo
2121
s2l+4Rv03gMG+yHLJ3rWElnNdRaNdQv59+lShrZF7Bvu7Zvc0mMNmFOM/mQ/K2Lt

.github/workflows/tests.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ jobs:
1616
strategy:
1717
fail-fast: true
1818
matrix:
19-
php: [8.2, 8.3]
19+
php: [8.2, 8.3, 8.4]
2020
laravel: [10, 11]
21+
exclude:
22+
- php: 8.4
23+
laravel: 10
2124

2225
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
2326

@@ -35,20 +38,22 @@ jobs:
3538

3639
- name: Install dependencies
3740
run: |
38-
composer require "laravel/framework=^${{ matrix.laravel }}" --no-update
39-
composer update --prefer-dist --no-interaction --no-progress
41+
composer update --prefer-dist --no-interaction --no-progress --with="illuminate/support=^${{ matrix.laravel }}"
4042
4143
- name: Execute tests
42-
run: vendor/bin/phpunit
44+
run: vendor/bin/phpunit --display-deprecations --fail-on-deprecation
4345

4446
windows_tests:
4547
runs-on: windows-latest
4648

4749
strategy:
4850
fail-fast: true
4951
matrix:
50-
php: [8.2, 8.3]
52+
php: [8.2, 8.3, 8.4]
5153
laravel: [10, 11]
54+
exclude:
55+
- php: 8.4
56+
laravel: 10
5257

5358
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Windows
5459

@@ -72,8 +77,7 @@ jobs:
7277

7378
- name: Install dependencies
7479
run: |
75-
composer require "laravel/framework=~${{ matrix.laravel }}" --no-update
76-
composer update --prefer-dist --no-interaction --no-progress
80+
composer update --prefer-dist --no-interaction --no-progress --with="illuminate/support=~${{ matrix.laravel }}"
7781
7882
- name: Execute tests
79-
run: vendor/bin/phpunit
83+
run: vendor/bin/phpunit --display-deprecations --fail-on-deprecation

CHANGELOG.md

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,45 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/installer/compare/v5.8.2...master)
3+
## [Unreleased](https://github.com/laravel/installer/compare/v5.11.1...master)
4+
5+
## [v5.11.1](https://github.com/laravel/installer/compare/v5.11.0...v5.11.1) - 2024-12-11
6+
7+
* [5.x] Throw exceptions when trying to use Installer on PHP environment without required extensions by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/373
8+
* Ensure Symfony/mbstring-polyfill version 1.31 or higher by [@ellnix](https://github.com/ellnix) in https://github.com/laravel/installer/pull/376
9+
10+
## [v5.11.0](https://github.com/laravel/installer/compare/v5.10.0...v5.11.0) - 2024-12-10
11+
12+
* Remove any trailing slash from application name by [@jasonmccreary](https://github.com/jasonmccreary) in https://github.com/laravel/installer/pull/368
13+
* Add disableProcessTimeout to composer run dev by [@ryan08100715](https://github.com/ryan08100715) in https://github.com/laravel/installer/pull/370
14+
* Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/371
15+
16+
## [v5.10.0](https://github.com/laravel/installer/compare/v5.9.2...v5.10.0) - 2024-11-19
17+
18+
* [5.x] Supports PHP 8.4 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/364
19+
* [5.x] Remove `php artisan pail` from `composer run dev` on Windows by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/366
20+
21+
## [v5.9.2](https://github.com/laravel/installer/compare/v5.9.1...v5.9.2) - 2024-10-22
22+
23+
* Replace `php artisan serve` with `composer run dev` by [@1weiho](https://github.com/1weiho) in https://github.com/laravel/installer/pull/362
24+
25+
## [v5.9.1](https://github.com/laravel/installer/compare/v5.9.0...v5.9.1) - 2024-10-10
26+
27+
* [5.x] Add `eslint` option for breeze inertia stack by [@avosalmon](https://github.com/avosalmon) in https://github.com/laravel/installer/pull/361
28+
29+
## [v5.9.0](https://github.com/laravel/installer/compare/v5.8.5...v5.9.0) - 2024-10-01
30+
31+
* [5.x] Utilise `Illuminate\Support\php_binary()` by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/360
32+
* [5.x] Support Laravel Prompts 0.2+ and 0.3+ by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/359
33+
34+
## [v5.8.5](https://github.com/laravel/installer/compare/v5.8.3...v5.8.5) - 2024-09-11
35+
36+
* Replace dead link in Security Policy by [@Jubeki](https://github.com/Jubeki) in https://github.com/laravel/installer/pull/351
37+
* Fix `--no-interaction` SQLite file prompt by [@jacksleight](https://github.com/jacksleight) in https://github.com/laravel/installer/pull/354
38+
39+
## [v5.8.3](https://github.com/laravel/installer/compare/v5.8.2...v5.8.3) - 2024-06-18
40+
41+
* Validate Laravel can be installed on selected directory by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/344
42+
* Automatically run migration when `--database` is given. by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/installer/pull/346
443

544
## [v5.8.2](https://github.com/laravel/installer/compare/v5.8.1...v5.8.2) - 2024-06-02
645

bin/laravel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (file_exists(__DIR__.'/../../../autoload.php')) {
77
require __DIR__.'/../vendor/autoload.php';
88
}
99

10-
$app = new Symfony\Component\Console\Application('Laravel Installer', '5.8.2');
10+
$app = new Symfony\Component\Console\Application('Laravel Installer', '5.11.1');
1111
$app->add(new Laravel\Installer\Console\NewCommand);
1212

1313
$app->run();

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
"php": "^8.2",
1414
"illuminate/filesystem": "^10.20|^11.0",
1515
"illuminate/support": "^10.20|^11.0",
16-
"laravel/prompts": "^0.1",
16+
"laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
1717
"symfony/console": "^6.2|^7.0",
18-
"symfony/process": "^6.2|^7.0"
18+
"symfony/process": "^6.2|^7.0",
19+
"symfony/polyfill-mbstring": "^1.31"
1920
},
2021
"require-dev": {
2122
"phpstan/phpstan": "^1.10",
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
3+
namespace Laravel\Installer\Console\Concerns;
4+
5+
use Symfony\Component\Process\Exception\ProcessStartFailedException;
6+
use Symfony\Component\Process\Process;
7+
8+
trait InteractsWithHerdOrValet
9+
{
10+
/**
11+
* Determine if the given directory is parked using Herd or Valet.
12+
*
13+
* @param string $directory
14+
* @return bool
15+
*/
16+
public function isParkedOnHerdOrValet(string $directory)
17+
{
18+
$output = $this->runOnValetOrHerd('paths');
19+
20+
return $output !== false ? in_array(dirname($directory), json_decode($output)) : false;
21+
}
22+
23+
/**
24+
* Runs the given command on the "herd" or "valet" CLI.
25+
*
26+
* @param string $command
27+
* @return string|false
28+
*/
29+
protected function runOnValetOrHerd(string $command)
30+
{
31+
foreach (['herd', 'valet'] as $tool) {
32+
$process = new Process([$tool, $command, '-v']);
33+
34+
try {
35+
$process->run();
36+
37+
if ($process->isSuccessful()) {
38+
return trim($process->getOutput());
39+
}
40+
} catch (ProcessStartFailedException) {
41+
}
42+
}
43+
44+
return false;
45+
}
46+
}

0 commit comments

Comments
 (0)