You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@@ -38,7 +39,7 @@ Informal discussion regarding bugs, new features, and implementation of existing
38
39
<aname="which-branch"></a>
39
40
## Which Branch?
40
41
41
-
**All** bug fixes should be sent to the latest stable branch. Bug fixes should **never** be sent to the `master` branch unless they fix features that exist only in the upcoming release.
42
+
**All** bug fixes should be sent to the latest stable branch, or to the current LTS banch (5.1). Bug fixes should **never** be sent to the `master` branch unless they fix features that exist only in the upcoming release.
42
43
43
44
**Minor** features that are **fully backwards compatible** with the current Laravel release may be sent to the latest stable branch.
44
45
@@ -56,7 +57,8 @@ If you discover a security vulnerability within Laravel, please send an e-mail t
56
57
57
58
Laravel follows the [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) coding standard and the [PSR-4](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md) autoloading standard.
58
59
59
-
### DocBlocks
60
+
<aname="phpdoc"></a>
61
+
### PHPDoc
60
62
61
63
`@param` tags should **not be aligned** and arguments should be separated by **2 spaces**.
62
64
@@ -75,13 +77,7 @@ Here's an example block:
75
77
//
76
78
}
77
79
78
-
<aname="code-style-fixer"></a>
79
-
### Code Style Fixer
80
+
<aname="styleci"></a>
81
+
### StyleCI
80
82
81
-
You may use the [PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to fix your code style before committing.
82
-
83
-
To get started, [install the tool globally](https://github.com/FriendsOfPHP/PHP-CS-Fixer#globally-manual) and check the code style by issuing the following terminal command from your project's root directory:
84
-
85
-
```sh
86
-
php-cs-fixer fix
87
-
```
83
+
Don't worry about getting your code style perfect, since [StyleCI](https://styleci.io/) will automatically merge any fixes into our codebase after we merge external contributions. This way, we can focus on the content of the contribution, and not the code style.
0 commit comments