language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | laravel | framework | ec966c21c4062c8ded5d8add4db91cab61a591dc.json | add helper for on delete cascade | src/Illuminate/Database/Schema/ForeignKeyDefinition.php | @@ -14,5 +14,13 @@
*/
class ForeignKeyDefinition extends Fluent
{
- //
+ /**
+ * Indicate that deletes should cascade.
+ *
+ * @return $this
+ */
+ public function cascadeOnDelete()
+ {
+ return $this->onDelete('cascade');
+ }
} | true |
Other | laravel | framework | ec966c21c4062c8ded5d8add4db91cab61a591dc.json | add helper for on delete cascade | tests/Database/DatabaseMySqlSchemaGrammarTest.php | @@ -371,6 +371,14 @@ public function testAddingForeignKey()
$this->assertCount(1, $statements);
$this->assertSame('alter table `users` add constraint `users_foo_id_foreign` foreign key (`foo_id`) references `orders` (`id`)', $statements[0]);
+
+
+ $blueprint = new Blueprint('users');
+ $blueprint->foreign('foo_id')->references('id')->on('orders')->cascadeOnDelete();
+ $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
+
+ $this->assertCount(1, $statements);
+ $this->assertSame('alter table `users` add constraint `users_foo_id_foreign` foreign key (`foo_id`) references `orders` (`id`) on delete cascade', $statements[0]);
}
public function testAddingIncrementingID() | true |
Other | laravel | framework | ea6cedb379a07a9dee713b269d05fc7fa6fda0d7.json | Apply fixes from StyleCI (#30486) | src/Illuminate/Database/Schema/ForeignIdColumnDefinition.php | @@ -3,7 +3,6 @@
namespace Illuminate\Database\Schema;
use Illuminate\Support\Str;
-use Illuminate\Database\Schema\Blueprint;
class ForeignIdColumnDefinition extends ColumnDefinition
{ | false |
Other | laravel | framework | 70cb9f346302031ddba2bb6c33b9b2ac6f0fb074.json | Add LazyCollection@remember method (#30443) | src/Illuminate/Support/LazyCollection.php | @@ -109,6 +109,44 @@ public function eager()
return new static($this->all());
}
+ /**
+ * Cache values as they're enumerated.
+ *
+ * @return static
+ */
+ public function remember()
+ {
+ $iterator = $this->getIterator();
+
+ $iteratorIndex = 0;
+
+ $cache = [];
+
+ return new static(function () use ($iterator, &$iteratorIndex, &$cache) {
+ for ($index = 0; true; $index++) {
+ if (array_key_exists($index, $cache)) {
+ yield $cache[$index][0] => $cache[$index][1];
+
+ continue;
+ }
+
+ if ($iteratorIndex < $index) {
+ $iterator->next();
+
+ $iteratorIndex++;
+ }
+
+ if (! $iterator->valid()) {
+ break;
+ }
+
+ $cache[$index] = [$iterator->key(), $iterator->current()];
+
+ yield $cache[$index][0] => $cache[$index][1];
+ }
+ });
+ }
+
/**
* Get the average value of a given key.
* | true |
Other | laravel | framework | 70cb9f346302031ddba2bb6c33b9b2ac6f0fb074.json | Add LazyCollection@remember method (#30443) | tests/Support/SupportLazyCollectionIsLazyTest.php | @@ -763,6 +763,27 @@ public function testRejectIsLazy()
});
}
+ public function testRememberIsLazy()
+ {
+ $this->assertDoesNotEnumerate(function ($collection) {
+ $collection->remember();
+ });
+
+ $this->assertEnumeratesOnce(function ($collection) {
+ $collection = $collection->remember();
+
+ $collection->all();
+ $collection->all();
+ });
+
+ $this->assertEnumerates(5, function ($collection) {
+ $collection = $collection->remember();
+
+ $collection->take(5)->all();
+ $collection->take(5)->all();
+ });
+ }
+
public function testReplaceIsLazy()
{
$this->assertDoesNotEnumerate(function ($collection) { | true |
Other | laravel | framework | 70cb9f346302031ddba2bb6c33b9b2ac6f0fb074.json | Add LazyCollection@remember method (#30443) | tests/Support/SupportLazyCollectionTest.php | @@ -80,6 +80,80 @@ public function testEager()
$this->assertSame([1, 2, 3, 4, 5], $data->all());
}
+ public function testRemember()
+ {
+ $source = [1, 2, 3, 4];
+
+ $collection = LazyCollection::make(function () use (&$source) {
+ yield from $source;
+ })->remember();
+
+ $this->assertSame([1, 2, 3, 4], $collection->all());
+
+ $source = [];
+
+ $this->assertSame([1, 2, 3, 4], $collection->all());
+ }
+
+ public function testRememberWithTwoRunners()
+ {
+ $source = [1, 2, 3, 4];
+
+ $collection = LazyCollection::make(function () use (&$source) {
+ yield from $source;
+ })->remember();
+
+ $a = $collection->getIterator();
+ $b = $collection->getIterator();
+
+ $this->assertEquals(1, $a->current());
+ $this->assertEquals(1, $b->current());
+
+ $b->next();
+
+ $this->assertEquals(1, $a->current());
+ $this->assertEquals(2, $b->current());
+
+ $b->next();
+
+ $this->assertEquals(1, $a->current());
+ $this->assertEquals(3, $b->current());
+
+ $a->next();
+
+ $this->assertEquals(2, $a->current());
+ $this->assertEquals(3, $b->current());
+
+ $a->next();
+
+ $this->assertEquals(3, $a->current());
+ $this->assertEquals(3, $b->current());
+
+ $a->next();
+
+ $this->assertEquals(4, $a->current());
+ $this->assertEquals(3, $b->current());
+
+ $b->next();
+
+ $this->assertEquals(4, $a->current());
+ $this->assertEquals(4, $b->current());
+ }
+
+ public function testRememberWithDuplicateKeys()
+ {
+ $collection = LazyCollection::make(function () {
+ yield 'key' => 1;
+ yield 'key' => 2;
+ })->remember();
+
+ $results = $collection->map(function ($value, $key) {
+ return [$key, $value];
+ })->values()->all();
+
+ $this->assertSame([['key', 1], ['key', 2]], $results);
+ }
+
public function testTapEach()
{
$data = LazyCollection::times(10); | true |
Other | laravel | framework | e9632af218c3e3d263526f4a19bcf6af4987a7fb.json | Fix $groups param type (#30465) | src/Illuminate/Database/Query/Builder.php | @@ -1668,7 +1668,7 @@ protected function addDynamic($segment, $connector, $parameters, $index)
/**
* Add a "group by" clause to the query.
*
- * @param array ...$groups
+ * @param array|string ...$groups
* @return $this
*/
public function groupBy(...$groups) | false |
Other | laravel | framework | 692b2917099b3ff414097245dc8de04dd5543f2e.json | Apply fixes from StyleCI (#30448) | tests/Routing/RoutingUrlGeneratorTest.php | @@ -629,7 +629,8 @@ public function testSignedRelativeUrl()
$this->assertFalse($url->hasValidSignature($request, false));
}
- public function testSignedUrlParameterCannotBeNamedSignature() {
+ public function testSignedUrlParameterCannotBeNamedSignature()
+ {
$url = new UrlGenerator(
$routes = new RouteCollection,
$request = Request::create('http://www.foo.com/') | false |
Other | laravel | framework | 50e60dc6a0239a38d533efc00efe8e16de8605c9.json | Apply fixes from StyleCI (#30413) | tests/Database/DatabaseEloquentModelTest.php | @@ -1981,7 +1981,7 @@ public function testGetOriginalCastsAttributes()
'foo' => 'bar2',
];
$model->collectionAttribute = collect([
- 'foo' => 'bar2'
+ 'foo' => 'bar2',
]);
$this->assertIsInt($model->getOriginal('intAttribute')); | false |
Other | laravel | framework | b85f8cb3ecd50c2dc846bd86cc721932355503d0.json | Fix bunch of docblocks (#30406) | src/Illuminate/Foundation/helpers.php | @@ -27,9 +27,9 @@
/**
* Throw an HttpException with the given data.
*
- * @param \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Support\Responsable|int $code
+ * @param \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Support\Responsable|int $code
* @param string $message
- * @param array $headers
+ * @param array $headers
* @return void
*
* @throws \Symfony\Component\HttpKernel\Exception\HttpException
@@ -51,10 +51,10 @@ function abort($code, $message = '', array $headers = [])
/**
* Throw an HttpException with the given data if the given condition is true.
*
- * @param bool $boolean
- * @param int $code
+ * @param bool $boolean
+ * @param int $code
* @param string $message
- * @param array $headers
+ * @param array $headers
* @return void
*
* @throws \Symfony\Component\HttpKernel\Exception\HttpException
@@ -72,10 +72,10 @@ function abort_if($boolean, $code, $message = '', array $headers = [])
/**
* Throw an HttpException with the given data unless the given condition is true.
*
- * @param bool $boolean
- * @param int $code
+ * @param bool $boolean
+ * @param int $code
* @param string $message
- * @param array $headers
+ * @param array $headers
* @return void
*
* @throws \Symfony\Component\HttpKernel\Exception\HttpException
@@ -94,8 +94,8 @@ function abort_unless($boolean, $code, $message = '', array $headers = [])
* Generate the URL to a controller action.
*
* @param string|array $name
- * @param mixed $parameters
- * @param bool $absolute
+ * @param mixed $parameters
+ * @param bool $absolute
* @return string
*/
function action($name, $parameters = [], $absolute = true)
@@ -109,7 +109,7 @@ function action($name, $parameters = [], $absolute = true)
* Get the available container instance.
*
* @param string|null $abstract
- * @param array $parameters
+ * @param array $parameters
* @return mixed|\Illuminate\Contracts\Foundation\Application
*/
function app($abstract = null, array $parameters = [])
@@ -170,7 +170,7 @@ function auth($guard = null)
/**
* Create a new redirect response to the previous location.
*
- * @param int $status
+ * @param int $status
* @param array $headers
* @param mixed $fallback
* @return \Illuminate\Http\RedirectResponse
@@ -374,7 +374,7 @@ function database_path($path = '')
* Decrypt the given value.
*
* @param string $value
- * @param bool $unserialize
+ * @param bool $unserialize
* @return mixed
*/
function decrypt($value, $unserialize = true)
@@ -459,7 +459,7 @@ function elixir($file, $buildDirectory = 'build')
* Encrypt the given value.
*
* @param mixed $value
- * @param bool $serialize
+ * @param bool $serialize
* @return string
*/
function encrypt($value, $serialize = true)
@@ -511,7 +511,7 @@ function factory()
* Write some information to the log.
*
* @param string $message
- * @param array $context
+ * @param array $context
* @return void
*/
function info($message, $context = [])
@@ -584,7 +584,7 @@ function mix($path, $manifestDirectory = '')
/**
* Create a new Carbon instance for the current time.
*
- * @param \DateTimeZone|string|null $tz
+ * @param \DateTimeZone|string|null $tz
* @return \Illuminate\Support\Carbon
*/
function now($tz = null)
@@ -598,7 +598,7 @@ function now($tz = null)
* Retrieve an old input item.
*
* @param string|null $key
- * @param mixed $default
+ * @param mixed $default
* @return mixed
*/
function old($key = null, $default = null)
@@ -640,9 +640,9 @@ function public_path($path = '')
* Get an instance of the redirector.
*
* @param string|null $to
- * @param int $status
- * @param array $headers
- * @param bool|null $secure
+ * @param int $status
+ * @param array $headers
+ * @param bool|null $secure
* @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
*/
function redirect($to = null, $status = 302, $headers = [], $secure = null)
@@ -678,7 +678,7 @@ function report($exception)
* Get an instance of the current request or an input item from the request.
*
* @param array|string|null $key
- * @param mixed $default
+ * @param mixed $default
* @return \Illuminate\Http\Request|string|array
*/
function request($key = null, $default = null)
@@ -752,8 +752,8 @@ function resource_path($path = '')
* Return a new response from the application.
*
* @param \Illuminate\View\View|string|array|null $content
- * @param int $status
- * @param array $headers
+ * @param int $status
+ * @param array $headers
* @return \Illuminate\Http\Response|\Illuminate\Contracts\Routing\ResponseFactory
*/
function response($content = '', $status = 200, array $headers = [])
@@ -801,7 +801,7 @@ function secure_asset($path)
* Generate a HTTPS url for the application.
*
* @param string $path
- * @param mixed $parameters
+ * @param mixed $parameters
* @return string
*/
function secure_url($path, $parameters = [])
@@ -851,7 +851,7 @@ function storage_path($path = '')
/**
* Create a new Carbon instance for the current date.
*
- * @param \DateTimeZone|string|null $tz
+ * @param \DateTimeZone|string|null $tz
* @return \Illuminate\Support\Carbon
*/
function today($tz = null)
@@ -865,7 +865,7 @@ function today($tz = null)
* Translate the given message.
*
* @param string|null $key
- * @param array $replace
+ * @param array $replace
* @param string|null $locale
* @return \Illuminate\Contracts\Translation\Translator|string|array|null
*/
@@ -885,7 +885,7 @@ function trans($key = null, $replace = [], $locale = null)
*
* @param string $key
* @param \Countable|int|array $number
- * @param array $replace
+ * @param array $replace
* @param string|null $locale
* @return string
*/
@@ -919,8 +919,8 @@ function __($key = null, $replace = [], $locale = null)
* Generate a url for the application.
*
* @param string $path
- * @param mixed $parameters
- * @param bool|null $secure
+ * @param mixed $parameters
+ * @param bool|null $secure
* @return \Illuminate\Contracts\Routing\UrlGenerator|string
*/
function url($path = null, $parameters = [], $secure = null)
@@ -960,8 +960,8 @@ function validator(array $data = [], array $rules = [], array $messages = [], ar
* Get the evaluated view contents for the given view.
*
* @param string|null $view
- * @param \Illuminate\Contracts\Support\Arrayable|array $data
- * @param array $mergeData
+ * @param \Illuminate\Contracts\Support\Arrayable|array $data
+ * @param array $mergeData
* @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
*/
function view($view = null, $data = [], $mergeData = []) | false |
Other | laravel | framework | 2227c446fcecb365346a08de203c1997de96a931.json | Add support for "where value" subqueries | src/Illuminate/Database/Eloquent/Builder.php | @@ -222,7 +222,7 @@ public function whereKeyNot($id)
*/
public function where($column, $operator = null, $value = null, $boolean = 'and')
{
- if ($column instanceof Closure) {
+ if ($column instanceof Closure && is_null($operator)) {
$column($query = $this->model->newQueryWithoutRelationships());
$this->query->addNestedWhereQuery($query->getQuery(), $boolean); | true |
Other | laravel | framework | 2227c446fcecb365346a08de203c1997de96a931.json | Add support for "where value" subqueries | src/Illuminate/Database/Query/Builder.php | @@ -651,10 +651,20 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
// If the columns is actually a Closure instance, we will assume the developer
// wants to begin a nested where statement which is wrapped in parenthesis.
// We'll add that Closure to the query then return back out immediately.
- if ($column instanceof Closure) {
+ if ($column instanceof Closure && is_null($operator)) {
return $this->whereNested($column, $boolean);
}
+ // If the column is a Closure instance and there an operator set, we will
+ // assume the developer wants to run a subquery and then compare the
+ // results of the subquery with the value that was provided.
+ if ($column instanceof Closure && ! is_null($operator)) {
+ list($sub, $bindings) = $this->createSub($column);
+
+ return $this->addBinding($bindings, 'where')
+ ->where(new Expression('('.$sub.')'), $operator, $value, $boolean);
+ }
+
// If the given operator is not found in the list of valid operators we will
// assume that the developer is just short-cutting the '=' operators and
// we will set the operators to '=' and set the values appropriately. | true |
Other | laravel | framework | 9e4dfccb19d4a181dfbc3d838c2ea52851124cb5.json | Apply fixes from StyleCI (#30401) | src/Illuminate/Routing/Router.php | @@ -1165,7 +1165,7 @@ public function auth(array $options = [])
}
// Password Confirmation Routes...
- if ($options['confirm'] ??
+ if ($options['confirm'] ??
class_exists($this->prependGroupNamespace('Auth\ConfirmPasswordController'))) {
$this->confirmPassword();
} | false |
Other | laravel | framework | 51e0b1dd8c5a5082f0a955a128abcdbedf35c591.json | Apply fixes from StyleCI (#30400) | src/Illuminate/Auth/Middleware/RequirePassword.php | @@ -48,7 +48,7 @@ public function handle($request, Closure $next, $redirectToRoute = null)
if ($this->shouldConfirmPassword($request)) {
if ($request->expectsJson()) {
return $this->responseFactory->json([
- 'message' => 'Password confirmation required.'
+ 'message' => 'Password confirmation required.',
], 423);
}
| false |
Other | laravel | framework | 93eb836c4d0b5d03cc789de98acc6e03aa4aca25.json | Handle ajax requests in RequirePassword middleware | src/Illuminate/Auth/Middleware/RequirePassword.php | @@ -46,6 +46,10 @@ public function __construct(ResponseFactory $responseFactory, UrlGenerator $urlG
public function handle($request, Closure $next, $redirectToRoute = null)
{
if ($this->shouldConfirmPassword($request)) {
+ if ($request->expectsJson()) {
+ abort(423, 'Password confirmation required.');
+ }
+
return $this->responseFactory->redirectGuest(
$this->urlGenerator->route($redirectToRoute ?? 'password.confirm')
); | false |
Other | laravel | framework | 55d28abb7568f5625ea63063d55847e8b5f95ebe.json | Move comment to match logout method (#30372) | src/Illuminate/Auth/SessionGuard.php | @@ -540,11 +540,11 @@ public function logoutCurrentDevice()
{
$user = $this->user();
+ $this->clearUserDataFromStorage();
+
// If we have an event dispatcher instance, we can fire off the logout event
// so any further processing can be done. This allows the developer to be
// listening for anytime a user signs out of this application manually.
- $this->clearUserDataFromStorage();
-
if (isset($this->events)) {
$this->events->dispatch(new Events\CurrentDeviceLogout($this->name, $user));
} | false |
Other | laravel | framework | ba6e666dc7c5ed84213472387fe0851f625d131a.json | Improve function `retry()` (#30356)
If given a value less than 1 for `$times`, function could be stuck in an infinite loop. | src/Illuminate/Support/helpers.php | @@ -384,20 +384,18 @@ function preg_replace_array($pattern, array $replacements, $subject)
function retry($times, callable $callback, $sleep = 0, $when = null)
{
$attempts = 0;
- $times--;
beginning:
$attempts++;
+ $times--;
try {
return $callback($attempts);
} catch (Exception $e) {
- if (! $times || ($when && ! $when($e))) {
+ if ($times < 1 || ($when && ! $when($e))) {
throw $e;
}
- $times--;
-
if ($sleep) {
usleep($sleep * 1000);
} | false |
Other | laravel | framework | 6d06919511fa34ffca24e03cd494db4d63ee2575.json | Remove @throws docblock tags | src/Illuminate/Database/Query/Builder.php | @@ -311,8 +311,6 @@ public function fromRaw($expression, $bindings = [])
*
* @param \Closure|\Illuminate\Database\Query\Builder|string $query
* @return array
- *
- * @throws \InvalidArgumentException
*/
protected function createSub($query)
{
@@ -540,8 +538,6 @@ public function leftJoinWhere($table, $first, $operator, $second)
* @param string|null $operator
* @param string|null $second
* @return \Illuminate\Database\Query\Builder|static
- *
- * @throws \InvalidArgumentException
*/
public function leftJoinSub($query, $as, $first, $operator = null, $second = null)
{
@@ -585,8 +581,6 @@ public function rightJoinWhere($table, $first, $operator, $second)
* @param string|null $operator
* @param string|null $second
* @return \Illuminate\Database\Query\Builder|static
- *
- * @throws \InvalidArgumentException
*/
public function rightJoinSub($query, $as, $first, $operator = null, $second = null)
{
@@ -2673,8 +2667,6 @@ public function insertGetId(array $values, $sequence = null)
* @param array $columns
* @param \Closure|\Illuminate\Database\Query\Builder|string $query
* @return int
- *
- * @throws \InvalidArgumentException
*/
public function insertUsing(array $columns, $query)
{ | false |
Other | laravel | framework | ab5ee8aa5b8d1fb9e2d1acd7bf7a6962e7db2581.json | Add more context about invalid subqueries
The valid values for performing subqueries are query builder instances, closures and strings.
If the value is not one of the above, an InvalidArgumentException was thrown without any message. I've added a sensible message, and also some `@throws` docblock tags to the affected methods.
I've also added some tests that confirm these methods can indeed throw exceptions when misused. | src/Illuminate/Database/Query/Builder.php | @@ -311,6 +311,8 @@ public function fromRaw($expression, $bindings = [])
*
* @param \Closure|\Illuminate\Database\Query\Builder|string $query
* @return array
+ *
+ * @throws \InvalidArgumentException
*/
protected function createSub($query)
{
@@ -331,6 +333,8 @@ protected function createSub($query)
*
* @param mixed $query
* @return array
+ *
+ * @throws \InvalidArgumentException
*/
protected function parseSub($query)
{
@@ -339,7 +343,9 @@ protected function parseSub($query)
} elseif (is_string($query)) {
return [$query, []];
} else {
- throw new InvalidArgumentException;
+ throw new InvalidArgumentException(
+ 'The subquery must be an instance of Closure or Builder, or a string.'
+ );
}
}
@@ -534,6 +540,8 @@ public function leftJoinWhere($table, $first, $operator, $second)
* @param string|null $operator
* @param string|null $second
* @return \Illuminate\Database\Query\Builder|static
+ *
+ * @throws \InvalidArgumentException
*/
public function leftJoinSub($query, $as, $first, $operator = null, $second = null)
{
@@ -577,6 +585,8 @@ public function rightJoinWhere($table, $first, $operator, $second)
* @param string|null $operator
* @param string|null $second
* @return \Illuminate\Database\Query\Builder|static
+ *
+ * @throws \InvalidArgumentException
*/
public function rightJoinSub($query, $as, $first, $operator = null, $second = null)
{
@@ -2663,6 +2673,8 @@ public function insertGetId(array $values, $sequence = null)
* @param array $columns
* @param \Closure|\Illuminate\Database\Query\Builder|string $query
* @return int
+ *
+ * @throws \InvalidArgumentException
*/
public function insertUsing(array $columns, $query)
{ | true |
Other | laravel | framework | ab5ee8aa5b8d1fb9e2d1acd7bf7a6962e7db2581.json | Add more context about invalid subqueries
The valid values for performing subqueries are query builder instances, closures and strings.
If the value is not one of the above, an InvalidArgumentException was thrown without any message. I've added a sensible message, and also some `@throws` docblock tags to the affected methods.
I've also added some tests that confirm these methods can indeed throw exceptions when misused. | tests/Database/DatabaseQueryBuilderTest.php | @@ -1658,6 +1658,10 @@ public function testJoinSub()
$expected .= 'inner join (select * from "contacts" where "name" = ?) as "sub2" on "users"."id" = "sub2"."user_id"';
$this->assertEquals($expected, $builder->toSql());
$this->assertEquals(['foo', 1, 'bar'], $builder->getRawBindings()['join']);
+
+ $this->expectException(InvalidArgumentException::class);
+ $builder = $this->getBuilder();
+ $builder->from('users')->joinSub(['foo'], 'sub', 'users.id', '=', 'sub.id');
}
public function testJoinSubWithPrefix()
@@ -1673,13 +1677,21 @@ public function testLeftJoinSub()
$builder = $this->getBuilder();
$builder->from('users')->leftJoinSub($this->getBuilder()->from('contacts'), 'sub', 'users.id', '=', 'sub.id');
$this->assertSame('select * from "users" left join (select * from "contacts") as "sub" on "users"."id" = "sub"."id"', $builder->toSql());
+
+ $this->expectException(InvalidArgumentException::class);
+ $builder = $this->getBuilder();
+ $builder->from('users')->leftJoinSub(['foo'], 'sub', 'users.id', '=', 'sub.id');
}
public function testRightJoinSub()
{
$builder = $this->getBuilder();
$builder->from('users')->rightJoinSub($this->getBuilder()->from('contacts'), 'sub', 'users.id', '=', 'sub.id');
$this->assertSame('select * from "users" right join (select * from "contacts") as "sub" on "users"."id" = "sub"."id"', $builder->toSql());
+
+ $this->expectException(InvalidArgumentException::class);
+ $builder = $this->getBuilder();
+ $builder->from('users')->rightJoinSub(['foo'], 'sub', 'users.id', '=', 'sub.id');
}
public function testRawExpressionsInSelect()
@@ -1917,6 +1929,13 @@ function (Builder $query) {
$this->assertEquals(1, $result);
}
+ public function testInsertUsingInvalidSubquery()
+ {
+ $this->expectException(InvalidArgumentException::class);
+ $builder = $this->getBuilder();
+ $builder->from('table1')->insertUsing(['foo'], ['bar']);
+ }
+
public function testInsertOrIgnoreMethod()
{
$this->expectException(RuntimeException::class);
@@ -2869,6 +2888,10 @@ public function testSubSelect()
$builder->selectSub($subBuilder, 'sub');
$this->assertEquals($expectedSql, $builder->toSql());
$this->assertEquals($expectedBindings, $builder->getBindings());
+
+ $this->expectException(InvalidArgumentException::class);
+ $builder = $this->getPostgresBuilder();
+ $builder->selectSub(['foo'], 'sub');
}
public function testSqlServerWhereDate()
@@ -3421,6 +3444,10 @@ public function testFromSub()
}, 'sessions')->where('bar', '<', '10');
$this->assertSame('select * from (select max(last_seen_at) as last_seen_at from "user_sessions" where "foo" = ?) as "sessions" where "bar" < ?', $builder->toSql());
$this->assertEquals(['1', '10'], $builder->getBindings());
+
+ $this->expectException(InvalidArgumentException::class);
+ $builder = $this->getBuilder();
+ $builder->fromSub(['invalid'], 'sessions')->where('bar', '<', '10');
}
public function testFromSubWithPrefix()
@@ -3441,6 +3468,10 @@ public function testFromSubWithoutBindings()
$query->select(new Raw('max(last_seen_at) as last_seen_at'))->from('user_sessions');
}, 'sessions');
$this->assertSame('select * from (select max(last_seen_at) as last_seen_at from "user_sessions") as "sessions"', $builder->toSql());
+
+ $this->expectException(InvalidArgumentException::class);
+ $builder = $this->getBuilder();
+ $builder->fromSub(['invalid'], 'sessions');
}
public function testFromRaw() | true |
Other | laravel | framework | 34179347ef23507f0a7ab1f6dcab371dc4b9d641.json | Add autocomplete support for FakeQueue (#30300)
Add auto completion for the IDE. Currently the IDE does not know which assert-methods exist for Queue-Facade.
The Mail-Facade and other Facades already have this included: See https://github.com/laravel/framework/blob/6.x/src/Illuminate/Support/Facades/Mail.php#L15-L20
With this change the IDE know can auto complete all assert-methods: See: https://imgur.com/a/nVOPgEi | src/Illuminate/Support/Facades/Queue.php | @@ -15,6 +15,11 @@
* @method static \Illuminate\Contracts\Queue\Job|null pop(string $queue = null)
* @method static string getConnectionName()
* @method static \Illuminate\Contracts\Queue\Queue setConnectionName(string $name)
+ * @method static void assertNothingPushed()
+ * @method static void assertNotPushed(string $job, \Closure $callback = null)
+ * @method static void assertPushed(string $job, \Closure|int $callback = null)
+ * @method static void assertPushedOn(string $job, int $times = 1)
+ * @method static void assertPushedWithChain(string $queue, string $job, \Closure $callback = null)
*
* @see \Illuminate\Queue\QueueManager
* @see \Illuminate\Queue\Queue | false |
Other | laravel | framework | 2afe7cbeaa21566f7bb62da0fc47e00851513fe1.json | Apply fixes from StyleCI (#30278) | src/Illuminate/Mail/resources/views/html/themes/default.css | @@ -3,7 +3,8 @@
body,
body *:not(html):not(style):not(br):not(tr):not(code) {
box-sizing: border-box;
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
+ 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
position: relative;
}
@@ -79,7 +80,7 @@ img {
-premailer-cellpadding: 0;
-premailer-cellspacing: 0;
-premailer-width: 100%;
- background-color: #EDF2F7;
+ background-color: #edf2f7;
margin: 0;
padding: 0;
width: 100%;
@@ -111,7 +112,7 @@ img {
/* Logo */
.logo {
- color: #CBD5E0;
+ color: #cbd5e0;
fill: currentColor;
height: 75px;
width: 75px;
@@ -123,7 +124,7 @@ img {
-premailer-cellpadding: 0;
-premailer-cellspacing: 0;
-premailer-width: 100%;
- background-color: #EDF2F7;
+ background-color: #edf2f7;
border-bottom: 1px solid #edeff2;
border-top: 1px solid #edeff2;
margin: 0;
@@ -233,40 +234,40 @@ img {
.button-blue,
.button-primary {
- background-color: #2D3748;
- border-bottom: 8px solid #2D3748;
- border-left: 18px solid #2D3748;
- border-right: 18px solid #2D3748;
- border-top: 8px solid #2D3748;
+ background-color: #2d3748;
+ border-bottom: 8px solid #2d3748;
+ border-left: 18px solid #2d3748;
+ border-right: 18px solid #2d3748;
+ border-top: 8px solid #2d3748;
}
.button-green,
.button-success {
- background-color: #48BB78;
- border-bottom: 8px solid #48BB78;
- border-left: 18px solid #48BB78;
- border-right: 18px solid #48BB78;
- border-top: 8px solid #48BB78;
+ background-color: #48bb78;
+ border-bottom: 8px solid #48bb78;
+ border-left: 18px solid #48bb78;
+ border-right: 18px solid #48bb78;
+ border-top: 8px solid #48bb78;
}
.button-red,
.button-error {
- background-color: #E53E3E;
- border-bottom: 8px solid #E53E3E;
- border-left: 18px solid #E53E3E;
- border-right: 18px solid #E53E3E;
- border-top: 8px solid #E53E3E;
+ background-color: #e53e3e;
+ border-bottom: 8px solid #e53e3e;
+ border-left: 18px solid #e53e3e;
+ border-right: 18px solid #e53e3e;
+ border-top: 8px solid #e53e3e;
}
/* Panels */
.panel {
- border-left: #2D3748 solid 4px;
+ border-left: #2d3748 solid 4px;
margin: 21px 0;
}
.panel-content {
- background-color: #EDF2F7;
+ background-color: #edf2f7;
color: #718096;
padding: 16px;
} | false |
Other | laravel | framework | 74252f30191728d650ea9515fab22dbf0863b042.json | modernize mail styling | src/Illuminate/Mail/resources/views/html/header.blade.php | @@ -1,7 +1,13 @@
<tr>
<td class="header">
- <a href="{{ $url }}">
- {{ $slot }}
+ <a href="{{ $url }}" style="display: inline-block;">
+ @if (trim($slot) === 'Laravel')
+ <svg class="logo" viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg">
+ <path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"/>
+ </svg>
+ @else
+ {{ $slot }}
+ @endif
</a>
</td>
</tr> | true |
Other | laravel | framework | 74252f30191728d650ea9515fab22dbf0863b042.json | modernize mail styling | src/Illuminate/Mail/resources/views/html/promotion.blade.php | @@ -1,7 +0,0 @@
-<table class="promotion" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
- <tr>
- <td align="center">
- {{ Illuminate\Mail\Markdown::parse($slot) }}
- </td>
- </tr>
-</table> | true |
Other | laravel | framework | 74252f30191728d650ea9515fab22dbf0863b042.json | modernize mail styling | src/Illuminate/Mail/resources/views/html/promotion/button.blade.php | @@ -1,13 +0,0 @@
-<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
- <tr>
- <td align="center">
- <table border="0" cellpadding="0" cellspacing="0" role="presentation">
- <tr>
- <td>
- <a href="{{ $url }}" class="button button-green" target="_blank">{{ $slot }}</a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table> | true |
Other | laravel | framework | 74252f30191728d650ea9515fab22dbf0863b042.json | modernize mail styling | src/Illuminate/Mail/resources/views/html/themes/default.css | @@ -2,25 +2,20 @@
body,
body *:not(html):not(style):not(br):not(tr):not(code) {
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
- 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
box-sizing: border-box;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+ position: relative;
}
body {
- background-color: #f8fafc;
- color: #74787e;
+ -webkit-text-size-adjust: none;
+ background-color: #ffffff;
+ color: #718096;
height: 100%;
- hyphens: auto;
line-height: 1.4;
margin: 0;
- -moz-hyphens: auto;
- -ms-word-break: break-all;
+ padding: 0;
width: 100% !important;
- -webkit-hyphens: auto;
- -webkit-text-size-adjust: none;
- word-break: break-all;
- word-break: break-word;
}
p,
@@ -43,30 +38,27 @@ a img {
h1 {
color: #3d4852;
- font-size: 19px;
+ font-size: 18px;
font-weight: bold;
margin-top: 0;
text-align: left;
}
h2 {
- color: #3d4852;
font-size: 16px;
font-weight: bold;
margin-top: 0;
text-align: left;
}
h3 {
- color: #3d4852;
font-size: 14px;
font-weight: bold;
margin-top: 0;
text-align: left;
}
p {
- color: #3d4852;
font-size: 16px;
line-height: 1.5em;
margin-top: 0;
@@ -84,22 +76,22 @@ img {
/* Layout */
.wrapper {
- background-color: #f8fafc;
- margin: 0;
- padding: 0;
- width: 100%;
-premailer-cellpadding: 0;
-premailer-cellspacing: 0;
-premailer-width: 100%;
-}
-
-.content {
+ background-color: #EDF2F7;
margin: 0;
padding: 0;
width: 100%;
+}
+
+.content {
-premailer-cellpadding: 0;
-premailer-cellspacing: 0;
-premailer-width: 100%;
+ margin: 0;
+ padding: 0;
+ width: 100%;
}
/* Header */
@@ -110,154 +102,179 @@ img {
}
.header a {
- color: #bbbfc3;
+ color: #3d4852;
font-size: 19px;
font-weight: bold;
text-decoration: none;
- text-shadow: 0 1px 0 white;
+}
+
+/* Logo */
+
+.logo {
+ color: #CBD5E0;
+ fill: currentColor;
+ height: 75px;
+ width: 75px;
}
/* Body */
.body {
- background-color: #ffffff;
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
+ background-color: #EDF2F7;
border-bottom: 1px solid #edeff2;
border-top: 1px solid #edeff2;
margin: 0;
padding: 0;
width: 100%;
- -premailer-cellpadding: 0;
- -premailer-cellspacing: 0;
- -premailer-width: 100%;
}
.inner-body {
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 570px;
background-color: #ffffff;
+ border-color: #e8e5ef;
+ border-radius: 2px;
+ border-width: 1px;
+ box-shadow: 0 2px 0 rgba(0, 0, 150, 0.025), 2px 4px 0 rgba(0, 0, 150, 0.015);
margin: 0 auto;
padding: 0;
width: 570px;
- -premailer-cellpadding: 0;
- -premailer-cellspacing: 0;
- -premailer-width: 570px;
}
/* Subcopy */
.subcopy {
- border-top: 1px solid #edeff2;
+ border-top: 1px solid #e8e5ef;
margin-top: 25px;
padding-top: 25px;
}
.subcopy p {
- font-size: 12px;
+ font-size: 14px;
}
/* Footer */
.footer {
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 570px;
margin: 0 auto;
padding: 0;
text-align: center;
width: 570px;
- -premailer-cellpadding: 0;
- -premailer-cellspacing: 0;
- -premailer-width: 570px;
}
.footer p {
- color: #aeaeae;
+ color: #b0adc5;
font-size: 12px;
text-align: center;
}
+.footer a {
+ color: #b0adc5;
+ text-decoration: underline;
+}
+
/* Tables */
.table table {
- margin: 30px auto;
- width: 100%;
-premailer-cellpadding: 0;
-premailer-cellspacing: 0;
-premailer-width: 100%;
+ margin: 30px auto;
+ width: 100%;
}
.table th {
border-bottom: 1px solid #edeff2;
- padding-bottom: 8px;
margin: 0;
+ padding-bottom: 8px;
}
.table td {
color: #74787e;
font-size: 15px;
line-height: 18px;
- padding: 10px 0;
margin: 0;
+ padding: 10px 0;
}
.content-cell {
- padding: 35px;
+ max-width: 100vw;
+ padding: 32px;
}
/* Buttons */
.action {
+ -premailer-cellpadding: 0;
+ -premailer-cellspacing: 0;
+ -premailer-width: 100%;
margin: 30px auto;
padding: 0;
text-align: center;
width: 100%;
- -premailer-cellpadding: 0;
- -premailer-cellspacing: 0;
- -premailer-width: 100%;
}
.button {
- border-radius: 3px;
- box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
+ -webkit-text-size-adjust: none;
+ border-radius: 4px;
color: #fff;
display: inline-block;
+ overflow: hidden;
+ text-decoration: none;
text-decoration: none;
- -webkit-text-size-adjust: none;
}
.button-blue,
.button-primary {
- background-color: #3490dc;
- border-top: 10px solid #3490dc;
- border-right: 18px solid #3490dc;
- border-bottom: 10px solid #3490dc;
- border-left: 18px solid #3490dc;
+ background-color: #2D3748;
+ border-bottom: 8px solid #2D3748;
+ border-left: 18px solid #2D3748;
+ border-right: 18px solid #2D3748;
+ border-top: 8px solid #2D3748;
}
.button-green,
.button-success {
- background-color: #38c172;
- border-top: 10px solid #38c172;
- border-right: 18px solid #38c172;
- border-bottom: 10px solid #38c172;
- border-left: 18px solid #38c172;
+ background-color: #48BB78;
+ border-bottom: 8px solid #48BB78;
+ border-left: 18px solid #48BB78;
+ border-right: 18px solid #48BB78;
+ border-top: 8px solid #48BB78;
}
.button-red,
.button-error {
- background-color: #e3342f;
- border-top: 10px solid #e3342f;
- border-right: 18px solid #e3342f;
- border-bottom: 10px solid #e3342f;
- border-left: 18px solid #e3342f;
+ background-color: #E53E3E;
+ border-bottom: 8px solid #E53E3E;
+ border-left: 18px solid #E53E3E;
+ border-right: 18px solid #E53E3E;
+ border-top: 8px solid #E53E3E;
}
/* Panels */
.panel {
- margin: 0 0 21px;
+ border-left: #2D3748 solid 4px;
+ margin: 21px 0;
}
.panel-content {
- background-color: #f1f5f8;
+ background-color: #EDF2F7;
+ color: #718096;
padding: 16px;
}
+.panel-content p {
+ color: #718096;
+}
+
.panel-item {
padding: 0;
}
@@ -266,27 +283,3 @@ img {
margin-bottom: 0;
padding-bottom: 0;
}
-
-/* Promotions */
-
-.promotion {
- background-color: #ffffff;
- border: 2px dashed #9ba2ab;
- margin: 0;
- margin-bottom: 25px;
- margin-top: 25px;
- padding: 24px;
- width: 100%;
- -premailer-cellpadding: 0;
- -premailer-cellspacing: 0;
- -premailer-width: 100%;
-}
-
-.promotion h1 {
- text-align: center;
-}
-
-.promotion p {
- font-size: 15px;
- text-align: center;
-} | true |
Other | laravel | framework | 74252f30191728d650ea9515fab22dbf0863b042.json | modernize mail styling | src/Illuminate/Mail/resources/views/text/promotion.blade.php | @@ -1 +0,0 @@
-{{ $slot }} | true |
Other | laravel | framework | 74252f30191728d650ea9515fab22dbf0863b042.json | modernize mail styling | src/Illuminate/Mail/resources/views/text/promotion/button.blade.php | @@ -1 +0,0 @@
-[{{ $slot }}]({{ $url }}) | true |
Other | laravel | framework | 4c80f73c6e6793e7de55eb50009fab034046161d.json | Apply fixes from StyleCI (#30274) | src/Illuminate/Http/Request.php | @@ -700,7 +700,7 @@ public function __get($key)
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function __clone()
{ | false |
Other | laravel | framework | cddab3c603581186bf2512751fec69fd7518424e.json | Remove transliteration of 'ия' in tests (#30269)
Since voku/portable-ascii 1.3.0:
'ия' is transliterated correctly to 'iya'
when transliterating 'и' and 'я' on their own.
Furthermore transliterated 'ia' would be pronounced 'иа'.
https://github.com/voku/portable-ascii/commit/62f9521b77693bb7a7be8fe855e86fa347e75f70#diff-07a0c79489ea27ae5e059a433ba83a34 | tests/Support/SupportStrTest.php | @@ -42,7 +42,7 @@ public function testStringAscii()
public function testStringAsciiWithSpecificLocale()
{
- $this->assertSame('h H sht Sht a A ia yo', Str::ascii('х Х щ Щ ъ Ъ ия йо', 'bg'));
+ $this->assertSame('h H sht Sht a A ia yo', Str::ascii('х Х щ Щ ъ Ъ иа йо', 'bg'));
$this->assertSame('ae oe ue Ae Oe Ue', Str::ascii('ä ö ü Ä Ö Ü', 'de'));
}
| false |
Other | laravel | framework | bba47876777b036d76811720769c681d6102e067.json | update docblock (#30265) | src/Illuminate/Auth/Middleware/Authenticate.php | @@ -87,7 +87,7 @@ protected function unauthenticated($request, array $guards)
* Get the path the user should be redirected to when they are not authenticated.
*
* @param \Illuminate\Http\Request $request
- * @return string
+ * @return string|null
*/
protected function redirectTo($request)
{ | false |
Other | laravel | framework | 4aed56ffdae629b54d393b8de6be30d386e7be36.json | Simplify gatherKeysByType method (#30201) | src/Illuminate/Database/Eloquent/Relations/MorphTo.php | @@ -138,9 +138,7 @@ protected function getResultsByType($type)
*/
protected function gatherKeysByType($type)
{
- return collect($this->dictionary[$type])->map(function ($models) {
- return head($models)->{$this->foreignKey};
- })->values()->unique()->all();
+ return array_keys($this->dictionary[$type]);
}
/** | false |
Other | laravel | framework | 850dffca81baafdbab209f0ce961cf07f8172a19.json | Add partialMock shorthand (#30202)
This is similar to `mock()` but it makes a partial mock. Method name could also be changed to `mockPartial()`
So instead of
```PHP
$this->instance(Abstract::class, Mockery::mock(Abstract::class, function ($mock) {
$mock->shouldReceive('call')->once();
})->makePartial());
```
You can write
```PHP
$this->partialMock(Abstract::class, function ($mock) {
$mock->shouldReceive('call')->once();
});
``` | src/Illuminate/Foundation/Testing/Concerns/InteractsWithContainer.php | @@ -45,6 +45,18 @@ protected function mock($abstract, Closure $mock = null)
return $this->instance($abstract, Mockery::mock(...array_filter(func_get_args())));
}
+ /**
+ * Mock a partial instance of an object in the container.
+ *
+ * @param string $abstract
+ * @param \Closure|null $mock
+ * @return \Mockery\MockInterface
+ */
+ protected function partialMock($abstract, Closure $mock = null)
+ {
+ return $this->instance($abstract, Mockery::mock(...array_filter(func_get_args()))->makePartial());
+ }
+
/**
* Spy an instance of an object in the container.
* | false |
Other | laravel | framework | 2bd0ef74d6962daea31045cb6f15aecb1fe2d19e.json | add multipolygonz type for postgreSQL (#30173) | src/Illuminate/Database/Schema/Blueprint.php | @@ -1180,6 +1180,17 @@ public function multiPolygon($column)
return $this->addColumn('multipolygon', $column);
}
+ /**
+ * Create a new multipolygon column on the table.
+ *
+ * @param string $column
+ * @return \Illuminate\Database\Schema\ColumnDefinition
+ */
+ public function multiPolygonZ($column)
+ {
+ return $this->addColumn('multipolygonz', $column);
+ }
+
/**
* Create a new generated, computed column on the table.
* | true |
Other | laravel | framework | 2bd0ef74d6962daea31045cb6f15aecb1fe2d19e.json | add multipolygonz type for postgreSQL (#30173) | src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php | @@ -868,6 +868,17 @@ protected function typeMultiPolygon(Fluent $column)
return $this->formatPostGisType('multipolygon');
}
+ /**
+ * Create the column definition for a spatial MultiPolygonZ type.
+ *
+ * @param \Illuminate\Support\Fluent $column
+ * @return string
+ */
+ protected function typeMultiPolygonZ(Fluent $column)
+ {
+ return $this->formatPostGisType('multipolygonz');
+ }
+
/**
* Format the column definition for a PostGIS spatial type.
* | true |
Other | laravel | framework | e8f7d450014bf7fbb98e25c991973c585b884f32.json | add test for sorted middlewares (#30166) | tests/Routing/RoutingSortedMiddlewareTest.php | @@ -44,10 +44,24 @@ public function testMiddlewareCanBeSortedByPriority()
$this->assertEquals([], (new SortedMiddleware(['First'], []))->all());
$this->assertEquals(['First'], (new SortedMiddleware(['First'], ['First']))->all());
$this->assertEquals(['First', 'Second'], (new SortedMiddleware(['First', 'Second'], ['Second', 'First']))->all());
+ }
+ public function testItDoesNotMoveNonStringValues()
+ {
$closure = function () {
- //
+ return 'foo';
};
+
+ $closure2 = function () {
+ return 'bar';
+ };
+
+ $this->assertEquals([2, 1], (new SortedMiddleware([1, 2], [2, 1]))->all());
$this->assertEquals(['Second', $closure], (new SortedMiddleware(['First', 'Second'], ['Second', $closure]))->all());
+ $this->assertEquals(['a', 'b', $closure], (new SortedMiddleware(['a', 'b'], ['b', $closure, 'a']))->all());
+ $this->assertEquals([$closure2, 'a', 'b', $closure, 'foo'], (new SortedMiddleware(['a', 'b'], [$closure2, 'b', $closure, 'a', 'foo']))->all());
+ $this->assertEquals([$closure, 'a', 'b', $closure2, 'foo'], (new SortedMiddleware(['a', 'b'], [$closure, 'b', $closure2, 'foo', 'a']))->all());
+ $this->assertEquals(['a', $closure, 'b', $closure2, 'foo'], (new SortedMiddleware(['a', 'b'], ['a', $closure, 'b', $closure2, 'foo']))->all());
+ $this->assertEquals([$closure, $closure2, 'foo', 'a'], (new SortedMiddleware(['a', 'b'], [$closure, $closure2, 'foo', 'a']))->all());
}
} | false |
Other | laravel | framework | 370ee34bef86ab140996abed98ce5cbfc952051b.json | Add retryUntil to SendQueueNotifications (#30141) | src/Illuminate/Notifications/SendQueuedNotifications.php | @@ -111,6 +111,20 @@ public function retryAfter()
return $this->notification->retryAfter ?? $this->notification->retryAfter();
}
+ /**
+ * Get the expiration for the notification.
+ *
+ * @return mixed
+ */
+ public function retryUntil()
+ {
+ if (! method_exists($this->notification, 'retryUntil') && ! isset($this->notification->timeoutAt)) {
+ return;
+ }
+
+ return $this->notification->timeoutAt ?? $this->notification->retryUntil();
+ }
+
/**
* Prepare the instance for cloning.
* | false |
Other | laravel | framework | d50929802e98a140018d42f2115c8d4ce8db6ced.json | Fix callback return for DurationLimiter (#30143)
The callback return value wasn't properly cascades back as a result.
Fixes https://github.com/laravel/framework/issues/28729 | src/Illuminate/Redis/Limiters/DurationLimiter.php | @@ -87,7 +87,7 @@ public function block($timeout, $callback = null)
}
if (is_callable($callback)) {
- $callback();
+ return $callback();
}
return true; | true |
Other | laravel | framework | d50929802e98a140018d42f2115c8d4ce8db6ced.json | Fix callback return for DurationLimiter (#30143)
The callback return value wasn't properly cascades back as a result.
Fixes https://github.com/laravel/framework/issues/28729 | tests/Redis/DurationLimiterTest.php | @@ -83,6 +83,17 @@ public function testItFailsImmediatelyOrRetriesForAWhileBasedOnAGivenTimeout()
$this->assertEquals([1, 3], $store);
}
+ public function testItReturnsTheCallbackResult()
+ {
+ $limiter = new DurationLimiter($this->redis(), 'key', 1, 1);
+
+ $result = $limiter->block(1, function () {
+ return 'foo';
+ });
+
+ $this->assertEquals('foo', $result);
+ }
+
private function redis()
{
return $this->redis['phpredis']->connection(); | true |
Other | laravel | framework | 073f9a976e836109c7f2b704d9ac3481f933909a.json | Add methods for sending cookies with test requests | src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php | @@ -11,6 +11,13 @@
trait MakesHttpRequests
{
+ /**
+ * Additional cookies for the request.
+ *
+ * @var array
+ */
+ protected $defaultCookies = [];
+
/**
* Additional headers for the request.
*
@@ -32,6 +39,13 @@ trait MakesHttpRequests
*/
protected $followRedirects = false;
+ /**
+ * Indicates whether cookies should be encrypted.
+ *
+ * @var bool
+ */
+ protected $encryptCookies = true;
+
/**
* Define additional headers to be sent with the request.
*
@@ -131,6 +145,33 @@ public function withMiddleware($middleware = null)
return $this;
}
+ /**
+ * Define additional cookies to be sent with the request.
+ *
+ * @param array $cookies
+ * @return $this
+ */
+ public function withCookies(array $cookies)
+ {
+ $this->defaultCookies = array_merge($this->defaultCookies, $cookies);
+
+ return $this;
+ }
+
+ /**
+ * Add a cookie to be sent with the request.
+ *
+ * @param string $name
+ * @param string $value
+ * @return $this
+ */
+ public function withCookie(string $name, string $value)
+ {
+ $this->defaultCookies[$name] = $value;
+
+ return $this;
+ }
+
/**
* Automatically follow any redirects returned from the response.
*
@@ -143,6 +184,18 @@ public function followingRedirects()
return $this;
}
+ /**
+ * Disable automatic encryption of cookie values.
+ *
+ * @return $this
+ */
+ public function disableCookieEncryption()
+ {
+ $this->encryptCookies = false;
+
+ return $this;
+ }
+
/**
* Set the referer header and previous URL session value in order to simulate a previous request.
*
@@ -166,8 +219,9 @@ public function from(string $url)
public function get($uri, array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('GET', $uri, [], [], [], $server);
+ return $this->call('GET', $uri, [], $cookies, [], $server);
}
/**
@@ -193,8 +247,9 @@ public function getJson($uri, array $headers = [])
public function post($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('POST', $uri, $data, [], [], $server);
+ return $this->call('POST', $uri, $data, $cookies, [], $server);
}
/**
@@ -221,8 +276,9 @@ public function postJson($uri, array $data = [], array $headers = [])
public function put($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('PUT', $uri, $data, [], [], $server);
+ return $this->call('PUT', $uri, $data, $cookies, [], $server);
}
/**
@@ -249,8 +305,9 @@ public function putJson($uri, array $data = [], array $headers = [])
public function patch($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('PATCH', $uri, $data, [], [], $server);
+ return $this->call('PATCH', $uri, $data, $cookies, [], $server);
}
/**
@@ -277,8 +334,9 @@ public function patchJson($uri, array $data = [], array $headers = [])
public function delete($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('DELETE', $uri, $data, [], [], $server);
+ return $this->call('DELETE', $uri, $data, $cookies, [], $server);
}
/**
@@ -305,8 +363,9 @@ public function deleteJson($uri, array $data = [], array $headers = [])
public function options($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('OPTIONS', $uri, $data, [], [], $server);
+ return $this->call('OPTIONS', $uri, $data, $cookies, [], $server);
}
/**
@@ -460,6 +519,22 @@ protected function extractFilesFromDataArray(&$data)
return $files;
}
+ /**
+ * If enabled, encrypt cookie values for request.
+ *
+ * @return array
+ */
+ protected function prepareCookiesForRequest()
+ {
+ if (! $this->encryptCookies) {
+ return $this->defaultCookies;
+ }
+
+ return collect($this->defaultCookies)->map(function ($value) {
+ return encrypt($value, false);
+ })->all();
+ }
+
/**
* Follow a redirect chain until a non-redirect is received.
* | true |
Other | laravel | framework | 073f9a976e836109c7f2b704d9ac3481f933909a.json | Add methods for sending cookies with test requests | tests/Foundation/Testing/Concerns/MakesHttpRequestsTest.php | @@ -52,6 +52,27 @@ public function testWithoutAndWithMiddlewareWithParameter()
$this->app->make(MyMiddleware::class)->handle('foo', $next)
);
}
+
+ public function testWithCookieSetCookie()
+ {
+ $this->withCookie('foo', 'bar');
+
+ $this->assertCount(1, $this->defaultCookies);
+ $this->assertSame('bar', $this->defaultCookies['foo']);
+ }
+
+ public function testWithCookiesSetsCookiesAndOverwritesPreviousValues()
+ {
+ $this->withCookie('foo', 'bar');
+ $this->withCookies([
+ 'foo' => 'baz',
+ 'new-cookie' => 'new-value',
+ ]);
+
+ $this->assertCount(2, $this->defaultCookies);
+ $this->assertSame('baz', $this->defaultCookies['foo']);
+ $this->assertSame('new-value', $this->defaultCookies['new-cookie']);
+ }
}
class MyMiddleware | true |
Other | laravel | framework | 4542387f4b0ac77726ec970b49c1102509df79e9.json | Add methods for sending cookies with test requests | src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php | @@ -11,6 +11,13 @@
trait MakesHttpRequests
{
+ /**
+ * Additional cookies for the request.
+ *
+ * @var array
+ */
+ protected $defaultCookies = [];
+
/**
* Additional headers for the request.
*
@@ -32,6 +39,13 @@ trait MakesHttpRequests
*/
protected $followRedirects = false;
+ /**
+ * Indicates whether cookies should be encrypted.
+ *
+ * @var bool
+ */
+ protected $encryptCookies = true;
+
/**
* Define additional headers to be sent with the request.
*
@@ -131,6 +145,33 @@ public function withMiddleware($middleware = null)
return $this;
}
+ /**
+ * Define additional cookies to be sent with the request.
+ *
+ * @param array $cookies
+ * @return $this
+ */
+ public function withCookies(array $cookies)
+ {
+ $this->defaultCookies = array_merge($this->defaultCookies, $cookies);
+
+ return $this;
+ }
+
+ /**
+ * Add a cookie to be sent with the request.
+ *
+ * @param string $name
+ * @param string $value
+ * @return $this
+ */
+ public function withCookie(string $name, string $value)
+ {
+ $this->defaultCookies[$name] = $value;
+
+ return $this;
+ }
+
/**
* Automatically follow any redirects returned from the response.
*
@@ -143,6 +184,18 @@ public function followingRedirects()
return $this;
}
+ /**
+ * Disable automatic encryption of cookie values.
+ *
+ * @return $this
+ */
+ public function disableCookieEncryption()
+ {
+ $this->encryptCookies = false;
+
+ return $this;
+ }
+
/**
* Set the referer header and previous URL session value in order to simulate a previous request.
*
@@ -166,8 +219,9 @@ public function from(string $url)
public function get($uri, array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('GET', $uri, [], [], [], $server);
+ return $this->call('GET', $uri, [], $cookies, [], $server);
}
/**
@@ -193,8 +247,9 @@ public function getJson($uri, array $headers = [])
public function post($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('POST', $uri, $data, [], [], $server);
+ return $this->call('POST', $uri, $data, $cookies, [], $server);
}
/**
@@ -221,8 +276,9 @@ public function postJson($uri, array $data = [], array $headers = [])
public function put($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('PUT', $uri, $data, [], [], $server);
+ return $this->call('PUT', $uri, $data, $cookies, [], $server);
}
/**
@@ -249,8 +305,9 @@ public function putJson($uri, array $data = [], array $headers = [])
public function patch($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('PATCH', $uri, $data, [], [], $server);
+ return $this->call('PATCH', $uri, $data, $cookies, [], $server);
}
/**
@@ -277,8 +334,9 @@ public function patchJson($uri, array $data = [], array $headers = [])
public function delete($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('DELETE', $uri, $data, [], [], $server);
+ return $this->call('DELETE', $uri, $data, $cookies, [], $server);
}
/**
@@ -305,8 +363,9 @@ public function deleteJson($uri, array $data = [], array $headers = [])
public function options($uri, array $data = [], array $headers = [])
{
$server = $this->transformHeadersToServerVars($headers);
+ $cookies = $this->prepareCookiesForRequest();
- return $this->call('OPTIONS', $uri, $data, [], [], $server);
+ return $this->call('OPTIONS', $uri, $data, $cookies, [], $server);
}
/**
@@ -460,6 +519,22 @@ protected function extractFilesFromDataArray(&$data)
return $files;
}
+ /**
+ * If enabled, encrypt cookie values for request.
+ *
+ * @return array
+ */
+ protected function prepareCookiesForRequest()
+ {
+ if (! $this->encryptCookies) {
+ return $this->defaultCookies;
+ }
+
+ return collect($this->defaultCookies)->map(function ($value) {
+ return encrypt($value, false);
+ })->all();
+ }
+
/**
* Follow a redirect chain until a non-redirect is received.
* | true |
Other | laravel | framework | 4542387f4b0ac77726ec970b49c1102509df79e9.json | Add methods for sending cookies with test requests | tests/Foundation/Testing/Concerns/MakesHttpRequestsTest.php | @@ -52,6 +52,27 @@ public function testWithoutAndWithMiddlewareWithParameter()
$this->app->make(MyMiddleware::class)->handle('foo', $next)
);
}
+
+ public function testWithCookieSetCookie()
+ {
+ $this->withCookie('foo', 'bar');
+
+ $this->assertCount(1, $this->defaultCookies);
+ $this->assertSame('bar', $this->defaultCookies['foo']);
+ }
+
+ public function testWithCookiesSetsCookiesAndOverwritesPreviousValues()
+ {
+ $this->withCookie('foo', 'bar');
+ $this->withCookies([
+ 'foo' => 'baz',
+ 'new-cookie' => 'new-value',
+ ]);
+
+ $this->assertCount(2, $this->defaultCookies);
+ $this->assertSame('baz', $this->defaultCookies['foo']);
+ $this->assertSame('new-value', $this->defaultCookies['new-cookie']);
+ }
}
class MyMiddleware | true |
Other | laravel | framework | b648c2e8377023c8fbe89c8068fe20364dc580a3.json | add runtime for seeders | src/Illuminate/Database/Seeder.php | @@ -36,12 +36,21 @@ public function call($class, $silent = false)
foreach ($classes as $class) {
$seeder = $this->resolve($class);
+ $name = get_class($seeder);
if ($silent === false && isset($this->command)) {
- $this->command->getOutput()->writeln('<info>Seeding:</info> '.get_class($seeder));
+ $this->command->getOutput()->writeln("<comment>Seeding:</comment> {$name}");
}
+ $startTime = microtime(true);
+
$seeder->__invoke();
+
+ $runTime = round(microtime(true) - $startTime, 2);
+
+ if ($silent === false && isset($this->command)) {
+ $this->command->getOutput()->writeln("<info>Seeded:</info> {$name} ({$runTime} seconds)");
+ }
}
return $this; | true |
Other | laravel | framework | b648c2e8377023c8fbe89c8068fe20364dc580a3.json | add runtime for seeders | tests/Database/DatabaseSeederTest.php | @@ -38,14 +38,16 @@ public function testCallResolveTheClassAndCallsRun()
$seeder = new TestSeeder;
$seeder->setContainer($container = m::mock(Container::class));
$output = m::mock(OutputInterface::class);
- $output->shouldReceive('writeln')->once()->andReturn('foo');
+ $output->shouldReceive('writeln')->once();
$command = m::mock(Command::class);
$command->shouldReceive('getOutput')->once()->andReturn($output);
$seeder->setCommand($command);
$container->shouldReceive('make')->once()->with('ClassName')->andReturn($child = m::mock(Seeder::class));
$child->shouldReceive('setContainer')->once()->with($container)->andReturn($child);
$child->shouldReceive('setCommand')->once()->with($command)->andReturn($child);
$child->shouldReceive('__invoke')->once();
+ $command->shouldReceive('getOutput')->once()->andReturn($output);
+ $output->shouldReceive('writeln')->once();
$seeder->call('ClassName');
} | true |
Other | laravel | framework | 3ec56b8810bc40016252977c69ba27057dcecf7d.json | Update param doc for whereNotNull() (#30055) | src/Illuminate/Database/Query/Builder.php | @@ -1026,13 +1026,13 @@ public function orWhereNull($column)
/**
* Add a "where not null" clause to the query.
*
- * @param string $column
+ * @param string|array $columns
* @param string $boolean
* @return \Illuminate\Database\Query\Builder|static
*/
- public function whereNotNull($column, $boolean = 'and')
+ public function whereNotNull($columns, $boolean = 'and')
{
- return $this->whereNull($column, $boolean, true);
+ return $this->whereNull($columns, $boolean, true);
}
/** | false |
Other | laravel | framework | 20b013220fc8346b73d403af5034b6ce1ee29c79.json | Fix a typo | src/Illuminate/Foundation/Auth/ThrottlesLogins.php | @@ -55,7 +55,7 @@ protected function sendLockoutResponse(Request $request)
throw ValidationException::withMessages([
$this->username() => [Lang::get('auth.throttle', [
'seconds' => $seconds,
- 'minutes' => ceil($seconds * 60),
+ 'minutes' => ceil($seconds / 60),
])],
])->status(Response::HTTP_TOO_MANY_REQUESTS);
} | false |
Other | laravel | framework | 26471a48ed27178151fe3ccf263d9e24661dee52.json | Apply fixes from StyleCI (#30013) | src/Illuminate/Mail/PendingMail.php | @@ -181,6 +181,6 @@ protected function fill(MailableContract $mailable)
if ($this->locale) {
$mailable->locale($this->locale);
}
- });
+ });
}
} | false |
Other | laravel | framework | 6fc9fb08f3f1f4c272a8899621adec2af90c59a9.json | Apply fixes from StyleCI (#29986) | src/Illuminate/Console/Scheduling/ScheduleRunCommand.php | @@ -3,10 +3,10 @@
namespace Illuminate\Console\Scheduling;
use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Date;
-use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Console\Events\ScheduledTaskFinished;
use Illuminate\Console\Events\ScheduledTaskStarting;
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Support\Facades\Date;
class ScheduleRunCommand extends Command
{ | false |
Other | laravel | framework | b59fe219697e8ea4690d71ebf94a33dc62873cbe.json | Use value helper where possible (#29959) | src/Illuminate/Console/ConfirmableTrait.php | @@ -2,8 +2,6 @@
namespace Illuminate\Console;
-use Closure;
-
trait ConfirmableTrait
{
/**
@@ -19,7 +17,7 @@ public function confirmToProceed($warning = 'Application In Production!', $callb
{
$callback = is_null($callback) ? $this->getDefaultConfirmCallback() : $callback;
- $shouldConfirm = $callback instanceof Closure ? $callback() : $callback;
+ $shouldConfirm = value($callback);
if ($shouldConfirm) {
if ($this->hasOption('force') && $this->option('force')) { | true |
Other | laravel | framework | b59fe219697e8ea4690d71ebf94a33dc62873cbe.json | Use value helper where possible (#29959) | src/Illuminate/Container/BoundMethod.php | @@ -75,7 +75,7 @@ protected static function callClass($container, $target, array $parameters = [],
protected static function callBoundMethod($container, $callback, $default)
{
if (! is_array($callback)) {
- return $default instanceof Closure ? $default() : $default;
+ return value($default);
}
// Here we need to turn the array callable into a Class@method string we can use to
@@ -87,7 +87,7 @@ protected static function callBoundMethod($container, $callback, $default)
return $container->callMethodBinding($method, $callback[0]);
}
- return $default instanceof Closure ? $default() : $default;
+ return value($default);
}
/** | true |
Other | laravel | framework | a66989e565a88ee4c1a72b5acfb44d95161d98d0.json | Apply fixes from StyleCI (#29938) | src/Illuminate/Broadcasting/BroadcastManager.php | @@ -3,13 +3,13 @@
namespace Illuminate\Broadcasting;
use Closure;
-use Illuminate\Contracts\Foundation\CachesRoutes;
use Illuminate\Broadcasting\Broadcasters\LogBroadcaster;
use Illuminate\Broadcasting\Broadcasters\NullBroadcaster;
use Illuminate\Broadcasting\Broadcasters\PusherBroadcaster;
use Illuminate\Broadcasting\Broadcasters\RedisBroadcaster;
use Illuminate\Contracts\Broadcasting\Factory as FactoryContract;
use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Contracts\Foundation\CachesRoutes;
use InvalidArgumentException;
use Psr\Log\LoggerInterface;
use Pusher\Pusher; | true |
Other | laravel | framework | a66989e565a88ee4c1a72b5acfb44d95161d98d0.json | Apply fixes from StyleCI (#29938) | src/Illuminate/Foundation/Application.php | @@ -5,15 +5,15 @@
use Closure;
use Illuminate\Container\Container;
use Illuminate\Contracts\Foundation\Application as ApplicationContract;
+use Illuminate\Contracts\Foundation\CachesConfiguration;
+use Illuminate\Contracts\Foundation\CachesRoutes;
use Illuminate\Contracts\Http\Kernel as HttpKernelContract;
use Illuminate\Events\EventServiceProvider;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
use Illuminate\Http\Request;
use Illuminate\Log\LogServiceProvider;
use Illuminate\Routing\RoutingServiceProvider;
-use Illuminate\Contracts\Foundation\CachesRoutes;
-use Illuminate\Contracts\Foundation\CachesConfiguration;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Illuminate\Support\Env; | true |
Other | laravel | framework | a66989e565a88ee4c1a72b5acfb44d95161d98d0.json | Apply fixes from StyleCI (#29938) | src/Illuminate/Support/ServiceProvider.php | @@ -3,9 +3,9 @@
namespace Illuminate\Support;
use Illuminate\Console\Application as Artisan;
+use Illuminate\Contracts\Foundation\CachesConfiguration;
use Illuminate\Contracts\Foundation\CachesRoutes;
use Illuminate\Contracts\Support\DeferrableProvider;
-use Illuminate\Contracts\Foundation\CachesConfiguration;
abstract class ServiceProvider
{ | true |
Other | laravel | framework | a66989e565a88ee4c1a72b5acfb44d95161d98d0.json | Apply fixes from StyleCI (#29938) | src/Illuminate/Validation/Concerns/ValidatesAttributes.php | @@ -3,7 +3,6 @@
namespace Illuminate\Validation\Concerns;
use Countable;
-use Exception;
use DateTime;
use DateTimeInterface;
use Egulias\EmailValidator\EmailValidator;
@@ -12,6 +11,7 @@
use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
use Egulias\EmailValidator\Validation\RFCValidation;
use Egulias\EmailValidator\Validation\SpoofCheckValidation;
+use Exception;
use Illuminate\Support\Arr;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Date; | true |
Other | laravel | framework | 19185e438faf8296226f0169b1fa6b606ae4e32a.json | Remove trailing spaces from policy.stubb | src/Illuminate/Foundation/Console/stubs/policy.stub | @@ -9,7 +9,7 @@ use Illuminate\Auth\Access\HandlesAuthorization;
class DummyClass
{
use HandlesAuthorization;
-
+
/**
* Determine whether the user can view any DocDummyPluralModel.
* | false |
Other | laravel | framework | e082ed250f5471a99cf9b990e8f76cfdfa1a217a.json | Remove confusing identation (#29863)
The indentation makes it seem like we're only calling 1 method, and have 2 mismatched parenthesis | src/Illuminate/Database/Grammar.php | @@ -83,9 +83,7 @@ protected function wrapAliasedValue($value, $prefixAlias = false)
$segments[1] = $this->tablePrefix.$segments[1];
}
- return $this->wrap(
- $segments[0]).' as '.$this->wrapValue($segments[1]
- );
+ return $this->wrap($segments[0]).' as '.$this->wrapValue($segments[1]);
}
/** | false |
Other | laravel | framework | 9be0434ee39fa9a0f393584b88ac3c6ea22972b3.json | Drop support for Monolog v1 (#29866) | composer.json | @@ -24,7 +24,7 @@
"egulias/email-validator": "^2.1.10",
"erusev/parsedown": "^1.7",
"league/flysystem": "^1.0.8",
- "monolog/monolog": "^1.12|^2.0",
+ "monolog/monolog": "^2.0",
"nesbot/carbon": "^2.0",
"opis/closure": "^3.1",
"psr/container": "^1.0", | true |
Other | laravel | framework | 9be0434ee39fa9a0f393584b88ac3c6ea22972b3.json | Drop support for Monolog v1 (#29866) | src/Illuminate/Log/composer.json | @@ -17,7 +17,7 @@
"php": "^7.2",
"illuminate/contracts": "^7.0",
"illuminate/support": "^7.0",
- "monolog/monolog": "^1.12|^2.0"
+ "monolog/monolog": "^2.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 139726e392ecb4fc7114fb63f968815c1426d3f9.json | Update Gate facade(inspect) (#29849) | src/Illuminate/Support/Facades/Gate.php | @@ -19,6 +19,7 @@
* @method static mixed getPolicyFor(object|string $class)
* @method static \Illuminate\Contracts\Auth\Access\Gate forUser(\Illuminate\Contracts\Auth\Authenticatable|mixed $user)
* @method static array abilities()
+ * @method static \Illuminate\Auth\Access\Response inspect(string $ability, array|mixed $arguments = [])
*
* @see \Illuminate\Contracts\Auth\Access\Gate
*/ | false |
Other | laravel | framework | e04a7ffba8b80b934506783a7d0a161dd52eb2ef.json | Apply fixes from StyleCI (#29841) | src/Illuminate/Support/Str.php | @@ -652,19 +652,19 @@ protected static function charsArray()
'7' => ['⁷', '₇', '۷', '７'],
'8' => ['⁸', '₈', '۸', '８'],
'9' => ['⁹', '₉', '۹', '９'],
- 'a' => ['à', 'á', 'ả', 'ã', 'ạ', 'ă', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'â', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ā', 'ą', 'å', 'α', 'ά', 'ἀ', 'ἁ', 'ἂ', 'ἃ', 'ἄ', 'ἅ', 'ἆ', 'ἇ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ', 'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ὰ', 'ά', 'ᾰ', 'ᾱ', 'ᾲ', 'ᾳ', 'ᾴ', 'ᾶ', 'ᾷ', 'а', 'أ', 'အ', 'ာ', 'ါ', 'ǻ', 'ǎ', 'ª', 'ა', 'अ', 'ا', 'ａ', 'ä','א'],
- 'b' => ['б', 'β', 'ب', 'ဗ', 'ბ', 'ｂ','ב'],
+ 'a' => ['à', 'á', 'ả', 'ã', 'ạ', 'ă', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'â', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ā', 'ą', 'å', 'α', 'ά', 'ἀ', 'ἁ', 'ἂ', 'ἃ', 'ἄ', 'ἅ', 'ἆ', 'ἇ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ', 'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ὰ', 'ά', 'ᾰ', 'ᾱ', 'ᾲ', 'ᾳ', 'ᾴ', 'ᾶ', 'ᾷ', 'а', 'أ', 'အ', 'ာ', 'ါ', 'ǻ', 'ǎ', 'ª', 'ა', 'अ', 'ا', 'ａ', 'ä', 'א'],
+ 'b' => ['б', 'β', 'ب', 'ဗ', 'ბ', 'ｂ', 'ב'],
'c' => ['ç', 'ć', 'č', 'ĉ', 'ċ', 'ｃ'],
'd' => ['ď', 'ð', 'đ', 'ƌ', 'ȡ', 'ɖ', 'ɗ', 'ᵭ', 'ᶁ', 'ᶑ', 'д', 'δ', 'د', 'ض', 'ဍ', 'ဒ', 'დ', 'ｄ', 'ד'],
'e' => ['é', 'è', 'ẻ', 'ẽ', 'ẹ', 'ê', 'ế', 'ề', 'ể', 'ễ', 'ệ', 'ë', 'ē', 'ę', 'ě', 'ĕ', 'ė', 'ε', 'έ', 'ἐ', 'ἑ', 'ἒ', 'ἓ', 'ἔ', 'ἕ', 'ὲ', 'έ', 'е', 'ё', 'э', 'є', 'ə', 'ဧ', 'ေ', 'ဲ', 'ე', 'ए', 'إ', 'ئ', 'ｅ'],
'f' => ['ф', 'φ', 'ف', 'ƒ', 'ფ', 'ｆ', 'פ', 'ף'],
- 'g' => ['ĝ', 'ğ', 'ġ', 'ģ', 'г', 'ґ', 'γ', 'ဂ', 'გ', 'گ', 'ｇ','ג'],
+ 'g' => ['ĝ', 'ğ', 'ġ', 'ģ', 'г', 'ґ', 'γ', 'ဂ', 'გ', 'گ', 'ｇ', 'ג'],
'h' => ['ĥ', 'ħ', 'η', 'ή', 'ح', 'ه', 'ဟ', 'ှ', 'ჰ', 'ｈ', 'ה'],
- 'i' => ['í', 'ì', 'ỉ', 'ĩ', 'ị', 'î', 'ï', 'ī', 'ĭ', 'į', 'ı', 'ι', 'ί', 'ϊ', 'ΐ', 'ἰ', 'ἱ', 'ἲ', 'ἳ', 'ἴ', 'ἵ', 'ἶ', 'ἷ', 'ὶ', 'ί', 'ῐ', 'ῑ', 'ῒ', 'ΐ', 'ῖ', 'ῗ', 'і', 'ї', 'и', 'ဣ', 'ိ', 'ီ', 'ည်', 'ǐ', 'ი', 'इ', 'ی', 'ｉ','י'],
+ 'i' => ['í', 'ì', 'ỉ', 'ĩ', 'ị', 'î', 'ï', 'ī', 'ĭ', 'į', 'ı', 'ι', 'ί', 'ϊ', 'ΐ', 'ἰ', 'ἱ', 'ἲ', 'ἳ', 'ἴ', 'ἵ', 'ἶ', 'ἷ', 'ὶ', 'ί', 'ῐ', 'ῑ', 'ῒ', 'ΐ', 'ῖ', 'ῗ', 'і', 'ї', 'и', 'ဣ', 'ိ', 'ီ', 'ည်', 'ǐ', 'ი', 'इ', 'ی', 'ｉ', 'י'],
'j' => ['ĵ', 'ј', 'Ј', 'ჯ', 'ج', 'ｊ'],
'k' => ['ķ', 'ĸ', 'к', 'κ', 'Ķ', 'ق', 'ك', 'က', 'კ', 'ქ', 'ک', 'ｋ', 'ק'],
'l' => ['ł', 'ľ', 'ĺ', 'ļ', 'ŀ', 'л', 'λ', 'ل', 'လ', 'ლ', 'ｌ', 'ל'],
- 'm' => ['м', 'μ', 'م', 'မ', 'მ', 'ｍ', 'מ' , 'ם'],
+ 'm' => ['м', 'μ', 'م', 'မ', 'მ', 'ｍ', 'מ', 'ם'],
'n' => ['ñ', 'ń', 'ň', 'ņ', 'ʼn', 'ŋ', 'ν', 'н', 'ن', 'န', 'ნ', 'ｎ', 'נ'],
'o' => ['ó', 'ò', 'ỏ', 'õ', 'ọ', 'ô', 'ố', 'ồ', 'ổ', 'ỗ', 'ộ', 'ơ', 'ớ', 'ờ', 'ở', 'ỡ', 'ợ', 'ø', 'ō', 'ő', 'ŏ', 'ο', 'ὀ', 'ὁ', 'ὂ', 'ὃ', 'ὄ', 'ὅ', 'ὸ', 'ό', 'о', 'و', 'ို', 'ǒ', 'ǿ', 'º', 'ო', 'ओ', 'ｏ', 'ö'],
'p' => ['п', 'π', 'ပ', 'პ', 'پ', 'ｐ', 'פ', 'ף'],
@@ -787,10 +787,10 @@ protected static function languageSpecificCharsArray($language)
['ae', 'oe', 'ue', 'AE', 'OE', 'UE'],
],
'he' => [
- ['א','ב','ג','ד','ה','ו'],
- ['ז','ח','ט','י','כ','ל'],
- ['מ','נ','ס','ע','פ','צ'],
- ['ק','ר','ש','ת','ן','ץ','ך','ם', 'ף'],
+ ['א', 'ב', 'ג', 'ד', 'ה', 'ו'],
+ ['ז', 'ח', 'ט', 'י', 'כ', 'ל'],
+ ['מ', 'נ', 'ס', 'ע', 'פ', 'צ'],
+ ['ק', 'ר', 'ש', 'ת', 'ן', 'ץ', 'ך', 'ם', 'ף'],
],
'ro' => [
['ă', 'â', 'î', 'ș', 'ț', 'Ă', 'Â', 'Î', 'Ș', 'Ț'], | false |
Other | laravel | framework | 7b39e0825ce3c837e1cae6be6e821ce22cad3efd.json | Apply fixes from StyleCI (#29840) | src/Illuminate/Support/Str.php | @@ -618,19 +618,19 @@ protected static function charsArray()
'7' => ['⁷', '₇', '۷', '７'],
'8' => ['⁸', '₈', '۸', '８'],
'9' => ['⁹', '₉', '۹', '９'],
- 'a' => ['à', 'á', 'ả', 'ã', 'ạ', 'ă', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'â', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ā', 'ą', 'å', 'α', 'ά', 'ἀ', 'ἁ', 'ἂ', 'ἃ', 'ἄ', 'ἅ', 'ἆ', 'ἇ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ', 'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ὰ', 'ά', 'ᾰ', 'ᾱ', 'ᾲ', 'ᾳ', 'ᾴ', 'ᾶ', 'ᾷ', 'а', 'أ', 'အ', 'ာ', 'ါ', 'ǻ', 'ǎ', 'ª', 'ა', 'अ', 'ا', 'ａ', 'ä','א'],
- 'b' => ['б', 'β', 'ب', 'ဗ', 'ბ', 'ｂ','ב'],
+ 'a' => ['à', 'á', 'ả', 'ã', 'ạ', 'ă', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'â', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ā', 'ą', 'å', 'α', 'ά', 'ἀ', 'ἁ', 'ἂ', 'ἃ', 'ἄ', 'ἅ', 'ἆ', 'ἇ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ', 'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ὰ', 'ά', 'ᾰ', 'ᾱ', 'ᾲ', 'ᾳ', 'ᾴ', 'ᾶ', 'ᾷ', 'а', 'أ', 'အ', 'ာ', 'ါ', 'ǻ', 'ǎ', 'ª', 'ა', 'अ', 'ا', 'ａ', 'ä', 'א'],
+ 'b' => ['б', 'β', 'ب', 'ဗ', 'ბ', 'ｂ', 'ב'],
'c' => ['ç', 'ć', 'č', 'ĉ', 'ċ', 'ｃ'],
'd' => ['ď', 'ð', 'đ', 'ƌ', 'ȡ', 'ɖ', 'ɗ', 'ᵭ', 'ᶁ', 'ᶑ', 'д', 'δ', 'د', 'ض', 'ဍ', 'ဒ', 'დ', 'ｄ', 'ד'],
'e' => ['é', 'è', 'ẻ', 'ẽ', 'ẹ', 'ê', 'ế', 'ề', 'ể', 'ễ', 'ệ', 'ë', 'ē', 'ę', 'ě', 'ĕ', 'ė', 'ε', 'έ', 'ἐ', 'ἑ', 'ἒ', 'ἓ', 'ἔ', 'ἕ', 'ὲ', 'έ', 'е', 'ё', 'э', 'є', 'ə', 'ဧ', 'ေ', 'ဲ', 'ე', 'ए', 'إ', 'ئ', 'ｅ'],
'f' => ['ф', 'φ', 'ف', 'ƒ', 'ფ', 'ｆ', 'פ', 'ף'],
- 'g' => ['ĝ', 'ğ', 'ġ', 'ģ', 'г', 'ґ', 'γ', 'ဂ', 'გ', 'گ', 'ｇ','ג'],
+ 'g' => ['ĝ', 'ğ', 'ġ', 'ģ', 'г', 'ґ', 'γ', 'ဂ', 'გ', 'گ', 'ｇ', 'ג'],
'h' => ['ĥ', 'ħ', 'η', 'ή', 'ح', 'ه', 'ဟ', 'ှ', 'ჰ', 'ｈ', 'ה'],
- 'i' => ['í', 'ì', 'ỉ', 'ĩ', 'ị', 'î', 'ï', 'ī', 'ĭ', 'į', 'ı', 'ι', 'ί', 'ϊ', 'ΐ', 'ἰ', 'ἱ', 'ἲ', 'ἳ', 'ἴ', 'ἵ', 'ἶ', 'ἷ', 'ὶ', 'ί', 'ῐ', 'ῑ', 'ῒ', 'ΐ', 'ῖ', 'ῗ', 'і', 'ї', 'и', 'ဣ', 'ိ', 'ီ', 'ည်', 'ǐ', 'ი', 'इ', 'ی', 'ｉ','י'],
+ 'i' => ['í', 'ì', 'ỉ', 'ĩ', 'ị', 'î', 'ï', 'ī', 'ĭ', 'į', 'ı', 'ι', 'ί', 'ϊ', 'ΐ', 'ἰ', 'ἱ', 'ἲ', 'ἳ', 'ἴ', 'ἵ', 'ἶ', 'ἷ', 'ὶ', 'ί', 'ῐ', 'ῑ', 'ῒ', 'ΐ', 'ῖ', 'ῗ', 'і', 'ї', 'и', 'ဣ', 'ိ', 'ီ', 'ည်', 'ǐ', 'ი', 'इ', 'ی', 'ｉ', 'י'],
'j' => ['ĵ', 'ј', 'Ј', 'ჯ', 'ج', 'ｊ'],
'k' => ['ķ', 'ĸ', 'к', 'κ', 'Ķ', 'ق', 'ك', 'က', 'კ', 'ქ', 'ک', 'ｋ', 'ק'],
'l' => ['ł', 'ľ', 'ĺ', 'ļ', 'ŀ', 'л', 'λ', 'ل', 'လ', 'ლ', 'ｌ', 'ל'],
- 'm' => ['м', 'μ', 'م', 'မ', 'მ', 'ｍ', 'מ' , 'ם'],
+ 'm' => ['м', 'μ', 'م', 'မ', 'მ', 'ｍ', 'מ', 'ם'],
'n' => ['ñ', 'ń', 'ň', 'ņ', 'ʼn', 'ŋ', 'ν', 'н', 'ن', 'န', 'ნ', 'ｎ', 'נ'],
'o' => ['ó', 'ò', 'ỏ', 'õ', 'ọ', 'ô', 'ố', 'ồ', 'ổ', 'ỗ', 'ộ', 'ơ', 'ớ', 'ờ', 'ở', 'ỡ', 'ợ', 'ø', 'ō', 'ő', 'ŏ', 'ο', 'ὀ', 'ὁ', 'ὂ', 'ὃ', 'ὄ', 'ὅ', 'ὸ', 'ό', 'о', 'و', 'ို', 'ǒ', 'ǿ', 'º', 'ო', 'ओ', 'ｏ', 'ö'],
'p' => ['п', 'π', 'ပ', 'პ', 'پ', 'ｐ', 'פ', 'ף'],
@@ -753,10 +753,10 @@ protected static function languageSpecificCharsArray($language)
['ae', 'oe', 'ue', 'AE', 'OE', 'UE'],
],
'he' => [
- ['א','ב','ג','ד','ה','ו'],
- ['ז','ח','ט','י','כ','ל'],
- ['מ','נ','ס','ע','פ','צ'],
- ['ק','ר','ש','ת','ן','ץ','ך','ם', 'ף'],
+ ['א', 'ב', 'ג', 'ד', 'ה', 'ו'],
+ ['ז', 'ח', 'ט', 'י', 'כ', 'ל'],
+ ['מ', 'נ', 'ס', 'ע', 'פ', 'צ'],
+ ['ק', 'ר', 'ש', 'ת', 'ן', 'ץ', 'ך', 'ם', 'ף'],
],
'ro' => [
['ă', 'â', 'î', 'ș', 'ț', 'Ă', 'Â', 'Î', 'Ș', 'Ț'], | false |
Other | laravel | framework | 9d86889575f0642dcd013a33ee291205b9452519.json | Update current branch in release.sh | bin/release.sh | @@ -9,7 +9,7 @@ then
exit 1
fi
-CURRENT_BRANCH="6.x"
+CURRENT_BRANCH="master"
VERSION=$1
# Always prepend with "v" | false |
Other | laravel | framework | aa30f39716cdbad3b3200ea507d346fb570fb1ab.json | Use old date format for Monolog formatter instance
If use new date format various formatters and log output might be affected, which may mess with log parsing in some cases. | src/Illuminate/Log/LogManager.php | @@ -42,6 +42,13 @@ class LogManager implements LoggerInterface
*/
protected $customCreators = [];
+ /**
+ * The date format for Monolog formatter instance.
+ *
+ * @var string
+ */
+ protected $dateFormat = "Y-m-d H:i:s";
+
/**
* Create a new Log manager instance.
*
@@ -381,7 +388,7 @@ protected function prepareHandler(HandlerInterface $handler, array $config = [])
*/
protected function formatter()
{
- return tap(new LineFormatter(null, null, true, true), function ($formatter) {
+ return tap(new LineFormatter(null, $this->dateFormat, true, true), function ($formatter) {
$formatter->includeStacktraces();
});
} | false |
Other | laravel | framework | b90fa4eeb1338b3d871c2b0f54cffff5265a061a.json | Use new UUID Factory (#29809) | src/Illuminate/Support/Str.php | @@ -3,6 +3,7 @@
namespace Illuminate\Support;
use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidFactory;
use Illuminate\Support\Traits\Macroable;
use Ramsey\Uuid\Generator\CombGenerator;
use Ramsey\Uuid\Codec\TimestampFirstCombCodec;
@@ -588,7 +589,7 @@ public static function orderedUuid()
return call_user_func(static::$uuidFactory);
}
- $factory = Uuid::getFactory();
+ $factory = new UuidFactory();
$factory->setRandomGenerator(new CombGenerator(
$factory->getRandomGenerator(), | false |
Other | laravel | framework | d36c49694aab53b6a664ad57a84664b67bcc8247.json | Remove rackspace from suggestion (#29792) | composer.json | @@ -125,7 +125,6 @@
"laravel/tinker": "Required to use the tinker console command (^1.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
- "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", | false |
Other | laravel | framework | e713113b5e90a4e778ae22090e4d4e557aaf7cf7.json | Use testbench 5 (#29785) | composer.json | @@ -83,7 +83,7 @@
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.0",
"moontoast/math": "^1.1",
- "orchestra/testbench-core": "^4.0",
+ "orchestra/testbench-core": "^5.0",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^8.0",
"predis/predis": "^1.1.1", | false |
Other | laravel | framework | 4d1fc4fa9eee5ea062562312d8f2270d28c8b7e7.json | Update branch alias | composer.json | @@ -109,7 +109,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "7.0-dev"
+ "dev-master": "7.x-dev"
}
},
"suggest": { | false |
Other | laravel | framework | 883c26576feb0849288363d622ea576e2a878644.json | Update branch alias | composer.json | @@ -109,7 +109,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "6.0-dev"
+ "dev-master": "6.x-dev"
}
},
"suggest": { | false |
Other | laravel | framework | 500295b7c43cf56993ca258be0489f6dd68c6921.json | Suggest ext-memcached (#29762) | composer.json | @@ -113,6 +113,7 @@
}
},
"suggest": {
+ "ext-memcached": "Required to use the memcache cache driver.",
"ext-pcntl": "Required to use all features of the queue worker.",
"ext-posix": "Required to use all features of the queue worker.",
"ext-redis": "Required to use the Redis cache and queue drivers.", | true |
Other | laravel | framework | 500295b7c43cf56993ca258be0489f6dd68c6921.json | Suggest ext-memcached (#29762) | src/Illuminate/Cache/composer.json | @@ -29,6 +29,7 @@
}
},
"suggest": {
+ "ext-memcached": "Required to use the memcache cache driver.",
"illuminate/database": "Required to use the database cache driver (^6.0).",
"illuminate/filesystem": "Required to use the file cache driver (^6.0).",
"illuminate/redis": "Required to use the redis cache driver (^6.0).", | true |
Other | laravel | framework | c6508d11be1acb7c1b9a2f29047e41ccf8b3334e.json | add test for pipeline class | tests/Pipeline/PipelineTest.php | @@ -199,6 +199,16 @@ public function testPipelineUsageWithParameters()
unset($_SERVER['__test.pipe.parameters']);
}
+ public function testItCanWorkWithNoPipe()
+ {
+ $result = (new Pipeline(new Container))
+ ->send('foo')
+ ->through([])
+ ->thenReturn();
+
+ $this->assertEquals('foo', $result);
+ }
+
public function testPipelineViaChangesTheMethodBeingCalledOnThePipes()
{
$piped = function ($piped, $next) { | false |
Other | laravel | framework | 3a2c381d3f7bd8aea100b94f4b9abf7eb49dc308.json | Add getInstance method | src/Illuminate/Queue/Jobs/Job.php | @@ -307,6 +307,16 @@ public function getQueue()
return $this->queue;
}
+ /**
+ * Get the job handler instance.
+ *
+ * @return mixed
+ */
+ public function getInstance()
+ {
+ return $this->instance;
+ }
+
/**
* Get the service container instance.
* | false |
Other | laravel | framework | 00bdd2f5d7e5fb153d6c0276a7042c4c4edc754e.json | add test for pipe execution order | tests/Pipeline/PipelineTest.php | @@ -33,6 +33,33 @@ public function testPipelineBasicUsage()
unset($_SERVER['__test.pipe.two']);
}
+ public function testMultiplePipelinesBackAndForthExecutionOrder()
+ {
+ $pipeTwo = function ($piped, $next) {
+ $_SERVER['__test.pipeline'] = $_SERVER['__test.pipeline'].'_forward2';
+
+ $value = $next($piped);
+
+ $_SERVER['__test.pipeline'] = $_SERVER['__test.pipeline'].'_backward2';
+
+ return $value;
+ };
+
+ $result = (new Pipeline(new Container))
+ ->send('foo')
+ ->through([PipelineTestPipeBack::class, $pipeTwo])
+ ->then(function ($piped) {
+ $_SERVER['__test.pipeline'] = $_SERVER['__test.pipeline'].'_core';
+
+ return $piped;
+ });
+
+ $this->assertEquals('foo', $result);
+ $this->assertEquals('forward1_forward2_core_backward2_backward1', $_SERVER['__test.pipeline']);
+
+ unset($_SERVER['__test.pipeline']);
+ }
+
public function testPipelineUsageWithObjects()
{
$result = (new Pipeline(new Container))
@@ -177,6 +204,20 @@ public function testPipelineThenReturnMethodRunsPipelineThenReturnsPassable()
}
}
+class PipelineTestPipeBack
+{
+ public function handle($piped, $next)
+ {
+ $_SERVER['__test.pipeline'] = 'forward1';
+
+ $value = $next($piped);
+
+ $_SERVER['__test.pipeline'] = $_SERVER['__test.pipeline'].'_backward1';
+
+ return $value;
+ }
+}
+
class PipelineTestPipeOne
{
public function handle($piped, $next) | false |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Auth/composer.json | @@ -15,10 +15,10 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/http": "^6.0",
- "illuminate/queue": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/http": "^7.0",
+ "illuminate/queue": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": {
@@ -31,9 +31,9 @@
}
},
"suggest": {
- "illuminate/console": "Required to use the auth:clear-resets command (^6.0).",
- "illuminate/queue": "Required to fire login / logout events (^6.0).",
- "illuminate/session": "Required to use the session based guard (^6.0)."
+ "illuminate/console": "Required to use the auth:clear-resets command (^7.0).",
+ "illuminate/queue": "Required to fire login / logout events (^7.0).",
+ "illuminate/session": "Required to use the session based guard (^7.0)."
},
"config": {
"sort-packages": true | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Broadcasting/composer.json | @@ -17,10 +17,10 @@
"php": "^7.2",
"ext-json": "*",
"psr/log": "^1.0",
- "illuminate/bus": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/queue": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/bus": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/queue": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Bus/composer.json | @@ -15,9 +15,9 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/pipeline": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/pipeline": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Cache/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": {
@@ -29,9 +29,9 @@
}
},
"suggest": {
- "illuminate/database": "Required to use the database cache driver (^6.0).",
- "illuminate/filesystem": "Required to use the file cache driver (^6.0).",
- "illuminate/redis": "Required to use the redis cache driver (^6.0).",
+ "illuminate/database": "Required to use the database cache driver (^7.0).",
+ "illuminate/filesystem": "Required to use the file cache driver (^7.0).",
+ "illuminate/redis": "Required to use the redis cache driver (^7.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^4.3)."
},
"config": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Config/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Console/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
"symfony/console": "^4.3",
"symfony/process": "^4.3"
},
@@ -33,7 +33,7 @@
"suggest": {
"dragonmantank/cron-expression": "Required to use scheduling component (^2.0).",
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.0).",
- "illuminate/filesystem": "Required to use the generator command (^6.0)"
+ "illuminate/filesystem": "Required to use the generator command (^7.0)"
},
"config": {
"sort-packages": true | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Container/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
"psr/container": "^1.0"
},
"autoload": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Cookie/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
"symfony/http-foundation": "^4.3",
"symfony/http-kernel": "^4.3"
}, | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Database/composer.json | @@ -17,9 +17,9 @@
"require": {
"php": "^7.2",
"ext-json": "*",
- "illuminate/container": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/container": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": {
@@ -34,10 +34,10 @@
"suggest": {
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).",
- "illuminate/console": "Required to use the database commands (^6.0).",
- "illuminate/events": "Required to use the observers with Eloquent (^6.0).",
- "illuminate/filesystem": "Required to use the migrations (^6.0).",
- "illuminate/pagination": "Required to paginate the result set (^6.0)."
+ "illuminate/console": "Required to use the database commands (^7.0).",
+ "illuminate/events": "Required to use the observers with Eloquent (^7.0).",
+ "illuminate/filesystem": "Required to use the migrations (^7.0).",
+ "illuminate/pagination": "Required to paginate the result set (^7.0)."
},
"config": {
"sort-packages": true | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Encryption/composer.json | @@ -18,8 +18,8 @@
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Events/composer.json | @@ -15,9 +15,9 @@
],
"require": {
"php": "^7.2",
- "illuminate/container": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/container": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Filesystem/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
"symfony/finder": "^4.3"
},
"autoload": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Hashing/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Http/composer.json | @@ -16,8 +16,8 @@
"require": {
"php": "^7.2",
"ext-json": "*",
- "illuminate/session": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/session": "^7.0",
+ "illuminate/support": "^7.0",
"symfony/http-foundation": "^4.3",
"symfony/http-kernel": "^4.3"
}, | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Log/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
"monolog/monolog": "^1.11"
},
"autoload": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Mail/composer.json | @@ -17,9 +17,9 @@
"php": "^7.2",
"ext-json": "*",
"erusev/parsedown": "^1.7",
- "illuminate/container": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/container": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
"psr/log": "^1.0",
"swiftmailer/swiftmailer": "^6.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.1" | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Notifications/composer.json | @@ -15,14 +15,14 @@
],
"require": {
"php": "^7.2",
- "illuminate/broadcasting": "^6.0",
- "illuminate/bus": "^6.0",
- "illuminate/container": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/filesystem": "^6.0",
- "illuminate/mail": "^6.0",
- "illuminate/queue": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/broadcasting": "^7.0",
+ "illuminate/bus": "^7.0",
+ "illuminate/container": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/filesystem": "^7.0",
+ "illuminate/mail": "^7.0",
+ "illuminate/queue": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": {
@@ -35,7 +35,7 @@
}
},
"suggest": {
- "illuminate/database": "Required to use the database transport (^6.0)."
+ "illuminate/database": "Required to use the database transport (^7.0)."
},
"config": {
"sort-packages": true | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Pagination/composer.json | @@ -16,8 +16,8 @@
"require": {
"php": "^7.2",
"ext-json": "*",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Pipeline/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Queue/composer.json | @@ -16,13 +16,13 @@
"require": {
"php": "^7.2",
"ext-json": "*",
- "illuminate/console": "^6.0",
- "illuminate/container": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/database": "^6.0",
- "illuminate/filesystem": "^6.0",
- "illuminate/pipeline": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/console": "^7.0",
+ "illuminate/container": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/database": "^7.0",
+ "illuminate/filesystem": "^7.0",
+ "illuminate/pipeline": "^7.0",
+ "illuminate/support": "^7.0",
"opis/closure": "^3.1",
"symfony/debug": "^4.3",
"symfony/process": "^4.3"
@@ -41,7 +41,7 @@
"ext-pcntl": "Required to use all features of the queue worker.",
"ext-posix": "Required to use all features of the queue worker.",
"aws/aws-sdk-php": "Required to use the SQS queue driver (^3.0).",
- "illuminate/redis": "Required to use the Redis queue driver (^6.0).",
+ "illuminate/redis": "Required to use the Redis queue driver (^7.0).",
"pda/pheanstalk": "Required to use the Beanstalk queue driver (^4.0)."
},
"config": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Redis/composer.json | @@ -15,8 +15,8 @@
],
"require": {
"php": "^7.2",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
"predis/predis": "^1.0"
},
"autoload": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Routing/composer.json | @@ -16,12 +16,12 @@
"require": {
"php": "^7.2",
"ext-json": "*",
- "illuminate/container": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/http": "^6.0",
- "illuminate/pipeline": "^6.0",
- "illuminate/session": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/container": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/http": "^7.0",
+ "illuminate/pipeline": "^7.0",
+ "illuminate/session": "^7.0",
+ "illuminate/support": "^7s.0",
"symfony/debug": "^4.3",
"symfony/http-foundation": "^4.3",
"symfony/http-kernel": "^4.3",
@@ -38,7 +38,7 @@
}
},
"suggest": {
- "illuminate/console": "Required to use the make commands (^6.0).",
+ "illuminate/console": "Required to use the make commands (^7.0).",
"symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.1)."
},
"config": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Session/composer.json | @@ -16,9 +16,9 @@
"require": {
"php": "^7.2",
"ext-json": "*",
- "illuminate/contracts": "^6.0",
- "illuminate/filesystem": "^6.0",
- "illuminate/support": "^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/filesystem": "^7.0",
+ "illuminate/support": "^7.0",
"symfony/finder": "^4.3",
"symfony/http-foundation": "^4.3"
},
@@ -33,7 +33,7 @@
}
},
"suggest": {
- "illuminate/console": "Required to use the session:table command (^6.0)."
+ "illuminate/console": "Required to use the session:table command (^7.0)."
},
"config": {
"sort-packages": true | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Support/composer.json | @@ -18,7 +18,7 @@
"ext-json": "*",
"ext-mbstring": "*",
"doctrine/inflector": "^1.1",
- "illuminate/contracts": "^6.0",
+ "illuminate/contracts": "^7.0",
"nesbot/carbon": "^2.0"
},
"conflict": {
@@ -38,7 +38,7 @@
}
},
"suggest": {
- "illuminate/filesystem": "Required to use the composer class (^6.0).",
+ "illuminate/filesystem": "Required to use the composer class (^7.0).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"ramsey/uuid": "Required to use Str::uuid() (^3.7).",
"symfony/process": "Required to use the composer class (^4.3).", | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Translation/composer.json | @@ -16,9 +16,9 @@
"require": {
"php": "^7.2",
"ext-json": "*",
- "illuminate/contracts": "^6.0",
- "illuminate/filesystem": "^6.0",
- "illuminate/support": "^6.0"
+ "illuminate/contracts": "^7.0",
+ "illuminate/filesystem": "^7.0",
+ "illuminate/support": "^7.0"
},
"autoload": {
"psr-4": { | true |
Other | laravel | framework | 9f84d8de45106d97feb672e199840ea186035ef4.json | Update versions for 7.0 | src/Illuminate/Validation/composer.json | @@ -17,10 +17,10 @@
"php": "^7.2",
"ext-json": "*",
"egulias/email-validator": "^2.0",
- "illuminate/container": "^6.0",
- "illuminate/contracts": "^6.0",
- "illuminate/support": "^6.0",
- "illuminate/translation": "^6.0",
+ "illuminate/container": "^7.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/support": "^7.0",
+ "illuminate/translation": "^7.0",
"symfony/http-foundation": "^4.3"
},
"autoload": {
@@ -34,7 +34,7 @@
}
},
"suggest": {
- "illuminate/database": "Required to use the database presence verifier (^6.0)."
+ "illuminate/database": "Required to use the database presence verifier (^7.0)."
},
"config": {
"sort-packages": true | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.