Merge pull request #49 from saloonphp/fix/v3-fix-stubs

Fix | V3 Update Stubs

config/saloon.php

@@ -26,12 +26,13 @@
     |--------------------------------------------------------------------------
     |
     | By default, this package will create any classes within
-    | /app/Http/Integrations directory. If you're using
+    | `/app/Http/Integrations` directory. If you're using
     | a different design approach, then your classes
     | may be in a different place. You can change
     | that location so that the saloon:list
     | command will still find your files
     |
     */
-    'integrations_path' => 'App/Http/Integrations',
+
+    'integrations_path' => base_path('App/Http/Integrations'),
 ];

src/Console/Commands/MakeCommand.php

@@ -26,7 +26,7 @@ abstract class MakeCommand extends GeneratorCommand
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/' . $this->resolveStubName());
+        return $this->resolveStubPath('/../../../stubs/' . $this->resolveStubName());
     }
 
     protected function resolveStubName(): string

src/Console/Commands/stubs/saloon.authenticator.stub → stubs/saloon.authenticator.stub

@@ -2,7 +2,7 @@
 
 namespace {{ namespace }};
 
-use Saloon\Contracts\PendingRequest;
+use Saloon\Http\PendingRequest;
 use Saloon\Contracts\Authenticator;
 
 class {{ class }} implements Authenticator
@@ -14,9 +14,6 @@ class {{ class }} implements Authenticator
 
     /**
      * Apply the authentication to the request.
-     *
-     * @param PendingRequest $pendingRequest
-     * @return void
      */
     public function set(PendingRequest $pendingRequest): void
     {

src/Console/Commands/stubs/saloon.connector.stub → stubs/saloon.connector.stub

@@ -11,8 +11,6 @@ class {{ class }} extends Connector
 
     /**
      * The Base URL of the API
-     *
-     * @return string
      */
     public function resolveBaseUrl(): string
     {
@@ -21,8 +19,6 @@ class {{ class }} extends Connector
 
     /**
      * Default headers for every request
-     *
-     * @return string[]
      */
     protected function defaultHeaders(): array
     {
@@ -31,8 +27,6 @@ class {{ class }} extends Connector
 
     /**
      * Default HTTP client options
-     *
-     * @return string[]
      */
     protected function defaultConfig(): array
     {

src/Console/Commands/stubs/saloon.oauth-connector.stub → stubs/saloon.oauth-connector.stub

@@ -14,18 +14,14 @@ class {{ class }} extends Connector
 
     /**
      * The Base URL of the API.
-     *
-     * @return string
      */
     public function resolveBaseUrl(): string
     {
         return '';
     }
 
     /**
-     * Define the default OAuth2 Config.
-     *
-     * @return OAuthConfig
+     * The OAuth2 configuration
      */
     protected function defaultOauthConfig(): OAuthConfig
     {

src/Console/Commands/stubs/saloon.plugin.stub → stubs/saloon.plugin.stub

@@ -2,7 +2,7 @@
 
 namespace {{ namespace }};
 
-use Saloon\Contracts\PendingRequest;
+use Saloon\Http\PendingRequest;
 
 trait {{ class }}
 {

src/Console/Commands/stubs/saloon.request.stub → stubs/saloon.request.stub

@@ -8,16 +8,12 @@ use Saloon\Http\Request;
 class {{ class }} extends Request
 {
     /**
-     * Define the HTTP method
-     *
-     * @var Method
+     * The HTTP method of the request
      */
     protected Method $method = Method::GET;
 
     /**
-     * Define the endpoint for the request
-     *
-     * @return string
+     * The endpoint for the request
      */
     public function resolveEndpoint(): string
     {