Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] assign correct YML version compatibility to PHP 7.0 #505

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,12 @@
- [ ] I have checked that there aren't other open [pull requests](https://github.com/weprovide/valet-plus/pulls) for the same issue ticket.
- [ ] I have formatted my code with the [PSR-2](http://www.php-fig.org/psr/psr-2/) coding style before submitting my PR.
-----

**I have read the contribution guidelines and am targeting the branch `<YOUR_TARGET_BRANCH>`:**
Because this is a Bug Fix which is Backwards Compatible.
Because this is a Feature which is not Backwards Compatible.
Because this is a Deprecation which is Backwards Compatible.
etc...

**Changelog entry:**
Short description of your work as explained by: [Keep A Changelog](https://keepachangelog.com).
18 changes: 8 additions & 10 deletions cli/Valet/Elasticsearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,14 @@ public function uninstall()
*/
public function updateDomain($domain)
{
if ($this->files->exists(self::NGINX_CONFIGURATION_PATH)) {
$this->files->putAsUser(
self::NGINX_CONFIGURATION_PATH,
str_replace(
['VALET_DOMAIN'],
[$domain],
$this->files->get(self::NGINX_CONFIGURATION_PATH)
)
);
}
$this->files->putAsUser(
self::NGINX_CONFIGURATION_PATH,
str_replace(
['VALET_DOMAIN'],
[$domain],
$this->files->get(self::NGINX_CONFIGURATION_STUB)
)
);
}

/**
Expand Down
1 change: 1 addition & 0 deletions cli/Valet/Pecl.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class Pecl extends AbstractPecl
],
self::YAML_EXTENSION => [
'5.6' => '1.3.1',
'7.0' => '2.0.4',
'extension_type' => self::NORMAL_EXTENSION_TYPE
]
];
Expand Down
8 changes: 7 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ This project is a fork of [laravel/valet](https://github.com/laravel/valet). Tha
## Valet+ Authors

- Tim Neutkens ([@timneutkens](https://github.com/timneutkens))
- Lou van der Laarse ([@Neodork](https://github.com/Neodork))
- Sam Granger ([@samgranger](https://github.com/samgranger))

## Valet+ Contributors

- Lou van der Laarse ([@Neodork](https://github.com/Neodork))
- Sander Pott (@Sander Valet+ slack channel)
- Mischa Braam ([@mischabraam](https://github.com/mischabraam))

## Get in touch

[![slack](https://p9.zdassets.com/hc/theme_assets/138842/200037786/logo.png)](https://join.slack.com/t/valet-plus/shared_invite/enQtNDE2MjU2NzgyNjQwLWFiYWNjOWFhOWQ2ZDcyOTEyZTA2MzAzOWYyYzYwMTYzODVlMGE3ZDg3ZWQ1M2JmN2M0OGY3OGUwMDI3NDM1NDU)

We have a slack workspace available [which you can join](https://join.slack.com/t/valet-plus/shared_invite/enQtNDE2MjU2NzgyNjQwLWFiYWNjOWFhOWQ2ZDcyOTEyZTA2MzAzOWYyYzYwMTYzODVlMGE3ZDg3ZWQ1M2JmN2M0OGY3OGUwMDI3NDM1NDU).

Yes, we have a Valet+ fan page https://www.weprovide.com/valet-plus