Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5f9e56f

Browse files
author
Phil Sturgeon
committed
Merge branch 'master' of https://github.com/laravel/framework 
2 parents 0bd40c9 + 0925c70 commit 5f9e56f

502 files changed

Lines changed: 20298 additions & 6693 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/build export-ignore
2-
/tests export-ignore
2+
/tests export-ignore

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/vendor
22
composer.phar
33
composer.lock
4-
.DS_Store
4+
.DS_Store

‎.travis.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
language: php
22

3-
php:
4-
- 5.3
3+
php:
54
- 5.4
65
- 5.5
6+
- 5.6
7+
- hhvm
78

89
before_script:
9-
- curl -s http://getcomposer.org/installer | php
10-
- php composer.phar install --prefer-source --no-interaction --dev
10+
- composer self-update
11+
- composer install --prefer-source --no-interaction --dev
1112

12-
script: phpunit
13+
script: phpunit -d memory_limit=1024M
14+
15+
matrix:
16+
allow_failures:
17+
- php: 5.6
18+
- php: hhvm
19+
fast_finish: true

‎CONTRIBUTING.md‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ Laravel follows the [PSR-0](https://github.com/php-fig/fig-standards/blob/master
2323
- Namespace declarations should be on the same line as `<?php`.
2424
- Class opening `{` should be on the same line as the class name.
2525
- Function and control structure opening `{` should be on a separate line.
26-
- Interface names are suffixed with `Interface` (`FooInterface`)
26+
- Interface names are suffixed with `Interface` (`FooInterface`)

‎LICENSE.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) <Taylor Otwell>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎build/illuminate-split-full.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ git subsplit publish src/Illuminate/Translation:[email protected]:illuminate/transl
2626
git subsplit publish src/Illuminate/Validation:[email protected]:illuminate/validation.git
2727
git subsplit publish src/Illuminate/View:[email protected]:illuminate/view.git
2828
git subsplit publish src/Illuminate/Workbench:[email protected]:illuminate/workbench.git
29-
rm -rf .subsplit/
29+
rm -rf .subsplit/

‎build/illuminate-split.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ git subsplit publish --no-tags src/Illuminate/Translation:[email protected]:illumin
2626
git subsplit publish --no-tags src/Illuminate/Validation:[email protected]:illuminate/validation.git
2727
git subsplit publish --no-tags src/Illuminate/View:[email protected]:illuminate/view.git
2828
git subsplit publish --no-tags src/Illuminate/Workbench:[email protected]:illuminate/workbench.git
29-
rm -rf .subsplit/
29+
rm -rf .subsplit/

‎composer.json‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,30 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=5.3.0",
13+
"php": ">=5.4.0",
1414
"classpreloader/classpreloader": "1.0.*",
15+
"d11wtq/boris": "1.0.*",
1516
"ircmaxell/password-compat": "1.0.*",
16-
"filp/whoops": "1.0.7",
17-
"monolog/monolog": "1.6.*",
17+
"filp/whoops": "1.0.10",
18+
"jeremeamia/superclosure": "1.0.*",
19+
"monolog/monolog": "1.*",
1820
"nesbot/carbon": "1.*",
1921
"patchwork/utf8": "1.1.*",
20-
"phpseclib/phpseclib": "0.3.x",
22+
"phpseclib/phpseclib": "0.3.*",
2123
"predis/predis": "0.8.*",
24+
"stack/builder": "1.0.*",
2225
"swiftmailer/swiftmailer": "5.0.*",
23-
"symfony/browser-kit": "2.3.*",
24-
"symfony/console": "2.3.*",
25-
"symfony/css-selector": "2.3.*",
26-
"symfony/debug": "2.3.*",
27-
"symfony/dom-crawler": "2.3.*",
28-
"symfony/finder": "2.3.*",
29-
"symfony/http-foundation": "2.3.*",
30-
"symfony/http-kernel": "2.3.*",
31-
"symfony/process": "2.3.*",
32-
"symfony/translation": "2.3.*"
26+
"symfony/browser-kit": "2.4.*",
27+
"symfony/console": "2.4.*",
28+
"symfony/css-selector": "2.4.*",
29+
"symfony/debug": "2.4.*",
30+
"symfony/dom-crawler": "2.4.*",
31+
"symfony/finder": "2.4.*",
32+
"symfony/http-foundation": "2.4.*",
33+
"symfony/http-kernel": "2.4.*",
34+
"symfony/process": "2.4.*",
35+
"symfony/routing": "2.4.*",
36+
"symfony/translation": "2.4.*"
3337
},
3438
"replace": {
3539
"illuminate/auth": "self.version",
@@ -61,31 +65,30 @@
6165
"illuminate/workbench": "self.version"
6266
},
6367
"require-dev": {
64-
"aws/aws-sdk-php": "2.2.*",
65-
"iron-io/iron_mq": "1.4.4",
66-
"pda/pheanstalk": "2.0.*",
67-
"mockery/mockery": "0.7.2",
68+
"aws/aws-sdk-php": "2.5.*",
69+
"iron-io/iron_mq": "1.5.*",
70+
"pda/pheanstalk": "2.1.*",
71+
"mockery/mockery": "0.9.*",
6872
"phpunit/phpunit": "3.7.*"
6973
},
7074
"autoload": {
7175
"classmap": [
7276
["src/Illuminate/Queue/IlluminateQueueClosure.php"]
7377
],
74-
"files": [
78+
"files": [
7579
"src/Illuminate/Support/helpers.php"
76-
],
80+
],
7781
"psr-0": {
7882
"Illuminate": "src/"
7983
}
8084
},
8185
"extra": {
8286
"branch-alias": {
83-
"dev-master": "4.1-dev"
87+
"dev-master": "4.2-dev"
8488
}
8589
},
8690
"suggest": {
87-
"doctrine/dbal": "Allow renaming columns and dropping SQLite columns.",
88-
"react/socket": "Allow live debugging using 'debug' Artisan command."
91+
"doctrine/dbal": "Allow renaming columns and dropping SQLite columns."
8992
},
9093
"minimum-stability": "dev"
9194
}

‎phpunit.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@
2525
|
2626
*/
2727

28-
date_default_timezone_set('UTC');
28+
date_default_timezone_set('UTC');
29+
30+
Carbon\Carbon::setTestNow(Carbon\Carbon::now());

‎phpunit.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
</exclude>
2525
</whitelist>
2626
</filter>
27-
</phpunit>
27+
</phpunit>

0 commit comments

Comments
 (0)