From 6d10cb560aefea6887076d0d7a6beac445e73fe7 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:01:31 +0100 Subject: [PATCH 1/9] Delete .styleci.yml --- .styleci.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .styleci.yml diff --git a/.styleci.yml b/.styleci.yml deleted file mode 100644 index 215fbcf..0000000 --- a/.styleci.yml +++ /dev/null @@ -1,4 +0,0 @@ -php: - preset: laravel -js: true -css: true From 12665c3ededb85f65202e0f804dd41bf113544f3 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:06:29 +0100 Subject: [PATCH 2/9] Implement Pint --- .github/workflows/coding-standards.yml | 7 +++++++ README.md | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 .github/workflows/coding-standards.yml diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml new file mode 100644 index 0000000..5f1a35d --- /dev/null +++ b/.github/workflows/coding-standards.yml @@ -0,0 +1,7 @@ +name: fix code styling + +on: [push] + +jobs: + lint: + uses: laravel/.github/.github/workflows/coding-standards.yml@main \ No newline at end of file diff --git a/README.md b/README.md index fd77508..018791b 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@

Build Status + + Coding Standards + Total Downloads Latest Stable Version License From cda928d1edb31b9575d1fc8c4ff20e5650b82555 Mon Sep 17 00:00:00 2001 From: driesvints Date: Mon, 13 Feb 2023 17:06:56 +0000 Subject: [PATCH 3/9] Fix code styling --- cli/Valet/Brew.php | 3 +++ cli/Valet/Diagnose.php | 3 +++ cli/Valet/DnsMasq.php | 5 +++++ cli/Valet/Nginx.php | 5 +++++ cli/Valet/Ngrok.php | 1 + cli/Valet/PhpFpm.php | 5 +++++ cli/Valet/Site.php | 3 +++ cli/Valet/Valet.php | 1 + tests/SiteTest.php | 1 + 9 files changed, 27 insertions(+) diff --git a/cli/Valet/Brew.php b/cli/Valet/Brew.php index eda51c4..84f6709 100644 --- a/cli/Valet/Brew.php +++ b/cli/Valet/Brew.php @@ -22,10 +22,13 @@ class Brew 'php71', 'php70', ]; + const BREW_DISABLE_AUTO_CLEANUP = 'HOMEBREW_NO_INSTALL_CLEANUP=1'; + const LATEST_PHP_VERSION = 'php@8.1'; public $cli; + public $files; /** diff --git a/cli/Valet/Diagnose.php b/cli/Valet/Diagnose.php index d6c8764..8c50245 100644 --- a/cli/Valet/Diagnose.php +++ b/cli/Valet/Diagnose.php @@ -51,8 +51,11 @@ class Diagnose ]; public $cli; + public $files; + public $print; + public $progressBar; /** diff --git a/cli/Valet/DnsMasq.php b/cli/Valet/DnsMasq.php index 71616b6..efa5645 100644 --- a/cli/Valet/DnsMasq.php +++ b/cli/Valet/DnsMasq.php @@ -5,12 +5,17 @@ class DnsMasq { public $brew; + public $cli; + public $files; + public $configuration; public $dnsmasqMasterConfigFile = BREW_PREFIX.'/etc/dnsmasq.conf'; + public $dnsmasqSystemConfDir = BREW_PREFIX.'/etc/dnsmasq.d'; + public $resolverPath = '/etc/resolver'; /** diff --git a/cli/Valet/Nginx.php b/cli/Valet/Nginx.php index e0cfdcc..a72f5cb 100644 --- a/cli/Valet/Nginx.php +++ b/cli/Valet/Nginx.php @@ -7,10 +7,15 @@ class Nginx { public $brew; + public $cli; + public $files; + public $configuration; + public $site; + const NGINX_CONF = BREW_PREFIX.'/etc/nginx/nginx.conf'; /** diff --git a/cli/Valet/Ngrok.php b/cli/Valet/Ngrok.php index f144b95..349f19b 100644 --- a/cli/Valet/Ngrok.php +++ b/cli/Valet/Ngrok.php @@ -9,6 +9,7 @@ class Ngrok { public $cli; + public $tunnelsEndpoints = [ 'http://127.0.0.1:4040/api/tunnels', 'http://127.0.0.1:4041/api/tunnels', diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php index 72ce377..bca67f8 100644 --- a/cli/Valet/PhpFpm.php +++ b/cli/Valet/PhpFpm.php @@ -7,10 +7,15 @@ class PhpFpm { public $brew; + public $cli; + public $files; + public $config; + public $site; + public $nginx; public $taps = [ diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php index 9c994a5..4c7bc4f 100644 --- a/cli/Valet/Site.php +++ b/cli/Valet/Site.php @@ -8,8 +8,11 @@ class Site { public $brew; + public $config; + public $cli; + public $files; /** diff --git a/cli/Valet/Valet.php b/cli/Valet/Valet.php index 62307e5..24b5e47 100644 --- a/cli/Valet/Valet.php +++ b/cli/Valet/Valet.php @@ -7,6 +7,7 @@ class Valet { public $cli; + public $files; public $valetBin = BREW_PREFIX.'/bin/valet'; diff --git a/tests/SiteTest.php b/tests/SiteTest.php index 4171da4..c933e3d 100644 --- a/tests/SiteTest.php +++ b/tests/SiteTest.php @@ -972,6 +972,7 @@ public function runCommand($command, callable $onError = null) class FixturesSiteFake extends Site { private $valetHomePath; + private $crtCounter = 0; public function valetHomePath() From e0e88308812641c4119241f443ce71c6e39c52a1 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:17:07 +0100 Subject: [PATCH 4/9] Update coding-standards.yml --- .github/workflows/coding-standards.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 5f1a35d..bedc2ad 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -4,4 +4,6 @@ on: [push] jobs: lint: - uses: laravel/.github/.github/workflows/coding-standards.yml@main \ No newline at end of file + uses: laravel/.github/.github/workflows/coding-standards.yml@main + with: + fix: github.ref_name == 'master' From f617fc85bc6dd7e5e4168243920738589f30bd69 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:18:56 +0100 Subject: [PATCH 5/9] Update coding-standards.yml --- .github/workflows/coding-standards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index bedc2ad..f4271f6 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -6,4 +6,4 @@ jobs: lint: uses: laravel/.github/.github/workflows/coding-standards.yml@main with: - fix: github.ref_name == 'master' + fix: ${{ github.ref_name == 'master' }} From abace888c5649c7a7966024ba2dfda3b9b130a27 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:24:33 +0100 Subject: [PATCH 6/9] Update coding-standards.yml --- .github/workflows/coding-standards.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index f4271f6..621618b 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -4,6 +4,5 @@ on: [push] jobs: lint: + if: ${{ github.ref_name == 'master' }} uses: laravel/.github/.github/workflows/coding-standards.yml@main - with: - fix: ${{ github.ref_name == 'master' }} From f0413051fa619730893a687bfdba8d8b7e5a96c1 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:26:33 +0100 Subject: [PATCH 7/9] Update coding-standards.yml --- .github/workflows/coding-standards.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 621618b..f4271f6 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -4,5 +4,6 @@ on: [push] jobs: lint: - if: ${{ github.ref_name == 'master' }} uses: laravel/.github/.github/workflows/coding-standards.yml@main + with: + fix: ${{ github.ref_name == 'master' }} From a3ec234d419da2a81a65e3efc6fb53cdc7cdcbaf Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:57:43 +0100 Subject: [PATCH 8/9] Update .gitattributes --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index c90cc85..4877314 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,7 +12,6 @@ .editorconfig export-ignore .gitattributes export-ignore .gitignore export-ignore -.styleci.yml export-ignore phpunit.xml export-ignore CHANGELOG.md export-ignore phpunit.xml.dist export-ignore From c9af7634c4338523c95f909cdb2228da5cafd2cb Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 13 Feb 2023 18:58:52 +0100 Subject: [PATCH 9/9] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 018791b..fd77508 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,6 @@

Build Status - - Coding Standards - Total Downloads Latest Stable Version License