Move empty key detection above starts_with check

Author: thecrypticace

src/Illuminate/Encryption/EncryptionServiceProvider.php

@@ -18,19 +18,21 @@ public function register()
         $this->app->singleton('encrypter', function ($app) {
             $config = $app->make('config')->get('app');
 
-            // If the key starts with "base64:", we will need to decode the key before handing
-            // it off to the encrypter. Keys may be base-64 encoded for presentation and we
-            // want to make sure to convert them back to the raw bytes before encrypting.
-            if (Str::startsWith($key = $config['key'], 'base64:')) {
-                $key = base64_decode(substr($key, 7));
-            }
+            $key = $config['key'];
 
             if (is_null($key) || $key === '') {
                 throw new RuntimeException(
                     'The application encryption key is missing. Run php artisan key:generate to generate it.'
                 );
             }
 
+            // If the key starts with "base64:", we will need to decode the key before handing
+            // it off to the encrypter. Keys may be base-64 encoded for presentation and we
+            // want to make sure to convert them back to the raw bytes before encrypting.
+            if (Str::startsWith($key, 'base64:')) {
+                $key = base64_decode(substr($key, 7));
+            }
+
             return new Encrypter($key, $config['cipher']);
         });
     }