Merge branch '7.x' into 8.x

Author: driesvints

README.md

@@ -1,4 +1,4 @@
-<p align="center"><a href="https://laravel.com" target="_blank" rel="noopener"><img src="https://res.cloudinary.com/dtfbvvkyp/image/upload/v1566331377/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
+<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
 
 <p align="center">
 <a href="https://github.com/laravel/framework/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a>

src/Illuminate/Contracts/Database/Eloquent/CastsAttributes.php

@@ -22,7 +22,7 @@ public function get($model, string $key, $value, array $attributes);
      * @param  string  $key
      * @param  mixed  $value
      * @param  array  $attributes
-     * @return array|string
+     * @return mixed
      */
     public function set($model, string $key, $value, array $attributes);
 }

src/Illuminate/Contracts/Database/Eloquent/CastsInboundAttributes.php

@@ -11,7 +11,7 @@ interface CastsInboundAttributes
      * @param  string  $key
      * @param  mixed  $value
      * @param  array  $attributes
-     * @return array
+     * @return mixed
      */
     public function set($model, string $key, $value, array $attributes);
 }

src/Illuminate/Contracts/Debug/ExceptionHandler.php

@@ -12,7 +12,7 @@ interface ExceptionHandler
      * @param  \Throwable  $e
      * @return void
      *
-     * @throws \Exception
+     * @throws \Throwable
      */
     public function report(Throwable $e);
 

src/Illuminate/Database/Connectors/Connector.php

@@ -33,7 +33,7 @@ class Connector
      * @param  array  $options
      * @return \PDO
      *
-     * @throws \Throwable
+     * @throws \Exception
      */
     public function createConnection($dsn, array $config, array $options)
     {
@@ -92,7 +92,7 @@ protected function isPersistentConnection($options)
      * @param  array  $options
      * @return \PDO
      *
-     * @throws \Throwable
+     * @throws \Exception
      */
     protected function tryAgainIfCausedByLostConnection(Throwable $e, $dsn, $username, $password, $options)
     {

src/Illuminate/Database/Eloquent/Collection.php

@@ -79,19 +79,18 @@ public function loadCount($relations)
             ->whereKey($this->modelKeys())
             ->select($this->first()->getKeyName())
             ->withCount(...func_get_args())
-            ->get();
+            ->get()
+            ->keyBy($this->first()->getKeyName());
 
         $attributes = Arr::except(
             array_keys($models->first()->getAttributes()),
             $models->first()->getKeyName()
         );
 
-        $models->each(function ($model) use ($attributes) {
-            $this->where($this->first()->getKeyName(), $model->getKey())
-                ->each
-                ->forceFill(Arr::only($model->getAttributes(), $attributes))
-                ->each
-                ->syncOriginalAttributes($attributes);
+        $this->each(function ($model) use ($models, $attributes) {
+            $extraAttributes = Arr::only($models->get($model->getKey())->getAttributes(), $attributes);
+
+            $model->forceFill($extraAttributes)->syncOriginalAttributes($attributes);
         });
 
         return $this;
@@ -358,7 +357,7 @@ public function intersect($items)
      *
      * @param  string|callable|null  $key
      * @param  bool  $strict
-     * @return static|\Illuminate\Support\Collection
+     * @return static
      */
     public function unique($key = null, $strict = false)
     {

src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php

@@ -48,7 +48,7 @@ public function compileColumnListing($table)
     {
         return "select col.name from sys.columns as col
                 join sys.objects as obj on col.object_id = obj.object_id
-                where obj.type = 'U' and obj.name = '$table'";
+                where obj.type = 'U' and obj.object_id = object_id('$table')";
     }
 
     /**

src/Illuminate/Http/Client/PendingRequest.php

@@ -525,7 +525,7 @@ public function delete($url, $data = [])
      * @param  array  $options
      * @return \Illuminate\Http\Client\Response
      *
-     * @throws \Throwable
+     * @throws \Exception
      */
     public function send(string $method, string $url, array $options = [])
     {

src/Illuminate/Translation/Translator.php

@@ -122,7 +122,7 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)
             $locales = $fallback ? $this->localeArray($locale) : [$locale];
 
             foreach ($locales as $locale) {
-                if (! is_null($line = $this->getLine(
+                if (! empty($line = $this->getLine(
                     $namespace, $group, $locale, $item, $replace
                 ))) {
                     return $line ?? $key;

tests/Translation/TranslationTranslatorTest.php

@@ -104,6 +104,17 @@ public function testGetMethodProperlyLoadsAndRetrievesItemForFallback()
         $this->assertSame('foo', $t->get('foo::bar.foo'));
     }
 
+    public function testGetMethodProperlyLoadsAndRetrievesItemForFallbackWhenLineIsEmpty()
+    {
+        $t = new Translator($this->getLoader(), 'en');
+        $t->setFallback('lv');
+        $t->getLoader()->shouldReceive('load')->once()->with('en', '*', '*')->andReturn([]);
+        $t->getLoader()->shouldReceive('load')->once()->with('en', 'bar', 'foo')->andReturn(['baz' => '']);
+        $t->getLoader()->shouldReceive('load')->once()->with('lv', 'bar', 'foo')->andReturn(['foo' => 'foo', 'baz' => 'breeze :foo']);
+        $this->assertSame('breeze bar', $t->get('foo::bar.baz', ['foo' => 'bar'], 'en'));
+        $this->assertSame('foo', $t->get('foo::bar.foo'));
+    }
+
     public function testGetMethodProperlyLoadsAndRetrievesItemForGlobalNamespace()
     {
         $t = new Translator($this->getLoader(), 'en');