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 | 81b3c1a52597260e5b8ade7da792886a921b17c2.json | Fix URL generation. | src/Illuminate/Routing/UrlGenerator.php | @@ -171,7 +171,7 @@ public function secureAsset($path)
*/
protected function getScheme($secure)
{
- if ( ! $secure)
+ if (is_null($secure))
{
return $this->request->getScheme().'://';
}
@@ -385,7 +385,9 @@ protected function addPortToDomain($domain)
*/
protected function getRouteRoot($r... | false |
Other | laravel | framework | 22e60f4741666aa01ee625ce7aac0fb5c6fd4986.json | Fix mockery test. | tests/View/ViewTest.php | @@ -49,8 +49,13 @@ public function testRenderProperlyRendersView()
public function testRenderSectionsReturnsEnvironmentSections()
{
- $view = m::mock('Illuminate\View\View[render]');
- $view->__construct(m::mock('Illuminate\View\Environment'), m::mock('Illuminate\View\Engines\EngineInterface'), 'view', 'path', ... | false |
Other | laravel | framework | bdee3286da2f7013792e26aeae449c8e2a8c9d82.json | Remove php 5.3 from travis | .travis.yml | @@ -1,7 +1,6 @@
language: php
php:
- - 5.3
- 5.4
- 5.5
- hhvm | false |
Other | laravel | framework | 72964e278ae2e34c40ecc9c00614596ee960ed4c.json | Add Response trait to dry code. | src/Illuminate/Http/JsonResponse.php | @@ -5,6 +5,8 @@
class JsonResponse extends \Symfony\Component\HttpFoundation\JsonResponse {
+ use ResponseTrait;
+
/**
* Get the json_decoded data from the response
*
@@ -28,32 +30,4 @@ public function setData($data = array())
return $this->update();
}
- /**
- * Set a header on the Response.
- *
-... | true |
Other | laravel | framework | 72964e278ae2e34c40ecc9c00614596ee960ed4c.json | Add Response trait to dry code. | src/Illuminate/Http/Response.php | @@ -7,41 +7,15 @@
class Response extends \Symfony\Component\HttpFoundation\Response {
+ use ResponseTrait;
+
/**
* The original content of the response.
*
* @var mixed
*/
public $original;
- /**
- * Set a header on the Response.
- *
- * @param string $key
- * @param string $value
- * @pa... | true |
Other | laravel | framework | 72964e278ae2e34c40ecc9c00614596ee960ed4c.json | Add Response trait to dry code. | src/Illuminate/Http/ResponseTrait.php | @@ -0,0 +1,33 @@
+<?php namespace Illuminate\Http;
+
+trait ResponseTrait {
+
+ /**
+ * Set a header on the Response.
+ *
+ * @param string $key
+ * @param string $value
+ * @param bool $replace
+ * @return \Illuminate\Http\Response
+ */
+ public function header($key, $value, $replace = true)
+ {
+ $thi... | true |
Other | laravel | framework | f66c859f8bdf47d2b58922759d0e2854fcfb084b.json | Pass config name to database extensions. | src/Illuminate/Database/DatabaseManager.php | @@ -111,7 +111,7 @@ protected function makeConnection($name)
// Closure and pass it the config allowing it to resolve the connection.
if (isset($this->extensions[$name]))
{
- return call_user_func($this->extensions[$name], $config);
+ return call_user_func($this->extensions[$name], $config, $name);
... | false |
Other | laravel | framework | 19f37ca715808aee7628774a50d19b8939f47945.json | Check IoC for custom Connector instances | src/Illuminate/Database/Connectors/ConnectionFactory.php | @@ -171,6 +171,11 @@ public function createConnector(array $config)
throw new \InvalidArgumentException("A driver must be specified.");
}
+ if ($this->container->bound($key = "db.connector.{$config['driver']}"))
+ {
+ return $this->container->make($key);
+ }
+
switch ($config['driver'])
{
case '... | false |
Other | laravel | framework | fd2047d9c8a00b45484b1913797a947a8b3e1f71.json | Register both classes as aliases. | src/Illuminate/Foundation/Application.php | @@ -997,7 +997,7 @@ public function registerCoreContainerAliases()
'translator' => 'Illuminate\Translation\Translator',
'log' => 'Illuminate\Log\Writer',
'mailer' => 'Illuminate\Mail\Mailer',
- 'paginator' => 'Illuminate\Pagination\Factory',
+ 'paginator' => array('Illum... | false |
Other | laravel | framework | 3a4c90769f40c2e722d6e2e6e590fbdc090afbee.json | Add doc block for deprecation. | src/Illuminate/Pagination/Environment.php | @@ -4,6 +4,9 @@
use Illuminate\View\Factory as ViewFactory;
use Symfony\Component\Translation\TranslatorInterface;
+/**
+ * DEPRECATED: Please use Illuminate\Pagination\Factory instead!
+ */
class Environment extends Factory {
/** | false |
Other | laravel | framework | e0f26b70d321dcd5d719739e82f29b658e2ea181.json | Remove some extra text. | readme.md | @@ -16,7 +16,7 @@ Laravel is accessible, yet powerful, providing powerful tools needed for large,
Documentation for the entire framework can be found on the [Laravel website](http://laravel.com/docs).
-## Contributing To Laravel
+## Contributing
Thank you for considering contributing to the Laravel framework. I... | false |
Other | laravel | framework | 640c2b559f16a6070805ce26efeb4afe992f2152.json | Add quick contribution note. | readme.md | @@ -1,5 +1,9 @@
-## Laravel Framework (Core)
+## Laravel Framework (Kernel)
[](https://packagist.org/packages/laravel/framework) [](https://packagist.org/packages/lara... | false |
Other | laravel | framework | b626dabaa85910a5f4d5a3a8ccc068d17ff2d0f3.json | Add dependency check to read me. | readme.md | @@ -1,5 +1,5 @@
## Laravel Framework (Core)
-[](https://packagist.org/packages/laravel/framework) [](https://packagist.org/packages/laravel/framework) [![Build Status]... | false |
Other | laravel | framework | 7e3a99ebbab959324eebd88bdc38667f3fd35461.json | Register core class aliases. | src/Illuminate/Foundation/Application.php | @@ -972,6 +972,51 @@ public static function onRequest($method, $parameters = array())
return forward_static_call_array(array(static::requestClass(), $method), $parameters);
}
+ /**
+ * Register the core class aliases in the container.
+ *
+ * @return void
+ */
+ public function registerCoreContainerAliases()... | true |
Other | laravel | framework | 7e3a99ebbab959324eebd88bdc38667f3fd35461.json | Register core class aliases. | src/Illuminate/Foundation/start.php | @@ -91,6 +91,19 @@
Facade::setFacadeApplication($app);
+/*
+|--------------------------------------------------------------------------
+| Register Facade Aliases To Full Classes
+|--------------------------------------------------------------------------
+|
+| By default, we use short keys in the container for ea... | true |
Other | laravel | framework | de713c4c907170b88334aaf110d99bca28fef502.json | Fix calls to sortBy revealed by HHVM tests. | src/Illuminate/Support/Collection.php | @@ -435,6 +435,18 @@ public function sortBy(Closure $callback, $options = SORT_REGULAR, $descending =
return $this;
}
+ /**
+ * Sort the collection in descending order using the given Closure.
+ *
+ * @param \Closure $callback
+ * @param int $options
+ * @return \Illuminate\Support\Collection
... | true |
Other | laravel | framework | de713c4c907170b88334aaf110d99bca28fef502.json | Fix calls to sortBy revealed by HHVM tests. | tests/Support/SupportCollectionTest.php | @@ -201,12 +201,12 @@ public function testSort()
public function testSortBy()
{
$data = new Collection(array('taylor', 'dayle'));
- $data->sortBy(function($x) { return $x; });
+ $data = $data->sortBy(function($x) { return $x; });
$this->assertEquals(array('dayle', 'taylor'), array_values($data->all(... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Auth/Reminders/DatabaseReminderRepository.php | @@ -53,7 +53,7 @@ public function __construct(Connection $connection, $table, $hashKey, $expires =
/**
* Create a new reminder record and token.
*
- * @param \Illuminate\Auth\RemindableInterface $user
+ * @param \Illuminate\Auth\Reminders\RemindableInterface $user
* @return string
*/
public functi... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Auth/Reminders/PasswordBroker.php | @@ -183,7 +183,7 @@ public function reset(array $credentials, Closure $callback)
* Validate a password reset for the given credentials.
*
* @param array $credentials
- * @return \Illuminate\Auth\RemindableInterface
+ * @return \Illuminate\Auth\Reminders\RemindableInterface
*/
protected function valida... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Auth/Reminders/ReminderRepositoryInterface.php | @@ -5,15 +5,15 @@ interface ReminderRepositoryInterface {
/**
* Create a new reminder record and token.
*
- * @param \Illuminate\Auth\RemindableInterface $user
+ * @param \Illuminate\Auth\Reminders\RemindableInterface $user
* @return string
*/
public function create(RemindableInterface $user);
... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Connection.php | @@ -60,7 +60,7 @@ class Connection implements ConnectionInterface {
/**
* The cache manager instance.
*
- * @var \Illuminate\Cache\CacheManger
+ * @var \Illuminate\Cache\CacheManager
*/
protected $cache;
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Connectors/ConnectorInterface.php | @@ -6,7 +6,7 @@ interface ConnectorInterface {
* Establish a database connection.
*
* @param array $config
- * @return PDO
+ * @return \PDO
*/
public function connect(array $config);
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Connectors/MySqlConnector.php | @@ -6,7 +6,7 @@ class MySqlConnector extends Connector implements ConnectorInterface {
* Establish a database connection.
*
* @param array $config
- * @return PDO
+ * @return \PDO
*/
public function connect(array $config)
{ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Connectors/SQLiteConnector.php | @@ -6,7 +6,7 @@ class SQLiteConnector extends Connector implements ConnectorInterface {
* Establish a database connection.
*
* @param array $config
- * @return PDO
+ * @return \PDO
*
* @throws \InvalidArgumentException
*/ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Console/Migrations/InstallCommand.php | @@ -23,14 +23,14 @@ class InstallCommand extends Command {
/**
* The repository instance.
*
- * @var \Illuminate\Database\Console\Migrations\MigrationRepositoryInterface
+ * @var \Illuminate\Database\Migrations\MigrationRepositoryInterface
*/
protected $repository;
/**
* Create a new migration ins... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Eloquent/Model.php | @@ -1708,7 +1708,7 @@ public function newCollection(array $models = array())
* @param array $attributes
* @param string $table
* @param bool $exists
- * @return \Illuminate\Database\Eloquent\Relation\Pivot
+ * @return \Illuminate\Database\Eloquent\Relations\Pivot
*/
public function newPivot(Mod... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php | @@ -888,7 +888,7 @@ public function newPivotStatementForId($id)
*
* @param array $attributes
* @param bool $exists
- * @return \Illuminate\Database\Eloquent\Relation\Pivot
+ * @return \Illuminate\Database\Eloquent\Relations\Pivot
*/
public function newPivot(array $attributes = array(), $exists = fa... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php | @@ -63,7 +63,7 @@ public function getRelationCountQuery(Builder $query, Builder $parent)
/**
* Set the join clause on the query.
*
- * @param \Illuminate\Databaes\Eloquent\Builder|null $query
+ * @param \Illuminate\Database\Eloquent\Builder|null $query
* @return void
*/
protected function setJoin(... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Eloquent/Relations/MorphToMany.php | @@ -108,7 +108,7 @@ protected function newPivotQuery()
*
* @param array $attributes
* @param bool $exists
- * @return \Illuminate\Database\Eloquent\Relation\Pivot
+ * @return \Illuminate\Database\Eloquent\Relations\Pivot
*/
public function newPivot(array $attributes = array(), $exists = false)
{ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Database/Query/Builder.php | @@ -403,7 +403,7 @@ public function orWhere($column, $operator = null, $value = null)
* Determine if the given operator and value combination is legal.
*
* @param string $operator
- * @param mxied $value
+ * @param mixed $value
* @return bool
*/
protected function invalidOperatorAndValue($opera... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Exception/Handler.php | @@ -212,7 +212,7 @@ protected function isFatal($type)
/**
* Handle a console exception.
*
- * @param Exception $exception
+ * @param \Exception $exception
* @return void
*/
public function handleConsole($exception)
@@ -223,7 +223,7 @@ public function handleConsole($exception)
/**
* Handle the... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Exception/PlainDisplayer.php | @@ -10,6 +10,7 @@ class PlainDisplayer implements ExceptionDisplayerInterface {
* Display the given exception to the user.
*
* @param \Exception $exception
+ * @return \Symfony\Component\HttpFoundation\Response
*/
public function display(Exception $exception)
{ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Exception/WhoopsDisplayer.php | @@ -38,6 +38,7 @@ public function __construct(Run $whoops, $runningInConsole)
* Display the given exception to the user.
*
* @param \Exception $exception
+ * @return \Symfony\Component\HttpFoundation\Response
*/
public function display(Exception $exception)
{ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Foundation/Testing/TestCase.php | @@ -53,7 +53,7 @@ protected function refreshApplication()
*
* Needs to be implemented by subclasses.
*
- * @return Symfony\Component\HttpKernel\HttpKernelInterface
+ * @return \Symfony\Component\HttpKernel\HttpKernelInterface
*/
abstract public function createApplication();
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Html/FormBuilder.php | @@ -612,7 +612,7 @@ protected function checkable($type, $name, $value, $checked, $options)
* @param string $name
* @param mixed $value
* @param bool $checked
- * @return void
+ * @return bool
*/
protected function getCheckedState($type, $name, $value, $checked)
{ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Log/Writer.php | @@ -34,7 +34,7 @@ class Writer {
/**
* The event dispatcher instance.
*
- * @var \Illuminate\Events\Dispacher
+ * @var \Illuminate\Events\Dispatcher
*/
protected $dispatcher;
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Mail/Mailer.php | @@ -42,7 +42,7 @@ class Mailer {
/**
* The IoC container instance.
*
- * @var \Illuminate\Container
+ * @var \Illuminate\Container\Container
*/
protected $container;
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Queue/IronQueue.php | @@ -101,7 +101,7 @@ public function recreate($payload, $queue = null, $delay)
*
* @param \DateTime|int $delay
* @param string $job
- * @param mixed data
+ * @param mixed $data
* @param string $queue
* @return mixed
*/ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Queue/Jobs/RedisJob.php | @@ -23,7 +23,7 @@ class RedisJob extends Job {
* Create a new job instance.
*
* @param \Illuminate\Container\Container $container
- * @param \Illuminate\Redis\Queue $redis
+ * @param \Illuminate\Queue\RedisQueue $redis
* @param string $job
* @param string $queue
* @return void | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Queue/QueueInterface.php | @@ -37,7 +37,7 @@ public function later($delay, $job, $data = '', $queue = null);
* Pop the next job off of the queue.
*
* @param string $queue
- * @return \Illuminate\Queue\Jobs\Job|nul
+ * @return \Illuminate\Queue\Jobs\Job|null
*/
public function pop($queue = null);
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Routing/ControllerDispatcher.php | @@ -158,6 +158,7 @@ protected function getAssignableAfter($filter)
* @param array $filter
* @param \Illuminate\Http\Request $request
* @param string $method
+ * @return bool
*/
protected function filterApplies($filter, $request, $method)
{
@@ -178,6 +179,7 @@ protected function filterApplies($fil... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Routing/Router.php | @@ -769,6 +769,7 @@ protected function getLastGroupPrefix()
* @param array|string $methods
* @param string $uri
* @param \Closure|array|string $action
+ * @return \Illuminate\Routing\Route
*/
protected function addRoute($methods, $uri, $action)
{ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Session/CacheBasedSessionHandler.php | @@ -21,7 +21,7 @@ class CacheBasedSessionHandler implements \SessionHandlerInterface {
/**
* Create a new cache driven handler instance.
*
- * @param Illuminate\Cache\Repository $cache
+ * @param \Illuminate\Cache\Repository $cache
* @param int $minutes
* @return void
*/ | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Support/Facades/Response.php | @@ -65,7 +65,7 @@ public static function json($data = array(), $status = 200, array $headers = arr
/**
* Return a new streamed response from the application.
*
- * @param Closure $callback
+ * @param \Closure $callback
* @param int $status
* @param array $headers
* @return \Symfony\Comp... | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Validation/Factory.php | @@ -9,7 +9,7 @@ class Factory {
/**
* The Translator implementation.
*
- * @var \Symfony\Component\Translator\TranslatorInterface
+ * @var \Symfony\Component\Translation\TranslatorInterface
*/
protected $translator;
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/View/Engines/CompilerEngine.php | @@ -63,7 +63,7 @@ public function get($path, array $data = array())
/**
* Handle a view exception.
*
- * @param Exception $e
+ * @param \Exception $e
* @return void
*
* @throws $e | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/View/Engines/PhpEngine.php | @@ -47,7 +47,7 @@ protected function evaluatePath($__path, $__data)
/**
* Handle a view exception.
*
- * @param Exception $e
+ * @param \Exception $e
* @return void
*
* @throws $e | true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/View/Environment.php | @@ -32,7 +32,7 @@ class Environment {
/**
* The IoC container instance.
*
- * @var \Illuminate\Container
+ * @var \Illuminate\Container\Container
*/
protected $container;
| true |
Other | laravel | framework | 4a160d8d219b8da18b211809cc0d6ae7fb1c2aa6.json | Fix doc blocks. | src/Illuminate/Workbench/PackageCreator.php | @@ -7,7 +7,7 @@ class PackageCreator {
/**
* The filesystem instance.
*
- * @var \Illuminate\Filesystem
+ * @var \Illuminate\Filesystem\Filesystem
*/
protected $files;
@@ -38,7 +38,7 @@ class PackageCreator {
/**
* Create a new package creator instance.
*
- * @param \Illuminate\Fil... | true |
Other | laravel | framework | cedc9d443c66f467a44edf7dbd291ae36cc5a4f9.json | Fix URL generation bug. | src/Illuminate/Routing/RouteCollection.php | @@ -90,6 +90,21 @@ protected function addLookups($route)
// is used by the route. This will let us reverse route to controllers while
// processing a request and easily generate URLs to the given controllers.
if (isset($action['controller']))
+ {
+ $this->addToActionList($action, $route);
+ }
+ }
+
... | false |
Other | laravel | framework | a735af6d68253755031ccfd1542c176d4d8d3250.json | Add getLastAttempted method to Auth\Guard class. | src/Illuminate/Auth/Guard.php | @@ -618,4 +618,14 @@ public function viaRemember()
return $this->viaRemember;
}
+ /**
+ * Get the last user that was attempted to be retrieved.
+ *
+ * @return \Illuminate\Auth\UserInterface
+ */
+ public function getLastAttempted()
+ {
+ return $this->lastAttempted;
+ }
+
} | false |
Other | laravel | framework | 198e9f2519a29ba8ff67ab08444f75509b80498b.json | Fix bug in Closure after filters. | src/Illuminate/Routing/ControllerDispatcher.php | @@ -1,5 +1,6 @@
<?php namespace Illuminate\Routing;
+use Closure;
use Illuminate\Http\Request;
use Illuminate\Container\Container;
@@ -135,11 +136,22 @@ protected function assignAfter($instance, $route, $request, $method)
// router take care of calling these filters so we do not duplicate logics.
if ($th... | false |
Other | laravel | framework | 5d5091f2fca543104c5635953ab36bbbe84a4c72.json | Fix array syntax for PHP 5.3 | tests/View/ViewEnvironmentTest.php | @@ -173,7 +173,7 @@ public function testComposersCanBeMassRegistered()
$env->getDispatcher()->shouldReceive('listen')->once()->with('composing: foo', m::type('Closure'));
$composers = $env->composers(array(
'foo' => 'bar',
- 'baz@baz' => ['qux', 'foo'],
+ 'baz@baz' => array('qux', 'foo'),
));
$ref... | false |
Other | laravel | framework | f6c1319283e3b31bc8ab8067393b436b003c2857.json | Make resolveProviderClass public | src/Illuminate/Foundation/Application.php | @@ -324,7 +324,7 @@ public function register($provider, $options = array())
* @param string $provider
* @return \Illuminate\Support\ServiceProvider
*/
- protected function resolveProviderClass($provider)
+ public function resolveProviderClass($provider)
{
return new $provider($this);
} | false |
Other | laravel | framework | f7894e9da7d92de64f2c73eedc78c3a7ed66a740.json | Return connect value. | src/Illuminate/Remote/SecLibGateway.php | @@ -78,11 +78,11 @@ protected function setHostAndPort($host)
* Connect to the SSH server.
*
* @param string $username
- * @return void
+ * @return bool
*/
public function connect($username)
{
- $this->getConnection()->login($username, $this->getAuthForLogin());
+ return $this->getConnection()->log... | false |
Other | laravel | framework | f5399ea6490e5b3bfeae0ff6f4b11f001eb861e7.json | Throw exception if we can't connect. | src/Illuminate/Remote/Connection.php | @@ -64,7 +64,7 @@ class Connection implements ConnectionInterface {
* @param string $username
* @param array $auth
* @param \Illuminate\Remote\GatewayInterface
- * @param
+ * @param
*/
public function __construct($name, $host, $username, array $auth, GatewayInterface $gateway = null)
{
@@ -214... | false |
Other | laravel | framework | 3e49b6254b76895539d489c7a3645ec3d56e5c4d.json | Fix variable name. | src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php | @@ -244,7 +244,7 @@ public function addConstraints()
*/
public function getRelationCountQuery(Builder $query, Builder $parent)
{
- if ($original->getQuery()->from == $query->getQuery()->from)
+ if ($parent->getQuery()->from == $query->getQuery()->from)
{
return $this->getRelationCountQueryForSelfJoin($q... | false |
Other | laravel | framework | 636032616fd8a6af13f9186b6535dea96d244575.json | Remove unneeded method. | src/Illuminate/View/Engines/Engine.php | @@ -9,16 +9,6 @@ abstract class Engine {
*/
protected $lastRendered;
- /**
- * Determine if the engine is sectionable.
- *
- * @return bool
- */
- public function isSectionable()
- {
- return $this instanceof SectionableInterface;
- }
-
/**
* Get the last view that was rendered.
* | false |
Other | laravel | framework | f27fd58b42ef1b84215879aee21729e4202e4f3f.json | Remove unused Filesystem | src/Illuminate/Foundation/start.php | @@ -43,7 +43,6 @@
*/
use Illuminate\Http\Request;
-use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Facades\Facade;
use Illuminate\Foundation\AliasLoader;
use Illuminate\Config\Repository as Config;
@@ -241,4 +240,4 @@
if (file_exists($routes)) require $routes;
-});
\ No newline at end of file
+... | false |
Other | laravel | framework | 677a4345ffffb8ec3191753e2e0ed74a584553fa.json | Add database prefix to renameColumn
Fixes an issue where renameColumn throws an exception if a database prefix is set.
Signed-off-by: Suhayb El Wardany <me@suw.me> | src/Illuminate/Database/Schema/Grammars/Grammar.php | @@ -23,7 +23,9 @@ public function compileRenameColumn(Blueprint $blueprint, Fluent $command, Conne
{
$schema = $connection->getDoctrineSchemaManager();
- $column = $connection->getDoctrineColumn($blueprint->getTable(), $command->from);
+ $table = $this->getTablePrefix() . $blueprint->getTable();
+
+ $column =... | false |
Other | laravel | framework | 8d80cc42fa368364a40d201cd2aea3b6b9147a12.json | rename some classes for consistency. | src/Illuminate/Auth/Console/MakeRemindersCommand.php | @@ -3,7 +3,7 @@
use Illuminate\Console\Command;
use Illuminate\Filesystem\Filesystem;
-class MakeRemindersCommand extends Command {
+class RemindersTableCommand extends Command {
/**
* The console command name. | true |
Other | laravel | framework | 8d80cc42fa368364a40d201cd2aea3b6b9147a12.json | rename some classes for consistency. | src/Illuminate/Auth/Reminders/ReminderServiceProvider.php | @@ -1,7 +1,7 @@
<?php namespace Illuminate\Auth\Reminders;
use Illuminate\Support\ServiceProvider;
-use Illuminate\Auth\Console\MakeRemindersCommand;
+use Illuminate\Auth\Console\RemindersTableCommand;
use Illuminate\Auth\Console\ClearRemindersCommand;
use Illuminate\Auth\Console\RemindersControllerCommand;
use ... | true |
Other | laravel | framework | 8d80cc42fa368364a40d201cd2aea3b6b9147a12.json | rename some classes for consistency. | src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php | @@ -4,7 +4,7 @@
use Symfony\Component\Console\Input\InputArgument;
use Illuminate\Database\Migrations\MigrationCreator;
-class MakeCommand extends BaseCommand {
+class MigrateMakeCommand extends BaseCommand {
/**
* The console command name.
@@ -64,7 +64,7 @@ public function fire()
$table = $this->input->g... | true |
Other | laravel | framework | 8d80cc42fa368364a40d201cd2aea3b6b9147a12.json | rename some classes for consistency. | src/Illuminate/Database/MigrationServiceProvider.php | @@ -3,12 +3,12 @@
use Illuminate\Support\ServiceProvider;
use Illuminate\Database\Migrations\Migrator;
use Illuminate\Database\Migrations\MigrationCreator;
-use Illuminate\Database\Console\Migrations\MakeCommand;
use Illuminate\Database\Console\Migrations\ResetCommand;
use Illuminate\Database\Console\Migratio... | true |
Other | laravel | framework | 8d80cc42fa368364a40d201cd2aea3b6b9147a12.json | rename some classes for consistency. | src/Illuminate/Session/CommandsServiceProvider.php | @@ -20,7 +20,7 @@ public function register()
{
$this->app->bindShared('command.session.database', function($app)
{
- return new Console\MakeTableCommand($app['files']);
+ return new Console\SessionTableCommand($app['files']);
});
$this->commands('command.session.database'); | true |
Other | laravel | framework | 8d80cc42fa368364a40d201cd2aea3b6b9147a12.json | rename some classes for consistency. | src/Illuminate/Session/Console/SessionTableCommand.php | @@ -3,7 +3,7 @@
use Illuminate\Console\Command;
use Illuminate\Filesystem\Filesystem;
-class MakeTableCommand extends Command {
+class SessionTableCommand extends Command {
/**
* The console command name. | true |
Other | laravel | framework | 8d80cc42fa368364a40d201cd2aea3b6b9147a12.json | rename some classes for consistency. | tests/Database/DatabaseMigrationMakeCommandTest.php | @@ -1,7 +1,7 @@
<?php
use Mockery as m;
-use Illuminate\Database\Console\Migrations\MakeCommand;
+use Illuminate\Database\Console\Migrations\MigrateMakeCommand;
class DatabaseMigrationMakeCommandTest extends PHPUnit_Framework_TestCase {
@@ -62,7 +62,7 @@ protected function runCommand($command, $input = array()... | true |
Other | laravel | framework | 15489ab9d8fb3287271c9f85ecf0c59886e11f38.json | Fix eloquent model relation doc blocks | src/Illuminate/Database/Eloquent/Model.php | @@ -637,7 +637,7 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
}
/**
- * Define an polymorphic, inverse one-to-one or many relationship.
+ * Define a polymorphic, inverse one-to-one or many relationship.
*
* @param string $name
* @param string $type
@@ -779,7 +... | false |
Other | laravel | framework | ebaf26c71b44f1f7650ba79d55cae0a64f029e7f.json | Add format parameter to Form::selectMonth | src/Illuminate/Html/FormBuilder.php | @@ -470,15 +470,16 @@ public function selectYear()
* @param string $name
* @param string $selected
* @param array $options
+ * @param string $format
* @return string
*/
- public function selectMonth($name, $selected = null, $options = array())
+ public function selectMonth($name, $selected = nu... | false |
Other | laravel | framework | 47f906120c578cec83d44744803e670acc57a2a7.json | Add setModel method to FormBuilder | src/Illuminate/Html/FormBuilder.php | @@ -150,6 +150,17 @@ public function model($model, array $options = array())
return $this->open($options);
}
+ /**
+ * Set model on form builder.
+ *
+ * @param mixed $model
+ * @return void
+ */
+ public function setModel($model)
+ {
+ $this->model = $model;
+ }
+
/**
* Close the current form.
* | false |
Other | laravel | framework | e21766c81d30bbe06c4860b7f6ff9a055abb27a0.json | Allow whereHas on belongsTo relations. | src/Illuminate/Database/Eloquent/Relations/BelongsTo.php | @@ -3,6 +3,7 @@
use LogicException;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Expression;
use Illuminate\Database\Eloquent\Collection;
class BelongsTo extends Relation {
@@ -85,7 +86,11 @@ public function addConstraints()
*/
public funct... | false |
Other | laravel | framework | 736716781cc1856ebb12701fc95edebaa894d716.json | return boolean from Filesystem::delete. | src/Illuminate/Filesystem/Filesystem.php | @@ -93,7 +93,7 @@ public function prepend($path, $data)
{
if ($this->exists($path))
{
- return $this->put($path, $data.$this->get($path));
+ return $this->put($path, $data.$this->get($path));
}
else
{
@@ -123,7 +123,11 @@ public function delete($paths)
{
$paths = is_array($paths) ? $paths :... | false |
Other | laravel | framework | b31117aaef08f8432606acdc03dd09813643b63f.json | Fix the definite article on evaluated | src/Illuminate/View/Environment.php | @@ -103,7 +103,7 @@ public function __construct(EngineResolver $engines, ViewFinderInterface $finder
}
/**
- * Get a evaluated view contents for the given view.
+ * Get the evaluated view contents for the given view.
*
* @param string $view
* @param array $data
@@ -133,7 +133,7 @@ protected functi... | false |
Other | laravel | framework | 9f53166d5645596f94820511b4ea39bce8be9f53.json | Fix the enum indefinite article | src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php | @@ -427,7 +427,7 @@ protected function typeBoolean(Fluent $column)
}
/**
- * Create the column definition for a enum type.
+ * Create the column definition for an enum type.
*
* @param \Illuminate\Support\Fluent $column
* @return string | true |
Other | laravel | framework | 9f53166d5645596f94820511b4ea39bce8be9f53.json | Fix the enum indefinite article | src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php | @@ -437,7 +437,7 @@ protected function typeBoolean(Fluent $column)
}
/**
- * Create the column definition for a enum type.
+ * Create the column definition for an enum type.
*
* @param \Illuminate\Support\Fluent $column
* @return string | true |
Other | laravel | framework | 9f53166d5645596f94820511b4ea39bce8be9f53.json | Fix the enum indefinite article | src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php | @@ -371,7 +371,7 @@ protected function typeBoolean(Fluent $column)
}
/**
- * Create the column definition for a enum type.
+ * Create the column definition for an enum type.
*
* @param \Illuminate\Support\Fluent $column
* @return string | true |
Other | laravel | framework | 612d58d4533690bb2801287879cb2dfb532ab820.json | Specify query cache driver | src/Illuminate/Database/Query/Builder.php | @@ -148,6 +148,13 @@ class Builder {
*/
protected $cacheTags;
+ /**
+ * The driver for the query cache.
+ *
+ * @var string
+ */
+ protected $cacheDriver;
+
/**
* All of the available clause operators.
*
@@ -1112,6 +1119,19 @@ public function cacheTags($cacheTags)
return $this;
}
+ /**
+ * In... | false |
Other | laravel | framework | 0a90a98eab970271d7b49b535b13af5284300793.json | Fix Router.php to behave on App::error
When App::error is triggered, Route is empty. When you try to access Route::currentRouteNamed($string), it fails because Route::current() is empty and does not have a getName() method. | src/Illuminate/Routing/Router.php | @@ -1407,7 +1407,7 @@ public function current()
*/
public function currentRouteName()
{
- return $this->current()->getName();
+ return ($this->current()) ? $this->current()->getName() : null;
}
/**
@@ -1418,7 +1418,7 @@ public function currentRouteName()
*/
public function currentRouteNamed($name)
... | false |
Other | laravel | framework | 9933484ca2ba7638007be888654538b65fd21a20.json | Fix docblock for return values | src/Illuminate/Routing/Router.php | @@ -115,7 +115,6 @@ class Router implements HttpKernelInterface, RouteFiltererInterface {
*
* @param \Illuminate\Events\Dispatcher $events
* @param \Illuminate\Container\Container $container
- * @return void
*/
public function __construct(Dispatcher $events, Container $container = null)
{
@@ -356,1... | false |
Other | laravel | framework | 79b69790ff4415221c96d8df0f41282cadd18009.json | Use max() instead of ternary in DB offset. | src/Illuminate/Database/Query/Builder.php | @@ -947,7 +947,7 @@ public function orderByRaw($sql, $bindings = array())
*/
public function offset($value)
{
- $this->offset = $value > 0 ? $value : 0;
+ $this->offset = max(0, $value);
return $this;
} | false |
Other | laravel | framework | d6e9c601054595ac5c1b40e426f22c97d50bd508.json | Fix missing method. | src/Illuminate/Routing/Controller.php | @@ -205,15 +205,14 @@ public function callAction($method, $parameters)
/**
* Handle calls to missing methods on the controller.
*
- * @param string $method
* @param array $parameters
* @return mixed
*
* @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/
- public functi... | true |
Other | laravel | framework | d6e9c601054595ac5c1b40e426f22c97d50bd508.json | Fix missing method. | src/Illuminate/Routing/Router.php | @@ -122,6 +122,8 @@ public function __construct(Dispatcher $events, Container $container = null)
$this->events = $events;
$this->routes = new RouteCollection;
$this->container = $container ?: new Container;
+
+ $this->bind('_missing', function($v) { return explode('/', $v); });
}
/** | true |
Other | laravel | framework | 516f0151bda428b62edb52d2206896bb1d087700.json | Fix bugs and merge. | composer.json | @@ -32,6 +32,7 @@
"symfony/http-foundation": "2.4.*",
"symfony/http-kernel": "2.4.*",
"symfony/process": "2.4.*",
+ "symfony/routing": "2.4.*",
"symfony/translation": "2.4.*"
},
"replace": {
| true |
Other | laravel | framework | 516f0151bda428b62edb52d2206896bb1d087700.json | Fix bugs and merge. | src/Illuminate/Routing/Matching/HostValidator.php | @@ -14,9 +14,9 @@ class HostValidator implements ValidatorInterface {
*/
public function matches(Route $route, Request $request)
{
- if (is_null($route->hostExpression())) return true;
+ if (is_null($route->getCompiled()->getHostRegex())) return true;
- return preg_match($route->hostExpression(), $req... | true |
Other | laravel | framework | 516f0151bda428b62edb52d2206896bb1d087700.json | Fix bugs and merge. | src/Illuminate/Routing/Matching/UriValidator.php | @@ -14,7 +14,9 @@ class UriValidator implements ValidatorInterface {
*/
public function matches(Route $route, Request $request)
{
- return preg_match($route->uriExpression(), $request->path());
+ $path = $request->path() == '/' ? '/' : '/'.$request->path();
+
+ return preg_match($route->getCompiled()->g... | true |
Other | laravel | framework | 516f0151bda428b62edb52d2206896bb1d087700.json | Fix bugs and merge. | src/Illuminate/Routing/Route.php | @@ -6,6 +6,7 @@
use Illuminate\Routing\Matching\HostValidator;
use Illuminate\Routing\Matching\MethodValidator;
use Illuminate\Routing\Matching\SchemeValidator;
+use Symfony\Component\Routing\Route as SymfonyRoute;
class Route {
@@ -59,25 +60,11 @@ class Route {
protected $parameterNames;
/**
- ... | true |
Other | laravel | framework | 516f0151bda428b62edb52d2206896bb1d087700.json | Fix bugs and merge. | src/Illuminate/Routing/Router.php | @@ -1398,6 +1398,16 @@ public function current()
return $this->current;
}
+ /**
+ * Get the current route name.
+ *
+ * @return string|null
+ */
+ public function currentRouteName()
+ {
+ return $this->current()->getName();
+ }
+
/**
* Determine if the current route matches a given name.
* | true |
Other | laravel | framework | 516f0151bda428b62edb52d2206896bb1d087700.json | Fix bugs and merge. | tests/Routing/RoutingRouteTest.php | @@ -67,6 +67,24 @@ public function testBasicDispatchingOfRoutes()
}
+ public function testNonGreedyMatches()
+ {
+ $route = new Route('GET', 'images/{id}.{ext}', function() {});
+
+ $request1 = Request::create('images/1.png', 'GET');
+ $this->assertTrue($rout... | true |
Other | laravel | framework | a911fac3e54a8e8242f5c0fa5e411247c3004e27.json | Use non-greedy quantifier for wildcard regex. | src/Illuminate/Routing/Route.php | @@ -63,7 +63,7 @@ class Route {
*
* @var string
*/
- protected static $wildcard = '(?P<$1>([a-zA-Z0-9\.\,\-_%=+]+))';
+ protected static $wildcard = '(?P<$1>([a-zA-Z0-9\.\,\-_%=+]+?))';
/**
* The regular expression for an optional wildcard.
| false |
Other | laravel | framework | eaa6de136963100b93a223ff45c9631aa7496d0e.json | Bind request to route. | tests/Routing/RoutingRouteTest.php | @@ -350,11 +350,13 @@ public function testDotDoesNotMatchEverything()
$request1 = Request::create('images/1.png', 'GET');
$this->assertTrue($route->matches($request1));
+ $route->bind($request1);
$this->assertEquals('1', $route->parameter('id'));
$this->assertEquals('png', $route->parameter('ext')... | false |
Other | laravel | framework | e350e7397d0518aa2a0cdd152332a31f18ba565e.json | Take array keys of pattern filters. | src/Illuminate/Foundation/Console/RoutesCommand.php | @@ -166,7 +166,7 @@ protected function getPatternFilters($route)
// we have already gathered up then return them back out to these consumers.
$inner = $this->getMethodPatterns($route->uri(), $method);
- $patterns = array_merge($patterns, $inner);
+ $patterns = array_merge($patterns, array_keys($inner));
... | false |
Other | laravel | framework | 87ee594cd3a164491aea13e209762b4a10c308a6.json | Fix bug in router. | src/Illuminate/Routing/Route.php | @@ -456,7 +456,7 @@ protected static function compileParameters($value, array $wheres = array())
{
$value = static::compileWhereParameters($value, $wheres);
- return preg_replace('/\{([\w\-]+)\}/', static::$wildcard, $value);
+ return preg_replace('/\{([A-Za-z\-\_]+)\}/', static::$wildcard, $value);
}
... | false |
Other | laravel | framework | 0012f28f88f19037fbea71a60c162d69903ceea7.json | Fix bug in URL generation. | src/Illuminate/Routing/UrlGenerator.php | @@ -221,7 +221,9 @@ protected function replaceRouteParameters($path, array $parameters)
$path = $this->replaceRouteParameter($path, $key, $value, $parameters);
}
- return $path.$this->getRouteQueryString($parameters);
+ $path = preg_replace('/\{.*?\?\}/', '', $path);
+
+ return trim($path, '/').$this-... | true |
Other | laravel | framework | 0012f28f88f19037fbea71a60c162d69903ceea7.json | Fix bug in URL generation. | tests/Routing/RoutingUrlGeneratorTest.php | @@ -116,7 +116,7 @@ public function testRoutesWithDomains()
public function testRoutesWithDomainsAndPorts()
{
- $url = new UrlGenerator(
+ $url = new UrlGenerator(
$routes = new Illuminate\Routing\RouteCollection,
$request = Illuminate\Http\Request::create('http://www.foo.com:8080/')
);
@@ -... | true |
Other | laravel | framework | 35c3ed94d54f19b2e040da11a6687dac3cd9e9e9.json | Fix branch alias. | composer.json | @@ -83,7 +83,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "4.2-dev"
}
},
"suggest": {
| false |
Other | laravel | framework | 7b7df5a18c38bd2bc24b1721d06e21dff11a418e.json | Add array_where helper. | src/Illuminate/Support/helpers.php | @@ -416,6 +416,28 @@ function array_sort($array, Closure $callback)
}
}
+if ( ! function_exists('array_where'))
+{
+ /**
+ * Filter the array using the given Closure.
+ *
+ * @param array $array
+ * @param \Closure $callback
+ * @return array
+ */
+ function array_where($array, Closure $callback)
+ {
+ ... | false |
Other | laravel | framework | 59fca940a3e59d91461e3b4d5dbe809146f38e72.json | Fix bug in URL generation. | src/Illuminate/Routing/UrlGenerator.php | @@ -193,18 +193,100 @@ public function route($name, $parameters = array(), $route = null)
* Get the URL for a given route instance.
*
* @param \Illuminate\Routing\Route $route
- * @param mixed $parameters
+ * @param array $parameters
* @return string
*/
- protected function toRoute($route,... | false |
Other | laravel | framework | cc0bd4d8c8f86d4fb841d02d3a7a2106c4f037f9.json | Fix extra parameters to action method. | src/Illuminate/Routing/UrlGenerator.php | @@ -202,7 +202,9 @@ protected function toRoute($route, $parameters)
$path = preg_replace_sub('/\{.*?\}/', $parameters, $route->uri());
- return $this->trimUrl($this->getRouteRoot($route, $domain), $path);
+ $query = count($parameters) > 0 ? '?'.http_build_query($parameters) : '';
+
+ return $this->trimU... | true |
Other | laravel | framework | cc0bd4d8c8f86d4fb841d02d3a7a2106c4f037f9.json | Fix extra parameters to action method. | tests/Routing/RoutingUrlGeneratorTest.php | @@ -70,7 +70,7 @@ public function testBasicRouteGeneration()
$routes->add($route);
$this->assertEquals('http://www.foo.com/foo/bar', $url->route('foo'));
- $this->assertEquals('http://www.foo.com/foo/bar/taylor/breeze/otwell', $url->route('bar', array('taylor', 'otwell')));
+ $this->assertEquals('http://w... | true |
Other | laravel | framework | e3be0deb504cf219544e99f881d2b39a0664e9e1.json | Move some code into refreshApplication. | src/Illuminate/Foundation/Testing/TestCase.php | @@ -29,10 +29,6 @@ public function setUp()
if ( ! $this->app)
{
$this->refreshApplication();
-
- $this->app->setRequestForConsoleEnvironment();
-
- $this->app->boot();
}
}
@@ -46,6 +42,10 @@ protected function refreshApplication()
$this->app = $this->createApplication();
$this->client = $th... | false |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.