CHANGELOG-8.x.md

@@ -1,32 +1,6 @@
 # Release Notes for 8.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v8.61.0...8.x)
-
-
-## [v8.61.0 (2021-09-13)](https://github.com/laravel/framework/compare/v8.60.0...v8.61.0)
-
-### Added
-- Added posibility compare custom date/immutable_date using date comparison ([#38720](https://github.com/laravel/framework/pull/38720))
-- Added policy option to make:model ([#38725](https://github.com/laravel/framework/pull/38725)
-- Allow tests to utilise the null logger ([#38785](https://github.com/laravel/framework/pull/38785))
-- Added deleteOrFail to Model ([#38784](https://github.com/laravel/framework/pull/38784))
-- Added assertExists testing method ([#38766](https://github.com/laravel/framework/pull/38766))
-- Added forwardDecoratedCallTo to Illuminate/Database/Eloquent/Relations/Relation ([#38800](https://github.com/laravel/framework/pull/38800))
-- Adding support for using a different Redis DB in a Sentinel setup ([#38764](https://github.com/laravel/framework/pull/38764))
-
-### Changed
-- Return on null in `Illuminate/Queue/Queue::getJobBackoff()` ([27bcf13](https://github.com/laravel/framework/commit/27bcf13ce0fb64d7677e1376bf6fde0fc08810a2))
-- Provide psr/simple-cache-implementation ([#38767](https://github.com/laravel/framework/pull/38767))
-- Use lowercase for hmac hash algorithm ([#38787](https://github.com/laravel/framework/pull/38787))
-
-
-## [v8.60.0 (2021-09-08)](https://github.com/laravel/framework/compare/v8.59.0...v8.60.0)
-
-### Added
-- Added the `valueOfFail()` Eloquent builder method ([#38707](https://github.com/laravel/framework/pull/38707))
-
-### Reverted
-- Reverted ["Added the password reset URL to the toMailCallback"](https://github.com/laravel/framework/pull/38552)) ([#38711](https://github.com/laravel/framework/pull/38711))
+## [Unreleased](https://github.com/laravel/framework/compare/v8.59.0...8.x)
 
 
 ## [v8.59.0 (2021-09-07)](https://github.com/laravel/framework/compare/v8.58.0...v8.59.0)

src/Illuminate/Database/Eloquent/Relations/Relation.php

@@ -478,7 +478,13 @@ public function __call($method, $parameters)
             return $this->macroCall($method, $parameters);
         }
 
-        return $this->forwardDecoratedCallTo($this->query, $method, $parameters);
+        $result = $this->forwardCallTo($this->query, $method, $parameters);
+
+        if ($result === $this->query) {
+            return $this;
+        }
+
+        return $result;
     }
 
     /**

src/Illuminate/Foundation/Application.php

@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '8.61.0';
+    const VERSION = '8.60.0';
 
     /**
      * The base path for the Laravel installation.

src/Illuminate/Redis/RedisManager.php

@@ -7,7 +7,6 @@
 use Illuminate\Redis\Connections\Connection;
 use Illuminate\Redis\Connectors\PhpRedisConnector;
 use Illuminate\Redis\Connectors\PredisConnector;
-use Illuminate\Support\Arr;
 use Illuminate\Support\ConfigurationUrlParser;
 use InvalidArgumentException;
 
@@ -109,7 +108,7 @@ public function resolve($name = null)
         if (isset($this->config[$name])) {
             return $this->connector()->connect(
                 $this->parseConnectionConfiguration($this->config[$name]),
-                array_merge(Arr::except($options, 'parameters'), ['parameters' => Arr::get($options, 'parameters.'.$name, Arr::get($options, 'parameters', []))])
+                $options
             );
         }
 

src/Illuminate/Support/Traits/ForwardsCalls.php

@@ -37,27 +37,6 @@ protected function forwardCallTo($object, $method, $parameters)
         }
     }
 
-    /**
-     * Forward a method call to the given object, returning $this if the forwarded call returned itself.
-     *
-     * @param  mixed  $object
-     * @param  string  $method
-     * @param  array  $parameters
-     * @return mixed
-     *
-     * @throws \BadMethodCallException
-     */
-    protected function forwardDecoratedCallTo($object, $method, $parameters)
-    {
-        $result = $this->forwardCallTo($object, $method, $parameters);
-
-        if ($result === $object) {
-            return $this;
-        }
-
-        return $result;
-    }
-
     /**
      * Throw a bad method call exception for the given method.
      *

src/Illuminate/View/View.php

@@ -81,7 +81,7 @@ public function __construct(Factory $factory, Engine $engine, $view, $path, $dat
      * Get the string contents of the view.
      *
      * @param  callable|null  $callback
-     * @return string
+     * @return array|string
      *
      * @throws \Throwable
      */

tests/Redis/RedisConnectorTest.php

@@ -181,30 +181,4 @@ public function testPredisConfigurationWithUsername()
         $this->assertEquals($username, $parameters->username);
         $this->assertEquals($password, $parameters->password);
     }
-
-    public function testPredisConfigurationWithSentinel()
-    {
-        $host = env('REDIS_HOST', '127.0.0.1');
-        $port = env('REDIS_PORT', 6379);
-
-        $predis = new RedisManager(new Application, 'predis', [
-            'cluster' => false,
-            'options' => [
-                'replication' => 'sentinel',
-                'service' => 'mymaster',
-                'parameters' => [
-                    'default' => [
-                        'database' => 5,
-                    ],
-                ],
-            ],
-            'default' => [
-                "tcp://{$host}:{$port}",
-            ],
-        ]);
-
-        $predisClient = $predis->connection()->client();
-        $parameters = $predisClient->getConnection()->getSentinelConnection()->getParameters();
-        $this->assertEquals($host, $parameters->host);
-    }
 }