Merge branch '5.x'

.php_cs

@@ -15,7 +15,6 @@ return PhpCsFixer\Config::create()
                 'no_extra_consecutive_blank_lines' => false,
                 'no_unneeded_control_parentheses' => false,
                 'not_operator_with_successor_space' => true,
-                'no_superfluous_phpdoc_tags' => false,
                 'ordered_imports' => ['sortAlgorithm' => 'alpha'],
                 'phpdoc_align' => false,
                 'phpdoc_no_empty_return' => false,

CHANGELOG-5.x.md

@@ -0,0 +1,11 @@
+# Changelog for 5.x
+
+This changelog references the relevant changes (bug and security fixes) done to `orchestra/messages`.
+
+## 5.0.0
+
+Released: 2020-02-27
+
+### Changes
+
+* Update support for Laravel Framework v7.0.

src/Http/Middleware/StoreMessageBag.php

@@ -11,7 +11,6 @@ class StoreMessageBag
      * Handle an incoming request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
      *
      * @return mixed
      */

src/MessageBag.php

@@ -27,8 +27,6 @@ class MessageBag extends Message implements MessageBagContract
     /**
      * Set the session store.
      *
-     * @param  \Illuminate\Contracts\Session\Session  $session
-     *
      * @return $this
      */
     public function setSessionStore(SessionContract $session)
@@ -42,8 +40,6 @@ public function setSessionStore(SessionContract $session)
 
     /**
      * Get the session store.
-     *
-     * @return \Illuminate\Contracts\Session\Session
      */
     public function getSessionStore(): SessionContract
     {
@@ -52,10 +48,6 @@ public function getSessionStore(): SessionContract
 
     /**
      * Extend Messages instance from session.
-     *
-     * @param  \Closure  $callback
-     *
-     * @return \Illuminate\Contracts\Support\MessageBag
      */
     public function extend(Closure $callback): MessageContract
     {
@@ -69,8 +61,6 @@ public function extend(Closure $callback): MessageContract
     /**
      * Retrieve Message instance from Session, the data should be in
      * serialize, so we need to unserialize it first.
-     *
-     * @return \Illuminate\Contracts\Support\MessageBag
      */
     public function copy(): MessageContract
     {
@@ -84,8 +74,6 @@ public function copy(): MessageContract
 
     /**
      * Store current instance.
-     *
-     * @return void
      */
     public function save(): void
     {

src/helpers.php

@@ -7,10 +7,7 @@
     /**
      * Add a message to the bag.
      *
-     * @param  string  $key
      * @param  string|callable  $message
-     *
-     * @return \Orchestra\Contracts\Messages\MessageBag
      */
     function messages(string $key, $message): MessageBag
     {

tests/Feature/TestCase.php

@@ -10,8 +10,6 @@ abstract class TestCase extends Testbench
      * Get package aliases.
      *
      * @param  \Illuminate\Foundation\Application  $app
-     *
-     * @return array
      */
     protected function getPackageAliases($app): array
     {
@@ -24,8 +22,6 @@ protected function getPackageAliases($app): array
      * Get package providers.
      *
      * @param  \Illuminate\Foundation\Application  $app
-     *
-     * @return array
      */
     protected function getPackageProviders($app): array
     {