Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign up[6.x] Allowing optional use of yml/yaml file extensions in .editorconfig #5090
Conversation
Can you send this to 6.0 branch instead? |
Is that the develop branch? There doesn't appear to be a public 6.0 branch? |
Ow, sorry. Mistook this with the framework repo |
pjona
added a commit
to pjona/lumen
that referenced
this pull request
Sep 16, 2019
Moved changes from Laravel repository - laravel/laravel#5090
apryaldy
added a commit
to apryaldy/laravel
that referenced
this pull request
Feb 13, 2020
* Update to Laravel 5.9 * Require PHP 7.2 * Encourage to use PHPUnit 8 * Update changelog * Remove services deleted from core See laravel/framework#28441 and laravel/framework#28442 * formatting * remove dumpserver since doesn't work on 5.9 * remove ui scaffolding * introduce test bootstrapping * style fix * [5.9] Add ThrottleRequests to the priority array (laravel#5057) * add ThrottleRequests to the priority array * Move ThrottleRequests under Authenticate middleware * Update version constraint (laravel#5066) * formatting * [6.0] - Add vapor link on the welcome view (laravel#5072) * Remove deprecated language line (laravel#5074) * formatting * add failed jobs table * Rename 2019_08_19_175727_create_failed_jobs_table.php to 2019_08_19_000000_create_failed_jobs_table.php (laravel#5082) * [6.0] Use phpredis as default Redis client (laravel#5085) * Use phpredis as default Redis client Follow up for laravel/framework#29688 It's best that we already start using `phpredis` as a default to discourage usage of Predis. * Update database.php * add new failed driver option * add ignition * add ignition * Allowing optional use of yml/yaml file extensions in .editorconfig (laravel#5090) * Update bootstrap.php * add phpunit extension * style * Set argon defaults to prevent password_hash(): Memory cost is outside of allowed memory range on PHP 7.4 (laravel#5094) With the values ```` 'argon' => [ 'memory' => 1024, 'threads' => 2, 'time' => 2, ], ``` Hash::make() produces password_hash(): Memory cost is outside of allowed memory range on PHP 7.4 * Revert "Set argon defaults to prevent password_hash(): Memory cost is outside of allowed memory range on PHP 7.4 (laravel#5094)" (laravel#5095) This reverts commit 86908e1. * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * According to PHP Bug 78516 Argon2 requires at least 8KB (laravel#5097) https://bugs.php.net/bug.php?id=78516 Argon2 requires at least 8KB On PHP 7.4 memory 1024 will throw: password_hash(): Memory cost is outside of allowed memory range * Order imports alphabetically * Apply fixes from StyleCI (laravel#5100) * Update CHANGELOG.md * Revert "According to PHP Bug 78516 Argon2 requires at least 8KB (laravel#5097)" (laravel#5102) This reverts commit 74d84e9. * Added Appoly sponsor (laravel#5105) * remove testing bootstrap extension (laravel#5107) * [6.x] Add 'null' logging channel (laravel#5106) * Add 'none' logging channel * Remove extra spaces * Rename 'none' channel to 'null' * Update logging.php * [6.x] Added OP.GG sponsor (laravel#5121) * Added OP.GG sponsor * Update readme.md * Add new password rule language line * Remove middleware from password reset It's not necessary for the user to be logged out when resetting their password. This allows users to reset their password while logged in. Can be used in combination with the new RequiresPassword middleware. * Implement password confirmation * formatting * formatting * Update CHANGELOG.md * Fixes required version of the framework within `composer.json` (laravel#5130) * Add xml schema to phpunit (laravel#5139) This allows an IDE to do auto completion, and show any errors in the configuration * Security fix: Waiting before retrying password reset * tweak formatting * fix key * Update .styleci.yml * Consistent readme * Rename readme * Update readme * Update CHANGELOG.md * Rename `encrypted` to `forceTLS`. (laravel#5159) * Use laravel/tinker v2 (laravel#5161) * Consistent order (laravel#5167) Keep the alphabetical order of the validation messages. * [6.x] Implement integration test and in-memory DB (laravel#5169) * Use in-memory DB for testing * Extend from PHPUnit test case for unit tests * DRY up path (laravel#5173) * Add "none" to supported same site options in session config (laravel#5174) * change some default settings * Update redirectTo return type PHPDoc * Updated config/logging.php (laravel#5179) This adds a default emergency logger path to the logging config file. This change goes hand-in-hand with my changes found here: https://github.com/Stokoe0990/framework/commit/7a03776bc860bde4cdc82e69ab133a755b66dd2d * default email from name to app name (laravel#5178) * Add MAIL_FROM_ADDRESS & MAIL_FROM_NAME to .env file (laravel#5180) * use class name to be consistent with web middleware * Correct exception handler doc (laravel#5187) * Fix types consistency in database config (laravel#5191) * Revert "Apply fixes from StyleCI (laravel#5006)" This reverts commit 5017673. * Use file session driver again * Use file session driver again * Update CHANGELOG.md * Add missing full stop for some validation messages (laravel#5205) * Update laravel mix and sass loader (laravel#5203) * [7.x] Update cross-env and resolve-url-loader to the latest (laravel#5210) * [6.x] Update cross-env to the latest (laravel#5216) This is not a fix for the vulnerability. Just updating the dependency to the latest version. @see https://yarnpkg.com/package/cross-env Yes, I know that they recently released version 6.0 and in a short time 7.0. * Bump fzaninotto/faker version to support PHP 7.4 (laravel#5218) Bumping `fzaninotto/faker` version to support PHP 7.4, especially when running composer with `--prefer-lowest` flag. PRs related to version `^1.9.1`: * fzaninotto/Faker#1748 * fzaninotto/Faker#1843 Co-authored-by: Dries Vints <dries.vints@gmail.com> Co-authored-by: Taylor Otwell <taylor@laravel.com> Co-authored-by: Graham Campbell <GrahamCampbell@users.noreply.github.com> Co-authored-by: Tim MacDonald <tim.mac7@me.com> Co-authored-by: Gergő D. Nagy <hello@iamgergo.com> Co-authored-by: Chuck Rincón <chuckrincon@gmail.com> Co-authored-by: Christopher Lass <arubacao@users.noreply.github.com> Co-authored-by: Darren Craig <darrencraig@hotmail.com> Co-authored-by: Sjors Ottjes <sjorsottjes@gmail.com> Co-authored-by: Patrick Heppler <12952240+HepplerDotNet@users.noreply.github.com> Co-authored-by: James Merrix <james@appoly.co.uk> Co-authored-by: Roger Vilà <rogervila@me.com> Co-authored-by: Sangrak Choi <kars@kargn.as> Co-authored-by: Nuno Maduro <enunomaduro@gmail.com> Co-authored-by: Gert de Pagter <BackEndTea@users.noreply.github.com> Co-authored-by: Michael Chernyshev <chmv@allnetic.com> Co-authored-by: Mark van den Broek <mvdnbrk@gmail.com> Co-authored-by: byjml <byjml@users.noreply.github.com> Co-authored-by: Bert Heyman <bert.heyman@hotmail.com> Co-authored-by: Can Vural <can9119@gmail.com> Co-authored-by: M Stokoe <mstokoe0990@gmail.com> Co-authored-by: Andrew Minion <andrew.minion@luminfire.com> Co-authored-by: Anton Komarev <1849174+antonkomarev@users.noreply.github.com> Co-authored-by: Aimeos <aimeos@aimeos.org> Co-authored-by: Robert Korulczyk <robert@korulczyk.pl> Co-authored-by: Caíque de Castro Soares da Silva <castro.caique@gmail.com> Co-authored-by: Andrey Helldar <helldar@ai-rus.com> Co-authored-by: ARCANEDEV <arcanedev.maroc@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
The YAML docs generally recommends using .yaml as the preferred extension for YAML files - https://yaml.org/faq.html.
I've tweaked the .editorconfig to set both yaml and yml files to have the same indentation. Without this, *.yaml files default to 4 spaces.