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
615ba9a6ead3608ef2cf6956c85a6fc71ac37e57.json
Allow multiple folders for migrations
src/Illuminate/Database/Console/Migrations/ResetCommand.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Migrations\Migrator; use Symfony\Component\Console\Input\InputOption; -class ResetCommand extends Command +class ResetCommand extends BaseCommand { use ConfirmableTrait; @@ -66,7 +66,11 @@ public function fire() $pretend = $this->input->getOption('pretend')...
true
Other
laravel
framework
615ba9a6ead3608ef2cf6956c85a6fc71ac37e57.json
Allow multiple folders for migrations
src/Illuminate/Database/Console/Migrations/RollbackCommand.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Migrations\Migrator; use Symfony\Component\Console\Input\InputOption; -class RollbackCommand extends Command +class RollbackCommand extends BaseCommand { use ConfirmableTrait; @@ -60,7 +60,11 @@ public function fire() $pretend = $this->input->getOption('pre...
true
Other
laravel
framework
615ba9a6ead3608ef2cf6956c85a6fc71ac37e57.json
Allow multiple folders for migrations
src/Illuminate/Database/Console/Migrations/StatusCommand.php
@@ -55,17 +55,19 @@ public function fire() $this->migrator->setConnection($this->input->getOption('database')); if (! is_null($path = $this->input->getOption('path'))) { - $path = $this->laravel->basePath().'/'.$path; + $paths[] = $this->laravel->basePath().'/'.$path; ...
true
Other
laravel
framework
615ba9a6ead3608ef2cf6956c85a6fc71ac37e57.json
Allow multiple folders for migrations
src/Illuminate/Database/Migrations/Migrator.php
@@ -44,6 +44,13 @@ class Migrator */ protected $notes = []; + /** + * The paths for all migration files. + * + * @var array + */ + protected $paths = []; + /** * Create a new migrator instance. * @@ -64,24 +71,30 @@ public function __construct(MigrationRepositoryInter...
true
Other
laravel
framework
615ba9a6ead3608ef2cf6956c85a6fc71ac37e57.json
Allow multiple folders for migrations
tests/Database/DatabaseMigrationMigrateCommandTest.php
@@ -17,8 +17,9 @@ public function testBasicMigrationsCallMigratorWithProperArguments() $app = new ApplicationDatabaseMigrationStub(['path.database' => __DIR__]); $app->useDatabasePath(__DIR__); $command->setLaravel($app); + $migrator->shouldReceive('paths')->once()->andReturn([]); ...
true
Other
laravel
framework
615ba9a6ead3608ef2cf6956c85a6fc71ac37e57.json
Allow multiple folders for migrations
tests/Database/DatabaseMigrationResetCommandTest.php
@@ -1,6 +1,7 @@ <?php use Mockery as m; +use Illuminate\Foundation\Application; use Illuminate\Database\Console\Migrations\ResetCommand; class DatabaseMigrationResetCommandTest extends PHPUnit_Framework_TestCase @@ -13,10 +14,13 @@ public function tearDown() public function testResetCommandCallsMigratorWit...
true
Other
laravel
framework
615ba9a6ead3608ef2cf6956c85a6fc71ac37e57.json
Allow multiple folders for migrations
tests/Database/DatabaseMigrationRollbackCommandTest.php
@@ -14,9 +14,12 @@ public function tearDown() public function testRollbackCommandCallsMigratorWithProperArguments() { $command = new RollbackCommand($migrator = m::mock('Illuminate\Database\Migrations\Migrator')); - $command->setLaravel(new AppDatabaseMigrationRollbackStub()); + $app = ...
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
src/Illuminate/Database/Console/Migrations/MigrateCommand.php
@@ -66,12 +66,14 @@ public function fire() // we will use the path relative to the root of this installation folder // so that migrations may be run for any path within the applications. if (! is_null($path = $this->input->getOption('path'))) { - $path = $this->laravel->basePath()....
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
src/Illuminate/Database/Console/Migrations/ResetCommand.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Migrations\Migrator; use Symfony\Component\Console\Input\InputOption; -class ResetCommand extends Command +class ResetCommand extends BaseCommand { use ConfirmableTrait; @@ -66,7 +66,11 @@ public function fire() $pretend = $this->input->getOption('pretend')...
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
src/Illuminate/Database/Console/Migrations/RollbackCommand.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Migrations\Migrator; use Symfony\Component\Console\Input\InputOption; -class RollbackCommand extends Command +class RollbackCommand extends BaseCommand { use ConfirmableTrait; @@ -60,7 +60,11 @@ public function fire() $pretend = $this->input->getOption('pre...
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
src/Illuminate/Database/Console/Migrations/StatusCommand.php
@@ -55,17 +55,19 @@ public function fire() $this->migrator->setConnection($this->input->getOption('database')); if (! is_null($path = $this->input->getOption('path'))) { - $path = $this->laravel->basePath().'/'.$path; + $paths[] = $this->laravel->basePath().'/'.$path; ...
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
src/Illuminate/Database/Migrations/Migrator.php
@@ -44,6 +44,13 @@ class Migrator */ protected $notes = []; + /** + * The paths for all migration files. + * + * @var array + */ + protected $paths = []; + /** * Create a new migrator instance. * @@ -64,24 +71,30 @@ public function __construct(MigrationRepositoryInter...
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
tests/Database/DatabaseMigrationMigrateCommandTest.php
@@ -17,8 +17,9 @@ public function testBasicMigrationsCallMigratorWithProperArguments() $app = new ApplicationDatabaseMigrationStub(['path.database' => __DIR__]); $app->useDatabasePath(__DIR__); $command->setLaravel($app); + $migrator->shouldReceive('paths')->once()->andReturn([]); ...
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
tests/Database/DatabaseMigrationResetCommandTest.php
@@ -1,6 +1,7 @@ <?php use Mockery as m; +use Illuminate\Foundation\Application; use Illuminate\Database\Console\Migrations\ResetCommand; class DatabaseMigrationResetCommandTest extends PHPUnit_Framework_TestCase @@ -13,10 +14,13 @@ public function tearDown() public function testResetCommandCallsMigratorWit...
true
Other
laravel
framework
cc6666e6e448906c17fc129130aedb6474172a48.json
Allow multiple folders for migrations
tests/Database/DatabaseMigrationRollbackCommandTest.php
@@ -14,9 +14,12 @@ public function tearDown() public function testRollbackCommandCallsMigratorWithProperArguments() { $command = new RollbackCommand($migrator = m::mock('Illuminate\Database\Migrations\Migrator')); - $command->setLaravel(new AppDatabaseMigrationRollbackStub()); + $app = ...
true
Other
laravel
framework
f35019fe4504344a6b74437d0da7e5e72f5863f2.json
Fix sqlserver grammar (#13458) Added square brackets to the table name. This fixes issues where the table name is equal to a keyword, like user.
src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -149,7 +149,7 @@ public function compileDrop(Blueprint $blueprint, Fluent $command) */ public function compileDropIfExists(Blueprint $blueprint, Fluent $command) { - return 'if exists (select * from INFORMATION_SCHEMA.TABLES where TABLE_NAME = \''.$blueprint->getTable().'\') drop table '.$blue...
false
Other
laravel
framework
594e1f5e94b1ea710357d96d209d94b7fb56cc32.json
Fix migration tests on windows (#13438)
tests/Database/DatabaseMigrationMakeCommandTest.php
@@ -20,7 +20,7 @@ public function testBasicCreateDumpsAutoload() $app = new Illuminate\Foundation\Application; $app->useDatabasePath(__DIR__); $command->setLaravel($app); - $creator->shouldReceive('create')->once()->with('create_foo', __DIR__.'/migrations', null, false); + $crea...
true
Other
laravel
framework
594e1f5e94b1ea710357d96d209d94b7fb56cc32.json
Fix migration tests on windows (#13438)
tests/Database/DatabaseMigrationMigrateCommandTest.php
@@ -18,7 +18,7 @@ public function testBasicMigrationsCallMigratorWithProperArguments() $app->useDatabasePath(__DIR__); $command->setLaravel($app); $migrator->shouldReceive('setConnection')->once()->with(null); - $migrator->shouldReceive('run')->once()->with(__DIR__.'/migrations', ['pre...
true
Other
laravel
framework
9b5dfdf3be34e1c729edabae2c9e02d95fe2ab7e.json
fix config call
src/Illuminate/Session/SessionManager.php
@@ -151,7 +151,7 @@ protected function createCacheBased($driver) */ protected function createCacheHandler($driver) { - $store = array_get($this->app['config'], 'session.store', $driver); + $store = $this->app['config']->get('session.store', $driver); $minutes = $this->app['confi...
false
Other
laravel
framework
a6ddacb568c1d4fa2d4b6e9f739830692c055973.json
Add test for SessionGuard::onceUsingId() (#13408)
tests/Auth/AuthGuardTest.php
@@ -272,6 +272,18 @@ public function testLoginUsingIdFailure() $this->assertFalse($guard->loginUsingId(11)); } + public function testOnceUsingIdSetsUser() + { + list($session, $provider, $request, $cookie) = $this->getMocks(); + $guard = m::mock('Illuminate\Auth\SessionGuard', ['defa...
false
Other
laravel
framework
6dc5c7c9edb9a9aa9ea031b80b4b0c832eea78bb.json
Fix style issues with previous commit
src/Illuminate/Database/Query/Processors/SqlServerProcessor.php
@@ -20,13 +20,12 @@ public function processInsertGetId(Builder $query, $sql, $values, $sequence = nu $connection = $query->getConnection(); $connection->insert($sql, $values); if ($connection->getConfig('odbc') === true) { - $result = $connection->select("SELECT CAST(COALESCE(SCOPE...
false
Other
laravel
framework
d9cc1bdc6c624f81222ca8b467374409ebcd737b.json
Fix scope nesting (#13413)
src/Illuminate/Database/Eloquent/Builder.php
@@ -1149,7 +1149,7 @@ protected function applyScope($scope, $builder) */ protected function shouldNestWheresForScope(QueryBuilder $query, $originalWhereCount) { - return $originalWhereCount && count($query->wheres) > $originalWhereCount; + return count($query->wheres) > $originalWhereCount...
true
Other
laravel
framework
d9cc1bdc6c624f81222ca8b467374409ebcd737b.json
Fix scope nesting (#13413)
tests/Database/DatabaseEloquentGlobalScopesTest.php
@@ -69,6 +69,10 @@ public function testGlobalScopesWithOrWhereConditionsAreNested() { $model = new EloquentClosureGlobalScopesWithOrTestModel(); + $query = $model->newQuery(); + $this->assertEquals('select "email", "password" from "table" where ("email" = ? or "email" = ?) and "active" = ?...
true
Other
laravel
framework
8d64b76dd9d820551c7b5b2d9b83fb292bd8b150.json
Add selectCount tests for Eloquent Builder
tests/Database/DatabaseEloquentBuilderTest.php
@@ -455,6 +455,28 @@ public function testDeleteOverride() $this->assertEquals(['foo' => $builder], $builder->delete()); } + public function testSelectCount() + { + $model = new EloquentBuilderTestModelParentStub; + + $builder = $model->selectCount('foo', 'fooCount'); + + $this...
false
Other
laravel
framework
e2da63875bd44d9359dd69a9aeebcba648e195bf.json
use request socket if passed
src/Illuminate/Broadcasting/BroadcastManager.php
@@ -77,6 +77,10 @@ public function socket($request = null) $request = $request ?: $this->app['request']; + if ($request->has('socket')) { + return $request->input('socket'); + } + return $this->app['cache']->get( 'pusher:socket:'.$request->session()->getId() ...
false
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Auth/AuthEloquentUserProviderTest.php
@@ -61,7 +61,7 @@ protected function getProviderMock() { $hasher = m::mock('Illuminate\Contracts\Hashing\Hasher'); - return $this->getMock('Illuminate\Auth\EloquentUserProvider', ['createModel'], [$hasher, 'foo']); + return $this->getMockBuilder('Illuminate\Auth\EloquentUserProvider')->set...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Auth/AuthGuardTest.php
@@ -73,7 +73,7 @@ public function testAttemptCallsRetrieveByCredentials() public function testAttemptReturnsUserInterface() { list($session, $provider, $request, $cookie) = $this->getMocks(); - $guard = $this->getMock('Illuminate\Auth\SessionGuard', ['login'], ['default', $provider, $session, ...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Cache/CacheFileStoreTest.php
@@ -30,7 +30,7 @@ public function testExpiredItemsReturnNull() $files = $this->mockFilesystem(); $contents = '0000000000'; $files->expects($this->once())->method('get')->will($this->returnValue($contents)); - $store = $this->getMock('Illuminate\Cache\FileStore', ['forget'], [$files, __...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Database/DatabaseEloquentCollectionTest.php
@@ -98,7 +98,7 @@ public function testFindMethodFindsModelById() public function testLoadMethodEagerLoadsGivenRelationships() { - $c = $this->getMock('Illuminate\Database\Eloquent\Collection', ['first'], [['foo']]); + $c = $this->getMockBuilder('Illuminate\Database\Eloquent\Collection')->setMe...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Database/DatabaseEloquentPivotTest.php
@@ -81,7 +81,7 @@ public function testDeleteMethodDeletesModelByKeys() $parent = m::mock('Illuminate\Database\Eloquent\Model[getConnectionName]'); $parent->guard([]); $parent->shouldReceive('getConnectionName')->once()->andReturn('connection'); - $pivot = $this->getMock('Illuminate\Dat...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Database/DatabaseMigrationCreatorTest.php
@@ -49,6 +49,6 @@ protected function getCreator() { $files = m::mock('Illuminate\Filesystem\Filesystem'); - return $this->getMock('Illuminate\Database\Migrations\MigrationCreator', ['getDatePrefix'], [$files]); + return $this->getMockBuilder('Illuminate\Database\Migrations\MigrationCreator...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Database/DatabaseSchemaBlueprintTest.php
@@ -20,7 +20,7 @@ public function testToSqlRunsCommandsFromBlueprint() $conn->shouldReceive('statement')->once()->with('foo'); $conn->shouldReceive('statement')->once()->with('bar'); $grammar = m::mock('Illuminate\Database\Schema\Grammars\MySqlGrammar'); - $blueprint = $this->getMock('...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Foundation/FoundationComposerTest.php
@@ -13,7 +13,7 @@ public function testDumpAutoloadRunsTheCorrectCommand() { $escape = '\\' === DIRECTORY_SEPARATOR ? '"' : '\''; - $composer = $this->getMock('Illuminate\Support\Composer', ['getProcess'], [$files = m::mock('Illuminate\Filesystem\Filesystem'), __DIR__]); + $composer = $this...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Mail/MailMessageTest.php
@@ -96,7 +96,7 @@ public function testGetSwiftMessageMethod() public function testBasicAttachment() { $swift = m::mock('StdClass'); - $message = $this->getMock('Illuminate\Mail\Message', ['createAttachmentFromPath'], [$swift]); + $message = $this->getMockBuilder('Illuminate\Mail\Message...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Queue/QueueDatabaseQueueTest.php
@@ -11,7 +11,7 @@ public function tearDown() public function testPushProperlyPushesJobOntoDatabase() { - $queue = $this->getMock('Illuminate\Queue\DatabaseQueue', ['getTime'], [$database = m::mock('Illuminate\Database\Connection'), 'table', 'default']); + $queue = $this->getMockBuilder('Illumi...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Queue/QueueRedisQueueTest.php
@@ -11,7 +11,7 @@ public function tearDown() public function testPushProperlyPushesJobOntoRedis() { - $queue = $this->getMock('Illuminate\Queue\RedisQueue', ['getRandomId'], [$redis = m::mock('Illuminate\Redis\Database'), 'default']); + $queue = $this->getMockBuilder('Illuminate\Queue\RedisQue...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Queue/QueueSqsJobTest.php
@@ -60,7 +60,7 @@ public function testDeleteRemovesTheJobFromSqs() ->setMethods(['deleteMessage']) ->disableOriginalConstructor() ->getMock(); - $queue = $this->getMock('Illuminate\Queue\SqsQueue', ['getQueue'], [$this->mockedSqsClient, $this->queueName, $this->account]); +...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Queue/QueueSqsQueueTest.php
@@ -47,7 +47,7 @@ public function setUp() public function testPopProperlyPopsJobOffOfSqs() { - $queue = $this->getMock('Illuminate\Queue\SqsQueue', ['getQueue'], [$this->sqs, $this->queueName, $this->account]); + $queue = $this->getMockBuilder('Illuminate\Queue\SqsQueue')->setMethods(['getQueu...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Queue/QueueWorkerTest.php
@@ -11,7 +11,7 @@ public function tearDown() public function testJobIsPoppedOffQueueAndProcessed() { - $worker = $this->getMock('Illuminate\Queue\Worker', ['process'], [$manager = m::mock('Illuminate\Queue\QueueManager')]); + $worker = $this->getMockBuilder('Illuminate\Queue\Worker')->setMetho...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Translation/TranslationTranslatorTest.php
@@ -11,28 +11,28 @@ public function tearDown() public function testHasMethodReturnsFalseWhenReturnedTranslationIsNull() { - $t = $this->getMock('Illuminate\Translation\Translator', ['get'], [$this->getLoader(), 'en']); + $t = $this->getMockBuilder('Illuminate\Translation\Translator')->setMetho...
true
Other
laravel
framework
49f4ce54b0e687088996fe0ac0f55eb42afcca98.json
fix first batch
tests/Validation/ValidationValidatorTest.php
@@ -1025,13 +1025,13 @@ public function testValidateSize() $v = new Validator($trans, ['foo' => [1, 2, 3]], ['foo' => 'Array|Size:4']); $this->assertFalse($v->passes()); - $file = $this->getMock('Symfony\Component\HttpFoundation\File\File', ['getSize'], [__FILE__, false]); + $file = $t...
true
Other
laravel
framework
46fd7dd7d794eb5fe6406198880d06a1b33d85e7.json
Fix Issue #11169 (#13360)
src/Illuminate/Database/Eloquent/Model.php
@@ -798,7 +798,7 @@ public function morphTo($name = null, $type = null, $id = null) // If the type value is null it is probably safe to assume we're eager loading // the relationship. When that is the case we will pass in a dummy query as // there are multiple types in the morph and we can't ...
false
Other
laravel
framework
2e12e8ac272699172bbc928c3f203202dc8fa855.json
rearrange check order
src/Illuminate/Database/Query/Builder.php
@@ -589,7 +589,7 @@ protected function invalidOperatorAndValue($operator, $value) { $isOperator = in_array($operator, $this->operators); - return $isOperator && ! in_array($operator, ['=', '<>', '!=']) && is_null($value); + return is_null($value) && $isOperator && ! in_array($operator, ['=...
false
Other
laravel
framework
59525ab14b5c3083db494c65459360ba3338ac6f.json
remove nested ternary
src/Illuminate/Validation/Validator.php
@@ -841,8 +841,11 @@ protected function validateRequiredIf($attribute, $value, $parameters) if (is_bool($data)) { array_walk($values, function (&$value) { - $value = $value == 'true' ? - true : ($value == 'false' ? false : $value); + if ($value ==...
false
Other
laravel
framework
0a26661949db13fb3f3c878177f77d8d3a8fa987.json
Fix postgres Schema::hastable (#13008)
src/Illuminate/Database/PostgresConnection.php
@@ -2,13 +2,28 @@ namespace Illuminate\Database; +use Illuminate\Database\Schema\PostgresBuilder; use Doctrine\DBAL\Driver\PDOPgSql\Driver as DoctrineDriver; use Illuminate\Database\Query\Processors\PostgresProcessor; use Illuminate\Database\Query\Grammars\PostgresGrammar as QueryGrammar; use Illuminate\Databa...
true
Other
laravel
framework
0a26661949db13fb3f3c878177f77d8d3a8fa987.json
Fix postgres Schema::hastable (#13008)
src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
@@ -28,7 +28,7 @@ class PostgresGrammar extends Grammar */ public function compileTableExists() { - return 'select * from information_schema.tables where table_name = ?'; + return 'select * from information_schema.tables where table_schema = ? and table_name = ?'; } /**
true
Other
laravel
framework
0a26661949db13fb3f3c878177f77d8d3a8fa987.json
Fix postgres Schema::hastable (#13008)
src/Illuminate/Database/Schema/PostgresBuilder.php
@@ -0,0 +1,23 @@ +<?php + +namespace Illuminate\Database\Schema; + +class PostgresBuilder extends Builder +{ + /** + * Determine if the given table exists. + * + * @param string $table + * @return bool + */ + public function hasTable($table) + { + $sql = $this->grammar->compileTabl...
true
Other
laravel
framework
b3a9b21e6a3c7bacc4349ec986b8488a9e7d622f.json
change config name
src/Illuminate/Database/Connectors/SqlServerConnector.php
@@ -60,8 +60,8 @@ protected function getDsn(array $config) */ protected function getOdbcDsn(array $config) { - if (isset($config['ODBC_DATA_SOURCE_NAME'])) { - return 'odbc:'.$config['ODBC_DATA_SOURCE_NAME']; + if (isset($config['odbc_datasource_name'])) { + return 'o...
false
Other
laravel
framework
0073655789b4297ed3667897ccf705c83f210462.json
Change config param get method
src/Illuminate/Database/Connectors/SqlServerConnector.php
@@ -46,12 +46,27 @@ protected function getDsn(array $config) if (in_array('dblib', $this->getAvailableDrivers())) { return $this->getDblibDsn($config); } elseif (in_array('odbc', $this->getAvailableDrivers())) { - return 'odbc:'.(isset($config('ODBC_DATA_SOURCE_NAME')) ? $confi...
false
Other
laravel
framework
c69a78303557305577568c1745119ababe67ae33.json
Change config param get method
src/Illuminate/Database/Connectors/SqlServerConnector.php
@@ -46,7 +46,7 @@ protected function getDsn(array $config) if (in_array('dblib', $this->getAvailableDrivers())) { return $this->getDblibDsn($config); } elseif (in_array('odbc', $this->getAvailableDrivers())) { - return 'odbc:'.env('ODBC_DATA_SOURCE_NAME'); + return '...
false
Other
laravel
framework
4219f0ac29615626be29940a6e20f047cb8204b9.json
Update saveMany parameter hint (#13257) It works great with any traversable objects, not only collections (and specifically eloquent collections as was hinted before)
src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -221,8 +221,8 @@ public function save(Model $model) /** * Attach a collection of models to the parent instance. * - * @param \Illuminate\Database\Eloquent\Collection|array $models - * @return \Illuminate\Database\Eloquent\Collection|array + * @param \Traversable|array $models + *...
false
Other
laravel
framework
5a52bebd203bb887e339e588aa75d938ae2d2ed7.json
Add Collection tests. (#13227)
tests/Support/SupportCollectionTest.php
@@ -1216,6 +1216,21 @@ public function testCombineWithCollection() $this->assertSame($expected, $actual); } + + public function testReduce() + { + $data = new Collection([1, 2, 3]); + $this->assertEquals(6, $data->reduce(function ($carry, $element) { return $carry += $element; })); +...
false
Other
laravel
framework
f13bb7f0a3db39c9c9cf8618cb70c0c309a54090.json
Remove unused parameter (#13206)
src/Illuminate/Foundation/helpers.php
@@ -612,12 +612,11 @@ function response($content = '', $status = 200, array $headers = []) * @param string $name * @param array $parameters * @param bool $absolute - * @param \Illuminate\Routing\Route $route * @return string */ - function route($name, $parameters = [], $a...
false
Other
laravel
framework
d0b5291098d856c3fb07075197feb165efb65c07.json
Move ability map to a method (#13214)
src/Illuminate/Foundation/Auth/Access/AuthorizesResources.php
@@ -6,21 +6,6 @@ trait AuthorizesResources { - /** - * Map of resource methods to ability names. - * - * @var array - */ - protected $resourceAbilityMap = [ - 'index' => 'view', - 'create' => 'create', - 'store' => 'create', - 'show' => 'view', - 'edit' ...
false
Other
laravel
framework
73e7b702b19c0039cda702c6f17b4ef9a767e29f.json
Add more test on View (#13192)
tests/View/ViewFlowTest.php
@@ -2,127 +2,202 @@ use Mockery as m; use Illuminate\View\Factory; +use Illuminate\Filesystem\Filesystem; +use Illuminate\View\Engines\CompilerEngine; use Illuminate\View\Compilers\BladeCompiler; class ViewFlowTest extends PHPUnit_Framework_TestCase { + public function setUp() + { + parent::setUp(...
false
Other
laravel
framework
29e4b14a619a9af0009b71a25d608788be53f4ad.json
Move ability map to a property (#13193)
src/Illuminate/Foundation/Auth/Access/AuthorizesResources.php
@@ -6,6 +6,21 @@ trait AuthorizesResources { + /** + * Map of resource methods to ability names. + * + * @var array + */ + protected $resourceAbilityMap = [ + 'index' => 'view', + 'create' => 'create', + 'store' => 'create', + 'show' => 'view', + 'edit' ...
false
Other
laravel
framework
8444190a742d7d77818f3938b214a95a4585ea35.json
Remove extra space
src/Illuminate/Support/Collection.php
@@ -1021,7 +1021,6 @@ public function toArray() { return array_map(function ($value) { return $value instanceof Arrayable ? $value->toArray() : $value; - }, $this->items); }
false
Other
laravel
framework
fbcf44403bfa651e4e624922411c6339399c30bf.json
fix documentation typo (#13149) is() calls currentRouteName() not currentRouteNamed()
src/Illuminate/Routing/Router.php
@@ -1164,7 +1164,7 @@ public function currentRouteName() } /** - * Alias for the "currentRouteNamed" method. + * Alias for the "currentRouteName" method. * * @param mixed string * @return bool
false
Other
laravel
framework
cd21d824846ad8be983ca97a7a627df993bbacf6.json
Add the ability to get routes keyed by method
src/Illuminate/Routing/RouteCollection.php
@@ -240,7 +240,7 @@ protected function check(array $routes, $request, $includingMethod = true) * @param string|null $method * @return array */ - protected function get($method = null) + public function get($method = null) { if (is_null($method)) { return $this->getRo...
false
Other
laravel
framework
307917505bbc1ef9f8e3b9442c92bbbf79cafa45.json
Fix bug in listener generation. This prevents the framework from generating listeners for listeners that are defined in packages outside of the App namespace.
src/Illuminate/Foundation/Console/ListenerMakeCommand.php
@@ -84,6 +84,17 @@ protected function getStub() } } + /** + * Determine if the class already exists. + * + * @param string $rawName + * @return bool + */ + protected function alreadyExists($rawName) + { + return class_exists($rawName); + } + /** * Get ...
false
Other
laravel
framework
cebc939e8ea6a5a17921b729333808a9bc8e814b.json
Add array pull and array forget tests
tests/Support/SupportArrTest.php
@@ -305,6 +305,18 @@ public function testPull() $name = Arr::pull($array, 'name'); $this->assertEquals('Desk', $name); $this->assertEquals(['price' => 100], $array); + + // Only works on first level keys + $array = ['joe@example.com' => 'Joe', 'jane@localhost' => 'Jane']; + ...
false
Other
laravel
framework
6b95535b4358967c603807804bf8116a36a0c8a8.json
Remove key when key exists
src/Illuminate/Support/Arr.php
@@ -233,6 +233,11 @@ public static function forget(&$array, $keys) } foreach ($keys as $key) { + if (static::exists($array, $key)) { + unset($array[$key]); + continue; + } + $parts = explode('.', $key); // clean up befor...
false
Other
laravel
framework
28e60c2f5ddfdee35564833ac36d0f13450690e7.json
remove extra spacing
src/Illuminate/Routing/Route.php
@@ -449,9 +449,7 @@ public function bindParameters(Request $request) // compile that and get the parameter matches for this domain. We will then // merge them into this parameters array so that this array is completed. $params = $this->matchToKeys( - array_slice($this->bindPathPa...
false
Other
laravel
framework
2ca9ca69043230b422d518d7fbc7cf797cc4e2a6.json
Update SqlServerGrammar.php (#13089) The description of 'compileAdd' function seems copied from 'compileCreate'. Suggested a clearer (hopefully) description for the function.
src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -59,7 +59,7 @@ public function compileCreate(Blueprint $blueprint, Fluent $command) } /** - * Compile a create table command. + * Compile a column addition table command. * * @param \Illuminate\Database\Schema\Blueprint $blueprint * @param \Illuminate\Support\Fluent $command
false
Other
laravel
framework
da62677cea29ce3f5e6348c416218f11459ca3d6.json
Allow numerics for unix timestamps.
src/Illuminate/Validation/Validator.php
@@ -1383,7 +1383,7 @@ protected function validateDate($attribute, $value) return true; } - if (! is_string($value) || strtotime($value) === false) { + if ((! is_string($value) && ! is_numeric($value)) || strtotime($value) === false) { return false; } @@ -140...
false
Other
laravel
framework
4f1ea6d756c309d29544eda7069cc0de0965a6f5.json
update assets + use SRI checking
src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
@@ -8,11 +8,11 @@ <title>Laravel</title> <!-- Fonts --> - <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css" rel='stylesheet' type='text/css'> + <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet" integr...
false
Other
laravel
framework
360bfab90ef63305820dbc608832887af371636d.json
fix multibyte string functions
src/Illuminate/Support/Str.php
@@ -66,7 +66,7 @@ public static function camel($value) public static function contains($haystack, $needles) { foreach ((array) $needles as $needle) { - if ($needle != '' && strpos($haystack, $needle) !== false) { + if ($needle != '' && mb_strpos($haystack, $needle) !== false) { ...
false
Other
laravel
framework
8031ca04f8c39a3650a84abc109db5fe8880c75f.json
Use relation setter
src/Illuminate/Database/Eloquent/Model.php
@@ -2694,7 +2694,9 @@ protected function getRelationshipFromMethod($method) .'Illuminate\Database\Eloquent\Relations\Relation'); } - return $this->relations[$method] = $relations->getResults(); + $this->setRelation($method, $results = $relations->getResults()); + + retur...
false
Other
laravel
framework
ab4bad7d2caf5535e6d3e65ce5937e4495853528.json
Reverse a breaking addition in router
src/Illuminate/Routing/Route.php
@@ -235,15 +235,7 @@ protected function extractOptionalParameters() public function middleware($middleware = null) { if (is_null($middleware)) { - $middlewares = (array) Arr::get($this->action, 'middleware', []); - - if (is_string($this->action['uses'])) { - $midd...
false
Other
laravel
framework
4ef35884eceb4ff17c7eaf7f6f9ba6fa551e32cf.json
Remove duplicate 'just'
src/Illuminate/Database/Query/Grammars/Grammar.php
@@ -142,9 +142,9 @@ protected function compileJoins(Builder $query, $joins) $type = $join->type; - // Cross joins generate a cartesian product between the first table and the joined - // table. Since they don't expect any "on" clauses to perform the join, we just - // j...
false
Other
laravel
framework
914582b4a6312a131db6935ef1939de3214fc7ca.json
Fix indentation in `Route::controllerMiddleware`
src/Illuminate/Routing/Route.php
@@ -269,7 +269,7 @@ protected function controllerMiddleware() $controller = $this->container->make($class); return (new ControllerDispatcher($this->router, $this->container)) - ->getMiddleware($controller, $method); + ->getMiddleware($controller, $method); } ...
false
Other
laravel
framework
7642f12d7199456e5bf634a3e449023e3ee0160d.json
add defualt value
src/Illuminate/Validation/Validator.php
@@ -369,7 +369,7 @@ public function extractValuesForWildcards($data, $attribute) * @param string|array $rules * @return $this */ - public function mergeRules($attribute, $rules) + public function mergeRules($attribute, $rules = []) { if (is_array($attribute)) { forea...
false
Other
laravel
framework
424f15785ab8d4815f251c0f44e5eb9005fab891.json
Add Filesystem tests.
tests/Filesystem/FilesystemTest.php
@@ -324,4 +324,40 @@ public function testSharedGet() $this->assertTrue($result === 1); @unlink(__DIR__.'/file.txt'); } + + public function testRequireOnceRequiresFileProperly() + { + $filesystem = new Filesystem; + mkdir(__DIR__.'/foo'); + file_put_contents(__DIR__.'/fo...
false
Other
laravel
framework
052c4c6f0c0483909a5bb2aa814c86897bf33892.json
Add email options closure
src/Illuminate/Foundation/Auth/ResetsPasswords.php
@@ -62,9 +62,7 @@ public function sendResetLinkEmail(Request $request) $broker = $this->getBroker(); - $response = Password::broker($broker)->sendResetLink($request->only('email'), function (Message $message) { - $message->subject($this->getEmailSubject()); - }); + $response...
false
Other
laravel
framework
65907a6be614554b7b55d53aab24bbdf3a7e2b1e.json
Move the Authorize middleware into Foundation
src/Illuminate/Foundation/Auth/Access/Middleware/Authorize.php
@@ -1,6 +1,6 @@ <?php -namespace Illuminate\Auth\Access\Middleware; +namespace Illuminate\Foundation\Auth\Access\Middleware; use Closure; use Illuminate\Contracts\Auth\Access\Gate;
true
Other
laravel
framework
65907a6be614554b7b55d53aab24bbdf3a7e2b1e.json
Move the Authorize middleware into Foundation
tests/Foundation/FoundationAuthorizeMiddlewareTest.php
@@ -5,11 +5,11 @@ use Illuminate\Auth\Access\Gate; use Illuminate\Events\Dispatcher; use Illuminate\Container\Container; -use Illuminate\Auth\Access\Middleware\Authorize; use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Contracts\Auth\Access\Gate as GateContract; +use Illuminate\Foundation\Auth\Ac...
true
Other
laravel
framework
80bb82a6398d51fe9b132ef450c268d78e95c165.json
Create AuthorizesResources trait
src/Illuminate/Foundation/Auth/Access/AuthorizesResources.php
@@ -0,0 +1,41 @@ +<?php + +namespace Illuminate\Foundation\Auth\Access; + +use Illuminate\Routing\ControllerMiddlewareOptions; + +trait AuthorizesResources +{ + /** + * Authorize a resource action. + * + * @param string $name + * @param string $model + * @param array $options + * @param...
false
Other
laravel
framework
d32dd12bad0116e66e0e41020b2d7f04f9468c7d.json
Test the Authorize middleware
tests/Auth/AuthorizeTest.php
@@ -0,0 +1,157 @@ +<?php + +use Illuminate\Http\Request; +use Illuminate\Routing\Router; +use Illuminate\Auth\Access\Gate; +use Illuminate\Events\Dispatcher; +use Illuminate\Container\Container; +use Illuminate\Auth\Access\Middleware\Authorize; +use Illuminate\Auth\Access\AuthorizationException; +use Illuminate\Contrac...
false
Other
laravel
framework
648fa7e35b1163e255a6f1a8939d79900761087c.json
Create Authorize middleware
src/Illuminate/Auth/Access/Middleware/Authorize.php
@@ -0,0 +1,68 @@ +<?php + +namespace Illuminate\Auth\Access\Middleware; + +use Closure; +use Illuminate\Contracts\Auth\Access\Gate; + +class Authorize +{ + /** + * The gate instance. + * + * @var \Illuminate\Contracts\Auth\Access\Gate + */ + protected $gate; + + /** + * Create a new middlew...
false
Other
laravel
framework
f946f279a5f1e92a350d1e765239d08d70c365ca.json
Trim the input name in the generator commands
src/Illuminate/Console/GeneratorCommand.php
@@ -202,7 +202,7 @@ protected function replaceClass($stub, $name) */ protected function getNameInput() { - return $this->argument('name'); + return trim($this->argument('name')); } /**
true
Other
laravel
framework
f946f279a5f1e92a350d1e765239d08d70c365ca.json
Trim the input name in the generator commands
src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php
@@ -63,7 +63,7 @@ public function fire() // It's possible for the developer to specify the tables to modify in this // schema operation. The developer may also specify if this table needs // to be freshly created so we can create the appropriate migrations. - $name = $this->input->getA...
true
Other
laravel
framework
b5efbbc0a836ad292c2427bdb617bb5d17d73a8f.json
remove git junk
src/Illuminate/Database/Query/Builder.php
@@ -1664,13 +1664,7 @@ public function chunkById($count, callable $callback, $column = 'id') return false; } -<<<<<<< HEAD - if ($column) { - $lastId = $results->last()->{$column}; - } -======= - $lastId = last($results)->{$column}; ->>>>>>...
false
Other
laravel
framework
185447cbd5374770d98cf8d869996c05dcb6e09e.json
Apply a middleware only once
src/Illuminate/Routing/Route.php
@@ -242,9 +242,9 @@ public function middleware($middleware = null) $middleware = [$middleware]; } - $this->action['middleware'] = array_merge( + $this->action['middleware'] = array_unique(array_merge( (array) Arr::get($this->action, 'middleware', []), $middleware - ...
true
Other
laravel
framework
185447cbd5374770d98cf8d869996c05dcb6e09e.json
Apply a middleware only once
tests/Routing/RoutingRouteTest.php
@@ -575,6 +575,20 @@ public function testRouteMiddlewareMergeWithMiddlewareAttributesAsStrings() ); } + public function testRouteMiddlewareAppliedOnlyOnce() + { + $router = $this->getRouter(); + $router->group(['middleware' => 'foo'], function () use ($router) { + $router-...
true
Other
laravel
framework
ab24e0d1f68584e973ece32d41a2302110e97d74.json
Adjust whitespace in one more docblock
src/Illuminate/Database/Query/Builder.php
@@ -1621,8 +1621,8 @@ protected function restoreFieldsForCount() /** * Chunk the results of the query. * - * @param int $count - * @param callable $callback + * @param int $count + * @param callable $callback * @return bool */ public function chunk($count, ca...
false
Other
laravel
framework
130a405547eef1c2e3931548a9c38a82c360ca53.json
Revert a param name
src/Illuminate/Database/Query/Builder.php
@@ -1650,23 +1650,23 @@ public function chunk($count, callable $callback) * * @param int $count * @param callable $callback - * @param string $idColumn + * @param string $column * @return bool */ - public function chunkById($count, callable $callback, $idColumn = 'id') ...
false
Other
laravel
framework
3ddd15e15840f165dc49a9e5dbd15881030d6c0b.json
Fix docblock formats
src/Illuminate/Database/Eloquent/Builder.php
@@ -330,8 +330,8 @@ public function value($column) /** * Chunk the results of the query. * - * @param int $count - * @param callable $callback + * @param int $count + * @param callable $callback * @return bool */ public function chunk($count, callable $callba...
true
Other
laravel
framework
3ddd15e15840f165dc49a9e5dbd15881030d6c0b.json
Fix docblock formats
src/Illuminate/Database/Query/Builder.php
@@ -1335,10 +1335,10 @@ public function forPage($page, $perPage = 15) /** * Constrain the query to the next "page" of results after a given ID. * - * @param int $perPage - * @param int $column - * @param string $column - * @return Builder|static + * @param int $perPage + ...
true
Other
laravel
framework
88d42be19a6fdc7c87d3b17bdf815080c94481c5.json
Remove route group from make:auth stub
src/Illuminate/Auth/Console/stubs/make/routes.stub
@@ -1,6 +1,4 @@ -Route::group(['middleware' => 'web'], function () { - Route::auth(); +Route::auth(); - Route::get('/home', 'HomeController@index'); -}); +Route::get('/home', 'HomeController@index');
false
Other
laravel
framework
e6f806cf35e1352d849d97b62e217398ab2c7f99.json
Add support for testing eloquent model events
src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php
@@ -4,6 +4,7 @@ use Mockery; use Exception; +use Illuminate\Database\Eloquent\Model; trait MocksApplicationServices { @@ -88,7 +89,14 @@ protected function withoutEvents() $this->firedEvents[] = $called; }); + $mock->shouldReceive('until')->andReturnUsing(function ($called) { + ...
false
Other
laravel
framework
70e504da5ad395d87467826e528dc9edf3f36ef3.json
Fix engine issueing Fix that a view (`welcomeblade.php`) would run the `BladeEngine` instead of the `PhpEngine`.
src/Illuminate/View/Factory.php
@@ -308,7 +308,7 @@ protected function getExtension($path) $extensions = array_keys($this->extensions); return Arr::first($extensions, function ($key, $value) use ($path) { - return Str::endsWith($path, $value); + return Str::endsWith($path, '.'.$value); }); }
false
Other
laravel
framework
c00e3dab384c42a8e9db793ec27b38212b1c8778.json
fix another bug
src/Illuminate/Database/Query/Builder.php
@@ -1659,7 +1659,7 @@ public function chunkById($count, callable $callback, $column = 'id') $results = $this->pageAfterId($count, 0, $column)->get(); - while (! $results->isEmpty()) { + while (! empty($results)) { if (call_user_func($callback, $results) === false) { ...
false
Other
laravel
framework
31fc2a3ccdc8564fa8f0589ad22a83ec199d17ca.json
fix formatting and comments
src/Illuminate/Database/Eloquent/Builder.php
@@ -355,31 +355,29 @@ public function chunk($count, callable $callback) } /** - * Chunk the results of a query, when the ID to query by is known. + * Chunk the results of a query by comparing numeric IDs. * - * Because if we know the ID to key by, then we can get through each page much fas...
true
Other
laravel
framework
31fc2a3ccdc8564fa8f0589ad22a83ec199d17ca.json
fix formatting and comments
src/Illuminate/Database/Query/Builder.php
@@ -1333,20 +1333,19 @@ public function forPage($page, $perPage = 15) } /** - * Set the limit and query for the next set of results, given the - * last scene ID in a set. + * Constrain the query to the next "page" of results after a given ID. * - * @param int $perPage - * @param $i...
true
Other
laravel
framework
31fc2a3ccdc8564fa8f0589ad22a83ec199d17ca.json
fix formatting and comments
tests/Database/DatabaseEloquentBuilderTest.php
@@ -197,9 +197,9 @@ public function testChunkCanBeStoppedByReturningFalse() public function testChunkPaginatesUsingWhereBetweenIds() { $builder = m::mock('Illuminate\Database\Eloquent\Builder[pageAfterId,get]', [$this->getMockQueryBuilder()]); - $builder->shouldReceive('pageAfterId')->once()->...
true
Other
laravel
framework
dfd1b507041818c3ffee53a9c9fe2670406482e6.json
Fix FormRequest tests.
tests/Foundation/FoundationFormRequestTest.php
@@ -3,27 +3,25 @@ use Mockery as m; use Illuminate\Container\Container; -class FoundationFormRequestTestCase extends PHPUnit_Framework_TestCase +class FoundationFormRequestTest extends PHPUnit_Framework_TestCase { public function tearDown() { m::close(); - unset($_SERVER['__request.valida...
false
Other
laravel
framework
f4dc2615ec22ab6cfdea14a73f0f047886db3393.json
escape function call
src/Illuminate/Encryption/Encrypter.php
@@ -64,7 +64,7 @@ public function encrypt($value) { $iv = Str::randomBytes($this->getIvSize()); - $value = openssl_encrypt(serialize($value), $this->cipher, $this->key, 0, $iv); + $value = \openssl_encrypt(serialize($value), $this->cipher, $this->key, 0, $iv); if ($value === fal...
false
Other
laravel
framework
12a1823803ac007fbd650227c8236ba2915621c1.json
add method assertSessionMissing(), fixe #12859 add method assertSessionMissing() like assertViewMissing()
src/Illuminate/Foundation/Testing/Concerns/InteractsWithSession.php
@@ -109,6 +109,23 @@ public function assertSessionHasAll(array $bindings) } } + /** + * Assert that the session has not a given key. + * + * @param string|array $key + * @return void + */ + public function assertSessionMissing($key) + { + if (is_array($key)) { + ...
false
Other
laravel
framework
2b951e43a042f1931d2253ed4749207366556cb6.json
fix suffix check
src/Illuminate/View/Factory.php
@@ -308,7 +308,7 @@ protected function getExtension($path) $extensions = array_keys($this->extensions); return Arr::first($extensions, function ($value) use ($path) { - return Str::endsWith($path, $value); + return Str::endsWith($path, '.'.$value); }); }
false
Other
laravel
framework
be8af6910def484ad8ee70d1b3025fc59223f2e3.json
Update docblock typo There was a letter 'n' missing on line 121
src/Illuminate/Foundation/Http/FormRequest.php
@@ -118,7 +118,7 @@ protected function passesAuthorization() * * @return mixed * - * @throws \\Illuminate\Http\Exception\HttpResponseExceptio + * @throws \\Illuminate\Http\Exception\HttpResponseException */ protected function failedAuthorization() {
false