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
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Pagination/BootstrapThreeNextPreviousButtonRendererTrait.php
@@ -37,7 +37,7 @@ public function getNextButton($text = '»') // If the current page is greater than or equal to the last page, it means we // can't go any further into the pages, as we're already on this last page // that is available, so we will make it the "next" link style disabled. ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Pagination/UrlWindow.php
@@ -75,7 +75,7 @@ protected function getUrlSlider($onEachSide) { $window = $onEachSide * 2; - if (!$this->hasPages()) { + if (! $this->hasPages()) { return [ 'first' => null, 'slider' => null,
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/CallQueuedHandler.php
@@ -42,7 +42,7 @@ public function call(Job $job, array $data) $this->setJobInstanceIfNecessary($job, $handler); }); - if (!$job->isDeletedOrReleased()) { + if (! $job->isDeletedOrReleased()) { $job->delete(); } }
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/Console/RetryCommand.php
@@ -30,7 +30,7 @@ public function fire() { $failed = $this->laravel['queue.failer']->find($this->argument('id')); - if (!is_null($failed)) { + if (! is_null($failed)) { $failed = (object) $failed; $failed->payload = $this->resetAttempts($failed->payload);
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/Console/WorkCommand.php
@@ -51,7 +51,7 @@ public function __construct(Worker $worker) */ public function fire() { - if ($this->downForMaintenance() && !$this->option('daemon')) { + if ($this->downForMaintenance() && ! $this->option('daemon')) { return $this->worker->sleep($this->option('sleep')); ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/DatabaseQueue.php
@@ -160,7 +160,7 @@ public function pop($queue = null) { $queue = $this->getQueue($queue); - if (!is_null($this->expire)) { + if (! is_null($this->expire)) { $this->releaseJobsThatHaveBeenReservedTooLong($queue); }
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/IronQueue.php
@@ -123,7 +123,7 @@ public function pop($queue = null) // If we were able to pop a message off of the queue, we will need to decrypt // the message body, as all Iron.io messages are encrypted, since the push // queues will be a security hazard to unsuspecting developers using it. - if ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/Jobs/IronJob.php
@@ -96,7 +96,7 @@ public function release($delay = 0) { parent::release($delay); - if (!$this->pushed) { + if (! $this->pushed) { $this->delete(); }
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/QueueManager.php
@@ -98,7 +98,7 @@ public function connection($name = null) // If the connection has not been resolved yet we will resolve it now as all // of the connections are resolved when they are actually needed so we do // not make any unnecessary connection to the various queue end-points. - if...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/RedisQueue.php
@@ -129,13 +129,13 @@ public function pop($queue = null) $queue = $this->getQueue($queue); - if (!is_null($this->expire)) { + if (! is_null($this->expire)) { $this->migrateAllExpiredJobs($queue); } $job = $this->getConnection()->lpop($queue); - if (!i...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Queue/Worker.php
@@ -153,7 +153,7 @@ public function pop($connectionName, $queue = null, $delay = 0, $sleep = 3, $max // If we're able to pull a job off of the stack, we will process it and // then immediately return back out. If there is no job on the queue // we will "sleep" the worker for the specified num...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/ControllerDispatcher.php
@@ -109,7 +109,7 @@ protected function getMiddleware($instance, $method) $results = []; foreach ($instance->getMiddleware() as $name => $options) { - if (!$this->methodExcludedByOptions($method, $options)) { + if (! $this->methodExcludedByOptions($method, $options)) { ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/Matching/SchemeValidator.php
@@ -17,7 +17,7 @@ class SchemeValidator implements ValidatorInterface public function matches(Route $route, Request $request) { if ($route->httpOnly()) { - return !$request->secure(); + return ! $request->secure(); } elseif ($route->secure()) { return $requ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/ResourceRegistrar.php
@@ -128,7 +128,7 @@ protected function getResourceMethods($defaults, $options) */ public function getResourceUri($resource) { - if (!Str::contains($resource, '.')) { + if (! Str::contains($resource, '.')) { return $resource; } @@ -194,7 +194,7 @@ protected function ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/ResponseFactory.php
@@ -82,7 +82,7 @@ public function view($view, $data = [], $status = 200, array $headers = []) */ public function json($data = [], $status = 200, array $headers = [], $options = 0) { - if ($data instanceof Arrayable && !$data instanceof JsonSerializable) { + if ($data instanceof Arrayable &...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/Route.php
@@ -106,7 +106,7 @@ public function __construct($methods, $uri, $action) $this->methods = (array) $methods; $this->action = $this->parseAction($action); - if (in_array('GET', $this->methods) && !in_array('HEAD', $this->methods)) { + if (in_array('GET', $this->methods) && ! in_array('HE...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/RouteCollection.php
@@ -127,7 +127,7 @@ public function match(Request $request) // by the consumer. Otherwise we will check for routes with another verb. $route = $this->check($routes, $request); - if (!is_null($route)) { + if (! is_null($route)) { return $route->bind($request); } ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/RouteDependencyResolverTrait.php
@@ -32,7 +32,7 @@ protected function callWithDependencies($instance, $method) */ protected function resolveClassMethodDependencies(array $parameters, $instance, $method) { - if (!method_exists($instance, $method)) { + if (! method_exists($instance, $method)) { return $paramete...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/Router.php
@@ -233,7 +233,7 @@ public function controller($uri, $controller, $names = []) // First, we will check to see if a controller prefix has been registered in // the route group. If it has, we will need to prefix it before trying to // reflect into the class instance and pull out the method for ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Routing/UrlGenerator.php
@@ -271,7 +271,7 @@ public function forceSchema($schema) */ public function route($name, $parameters = [], $absolute = true) { - if (!is_null($route = $this->routes->getByName($name))) { + if (! is_null($route = $this->routes->getByName($name))) { return $this->toRoute($route,...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Session/CacheBasedSessionHandler.php
@@ -35,47 +35,47 @@ public function __construct(CacheContract $cache, $minutes) } /** - * {@inheritDoc} + * {@inheritdoc} */ public function open($savePath, $sessionName) { return true; } /** - * {@inheritDoc} + * {@inheritdoc} */ public functi...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Session/CookieSessionHandler.php
@@ -36,47 +36,47 @@ public function __construct(CookieJar $cookie, $minutes) } /** - * {@inheritDoc} + * {@inheritdoc} */ public function open($savePath, $sessionName) { return true; } /** - * {@inheritDoc} + * {@inheritdoc} */ public function ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Session/DatabaseSessionHandler.php
@@ -42,23 +42,23 @@ public function __construct(ConnectionInterface $connection, $table) } /** - * {@inheritDoc} + * {@inheritdoc} */ public function open($savePath, $sessionName) { return true; } /** - * {@inheritDoc} + * {@inheritdoc} */ publ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Session/FileSessionHandler.php
@@ -36,23 +36,23 @@ public function __construct(Filesystem $files, $path) } /** - * {@inheritDoc} + * {@inheritdoc} */ public function open($savePath, $sessionName) { return true; } /** - * {@inheritDoc} + * {@inheritdoc} */ public function clo...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Session/Middleware/StartSession.php
@@ -84,7 +84,7 @@ public function handle($request, Closure $next) */ public function terminate($request, $response) { - if ($this->sessionHandled && $this->sessionConfigured() && !$this->usingCookieSessions()) { + if ($this->sessionHandled && $this->sessionConfigured() && ! $this->usingCoo...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Session/Store.php
@@ -91,7 +91,7 @@ public function start() { $this->loadSession(); - if (!$this->has('_token')) { + if (! $this->has('_token')) { $this->regenerateToken(); } @@ -169,7 +169,7 @@ public function getId() */ public function setId($id) { - if (!$th...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/Arr.php
@@ -208,7 +208,7 @@ public static function get($array, $key, $default = null) } foreach (explode('.', $key) as $segment) { - if (!is_array($array) || !array_key_exists($segment, $array)) { + if (! is_array($array) || ! array_key_exists($segment, $array)) { retu...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/ClassLoader.php
@@ -61,7 +61,7 @@ public static function normalizeClass($class) */ public static function register() { - if (!static::$registered) { + if (! static::$registered) { static::$registered = spl_autoload_register(['\Illuminate\Support\ClassLoader', 'load']); } }
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/Collection.php
@@ -79,7 +79,7 @@ public function contains($key, $value = null) } if ($this->useAsCallable($key)) { - return !is_null($this->first($key)); + return ! is_null($this->first($key)); } return in_array($key, $this->items); @@ -237,7 +237,7 @@ public function grou...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/Facades/Cookie.php
@@ -15,7 +15,7 @@ class Cookie extends Facade */ public static function has($key) { - return !is_null(static::$app['request']->cookie($key, null)); + return ! is_null(static::$app['request']->cookie($key, null)); } /**
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/HtmlString.php
@@ -7,7 +7,7 @@ class HtmlString implements Htmlable { /** - * The HTML string + * The HTML string. * * @var string */ @@ -25,7 +25,7 @@ public function __construct($html) } /** - * Get the the HTML string + * Get the the HTML string. * * @return string ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/Manager.php
@@ -59,7 +59,7 @@ public function driver($driver = null) // If the given driver has not been created before, we will create the instances // here and cache it so we can return it next time very quickly. If there is // already a driver created by this name, we'll just return that instance. - ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/MessageBag.php
@@ -92,7 +92,7 @@ protected function isUnique($key, $message) { $messages = (array) $this->messages; - return !isset($messages[$key]) || !in_array($message, $messages[$key]); + return ! isset($messages[$key]) || ! in_array($message, $messages[$key]); } /** @@ -243,7 +243,7 @@ p...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/ServiceProvider.php
@@ -105,14 +105,14 @@ protected function publishes(array $paths, $group = null) { $class = get_class($this); - if (!array_key_exists($class, static::$publishes)) { + if (! array_key_exists($class, static::$publishes)) { static::$publishes[$class] = []; } st...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/Str.php
@@ -181,7 +181,7 @@ public static function words($value, $words = 100, $end = '...') { preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches); - if (!isset($matches[0]) || strlen($value) === strlen($matches[0])) { + if (! isset($matches[0]) || strlen($value) === strlen($matches...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/Traits/CapsuleManagerTrait.php
@@ -31,7 +31,7 @@ protected function setupContainer(Container $container) { $this->container = $container; - if (!$this->container->bound('config')) { + if (! $this->container->bound('config')) { $this->container->instance('config', new Fluent); } }
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Support/helpers.php
@@ -6,7 +6,7 @@ use Illuminate\Support\Debug\Dumper; use Illuminate\Contracts\Support\Htmlable; -if (!function_exists('append_config')) { +if (! function_exists('append_config')) { /** * Assign high numeric IDs to a config item to force appending. * @@ -29,7 +29,7 @@ function append_config(array $a...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Translation/Translator.php
@@ -85,15 +85,15 @@ public function get($key, array $replace = [], $locale = null) $namespace, $group, $locale, $item, $replace ); - if (!is_null($line)) { + if (! is_null($line)) { break; } } // If the line doesn't ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Validation/DatabasePresenceVerifier.php
@@ -46,7 +46,7 @@ public function getCount($collection, $column, $value, $excludeId = null, $idCol { $query = $this->table($collection)->where($column, '=', $value); - if (!is_null($excludeId) && $excludeId != 'NULL') { + if (! is_null($excludeId) && $excludeId != 'NULL') { $q...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Validation/Factory.php
@@ -95,14 +95,14 @@ public function make(array $data, array $rules, array $messages = [], array $cus // it may be written besides database. We'll inject it into the validator. $validator = $this->resolve($data, $rules, $messages, $customAttributes); - if (!is_null($this->verifier)) { + ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
@@ -19,9 +19,9 @@ public function validate() { $instance = $this->getValidatorInstance(); - if (!$this->passesAuthorization()) { + if (! $this->passesAuthorization()) { $this->failedAuthorization(); - } elseif (!$instance->passes()) { + } elseif (! $instance->pas...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/Validation/Validator.php
@@ -262,7 +262,7 @@ public function each($attribute, $rules) { $data = Arr::get($this->data, $attribute); - if (!is_array($data)) { + if (! is_array($data)) { if ($this->hasRule($attribute, 'Array')) { return; } @@ -272,7 +272,7 @@ public function...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/View/Compilers/BladeCompiler.php
@@ -98,7 +98,7 @@ public function compile($path = null) $contents = $this->compileString($this->files->get($this->getPath())); - if (!is_null($this->cachePath)) { + if (! is_null($this->cachePath)) { $this->files->put($this->getCompiledPath($this->getPath()), $contents); ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/View/Compilers/Compiler.php
@@ -57,7 +57,7 @@ public function isExpired($path) // If the compiled file doesn't exist we will indicate that the view is expired // so that it can be re-compiled. Else, we will verify the last modification // of the views is less than the modification times of the compiled views. - i...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/View/Expression.php
@@ -7,7 +7,7 @@ class Expression implements Htmlable { /** - * The HTML string + * The HTML string. * * @var string */ @@ -25,7 +25,7 @@ public function __construct($html) } /** - * Get the the HTML string + * Get the the HTML string. * * @return string ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/View/Factory.php
@@ -288,7 +288,7 @@ public function renderEach($view, $data, $iterator, $empty = 'raw|') */ public function getEngineFromPath($path) { - if (!$extension = $this->getExtension($path)) { + if (! $extension = $this->getExtension($path)) { throw new InvalidArgumentException("Unrec...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
src/Illuminate/View/FileViewFinder.php
@@ -108,7 +108,7 @@ protected function getNamespaceSegments($name) throw new InvalidArgumentException("View [$name] has an invalid name."); } - if (!isset($this->hints[$segments[0]])) { + if (! isset($this->hints[$segments[0]])) { throw new InvalidArgumentException("No...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Cache/CacheRateLimiterTest.php
@@ -6,54 +6,50 @@ class CacheRateLimiterTest extends PHPUnit_Framework_TestCase { - public function tearDown() - { - m::close(); - } - - - public function testTooManyAttemptsReturnTrueIfAlreadyLockedOut() - { - $cache = m::mock(Cache::class); - $cache->shouldReceive('get')->once()->with('key', 0)->andReturn(0); ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Cookie/Middleware/EncryptCookiesTest.php
@@ -39,7 +39,7 @@ public function testSetCookieEncryption() { $this->router->get($this->setCookiePath, [ 'middleware' => 'EncryptCookiesTestMiddleware', - 'uses' => 'EncryptCookiesTestController@setCookies' + 'uses' => 'EncryptCookiesTestController@setCookies', ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Database/DatabaseConnectorTest.php
@@ -77,7 +77,7 @@ public function testPostgresSearchPathArraySupported() { $dsn = 'pgsql:host=foo;dbname=bar'; $config = ['host' => 'foo', 'database' => 'bar', 'schema' => ['public', 'user'], 'charset' => 'utf8']; - $connector = $this->getMock('Illuminate\Database\Connectors\PostgresConnec...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Database/DatabaseEloquentSoftDeletesIntegrationTest.php
@@ -124,7 +124,6 @@ public function testOnlyTrashedOnlyReturnsTrashedRecords() $this->assertEquals(1, $users->first()->id); } - /** * Helpers... */ @@ -169,7 +168,6 @@ class SoftDeletesTestUser extends Eloquent protected $guarded = []; } - /** * Connection Resolver. */
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Database/DatabaseMigrationMakeCommandTest.php
@@ -58,7 +58,7 @@ public function testBasicCreateGivesCreatorProperArgumentsWhenTableIsSet() public function testCanSpecifyPathToCreateMigrationsIn() { - $command = new MigrateMakeCommand( + $command = new MigrateMakeCommand( $creator = m::mock('Illuminate\Database\Migrations\Mig...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Database/DatabaseMySqlSchemaGrammarTest.php
@@ -581,7 +581,7 @@ public function testAddingTimeStampTz() public function testAddingTimeStampTzWithDefault() { $blueprint = new Blueprint('users'); - $blueprint->timestampTz('foo')->default('2015-07-22 11:43:17');; + $blueprint->timestampTz('foo')->default('2015-07-22 11:43:17'); ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Database/DatabaseQueryBuilderTest.php
@@ -538,7 +538,7 @@ public function testLimitsAndOffsets() public function testGetCountForPaginationWithBindings() { $builder = $this->getBuilder(); - $builder->from('users')->selectSub(function($q) { $q->select('body')->from('posts')->where('id', 4); }, 'post'); + $builder->from('users...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Http/HttpRequestTest.php
@@ -343,7 +343,7 @@ public function testPrefers() $this->assertEquals('text/html', Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'application/json;q=0.4, text/html;q=0.6'])->prefers(['text/html', 'application/json'])); $this->assertEquals('text/html', Request::create('/', 'GET', [], [], []...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Queue/QueueDatabaseQueueTest.php
@@ -20,7 +20,7 @@ public function testPushProperlyPushesJobOntoDatabase() $this->assertEquals(0, $array['attempts']); $this->assertEquals(0, $array['reserved']); $this->assertNull($array['reserved_at']); - $this->assertTrue(is_integer($array['available_at'])); + ...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Routing/RoutingRouteTest.php
@@ -477,31 +477,31 @@ public function testNestedRouteGroupingWithAs() public function testRoutePrefixing() { - /** + /* * Prefix route */ $router = $this->getRouter(); - $router->get('foo/bar', function() { return 'hello'; }); + $router->get('foo/bar'...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Support/SupportArrTest.php
@@ -13,7 +13,6 @@ public function testIsAssoc() $this->assertFalse(Arr::isAssoc(['a', 'b'])); } - public function testSortRecursive() { $array = [
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Support/SupportCollectionTest.php
@@ -694,7 +694,7 @@ public function testSearchReturnsIndexOfFirstFoundItem() $this->assertEquals(1, $c->search(2)); $this->assertEquals('foo', $c->search('bar')); $this->assertEquals(4, $c->search(function ($value) { return $value > 4; })); - $this->assertEquals('foo', $c->search(funct...
true
Other
laravel
framework
2c64b62f61ba0bf51fc1578c9286abead664e231.json
fix merge conflicts.
tests/Support/SupportHelpersTest.php
@@ -351,7 +351,7 @@ public function testArraySortRecursive() 'bar', 'baz', 'foo', - ] + ], ]; $this->assertEquals($assumedArray, array_sort_recursive($array));
true
Other
laravel
framework
3a00e3c9dd99156e7495f1e2005e5f7134c0e7cc.json
Fix additional subqueries
src/Illuminate/Database/Query/Builder.php
@@ -640,7 +640,7 @@ public function addNestedWhereQuery($query, $boolean = 'and') $this->wheres[] = compact('type', 'query', 'boolean'); - $this->mergeBindings($query); + $this->addBinding($query->getBindings(), 'where'); } return $this; @@ -668,7 +668,7 @@ pro...
true
Other
laravel
framework
3a00e3c9dd99156e7495f1e2005e5f7134c0e7cc.json
Fix additional subqueries
tests/Database/DatabaseQueryBuilderTest.php
@@ -312,10 +312,11 @@ public function testUnions() $this->assertEquals([0 => 1, 1 => 2], $builder->getBindings()); $builder = $this->getMysqlBuilder(); - $second = $this->getMysqlBuilder()->select('*')->from('users')->orderByRaw('id = ?', 2); - $third = $this->getMysqlBuilder()->select...
true
Other
laravel
framework
89c5f0b6b9de31895709153af2ed98ab3f38c923.json
Fix bindings on unions by added a new binding type
src/Illuminate/Database/Query/Builder.php
@@ -49,6 +49,7 @@ class Builder 'where' => [], 'having' => [], 'order' => [], + 'union' => [], ]; /** @@ -1233,7 +1234,7 @@ public function union($query, $all = false) $this->unions[] = compact('query', 'all'); - return $this->mergeBindings($query); +...
true
Other
laravel
framework
89c5f0b6b9de31895709153af2ed98ab3f38c923.json
Fix bindings on unions by added a new binding type
tests/Database/DatabaseQueryBuilderTest.php
@@ -310,6 +310,12 @@ public function testUnions() $builder->union($this->getMySqlBuilder()->select('*')->from('users')->where('id', '=', 2)); $this->assertEquals('(select * from `users` where `id` = ?) union (select * from `users` where `id` = ?)', $builder->toSql()); $this->assertEquals([0 =...
true
Other
laravel
framework
5ce38d712d381cff62849b935c1bc3a701331d9e.json
Allow multi-dimentional arrays
src/Illuminate/Pagination/AbstractPaginator.php
@@ -128,7 +128,7 @@ public function url($page) } return $this->path.'?' - .http_build_query($parameters, null, '&') + .url_decode(http_build_query($parameters, null, '&')) .$this->buildFragment(); }
false
Other
laravel
framework
ce2b1a271352bb19a1785a337c6551bc63d7fe23.json
Fix typo in with() docblock.
src/Illuminate/Database/Eloquent/Model.php
@@ -703,7 +703,7 @@ public function load($relations) } /** - * Being querying a model with eager loading. + * Begin querying a model with eager loading. * * @param array|string $relations * @return \Illuminate\Database\Eloquent\Builder|static
false
Other
laravel
framework
65fec46142e4e9d284aee2a4d8b07c87be8934bf.json
remove repeated code
src/Illuminate/Database/Migrations/Migrator.php
@@ -157,22 +157,20 @@ public function rollback($pretend = false) // of them "down" to reverse the last migration "operation" which ran. $migrations = $this->repository->getLast(); - $migrationsCount = count($migrations); + $count = count($migrations); - if ($migrationsCount ==...
false
Other
laravel
framework
3d8146a58232d6a69818e9d2c2d2b18660b0fc33.json
add a blank line between methods.
src/Illuminate/Foundation/Testing/CrawlerTrait.php
@@ -673,13 +673,14 @@ protected function filterByNameOrId($name, $element = '*') public function call($method, $uri, $parameters = [], $cookies = [], $files = [], $server = [], $content = null) { $kernel = $this->app->make('Illuminate\Contracts\Http\Kernel'); + $this->currentUri = $this->pre...
false
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Database/Connection.php
@@ -6,6 +6,7 @@ use Closure; use DateTime; use Exception; +use Throwable; use LogicException; use RuntimeException; use Illuminate\Support\Arr; @@ -450,7 +451,7 @@ public function prepareBindings(array $bindings) /** * Execute a Closure within a transaction. * - * @param \Closure $callback ...
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Database/ConnectionInterface.php
@@ -107,7 +107,7 @@ public function prepareBindings(array $bindings); * @param \Closure $callback * @return mixed * - * @throws \Exception + * @throws \Throwable */ public function transaction(Closure $callback);
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Database/SqlServerConnection.php
@@ -4,6 +4,7 @@ use Closure; use Exception; +use Throwable; use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as DoctrineDriver; use Illuminate\Database\Query\Processors\SqlServerProcessor; use Illuminate\Database\Query\Grammars\SqlServerGrammar as QueryGrammar; @@ -17,7 +18,7 @@ class SqlServerConnection extends Connec...
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Foundation/Bootstrap/HandleExceptions.php
@@ -2,10 +2,12 @@ namespace Illuminate\Foundation\Bootstrap; +use Exception; use ErrorException; use Illuminate\Contracts\Foundation\Application; use Symfony\Component\Console\Output\ConsoleOutput; use Symfony\Component\Debug\Exception\FatalErrorException; +use Symfony\Component\Debug\Exception\FatalThrowableE...
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Foundation/Console/Kernel.php
@@ -3,11 +3,13 @@ namespace Illuminate\Foundation\Console; use Exception; +use Throwable; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Console\Application as Artisan; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Console\Kern...
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Foundation/Http/Kernel.php
@@ -3,12 +3,14 @@ namespace Illuminate\Foundation\Http; use Exception; +use Throwable; use RuntimeException; use Illuminate\Routing\Router; use Illuminate\Pipeline\Pipeline; use Illuminate\Support\Facades\Facade; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Http\Kernel as KernelCo...
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Queue/SyncQueue.php
@@ -3,6 +3,7 @@ namespace Illuminate\Queue; use Exception; +use Throwable; use Illuminate\Queue\Jobs\SyncJob; use Illuminate\Contracts\Queue\Job; use Illuminate\Contracts\Queue\Queue as QueueContract; @@ -16,7 +17,7 @@ class SyncQueue extends Queue implements QueueContract * @param mixed $data * @...
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/Queue/Worker.php
@@ -3,11 +3,13 @@ namespace Illuminate\Queue; use Exception; +use Throwable; use Illuminate\Contracts\Queue\Job; use Illuminate\Contracts\Events\Dispatcher; +use Illuminate\Contracts\Debug\ExceptionHandler; use Illuminate\Queue\Failed\FailedJobProviderInterface; +use Symfony\Component\Debug\Exception\FatalThrowa...
true
Other
laravel
framework
03221c9a0ac66d6b3f6f1b239d125ded467bf360.json
Support php 7 throwables
src/Illuminate/View/Engines/PhpEngine.php
@@ -3,6 +3,8 @@ namespace Illuminate\View\Engines; use Exception; +use Throwable; +use Symfony\Component\Debug\Exception\FatalThrowableError; class PhpEngine implements EngineInterface { @@ -40,6 +42,8 @@ protected function evaluatePath($__path, $__data) include $__path; } catch (Exception...
true
Other
laravel
framework
191a8499eb9c7226e4564633143a82bdfd9510bd.json
Improve artisan make:listener feedback
src/Illuminate/Foundation/Console/ListenerMakeCommand.php
@@ -29,6 +29,20 @@ class ListenerMakeCommand extends GeneratorCommand */ protected $type = 'Listener'; + /** + * Execute the console command. + * + * @return void + */ + public function fire() + { + if (!$this->option('event')) { + return $this->error("Missing req...
false
Other
laravel
framework
7937238d6313a9e87ec57adfff5383d1204d8e7b.json
Add all() to the Config contract
src/Illuminate/Contracts/Config/Repository.php
@@ -47,4 +47,11 @@ public function prepend($key, $value); * @return void */ public function push($key, $value); + + /** + * Get all of the configuration items for the application. + * + * @return array + */ + public function all(); }
false
Other
laravel
framework
4ffb4a33c881e8e6443a3b09a66ccdc57e6ac028.json
Modify dd() to conform to PSR2
src/Illuminate/Support/helpers.php
@@ -430,7 +430,9 @@ function data_get($target, $key, $default = null) */ function dd() { - array_map(function ($x) { (new Dumper)->dump($x); }, func_get_args()); + array_map(function ($x) { + (new Dumper)->dump($x); + }, func_get_args()); die(1); }
false
Other
laravel
framework
ac5c52b2e108d2b2eb4bc84d2d7b08c2237c09b7.json
Remove old code that was never documented or used.
src/Illuminate/Foundation/Testing/TestCase.php
@@ -9,13 +9,6 @@ abstract class TestCase extends PHPUnit_Framework_TestCase { use ApplicationTrait, AssertionsTrait, CrawlerTrait; - /** - * The Eloquent factory instance. - * - * @var \Illuminate\Database\Eloquent\Factory - */ - protected $factory; - /** * The callbacks that sh...
false
Other
laravel
framework
5721d82315de50adc81eb0fe8167c4c8b18138c6.json
remove unneeded tests.
tests/View/ViewBladeCompilerTest.php
@@ -159,29 +159,6 @@ public function testEscapedWithAtEchosAreCompiled() ')); } - public function testReversedEchosAreCompiled() - { - $compiler = new BladeCompiler($this->getFiles(), __DIR__); - $compiler->setEscapedContentTags('{{', '}}'); - $compiler->setContentTags('{{...
false
Other
laravel
framework
73ab0d56526488bfb1692e014deda17ea0b78599.json
fix several problems
src/Illuminate/Queue/Console/ListFailedCommand.php
@@ -69,7 +69,7 @@ protected function parseFailedJob(array $failed) { $row = array_values(array_except($failed, ['payload'])); - array_splice($row, 3, 0, $this->setPayload($failed['payload'])); + array_splice($row, 3, 0, $this->extractJobName($failed['payload'])); return $row; ...
false
Other
laravel
framework
ae0e42fb7ff008e48abd4baa7427bba3232ab9fe.json
Cleanup the caster
src/Illuminate/Foundation/Console/IlluminateCaster.php
@@ -6,7 +6,6 @@ use Illuminate\Support\Collection; use Illuminate\Foundation\Application; use Illuminate\Database\Eloquent\Model; -use Symfony\Component\VarDumper\Cloner\Stub; use Symfony\Component\VarDumper\Caster\Caster; class IlluminateCaster @@ -37,41 +36,33 @@ class IlluminateCaster * Get an array rep...
false
Other
laravel
framework
f7eba2089b91733b70ae25dd36556111ed3b4313.json
Fix psysh upgrade
composer.json
@@ -26,7 +26,7 @@ "monolog/monolog": "~1.11", "mtdowling/cron-expression": "~1.0", "nesbot/carbon": "~1.19", - "psy/psysh": "0.5.*", + "psy/psysh": "~0.5.1", "swiftmailer/swiftmailer": "~5.1", "symfony/console": "2.7.*", "symfony/css-selector": "2.7.*"...
true
Other
laravel
framework
f7eba2089b91733b70ae25dd36556111ed3b4313.json
Fix psysh upgrade
src/Illuminate/Foundation/Console/Tinker/IlluminateCaster.php
@@ -3,16 +3,16 @@ namespace Illuminate\Foundation\Console\Tinker\Casters; use Exception; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Foundation\Application; use Illuminate\Support\Collection; -use Symfony\Component\VarDumper\Caster\Caster; +use Illuminate\Foundation\Application; +use Illuminate\Databa...
true
Other
laravel
framework
f7eba2089b91733b70ae25dd36556111ed3b4313.json
Fix psysh upgrade
src/Illuminate/Foundation/Console/TinkerCommand.php
@@ -73,15 +73,15 @@ protected function getCommands() } /** - * Get an array of Laravel tailored Casters. + * Get an array of Laravel tailored casters. * * @return array */ protected function getCasters() { return [ - 'Illuminate\Foundation\Application'...
true
Other
laravel
framework
9cd2ea83b04a696a8ebba040f95ae69ae173f6a8.json
Replace Presenters by Casters for PsySH 0.5 Signed-off-by: Graham Campbell <graham@alt-three.com>
composer.json
@@ -26,7 +26,7 @@ "monolog/monolog": "~1.11", "mtdowling/cron-expression": "~1.0", "nesbot/carbon": "~1.19", - "psy/psysh": "0.4.*", + "psy/psysh": "0.5.*", "swiftmailer/swiftmailer": "~5.1", "symfony/console": "2.7.*", "symfony/css-selector": "2.7.*",
true
Other
laravel
framework
9cd2ea83b04a696a8ebba040f95ae69ae173f6a8.json
Replace Presenters by Casters for PsySH 0.5 Signed-off-by: Graham Campbell <graham@alt-three.com>
src/Illuminate/Foundation/Console/Tinker/IlluminateCaster.php
@@ -0,0 +1,103 @@ +<?php + +namespace Illuminate\Foundation\Console\Tinker\Casters; + +use Exception; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Foundation\Application; +use Illuminate\Support\Collection; +use Symfony\Component\VarDumper\Caster\Caster; +use Symfony\Component\VarDumper\Cloner\Stub; + +clas...
true
Other
laravel
framework
9cd2ea83b04a696a8ebba040f95ae69ae173f6a8.json
Replace Presenters by Casters for PsySH 0.5 Signed-off-by: Graham Campbell <graham@alt-three.com>
src/Illuminate/Foundation/Console/Tinker/Presenters/EloquentModelPresenter.php
@@ -1,68 +0,0 @@ -<?php - -namespace Illuminate\Foundation\Console\Tinker\Presenters; - -use ReflectionClass; -use ReflectionProperty; -use Psy\Presenter\ObjectPresenter; -use Illuminate\Database\Eloquent\Model; - -class EloquentModelPresenter extends ObjectPresenter -{ - /** - * Determine if the presenter can p...
true
Other
laravel
framework
9cd2ea83b04a696a8ebba040f95ae69ae173f6a8.json
Replace Presenters by Casters for PsySH 0.5 Signed-off-by: Graham Campbell <graham@alt-three.com>
src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateApplicationPresenter.php
@@ -1,71 +0,0 @@ -<?php - -namespace Illuminate\Foundation\Console\Tinker\Presenters; - -use Exception; -use ReflectionClass; -use Psy\Presenter\ObjectPresenter; -use Illuminate\Foundation\Application; - -class IlluminateApplicationPresenter extends ObjectPresenter -{ - /** - * Illuminate Application methods to ...
true
Other
laravel
framework
9cd2ea83b04a696a8ebba040f95ae69ae173f6a8.json
Replace Presenters by Casters for PsySH 0.5 Signed-off-by: Graham Campbell <graham@alt-three.com>
src/Illuminate/Foundation/Console/Tinker/Presenters/IlluminateCollectionPresenter.php
@@ -1,42 +0,0 @@ -<?php - -namespace Illuminate\Foundation\Console\Tinker\Presenters; - -use Psy\Presenter\ArrayPresenter; -use Illuminate\Support\Collection; - -class IlluminateCollectionPresenter extends ArrayPresenter -{ - /** - * Determine if the presenter can present the given value. - * - * @param ...
true
Other
laravel
framework
9cd2ea83b04a696a8ebba040f95ae69ae173f6a8.json
Replace Presenters by Casters for PsySH 0.5 Signed-off-by: Graham Campbell <graham@alt-three.com>
src/Illuminate/Foundation/Console/TinkerCommand.php
@@ -6,9 +6,6 @@ use Psy\Configuration; use Illuminate\Console\Command; use Symfony\Component\Console\Input\InputArgument; -use Illuminate\Foundation\Console\Tinker\Presenters\EloquentModelPresenter; -use Illuminate\Foundation\Console\Tinker\Presenters\IlluminateCollectionPresenter; -use Illuminate\Foundation\Console...
true
Other
laravel
framework
e3c381570a239c2d8d96607eeef5173a760af50d.json
Add test for incrementing forever cache item
tests/Cache/CacheFileStoreTest.php
@@ -68,6 +68,17 @@ public function testForeversAreStoredWithHighTimestamp() $store->forever('foo', 'Hello World', 10); } + public function testForeversAreNotRemovedOnIncrement() + { + $files = $this->mockFilesystem(); + $contents = '9999999999'.serialize('Hello World'); + $sto...
false
Other
laravel
framework
18dfea3a1c47116407bb7cefd6897318b9f2087a.json
Add root url to elixir
src/Illuminate/Foundation/helpers.php
@@ -688,7 +688,7 @@ function elixir($file) } if (isset($manifest[$file])) { - return '/build/'.$manifest[$file]; + return asset('build/'.$manifest[$file]); } throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
false
Other
laravel
framework
dd6433fad46a5076ac8080ca42cd1a1ed1930613.json
Fix wrong @return docblock in updateExistingPivot
src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -832,7 +832,7 @@ protected function attachNew(array $records, array $current, $touch = true) * @param mixed $id * @param array $attributes * @param bool $touch - * @return void + * @return int */ public function updateExistingPivot($id, array $attributes, $touch = true) ...
false
Other
laravel
framework
7612009667db1b7796a3525ce8614ccec38def53.json
add comment. fix formatting
src/Illuminate/Database/Query/Builder.php
@@ -1643,7 +1643,12 @@ public function aggregate($function, $columns = ['*']) $this->aggregate = compact('function', 'columns'); $previousColumns = $this->columns; + + // We will also back up the select bindings since the select clause will be + // removed when performing the aggregate...
false
Other
laravel
framework
407ee032a90e9e2a26774f4a346228f54a132eb7.json
Fix bug in lockout.
src/Illuminate/Foundation/Auth/ThrottlesLogins.php
@@ -18,8 +18,12 @@ protected function hasTooManyLoginAttempts(Request $request) { $attempts = $this->getLoginAttempts($request); - if ($attempts > 5) { - Cache::add($this->getLoginLockExpirationKey($request), time() + 60, 1); + $lockedOut = Cache::has($this->getLoginLockExpirati...
false
Other
laravel
framework
e14199a3386f86af84efbad2d83ef62f851ebb5b.json
Add support for localization in AuthenticatesUsers Just suggestion, add lang support for failed login message
src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
@@ -81,7 +81,7 @@ protected function getCredentials(Request $request) */ protected function getFailedLoginMessage() { - return 'These credentials do not match our records.'; + return trans()->has('passwords.failed') ? trans('passwords.failed') : 'These credentials do not match our records....
false
Other
laravel
framework
e963fcbe25e0b716f2a8d958a84dabb25a97670e.json
Add support for localization in ThrottlesLogins Just suggestion, and it assumes we use the existing passwords.php file in resources/lang/en Thank you.
src/Illuminate/Foundation/Auth/ThrottlesLogins.php
@@ -59,11 +59,11 @@ protected function incrementLoginAttempts(Request $request) protected function sendLockoutResponse(Request $request) { $seconds = (int) Cache::get($this->getLoginLockExpirationKey($request)) - time(); - + $key = 'passwords.throttle'; return redirect($this->loginPat...
false