Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/framework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.20.0
Choose a base ref
...
head repository: laravel/framework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.20.1
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 29, 2020

  1. fix alias usage

    taylorotwell committed Oct 29, 2020
    Copy the full SHA
    6091048 View commit details
  2. fix isCallable

    taylorotwell committed Oct 29, 2020
    Copy the full SHA
    a90f344 View commit details
  3. version

    taylorotwell committed Oct 29, 2020
    Copy the full SHA
    2be9317 View commit details
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Eloquent/Builder.php
Original file line number Diff line number Diff line change
@@ -510,7 +510,7 @@ public function firstOr($columns = ['*'], Closure $callback = null)
public function value($column)
{
if ($result = $this->first([$column])) {
return $result->{$column};
return $result->{Str::afterLast($column, '.')};
}
}

2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Application.php
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
*
* @var string
*/
const VERSION = '6.20.0';
const VERSION = '6.20.1';

/**
* The base path for the Laravel installation.
6 changes: 6 additions & 0 deletions src/Illuminate/Support/Reflector.php
Original file line number Diff line number Diff line change
@@ -26,6 +26,12 @@ public static function isCallable($var, $syntaxOnly = false)
return false;
}

if ($syntaxOnly &&
(is_string($var[0]) || is_object($var[0])) &&
is_string($var[1])) {
return true;
}

$class = is_object($var[0]) ? get_class($var[0]) : $var[0];

$method = $var[1];
2 changes: 2 additions & 0 deletions tests/Support/SupportReflectorTest.php
Original file line number Diff line number Diff line change
@@ -68,6 +68,8 @@ public function testIsCallable()
$this->assertTrue(Reflector::isCallable([TestClassWithCallStatic::class, 'f']));
$this->assertFalse(Reflector::isCallable([new TestClassWithCallStatic, 'f']));
$this->assertFalse(Reflector::isCallable([new TestClassWithCallStatic]));
$this->assertFalse(Reflector::isCallable(['TotallyMissingClass', 'foo']));
$this->assertTrue(Reflector::isCallable(['TotallyMissingClass', 'foo'], true));
}
}