Merge branch 'orkhanahmadov/8.x' into 8.x

Author: taylorotwell

src/Illuminate/Bus/PendingBatch.php

@@ -226,6 +226,20 @@ public function queue()
         return $this->options['queue'] ?? null;
     }
 
+    /**
+     * Add additional data into the batch's options array.
+     *
+     * @param  string  $key
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function withOption(string $key, $value)
+    {
+        $this->options[$key] = $value;
+
+        return $this;
+    }
+
     /**
      * Dispatch the batch.
      *

tests/Bus/BusPendingBatchTest.php

@@ -41,12 +41,14 @@ public function test_pending_batch_may_be_configured_and_dispatched()
             //
         })->catch(function () {
             //
-        })->allowFailures()->onConnection('test-connection')->onQueue('test-queue');
+        })->allowFailures()->onConnection('test-connection')->onQueue('test-queue')->withOption('extra-option', 123);
 
         $this->assertSame('test-connection', $pendingBatch->connection());
         $this->assertSame('test-queue', $pendingBatch->queue());
         $this->assertCount(1, $pendingBatch->thenCallbacks());
         $this->assertCount(1, $pendingBatch->catchCallbacks());
+        $this->assertArrayHasKey('extra-option', $pendingBatch->options);
+        $this->assertSame(123, $pendingBatch->options['extra-option']);
 
         $repository = m::mock(BatchRepository::class);
         $repository->shouldReceive('store')->once()->with($pendingBatch)->andReturn($batch = m::mock(stdClass::class));