Revert "test: fix deprecation errors (#2351)"

e04e0d5

tests/Datasets/AddOrganizationValidationErrors.php

@@ -4,7 +4,7 @@
 use App\Models\Organization;
 
 dataset('addOrganizationValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Organization id is missing' => [
             'state' => ['organization_id' => null],
             'errors' => fn () => ['organization_id' => __('validation.required', ['attribute' => __('organization.singular_name')])],
@@ -20,5 +20,5 @@
             ])->id],
             'errors' => fn () => ['organization_id' => __('The organization you have added does not participate in engagements.')],
         ],
-    ]);
+    ];
 });

tests/Datasets/BrowseEngagementsFormat.php

@@ -33,5 +33,5 @@
         ];
     }
 
-    return array_map('array_values', $testCases);
+    return $testCases;
 });

tests/Datasets/DestroyIndividualRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('destroyIndividualRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Current password is missing' => [
             'state' => ['current_password' => null],
             'errors' => fn () => ['current_password' => __('validation.required', ['attribute' => __('current password')])],
@@ -14,5 +14,5 @@
             'state' => ['current_password' => 'fake_password'],
             'errors' => fn () => ['current_password' => __('The provided password does not match your current password.')],
         ],
-    ]);
+    ];
 });

tests/Datasets/DestroyOrganizationRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('destroyOrganizationRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Current password is missing' => [
             'state' => ['current_password' => null],
             'errors' => fn () => ['current_password' => __('validation.required', ['attribute' => __('current password')])],
@@ -14,5 +14,5 @@
             'state' => ['current_password' => 'fake_password'],
             'errors' => fn () => ['current_password' => __('validation.current_password', ['attribute' => __('current password')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/DestroyProjectRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('destroyProjectRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Current password is missing' => [
             'state' => [],
             'errors' => fn () => ['current_password' => __('validation.required', ['attribute' => __('current password')])],
@@ -14,5 +14,5 @@
             'state' => ['current_password' => 'WrongPassword'],
             'errors' => fn () => ['current_password' => __('The provided password does not match your current password.')],
         ],
-    ]);
+    ];
 });

tests/Datasets/DestroyRegulatedOrganizationRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('destroyRegulatedOrganizationRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Current password is missing' => [
             'state' => ['current_password' => null],
             'errors' => fn () => ['current_password' => __('validation.required', ['attribute' => __('current password')])],
@@ -14,5 +14,5 @@
             'state' => ['current_password' => 'fake_password'],
             'errors' => fn () => ['current_password' => __('The provided password does not match your current password.')],
         ],
-    ]);
+    ];
 });

tests/Datasets/InviteParticipantValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('inviteParticipantValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Email is missing' => [
             'state' => ['email' => null],
             'errors' => fn () => ['email' => __('You must enter an email address.')],
@@ -22,5 +22,5 @@
             'state' => ['email' => '[email protected]'],
             'errors' => fn () => ['email' => __('The person with the email address you provided is not a consultation participant.')],
         ],
-    ]);
+    ];
 });

