fix conflicts

Author: taylorotwell

CHANGELOG-5.7.md

@@ -1,5 +1,21 @@
 # Release Notes for 5.7.x
 
+## [v5.7.18 (2018-12-17)](https://github.com/laravel/framework/compare/v5.7.17...v5.7.18)
+
+### Added
+- Added missing `starts_with` validation message ([#26822](https://github.com/laravel/framework/pull/26822))
+- Added `Facade::resolved()` method to register pending callback until the service is available. ([#26824](https://github.com/laravel/framework/pull/26824))
+- Added env var `APP_CONFIG_CACHE` to control cache config path ([578bc83](https://github.com/laravel/framework/commit/578bc83f0247b97ec87fefe39a8da7e9bbfd4a66))
+
+### Changed
+- Changed `TransportManager::createMailDriver` ([#26846](https://github.com/laravel/framework/pull/26846))
+
+### Fixed
+- Fixed of using `illuminate/mail` outside of Laravel with driver log ([#26842](https://github.com/laravel/framework/pull/26842))
+- Fixed some bugs for `app()->call()` ([#26852](https://github.com/laravel/framework/pull/26852))
+- Added workaround for PHP-bug related to [incorrect variable values when Opcache enabled in PHP v 7.3.0](https://github.com/laravel/framework/issues/26819) ([36d3436](https://github.com/laravel/framework/commit/36d343682d25570946ff22397a720727e0c1dcd7))
+
+
 ## [v5.7.17 (2018-12-12)](https://github.com/laravel/framework/compare/v5.7.16...v5.7.17)
 
 ### Added

src/Illuminate/Container/Container.php

@@ -195,7 +195,7 @@ public function resolved($abstract)
     public function isShared($abstract)
     {
         return isset($this->instances[$abstract]) ||
-              (isset($this->bindings[$abstract]['shared']) &&
+               (isset($this->bindings[$abstract]['shared']) &&
                $this->bindings[$abstract]['shared'] === true);
     }
 
@@ -782,7 +782,7 @@ public function build($concrete)
         $reflector = new ReflectionClass($concrete);
 
         // If the type is not instantiable, the developer is attempting to resolve
-        // an abstract type such as an Interface of Abstract Class and there is
+        // an abstract type such as an Interface or Abstract Class and there is
         // no binding registered for the abstractions so we need to bail out.
         if (! $reflector->isInstantiable()) {
             return $this->notInstantiable($concrete);

src/Illuminate/Database/Connection.php

@@ -751,6 +751,8 @@ protected function tryAgainIfCausedByLostConnection(QueryException $e, $query, $
     public function reconnect()
     {
         if (is_callable($this->reconnector)) {
+            $this->doctrineConnection = null;
+
             return call_user_func($this->reconnector, $this);
         }
 

src/Illuminate/Mail/MailServiceProvider.php

@@ -25,9 +25,7 @@ class MailServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerSwiftMailer();
-
         $this->registerIlluminateMailer();
-
         $this->registerMarkdownRenderer();
     }
 
@@ -38,18 +36,20 @@ public function register()
      */
     protected function registerIlluminateMailer()
     {
-        $this->app->singleton('mailer', function ($app) {
-            $config = $app->make('config')->get('mail');
+        $this->app->singleton('mailer', function () {
+            $config = $this->app->make('config')->get('mail');
 
             // Once we have create the mailer instance, we will set a container instance
             // on the mailer. This allows us to resolve mailer classes via containers
             // for maximum testability on said classes instead of passing Closures.
             $mailer = new Mailer(
-                $app['view'], $app['swift.mailer'], $app['events']
+                $this->app['view'],
+                $this->app['swift.mailer'],
+                $this->app['events']
             );
 
-            if ($app->bound('queue')) {
-                $mailer->setQueue($app['queue']);
+            if ($this->app->bound('queue')) {
+                $mailer->setQueue($this->app['queue']);
             }
 
             // Next we will set all of the global addresses on this mailer, which allows
@@ -92,14 +92,14 @@ public function registerSwiftMailer()
         // Once we have the transporter registered, we will register the actual Swift
         // mailer instance, passing in the transport instances, which allows us to
         // override this transporter instances during app start-up if necessary.
-        $this->app->singleton('swift.mailer', function ($app) {
-            if ($domain = $app->make('config')->get('mail.domain')) {
+        $this->app->singleton('swift.mailer', function () {
+            if ($domain = $this->app->make('config')->get('mail.domain')) {
                 Swift_DependencyContainer::getInstance()
                                 ->register('mime.idgenerator.idright')
                                 ->asValue($domain);
             }
 
-            return new Swift_Mailer($app['swift.transport']->driver());
+            return new Swift_Mailer($this->app['swift.transport']->driver());
         });
     }
 
@@ -110,8 +110,8 @@ public function registerSwiftMailer()
      */
     protected function registerSwiftTransport()
     {
-        $this->app->singleton('swift.transport', function ($app) {
-            return new TransportManager($app);
+        $this->app->singleton('swift.transport', function () {
+            return new TransportManager($this->app);
         });
     }
 
@@ -128,10 +128,10 @@ protected function registerMarkdownRenderer()
             ], 'laravel-mail');
         }
 
-        $this->app->singleton(Markdown::class, function ($app) {
-            $config = $app->make('config');
+        $this->app->singleton(Markdown::class, function () {
+            $config = $this->app->make('config');
 
-            return new Markdown($app->make('view'), [
+            return new Markdown($this->app->make('view'), [
                 'theme' => $config->get('mail.markdown.theme', 'default'),
                 'paths' => $config->get('mail.markdown.paths', []),
             ]);

src/Illuminate/Support/Collection.php

@@ -678,6 +678,18 @@ public function whereInStrict($key, $values)
         return $this->whereIn($key, $values, true);
     }
 
+    /**
+     * Filter items where the given key between values.
+     *
+     * @param  string  $key
+     * @param  array  $values
+     * @return static
+     */
+    public function whereBetween($key, $values)
+    {
+        return $this->where($key, '>=', reset($values))->where($key, '<=', end($values));
+    }
+
     /**
      * Filter items by the given key value pair.
      *
@@ -800,7 +812,7 @@ public function get($key, $default = null)
     /**
      * Group an associative array by a field or using a callback.
      *
-     * @param  callable|string  $groupBy
+     * @param  array|callable|string  $groupBy
      * @param  bool  $preserveKeys
      * @return static
      */

src/Illuminate/Translation/Translator.php

@@ -94,7 +94,7 @@ public function has($key, $locale = null, $fallback = true)
      * @param  string  $key
      * @param  array   $replace
      * @param  string  $locale
-     * @return string|array|null
+     * @return string|array
      */
     public function trans($key, array $replace = [], $locale = null)
     {
@@ -108,7 +108,7 @@ public function trans($key, array $replace = [], $locale = null)
      * @param  array   $replace
      * @param  string|null  $locale
      * @param  bool  $fallback
-     * @return string|array|null
+     * @return string|array
      */
     public function get($key, array $replace = [], $locale = null, $fallback = true)
     {
@@ -144,7 +144,7 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)
      * @param  string  $key
      * @param  array  $replace
      * @param  string  $locale
-     * @return string|array|null
+     * @return string|array
      */
     public function getFromJson($key, array $replace = [], $locale = null)
     {

tests/Mail/MailLogTransportTest.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Tests\Mail;
 
 use Monolog\Logger;
+use Psr\Log\NullLogger;
 use Psr\Log\LoggerInterface;
 use Orchestra\Testbench\TestCase;
 use Monolog\Handler\StreamHandler;
@@ -30,4 +31,13 @@ public function testGetLogTransportWithConfiguredChannel()
         $this->assertCount(1, $handlers = $monolog->getHandlers());
         $this->assertInstanceOf(StreamHandler::class, $handler = $handlers[0]);
     }
+
+    public function testGetLogTransportWithPsrLogger()
+    {
+        $logger = $this->app->instance('log', new NullLogger());
+
+        $manager = $this->app['swift.transport'];
+
+        $this->assertAttributeEquals($logger, 'logger', $manager->driver('log'));
+    }
 }

tests/Support/SupportCollectionTest.php

@@ -543,6 +543,16 @@ public function testValues()
         })->values()->all());
     }
 
+    public function testBetween()
+    {
+        $c = new Collection([['v' => 1], ['v' => 2], ['v' => 3], ['v' => '3'], ['v' => 4]]);
+
+        $this->assertEquals([['v' => 2], ['v' => 3], ['v' => '3'], ['v' => 4]],
+            $c->whereBetween('v', [2, 4])->values()->all());
+        $this->assertEquals([['v' => 1]], $c->whereBetween('v', [-1, 1])->all());
+        $this->assertEquals([['v' => 3], ['v' => '3']], $c->whereBetween('v', [3, 3])->values()->all());
+    }
+
     public function testFlatten()
     {
         // Flat arrays are unaffected