fix conflicts

laravel · Aug 27, 2020 · 603a5bb · 603a5bb
2 parents 31b07c1 + ac8a7ba
commit 603a5bb
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 19 deletions.
diff --git a/billing.md b/billing.md
@@ -62,7 +62,7 @@ Laravel Cashier provides an expressive, fluent interface to [Stripe's](https://s
 
 When upgrading to a new version of Cashier, it's important that you carefully review [the upgrade guide](https://github.com/laravel/cashier-stripe/blob/master/UPGRADE.md).
 
-> {note} To prevent breaking changes, Cashier uses a fixed Stripe API version. Cashier 11 utilizes Stripe API version `2020-03-02`. The Stripe API version will be updated on minor releases in order to make use of new Stripe features and improvements.
+> {note} To prevent breaking changes, Cashier uses a fixed Stripe API version. Cashier 12 utilizes Stripe API version `2020-03-02`. The Stripe API version will be updated on minor releases in order to make use of new Stripe features and improvements.
 
 <a name="installation"></a>
 ## Installation
@@ -711,7 +711,7 @@ By default, Stripe will prorate charges when adding or removing plans from a sub
 
 #### Quantities
 
-If you would like to update quantities on individual subscription plans, you may do so using the [existing quantity methods](subscription-quantity) and passing the name of the plan as an additional argument to the method:
+If you would like to update quantities on individual subscription plans, you may do so using the [existing quantity methods](#subscription-quantity) and passing the name of the plan as an additional argument to the method:
 
     $user = User::find(1);
 

diff --git a/blade.md b/blade.md
@@ -13,6 +13,7 @@
     - [The Loop Variable](#the-loop-variable)
     - [Comments](#comments)
     - [PHP](#php)
+    - [The `@once` Directive](#the-once-directive)
 - [Forms](#forms)
     - [CSRF Field](#csrf-field)
     - [Method Field](#method-field)
@@ -415,6 +416,19 @@ In some situations, it's useful to embed PHP code into your views. You can use t
 
 > {tip} While Blade provides this feature, using it frequently may be a signal that you have too much logic embedded within your template.
 
+<a name="the-once-directive"></a>
+### The `@once` Directive
+
+The `@once` directive allows you to define a portion of the template that will only be evaluate once per rendering cycle. This may be useful for pushing a given piece of JavaScript into the page's header using [stacks](#stacks). For example, if you are rendering a given [component](#components) within a loop, you may wish to only push the JavaScript to the header the the first time the component is rendered:
+
+    @once
+        @push('scripts')
+            <script>
+                // Your custom JavaScript...
+            </script>
+        @endpush
+    @endonce
+
 <a name="forms"></a>
 ## Forms
 
@@ -628,7 +642,7 @@ Blade components also allow you to access the component name, attributes, and sl
             // $data['attributes'];
             // $data['slot'];
 
-            return view('components.alert');
+            return '<div>Component content</div>';
         };
     }
 

diff --git a/cashier-paddle.md b/cashier-paddle.md
@@ -43,8 +43,6 @@
 <a name="introduction"></a>
 ## Introduction
 
-> {note} Cashier Paddle is currently in beta. During the beta period things can and probably will change. Don't use Cashier Paddle in production until a stable version has been released. We appreciate your help with testing and reporting any bugs.
-
 Laravel Cashier Paddle provides an expressive, fluent interface to [Paddle's](https://paddle.com) subscription billing services. It handles almost all of the boilerplate subscription billing code you are dreading. In addition to basic subscription management, Cashier can handle: coupons, swapping subscription, subscription "quantities", cancellation grace periods, and more.
 
 While working with Cashier we recommend you also refer to Paddle's [user guides](https://developer.paddle.com/guides) and [API documentation](https://developer.paddle.com/api-reference/intro).
@@ -210,6 +208,7 @@ Therefore, when displaying subscriptions you should always inform the user which
     $subscription = $user->subscription('default');
 
     $customerEmailAddress = $subscription->paddleEmail();
+    $paymentMethod = $subscription->paymentMethod();
     $cardBrand = $subscription->cardBrand();
     $cardLastFour = $subscription->cardLastFour();
     $cardExpirationDate = $subscription->cardExpirationDate();
@@ -813,12 +812,6 @@ The `charge` method accepts an array as its third argument, allowing you to pass
         'custom_option' => $value,
     ]);
 
-You may also use the `charge` method without an underlying customer or user:
-
-    use App\Models\User;
-
-    $payLink = (new User)->charge(12.99, 'Product title');
-
 Charges happen in the currency specified in the `cashier.currency` configuration option. By default, this is set to USD. You may override the default currency by setting the `CASHIER_CURRENCY` in your `.env` file:
 
     CASHIER_CURRENCY=EUR

diff --git a/horizon.md b/horizon.md
@@ -18,10 +18,6 @@ Horizon provides a beautiful dashboard and code-driven configuration for your La
 
 All of your worker configuration is stored in a single, simple configuration file, allowing your configuration to stay in source control where your entire team can collaborate.
 
-<p align="center">
-<img src="https://res.cloudinary.com/dtfbvvkyp/image/upload/v1537195039/photos/Test.png" width="600" height="481">
-</p>
-
 <a name="installation"></a>
 ## Installation
 

diff --git a/packages.md b/packages.md
@@ -280,6 +280,12 @@ Once your view components are registered in a service provider, you may referenc
 
     <x-courier-button />
 
+#### Anonymous Components
+
+If your package contains anonymous components, they must be placed within a `components` directory of your package's "views" directory (as specified by `loadViewsFrom`). Then, you may render them by prefixing the component name with the package's view namespace:
+
+    <x-courier::alert />
+
 <a name="commands"></a>
 ## Commands
 

diff --git a/providers.md b/providers.md
@@ -91,7 +91,7 @@ If your service provider registers many simple bindings, you may wish to use the
          */
         public $singletons = [
             DowntimeNotifier::class => PingdomDowntimeNotifier::class,
-            ServerToolsProvider::class => ServerToolsProvider::class,
+            ServerProvider::class => ServerToolsProvider::class,
         ];
     }
 

diff --git a/queues.md b/queues.md
@@ -564,7 +564,7 @@ In this example, the job is released for ten seconds if the application is unabl
 
 #### Timeout
 
-> {note} The `timeout` feature is optimized for PHP 7.1+ and the `pcntl` PHP extension.
+> {note} The `pcntl` PHP extension must be installed in order to specify job timeouts.
 
 Likewise, the maximum number of seconds that jobs can run may be specified using the `--timeout` switch on the Artisan command line:
 
@@ -816,11 +816,11 @@ You may define a `failed` method directly on your job class, allowing you to per
 
     use App\Models\Podcast;
     use App\Services\AudioProcessor;
-    use Exception;
     use Illuminate\Bus\Queueable;
     use Illuminate\Contracts\Queue\ShouldQueue;
     use Illuminate\Queue\InteractsWithQueue;
     use Illuminate\Queue\SerializesModels;
+    use Throwable;
 
     class ProcessPodcast implements ShouldQueue
     {

diff --git a/telescope.md b/telescope.md
@@ -35,7 +35,7 @@
 Laravel Telescope is an elegant debug assistant for the Laravel framework. Telescope provides insight into the requests coming into your application, exceptions, log entries, database queries, queued jobs, mail, notifications, cache operations, scheduled tasks, variable dumps and more. Telescope makes a wonderful companion to your local Laravel development environment.
 
 <p align="center">
-<img src="https://res.cloudinary.com/dtfbvvkyp/image/upload/v1539110860/Screen_Shot_2018-10-09_at_1.47.23_PM.png" width="600">
+<img src="https://laravel.com/assets/img/examples/Screen_Shot_2018-10-09_at_1.47.23_PM.png" width="600">
 </p>
 
 <a name="installation"></a>