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

Skip to content

Commit 8f520e3

Browse files
taylorotwelltaylorotwell
committed
Merge branch '4.1'
2 parents 6b35f8a + 3a1cb32 commit 8f520e3

81 files changed

Lines changed: 147 additions & 107 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.

‎build/illuminate-split.sh‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
git subsplit init [email protected]:laravel/framework.git
2-
git subsplit publish --no-tags src/Illuminate/Auth:[email protected]:illuminate/auth.git
3-
git subsplit publish --no-tags src/Illuminate/Cache:[email protected]:illuminate/cache.git
4-
git subsplit publish --no-tags src/Illuminate/Config:[email protected]:illuminate/config.git
5-
git subsplit publish --no-tags src/Illuminate/Console:[email protected]:illuminate/console.git
6-
git subsplit publish --no-tags src/Illuminate/Container:[email protected]:illuminate/container.git
7-
git subsplit publish --no-tags src/Illuminate/Cookie:[email protected]:illuminate/cookie.git
8-
git subsplit publish --no-tags src/Illuminate/Database:[email protected]:illuminate/database.git
9-
git subsplit publish --no-tags src/Illuminate/Encryption:[email protected]:illuminate/encryption.git
10-
git subsplit publish --no-tags src/Illuminate/Events:[email protected]:illuminate/events.git
11-
git subsplit publish --no-tags src/Illuminate/Exception:[email protected]:illuminate/exception.git
12-
git subsplit publish --no-tags src/Illuminate/Filesystem:[email protected]:illuminate/filesystem.git
13-
git subsplit publish --no-tags src/Illuminate/Hashing:[email protected]:illuminate/hashing.git
14-
git subsplit publish --no-tags src/Illuminate/Html:[email protected]:illuminate/html.git
15-
git subsplit publish --no-tags src/Illuminate/Http:[email protected]:illuminate/http.git
16-
git subsplit publish --no-tags src/Illuminate/Log:[email protected]:illuminate/log.git
17-
git subsplit publish --no-tags src/Illuminate/Mail:[email protected]:illuminate/mail.git
18-
git subsplit publish --no-tags src/Illuminate/Pagination:[email protected]:illuminate/pagination.git
19-
git subsplit publish --no-tags src/Illuminate/Queue:[email protected]:illuminate/queue.git
20-
git subsplit publish --no-tags src/Illuminate/Redis:[email protected]:illuminate/redis.git
21-
git subsplit publish --no-tags src/Illuminate/Remote:[email protected]:illuminate/remote.git
22-
git subsplit publish --no-tags src/Illuminate/Routing:[email protected]:illuminate/routing.git
23-
git subsplit publish --no-tags src/Illuminate/Session:[email protected]:illuminate/session.git
24-
git subsplit publish --no-tags src/Illuminate/Support:[email protected]:illuminate/support.git
25-
git subsplit publish --no-tags src/Illuminate/Translation:[email protected]:illuminate/translation.git
26-
git subsplit publish --no-tags src/Illuminate/Validation:[email protected]:illuminate/validation.git
27-
git subsplit publish --no-tags src/Illuminate/View:[email protected]:illuminate/view.git
28-
git subsplit publish --no-tags src/Illuminate/Workbench:[email protected]:illuminate/workbench.git
2+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Auth:[email protected]:illuminate/auth.git
3+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Cache:[email protected]:illuminate/cache.git
4+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Config:[email protected]:illuminate/config.git
5+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Console:[email protected]:illuminate/console.git
6+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Container:[email protected]:illuminate/container.git
7+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Cookie:[email protected]:illuminate/cookie.git
8+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Database:[email protected]:illuminate/database.git
9+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Encryption:[email protected]:illuminate/encryption.git
10+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Events:[email protected]:illuminate/events.git
11+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Exception:[email protected]:illuminate/exception.git
12+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Filesystem:[email protected]:illuminate/filesystem.git
13+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Hashing:[email protected]:illuminate/hashing.git
14+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Html:[email protected]:illuminate/html.git
15+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Http:[email protected]:illuminate/http.git
16+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Log:[email protected]:illuminate/log.git
17+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Mail:[email protected]:illuminate/mail.git
18+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Pagination:[email protected]:illuminate/pagination.git
19+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Queue:[email protected]:illuminate/queue.git
20+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Redis:[email protected]:illuminate/redis.git
21+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Remote:[email protected]:illuminate/remote.git
22+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Routing:[email protected]:illuminate/routing.git
23+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Session:[email protected]:illuminate/session.git
24+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Support:[email protected]:illuminate/support.git
25+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Translation:[email protected]:illuminate/translation.git
26+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Validation:[email protected]:illuminate/validation.git
27+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/View:[email protected]:illuminate/view.git
28+
git subsplit publish --heads="master 4.1" --no-tags src/Illuminate/Workbench:[email protected]:illuminate/workbench.git
2929
rm -rf .subsplit/

