Merge branch '5.7'

Author: taylorotwell

src/Illuminate/Foundation/Application.php

@@ -891,7 +891,7 @@ public function configurationIsCached()
      */
     public function getCachedConfigPath()
     {
-        return $this->bootstrapPath().'/cache/config.php';
+        return $_ENV['APP_CONFIG_CACHE'] ?? $this->bootstrapPath().'/cache/config.php';
     }
 
     /**

src/Illuminate/Foundation/Console/ConfigCacheCommand.php

@@ -56,6 +56,7 @@ public function handle()
         $this->call('config:clear');
 
         $config = $this->getFreshConfiguration();
+
         $configPath = $this->laravel->getCachedConfigPath();
 
         $this->files->put(

src/Illuminate/Mail/TransportManager.php

@@ -5,6 +5,7 @@
 use Aws\Ses\SesClient;
 use Illuminate\Support\Arr;
 use Psr\Log\LoggerInterface;
+use Illuminate\Log\LogManager;
 use Illuminate\Support\Manager;
 use GuzzleHttp\Client as HttpClient;
 use Swift_SmtpTransport as SmtpTransport;
@@ -159,11 +160,13 @@ protected function createSparkPostDriver()
      */
     protected function createLogDriver()
     {
-        $channel = $this->app['config']['mail.log_channel'];
+        $logger = $this->app->make(LoggerInterface::class);
 
-        return new LogTransport(
-            $this->app->make(LoggerInterface::class)->channel($channel)
-        );
+        if ($logger instanceof LogManager) {
+            $logger = $logger->channel($this->app['config']['mail.log_channel']);
+        }
+
+        return new LogTransport($logger);
     }
 
     /**

src/Illuminate/Validation/Concerns/ReplacesAttributes.php

@@ -469,4 +469,22 @@ protected function replaceDimensions($message, $attribute, $rule, $parameters)
 
         return $message;
     }
+
+    /**
+     * Replace all place-holders for the starts_with rule.
+     *
+     * @param  string  $message
+     * @param  string  $attribute
+     * @param  string  $rule
+     * @param  array   $parameters
+     * @return string
+     */
+    protected function replaceStartsWith($message, $attribute, $rule, $parameters)
+    {
+        foreach ($parameters as &$parameter) {
+            $parameter = $this->getDisplayableValue($attribute, $parameter);
+        }
+
+        return str_replace(':values', implode(', ', $parameters), $message);
+    }
 }

tests/Validation/ValidationValidatorTest.php

@@ -1214,6 +1214,18 @@ public function testValidateStartsWith()
         $trans = $this->getIlluminateArrayTranslator();
         $v = new Validator($trans, ['x' => 'hello world'], ['x' => 'starts_with:world,hello']);
         $this->assertTrue($v->passes());
+
+        $trans = $this->getIlluminateArrayTranslator();
+        $trans->addLines(['validation.starts_with' => 'The :attribute must start with one of the following values :values'], 'en');
+        $v = new Validator($trans, ['url' => 'laravel.com'], ['url' => 'starts_with:http']);
+        $this->assertFalse($v->passes());
+        $this->assertEquals('The url must start with one of the following values http', $v->messages()->first('url'));
+
+        $trans = $this->getIlluminateArrayTranslator();
+        $trans->addLines(['validation.starts_with' => 'The :attribute must start with one of the following values :values'], 'en');
+        $v = new Validator($trans, ['url' => 'laravel.com'], ['url' => 'starts_with:http,https']);
+        $this->assertFalse($v->passes());
+        $this->assertEquals('The url must start with one of the following values http, https', $v->messages()->first('url'));
     }
 
     public function testValidateString()