tests/Datasets/SaveOrganizationRolesRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('saveOrganizationRolesRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Roles is missing' => [
             'state' => ['roles' => null],
             'errors' => fn () => ['roles' => __('You must select a role for your organization.')],
@@ -14,5 +14,5 @@
             'state' => ['roles' => ['other']],
             'errors' => fn () => ['roles.0' => __('validation.exists', ['attribute' => __('roles')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreAccessNeedsPermissionsValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeAccessNeedsPermissionsValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Share access needs is missing' => [
             'state' => [],
             'errors' => fn () => ['share_access_needs' => __('validation.required', ['attribute' => __('share access needs')])],
@@ -10,5 +10,5 @@
             'state' => ['share_access_needs' => 123],
             'errors' => fn () => ['share_access_needs' => __('validation.boolean', ['attribute' => __('share access needs')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreEngagementFormatRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeEngagementFormatRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Format is missing' => [
             'state' => ['format' => null],
             'errors' => fn () => ['format' => __('validation.required', ['attribute' => __('engagement format')])],
@@ -10,5 +10,5 @@
             'state' => ['format' => ['xyz']],
             'errors' => fn () => ['format' => __('validation.exists', ['attribute' => __('engagement format')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreEngagementLanguagesRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeEngagementLanguagesRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Languages is missing' => [
             'state' => ['languages' => null],
             'errors' => fn () => ['languages' => __('validation.required', ['attribute' => __('languages')])],
@@ -18,5 +18,5 @@
             'state' => ['languages' => ['xyz']],
             'errors' => fn () => ['languages.0' => __('validation.exists', ['attribute' => __('languages')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreEngagementRecruitmentRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeEngagementRecruitmentRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Recruitment is missing' => [
             'state' => ['recruitment' => null],
             'errors' => fn () => ['recruitment' => __('validation.required', ['attribute' => __('recruitment method')])],
@@ -10,5 +10,5 @@
             'state' => ['recruitment' => ['xyz']],
             'errors' => fn () => ['recruitment' => __('validation.exists', ['attribute' => __('recruitment method')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreEngagementRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeEngagementRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Project id is missing' => [
             'state' => ['project_id' => null],
             'errors' => fn () => ['project_id' => __('validation.required', ['attribute' => __('project id')])],
@@ -29,5 +29,5 @@
             'state' => ['who' => 'other'],
             'errors' => fn () => ['who' => __('validation.exists', ['attribute' => __('who')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreOrganizationLanguagesRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeOrganizationLanguagesRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Languages is missing' => [
             'state' => ['roles' => null],
             'errors' => fn () => ['languages' => __('validation.required', ['attribute' => __('languages')])],
@@ -14,5 +14,5 @@
             'state' => ['languages' => []],
             'errors' => fn () => ['languages' => __('validation.required', ['attribute' => __('languages')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreOrganizationRequestValidationErrors.php

@@ -3,7 +3,7 @@
 use App\Models\Organization;
 
 dataset('storeOrganizationRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Type is missing' => [
             'state' => ['type' => null],
             'errors' => fn () => ['type' => __('validation.required', ['attribute' => __('organization type')])],
@@ -26,5 +26,5 @@
                 'name.fr' => __('An organization with this name already exists on our website. Please contact your colleagues to get an invitation. If this isn’t your organization, please use a different name.'),
             ],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreOrganizationTypeRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeOrganizationTypeRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Type is missing' => [
             'state' => ['type' => null],
             'errors' => fn () => ['type' => __('You must select what type of organization you are.')],
@@ -10,5 +10,5 @@
             'state' => ['type' => 'other'],
             'errors' => fn () => ['type' => __('validation.exists', ['attribute' => __('organization type')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreProjectContextRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeProjectContextRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Context type is missing' => [
             'state' => ['context' => null],
             'errors' => fn () => ['context' => __('validation.required', ['attribute' => __('project context')])],
@@ -26,5 +26,5 @@
             'state' => ['ancestor' => 1000000, 'context' => 'new'],
             'errors' => fn () => ['ancestor' => __('validation.exists', ['attribute' => __('previous project')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreProjectLanguagesRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeProjectLanguagesRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Languages type is missing' => [
             'state' => ['languages' => null],
             'errors' => fn () => ['languages' => __('validation.required', ['attribute' => __('project languages')])],
@@ -14,5 +14,5 @@
             'state' => ['languages' => []],
             'errors' => fn () => ['languages' => __('validation.required', ['attribute' => __('project languages')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreProjectRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeProjectRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Projectable type is missing' => [
             'state' => ['projectable_type' => null],
             'errors' => fn () => ['projectable_type' => __('validation.required', ['attribute' => __('projectable type')])],
@@ -53,5 +53,5 @@
             'state' => ['name.en' => false],
             'errors' => fn () => ['name.en' => __('validation.string', ['attribute' => __('project name (English)')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreRegulatedOrganizationLanguagesRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeRegulatedOrganizationLanguagesRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Languages is missing' => [
             'state' => ['languages' => null],
             'errors' => fn () => ['languages' => __('validation.required', ['attribute' => __('languages')])],
@@ -10,5 +10,5 @@
             'state' => ['languages' => false],
             'errors' => fn () => ['languages' => __('validation.array', ['attribute' => __('languages')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreRegulatedOrganizationRequestValidationErrors.php

@@ -6,7 +6,7 @@
 dataset('storeRegulatedOrganizationRequestValidationErrors', function () {
     $businessType = RegulatedOrganizationType::Business->value;
 
-    return array_map('array_values', [
+    return [
         'Type is missing' => [
             'state' => ['type' => null],
             'errors' => fn () => ['type' => __('validation.required', ['attribute' => __('organization type')])],
@@ -36,5 +36,5 @@
                 'name.fr' => __('A :type with this name already exists.', ['type' => $businessType]),
             ],
         ],
-    ]);
+    ];
 });

tests/Datasets/StoreRegulatedOrganizationTypeRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('storeRegulatedOrganizationTypeRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Type is missing' => [
             'state' => ['type' => null],
             'errors' => fn () => ['type' => __('You must select what type of organization you are.')],
@@ -14,5 +14,5 @@
             'state' => ['type' => 'other'],
             'errors' => fn () => ['type' => __('validation.exists', ['attribute' => __('organization type')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/UpdateEngagementLanguagesRequestValidationErrors.php

@@ -1,7 +1,7 @@
 <?php
 
 dataset('updateEngagementLanguagesRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Languages is missing' => [
             'state' => ['languages' => null],
             'errors' => fn () => ['languages' => __('validation.required', ['attribute' => __('languages')])],
@@ -18,5 +18,5 @@
             'state' => ['languages' => ['xyz']],
             'errors' => fn () => ['languages.0' => __('validation.exists', ['attribute' => __('languages')])],
         ],
-    ]);
+    ];
 });

tests/Datasets/UpdateEngagementRequestValidationErrors.php

@@ -6,7 +6,7 @@
 use App\Enums\MeetingType;
 
 dataset('updateEngagementRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Name is missing' => [
             ['name' => null],
             fn () => [
@@ -648,5 +648,5 @@
                 'meetingType' => MeetingType::InPerson->value,
             ],
         ],
-    ]);
+    ];
 });

tests/Datasets/UpdateIndividualCommunicationAndConsultationPreferencesRequestValidationErrors.php

@@ -4,7 +4,7 @@
 use App\Models\User;
 
 dataset('updateIndividualCommunicationAndConsultationPreferencesRequestValidationErrors', function () {
-    return array_map('array_values', [
+    return [
         'Preferred contact person is missing' => [
             'state' => ['preferred_contact_person' => null],
             'errors' => fn () => ['preferred_contact_person' => __('validation.required', ['attribute' => __('Preferred contact person')])],
@@ -121,5 +121,5 @@
             'state' => ['meeting_types' => ['other']],
             'errors' => fn () => ['meeting_types.0' => __('validation.exists', ['attribute' => __('Ways to attend')])],
         ],
-    ]);
+    ];
 });