‎src/Illuminate/Database/Eloquent/Relations/MorphToMany.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,24 @@ public function newPivot(array $attributes = array(), $exists = false)
135135
return $pivot;
136136
}
137137

138+
/**
139+
* Get the foreign key "type" name.
140+
*
141+
* @return string
142+
*/
143+
public function getMorphType()
144+
{
145+
return $this->morphType;
146+
}
147+
148+
/**
149+
* Get the class name of the parent model.
150+
*
151+
* @return string
152+
*/
153+
public function getMorphClass()
154+
{
155+
return $this->morphClass;
156+
}
157+
138158
}

‎src/Illuminate/Foundation/Testing/TestCase.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,24 @@ public function assertViewHasAll(array $bindings)
211211
}
212212
}
213213

214+
/**
215+
* Assert that the response view is missing a piece of bound data.
216+
*
217+
* @param string $key
218+
* @return void
219+
*/
220+
public function assertViewMissing($key)
221+
{
222+
$response = $this->client->getResponse()->original;
223+
224+
if ( ! $response instanceof View)
225+
{
226+
return $this->assertTrue(false, 'The response was not a view.');
227+
}
228+
229+
$this->assertArrayNotHasKey($key, $response->getData());
230+
}
231+
214232
/**
215233
* Assert whether the client was redirected to a given URI.
216234
*

‎src/Illuminate/Foundation/changes.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@
113113
{"message": "Allow container parameter overrides to be specified by argument name.", "backport": null},
114114
{"message": "BelongsToMany 'sync' method now returns array with information on what changed.", "backport": null},
115115
{"message": "TTR configuration option now supported on Beanstalk queues.", "backport": null},
116-
{"message": "Added support for eager loading of MorphTo relationships.", "backport": null}
116+
{"message": "Added support for eager loading of MorphTo relationships.", "backport": null},
117+
{"message": "Added 'assertViewMissing' method to TestCase.", "backport": null}
117118
],
118119
"4.0.*": [
119120
{"message": "Added implode method to query builder and Collection class.", "backport": null},

‎src/Illuminate/Redis/Database.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@ public function __call($method, $parameters)
9595
return $this->command($method, $parameters);
9696
}
9797

98-
}
98+
}

‎src/Illuminate/Redis/RedisServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ public function provides()
3434
return array('redis');
3535
}
3636

37-
}
37+
}

‎src/Illuminate/Remote/ConnectionInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ public function put($local, $remote);
4949
*/
5050
public function putString($remote, $contents);
5151

52-
}
52+
}

‎src/Illuminate/Remote/GatewayInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ public function nextLine();
5757
*/
5858
public function status();
5959

60-
}
60+
}

‎src/Illuminate/Remote/MultiConnection.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ public function putString($remote, $contents)
9797
}
9898
}
9999

100-
}
100+
}

‎src/Illuminate/Remote/RemoteServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ public function provides()
3434
return array('remote');
3535
}
3636

37-
}
37+
}

0 commit comments

Comments
 (0)