Taylor Otwell
5ceadf91f1
version
2020-04-14 09:16:50 -05:00
Graham Campbell
179b7d37fa
Add support for the new composer installed.json format ( #32310 ) ( #32330 )
...
Co-authored-by: Jakub Arbet <jakub.arbet@protonmail.com>
2020-04-11 09:41:37 -05:00
Taylor Otwell
d4edbf5f25
Apply fixes from StyleCI ( #29062 )
2019-07-03 11:39:03 -06:00
Taylor Otwell
d13830312d
Merge pull request #29051 from NostradamusICTBV/5.6
...
Added return type to avoid errors in tests
2019-07-03 11:37:56 -06:00
Adam
6490d6354e
Added return type to avoid errors in tests
2019-07-03 13:30:20 +02:00
Dries Vints
8bcaa9ba9b
Add .styleci.yml to .gitattributes
2019-04-30 13:00:27 +02:00
Dries Vints
9e427ed3da
Modify layout file
2019-04-22 21:17:10 +02:00
Dries Vints
614a54721e
Merge pull request #28300 from laravel/analysis-XkdkB1
...
Apply fixes from StyleCI
2019-04-22 21:12:28 +02:00
Dries Vints
de04af8e9b
Apply fixes from StyleCI
...
[ci skip] [skip ci]
2019-04-22 19:10:46 +00:00
Dries Vints
4f762cf361
Only check PHP on old branches
2019-04-22 21:10:44 +02:00
Dries Vints
9b76c6a3f2
Add styleci config
2019-04-22 21:08:08 +02:00
Taylor Otwell
5f8a72ffc3
Merge pull request #27662 from xuanquynh/make_view_finder_setter_returns_this
...
[5.6] Make view finder setter returns this
2019-02-25 19:29:42 -06:00
Nguyễn Xuân Quỳnh
caedd40c66
Make view finder setter returns this
2019-02-26 07:47:06 +07:00
Taylor Otwell
388cefe0f5
Merge pull request #27658 from jasonvarga/5.6
...
Add paths setter to FileViewFinder
2019-02-25 16:35:04 -06:00
Jason Varga
b130c9545b
Add setter
2019-02-25 14:37:27 -05:00
Dries Vints
b12feabda7
[5.6] Fix cache repository ( #26496 )
...
* Fix a bug with PHP 7.2.12
PHP 7.2.12 broke the way Carbon's diffInSeconds method works. Using diffInRealSeconds instead fixes the problem.
See https://github.com/briannesbitt/Carbon/issues/1503
* Clean up diff check in cache repository
We can pass the duration here directly.
Signed-off-by: Dries Vints <dries.vints@gmail.com>
* Upgrade mimum Carbon version
This fixes a problem with working with DateTimeImmutable instances in the cache repository.
Signed-off-by: Dries Vints <dries.vints@gmail.com>
2018-11-13 08:14:53 -06:00
Graham Campbell
372dcf3ed1
Merge pull request #26132 from hedii/5.6
...
[5.6] hash_equals(): Expected user_string to be a string, null given
2018-10-15 21:40:44 +01:00
hedii
d32eae28aa
Cast user_string to string to avoid ErrorException
2018-10-15 15:41:31 +02:00
Evgeniy Kuzmin
7939094eb5
[5.6] fixed @return type for phpstan ( #26098 )
...
* fixed @return type for phpstan
* code style fix
* Update Mailer.php
2018-10-12 08:42:13 -05:00
Tetiana Blindaruk
71964f873c
[5.6] Revert email lang template changes. ( #25983 )
...
* [5.6] Revert email lang template changes.
I`m not sure, but probably we also should reverting `email lang template` ([#25734 ](https://github.com/laravel/framework/pull/25734 )) changes in 5.6 version
Since in prev 5.6 release we also had:
- `Fixed translation escaping ([#25858 ](https://github.com/laravel/framework/pull/25858 ), [4c46500
](4c465007bb
))` for fixed translation escaping
The same revert was in 5.7 (https://github.com/laravel/framework/pull/25963 )
* [5.6] Revert email lang template changes.
- add `comma` after last value in array.
2018-10-07 10:51:20 -05:00
Tetiana Blindaruk
7cc72ee1ae
[5.6] Fixed changelog style mistakes ( #25965 )
...
* [5.6] Changed revision number in changelog to the short version.
* [5.6] Added missed `#`
2018-10-06 12:47:39 +03:00
Tetiana Blindaruk
b73bfeba86
[5.6] Add changelog for v5.6.39
2018-10-04 20:52:06 +03:00
Taylor Otwell
37bb306f51
version
2018-10-04 09:50:41 -05:00
Taylor Otwell
4c465007bb
revert
2018-10-04 09:43:16 -05:00
Antonio Pauletich
1807c924d9
[5.6] Fix translation escaping ( #25858 )
...
* Fix translation escaping
* Update Translator.php
2018-10-02 06:27:20 -07:00
Tetiana Blindaruk
fa5ea32d59
[5.6] Add changelog for v5.6.38 ( #25760 )
2018-09-25 07:14:23 -07:00
Tetiana Blindaruk
ecf2999b2a
[5.6] Add changelog for v5.6.37 ( #25707 ) ( #25747 )
2018-09-23 11:58:19 -07:00
Laurence Ioannou
852ff285db
Update email.blade.php ( #25734 )
2018-09-21 11:42:35 -05:00
Tetiana Blindaruk
7c09461690
[5.6] make a 2 new line before new release in CHANGELOG-5.6 file ( #25722 )
...
- it is a style in CHANGELOG, as I can see
2018-09-20 16:27:49 -07:00
Tetiana Blindaruk
aa249cb6f6
[5.6] Add changelog for v5.6.36 ( #25707 )
2018-09-20 08:41:25 -05:00
Graham Campbell
0a83ce33da
Merge pull request #25705 from pahan35/5.6-port-test-fixes
...
[5.6] port Windows test fixes PR #25646 to 5.6 branch
2018-09-19 21:52:56 +01:00
Pavlo Zhukov
e7ba421ba8
[5.6] port Windows test fixes PR #25646 to 5.6 branch
2018-09-19 23:28:52 +03:00
Tetiana Blindaruk
e8bc9fb2a4
[5.6] update `release.sh` as in `5.7`. ( #25687 )
2018-09-19 07:50:50 -05:00
Tetiana Blindaruk
05fc617d68
[5.6] Add `/bin` folder to `export-ignore` ( #25672 )
2018-09-18 07:49:26 -05:00
Tetiana Blindaruk
70d1e43d99
[5.6] update CURRENT_BRANCH to "5.6" in release.sh ( #25666 )
...
- Should it be `5.6`?
If yes, than please update master branch also
2018-09-17 16:58:21 -05:00
Taylor Otwell
41092578a2
add bin
2018-09-17 13:08:22 -05:00
Tetiana Blindaruk
7fa3629995
[5.6] Added changelog for v5.6.35 ( #25652 )
...
- fixed https://github.com/laravel/framework/issues/25651 issue
2018-09-16 19:41:25 -05:00
Graham Campbell
394f79f9a6
Fixed required carbon version
2018-09-06 14:37:53 +01:00
Taylor Otwell
38d838bab9
version
2018-09-04 08:15:09 -05:00
joskfg
dc83d33c3f
[5.6] Allow load relations with similar keys using strict comparisson ( #25429 )
...
* 5.6 Allow load relations with similar keys using strict comparisson
* feature/Allow-load-relations-without-losing-keys Fix null value
2018-09-04 08:11:31 -05:00
Taylor Otwell
805181ce81
formatting
2018-09-04 08:01:52 -05:00
Jonas Staudenmeir
a8c505652b
Fix nullable MorphTo and $touches
2018-09-04 02:08:41 +02:00
Phan An
83bd575a3f
Fix the return types for Command methods ( #25425 )
2018-09-03 15:49:38 +02:00
Graham Campbell
62332b6f79
Merge pull request #25414 from carusogabriel/null-type-hint
...
[5.6] Move null type hint to the last position in phpDocs
2018-09-03 02:31:11 -05:00
Graham Campbell
b56c3d8a89
Merge pull request #25412 from carusogabriel/useless-parentheses
...
[5.6] Remove useless parentheses
2018-09-03 02:30:43 -05:00
Gabriel Caruso
7fef0307c6
[5.6] Move null type hint to the last position in phpDocs
2018-09-02 18:09:00 -03:00
Gabriel Caruso
c3b57a1cff
[5.6] Remove useless parentheses
2018-09-02 17:48:12 -03:00
Taylor Otwell
975e182d42
version
2018-09-02 15:51:42 +02:00
Tetiana Blindaruk
4b7441032d
[5.6] Delete unneeded code after https://github.com/laravel/framework/pull/25392 ( #25400 )
2018-09-02 15:50:34 +02:00
Jonas Staudenmeir
ec81088570
Fix MorphTo lazy loading and withoutGlobalScopes() ( #25406 )
2018-09-02 15:49:42 +02:00