Merge pull request #20 from Laravel-Lang/1.x

Fixed alignment of PR elements
Laravel-Lang · Mar 24, 2024 · 263228b · 263228b
2 parents 2e1c765 + 40e37b0
commit 263228b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 33 deletions.
diff --git a/app/Http/Requests/AssignRequest.php b/app/Http/Requests/AssignRequest.php
@@ -15,20 +15,20 @@ class AssignRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'action' => ['required', 'string', 'in:opened,edited'],
+            'action' => ['required', 'string', 'in:opened'],
 
-            'pull_request'        => ['required', 'array'],
-            'pull_request.state'  => ['required', 'string', 'in:open'],
-            'pull_request.locked' => ['required', 'bool', 'declined'],
-            'pull_request.draft'  => ['required', 'bool', 'declined'],
+            'repository'             => ['required', 'array'],
+            'repository.name'        => ['required', 'string'],
+            'repository.owner.login' => ['required', 'string'],
 
+            'pull_request'            => ['required', 'array'],
+            'pull_request.user.login' => ['required', 'string'],
             'pull_request.number'     => ['required', 'numeric'],
             'pull_request.title'      => ['required', 'string'],
-            'pull_request.user.login' => ['required', 'string'],
 
-            'repository'             => ['required', 'array'],
-            'repository.name'        => ['required', 'string'],
-            'repository.owner.login' => ['required', 'string'],
+            'pull_request.state'  => ['required', 'string', 'in:open'],
+            'pull_request.locked' => ['required', 'bool', 'declined'],
+            'pull_request.draft'  => ['required', 'bool', 'declined'],
         ];
     }
 }
diff --git a/app/Http/Requests/DependabotRequest.php b/app/Http/Requests/DependabotRequest.php
@@ -18,18 +18,19 @@ public function rules(): array
         return [
             'action' => ['required', 'string', 'in:opened'],
 
+            'repository'             => ['required', 'array'],
+            'repository.name'        => ['required', 'string'],
+            'repository.owner.login' => ['required', 'string'],
+
             'pull_request'        => ['required', 'array'],
-            'pull_request.state'  => ['required', 'string', 'in:open'],
             'pull_request.number' => ['required', 'numeric'],
 
+            'pull_request.state'  => ['required', 'string', 'in:open'],
+            'pull_request.locked' => ['required', 'bool', 'declined'],
+            'pull_request.draft'  => ['required', 'bool', 'declined'],
+
             'sender'    => ['required', 'array'],
             'sender.id' => ['required', 'numeric', Rule::in(config('github.dependabot.id'))],
-
-            'organization'       => ['required', 'array'],
-            'organization.login' => ['required', 'string'],
-
-            'repository'      => ['required', 'array'],
-            'repository.name' => ['required', 'string'],
         ];
     }
 }
diff --git a/app/Http/Requests/TranslationRequest.php b/app/Http/Requests/TranslationRequest.php
@@ -6,7 +6,6 @@
 
 use App\Data\PullRequestData;
 use App\Rules\InCollectionRule;
-use Illuminate\Validation\Rule;
 use Spatie\LaravelData\Data;
 
 /** @method PullRequestData dto() */
@@ -19,22 +18,20 @@ public function rules(): array
         return [
             'action' => ['required', 'string', 'in:opened,edited,labeled'],
 
+            'repository'             => ['required', 'array'],
+            'repository.name'        => ['required', 'string'],
+            'repository.owner.login' => ['required', 'string'],
+
             'pull_request'          => ['required', 'array'],
-            'pull_request.state'    => ['required', 'string', 'in:open'],
-            'pull_request.locked'   => ['required', 'bool', 'declined'],
-            'pull_request.draft'    => ['required', 'bool', 'declined'],
             'pull_request.number'   => ['required', 'numeric'],
             'pull_request.head.sha' => ['required', 'string'],
-            'pull_request.labels'   => ['required', 'array', new InCollectionRule('name', 'machine')],
-
-            'sender'    => ['required', 'array'],
-            'sender.id' => ['required', 'numeric', Rule::in(config('github.actions.id'))],
-
-            'organization'       => ['required', 'array'],
-            'organization.login' => ['required', 'string'],
+            'pull_request.title'    => ['required', 'string'],
+            'pull_request.body'     => ['required', 'string'],
 
-            'repository'      => ['required', 'array'],
-            'repository.name' => ['required', 'string'],
+            'pull_request.state'  => ['required', 'string', 'in:open'],
+            'pull_request.locked' => ['required', 'bool', 'declined'],
+            'pull_request.draft'  => ['required', 'bool', 'declined'],
+            'pull_request.labels' => ['required', 'array', new InCollectionRule('name', 'machine')],
         ];
     }
 }
diff --git a/config/github.php b/config/github.php
@@ -37,10 +37,6 @@
         'delay' => 5 * 60,
     ],
 
-    'actions' => [
-        'id' => 41898282,
-    ],
-
     'webhooks' => [
         'github.assign'      => ['pull_request'],
         'github.dependabot'  => ['pull_request'],