test: remove usage of old str helper

ibrunotome · Sep 6, 2020 · 228da65 · 228da65
1 parent 6f104ab
commit 228da65
Show file tree

Hide file tree

Showing 64 changed files with 294 additions and 263 deletions.
diff --git a/default-structure/app/Http/Controllers/Auth/EmailVerificationController.php b/default-structure/app/Http/Controllers/Auth/EmailVerificationController.php
@@ -5,7 +5,6 @@
 use App\Contracts\UserRepository;
 use App\Events\EmailWasVerifiedEvent;
 use App\Http\Controllers\Controller;
-use App\Models\User;
 use Exception;
 use Illuminate\Http\Response;
 

diff --git a/default-structure/app/Http/Controllers/Auth/TwoFactorAuthenticationController.php b/default-structure/app/Http/Controllers/Auth/TwoFactorAuthenticationController.php
@@ -7,7 +7,6 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DisableTwoFactorAuthenticationRequest;
 use App\Http\Requests\EnableTwoFactorAuthenticationRequest;
-use App\Models\User;
 use App\Support\ExceptionFormat;
 use App\Support\TwoFactorAuthenticator;
 use Exception;

diff --git a/default-structure/app/Services/DisableAccountService.php b/default-structure/app/Services/DisableAccountService.php
@@ -3,7 +3,6 @@
 namespace App\Services;
 
 use App\Contracts\UserRepository;
-use App\Models\User;
 use App\Notifications\AccountDisabledNotification;
 use App\Support\TwoFactorAuthenticator;
 use Exception;

diff --git a/default-structure/resources/lang/en_US/validation.php b/default-structure/resources/lang/en_US/validation.php
@@ -13,109 +13,110 @@
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
+    'accepted' => 'The :attribute must be accepted.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after' => 'The :attribute must be a date after :date.',
+    'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+    'alpha' => 'The :attribute may only contain letters.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num' => 'The :attribute may only contain letters and numbers.',
+    'array' => 'The :attribute must be an array.',
+    'before' => 'The :attribute must be a date before :date.',
+    'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+    'between' => [
         'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+        'file' => 'The :attribute must be between :min and :max kilobytes.',
+        'string' => 'The :attribute must be between :min and :max characters.',
+        'array' => 'The :attribute must have between :min and :max items.',
     ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_equals'          => 'The :attribute must be a date equal to :date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'gt'                   => [
+    'boolean' => 'The :attribute field must be true or false.',
+    'confirmed' => 'The :attribute confirmation does not match.',
+    'date' => 'The :attribute is not a valid date.',
+    'date_equals' => 'The :attribute must be a date equal to :date.',
+    'date_format' => 'The :attribute does not match the format :format.',
+    'different' => 'The :attribute and :other must be different.',
+    'digits' => 'The :attribute must be :digits digits.',
+    'digits_between' => 'The :attribute must be between :min and :max digits.',
+    'dimensions' => 'The :attribute has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'email' => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values.',
+    'exists' => 'The selected :attribute is invalid.',
+    'file' => 'The :attribute must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
         'numeric' => 'The :attribute must be greater than :value.',
-        'file'    => 'The :attribute must be greater than :value kilobytes.',
-        'string'  => 'The :attribute must be greater than :value characters.',
-        'array'   => 'The :attribute must have more than :value items.',
+        'file' => 'The :attribute must be greater than :value kilobytes.',
+        'string' => 'The :attribute must be greater than :value characters.',
+        'array' => 'The :attribute must have more than :value items.',
     ],
-    'gte'                  => [
+    'gte' => [
         'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
+        'file' => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string' => 'The :attribute must be greater than or equal :value characters.',
+        'array' => 'The :attribute must have :value items or more.',
     ],
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'lt'                   => [
+    'image' => 'The :attribute must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field does not exist in :other.',
+    'integer' => 'The :attribute must be an integer.',
+    'ip' => 'The :attribute must be a valid IP address.',
+    'ipv4' => 'The :attribute must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute must be a valid IPv6 address.',
+    'json' => 'The :attribute must be a valid JSON string.',
+    'lt' => [
         'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
+        'file' => 'The :attribute must be less than :value kilobytes.',
+        'string' => 'The :attribute must be less than :value characters.',
+        'array' => 'The :attribute must have less than :value items.',
     ],
-    'lte'                  => [
+    'lte' => [
         'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
+        'file' => 'The :attribute must be less than or equal :value kilobytes.',
+        'string' => 'The :attribute must be less than or equal :value characters.',
+        'array' => 'The :attribute must not have more than :value items.',
     ],
-    'max'                  => [
+    'max' => [
         'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'file' => 'The :attribute may not be greater than :max kilobytes.',
+        'string' => 'The :attribute may not be greater than :max characters.',
+        'array' => 'The :attribute may not have more than :max items.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
+    'mimes' => 'The :attribute must be a file of type: :values.',
+    'mimetypes' => 'The :attribute must be a file of type: :values.',
+    'min' => [
         'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+        'file' => 'The :attribute must be at least :min kilobytes.',
+        'string' => 'The :attribute must be at least :min characters.',
+        'array' => 'The :attribute must have at least :min items.',
     ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'not_regex'            => 'The :attribute format is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values are present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute format is invalid.',
+    'numeric' => 'The :attribute must be a number.',
+    'password' => 'The password is incorrect.',
+    'present' => 'The :attribute field must be present.',
+    'regex' => 'The :attribute format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
+    'same' => 'The :attribute and :other must match.',
+    'size' => [
         'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+        'file' => 'The :attribute must be :size kilobytes.',
+        'string' => 'The :attribute must be :size characters.',
+        'array' => 'The :attribute must contain :size items.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values',
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
-    'uuid'                 => 'The :attribute must be a valid UUID.',
+    'starts_with' => 'The :attribute must start with one of the following: :values.',
+    'string' => 'The :attribute must be a string.',
+    'timezone' => 'The :attribute must be a valid zone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'url' => 'The :attribute format is invalid.',
+    'uuid' => 'The :attribute must be a valid UUID.',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/default-structure/tests/Feature/ResetPasswordControllerTest.php b/default-structure/tests/Feature/ResetPasswordControllerTest.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Password;
-use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class PasswordResetTest extends TestCase

diff --git a/modular-structure/app/Application/Exceptions/Handler.php b/modular-structure/app/Application/Exceptions/Handler.php
@@ -2,6 +2,8 @@
 
 namespace App\Application\Exceptions;
 
+use App\Domain\Users\Exceptions\LockedException;
+use App\Interfaces\Http\Controllers\ResponseTrait;
 use Exception;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
@@ -11,8 +13,6 @@
 use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Http\Exceptions\ThrottleRequestsException;
 use Illuminate\Http\Response;
-use App\Domain\Users\Exceptions\LockedException;
-use App\Interfaces\Http\Controllers\ResponseTrait;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 

diff --git a/modular-structure/app/Application/Http/Middlewares/CheckTwoFactorAuthentication.php b/modular-structure/app/Application/Http/Middlewares/CheckTwoFactorAuthentication.php
@@ -2,10 +2,10 @@
 
 namespace App\Application\Http\Middlewares;
 
-use Closure;
-use Illuminate\Http\Response;
 use App\Infrastructure\Support\TwoFactorAuthenticator;
 use App\Interfaces\Http\Controllers\ResponseTrait;
+use Closure;
+use Illuminate\Http\Response;
 
 class CheckTwoFactorAuthentication
 {

diff --git a/modular-structure/app/Application/Http/Middlewares/RedirectIfAuthenticated.php b/modular-structure/app/Application/Http/Middlewares/RedirectIfAuthenticated.php
@@ -2,8 +2,8 @@
 
 namespace App\Application\Http\Middlewares;
 
-use Closure;
 use App\Interfaces\Http\Controllers\ResponseTrait;
+use Closure;
 
 class RedirectIfAuthenticated
 {

diff --git a/modular-structure/app/Application/Http/Middlewares/TrustProxies.php b/modular-structure/app/Application/Http/Middlewares/TrustProxies.php
@@ -10,7 +10,7 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array|string
      */
     protected $proxies;
 

diff --git a/modular-structure/app/Domain/Audits/Providers/EventServiceProvider.php b/modular-structure/app/Domain/Audits/Providers/EventServiceProvider.php
@@ -2,10 +2,10 @@
 
 namespace App\Domain\Audits\Providers;
 
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Neves\Events\Contracts\TransactionalEvent;
 use App\Domain\Audits\Entities\Audit;
 use App\Domain\Audits\Listeners\Observers\AuditObserver;
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Neves\Events\Contracts\TransactionalEvent;
 
 class EventServiceProvider extends ServiceProvider implements TransactionalEvent
 {

diff --git a/modular-structure/app/Domain/Notifications/Providers/DomainServiceProvider.php b/modular-structure/app/Domain/Notifications/Providers/DomainServiceProvider.php
@@ -2,9 +2,9 @@
 
 namespace App\Domain\Notifications\Providers;
 
-use Illuminate\Notifications\DatabaseNotification;
 use App\Domain\Notifications\Policies\NotificationPolicy;
 use App\Infrastructure\Abstracts\ServiceProvider;
+use Illuminate\Notifications\DatabaseNotification;
 
 class DomainServiceProvider extends ServiceProvider
 {

diff --git a/modular-structure/app/Domain/Notifications/Tests/Unit/ExceptionFromatTest.php b/modular-structure/app/Domain/Notifications/Tests/Unit/ExceptionFromatTest.php
@@ -2,8 +2,8 @@
 
 namespace App\Domain\Notifications\Tests\Unit;
 
-use Exception;
 use App\Infrastructure\Support\ExceptionFormat;
+use Exception;
 use Tests\TestCase;
 
 class ExceptionFromatTest extends TestCase

diff --git a/modular-structure/app/Domain/Users/Database/Seeds/PermissionsTableSeeder.php b/modular-structure/app/Domain/Users/Database/Seeds/PermissionsTableSeeder.php
@@ -2,8 +2,8 @@
 
 namespace App\Domain\Users\Database\Seeds;
 
-use Illuminate\Database\Seeder;
 use App\Domain\Users\Entities\Permission;
+use Illuminate\Database\Seeder;
 
 class PermissionsTableSeeder extends Seeder
 {

diff --git a/modular-structure/app/Domain/Users/Database/Seeds/RolesTableSeeder.php b/modular-structure/app/Domain/Users/Database/Seeds/RolesTableSeeder.php
@@ -2,9 +2,9 @@
 
 namespace App\Domain\Users\Database\Seeds;
 
-use Illuminate\Database\Seeder;
 use App\Domain\Users\Entities\Permission;
 use App\Domain\Users\Entities\Role;
+use Illuminate\Database\Seeder;
 
 class RolesTableSeeder extends Seeder
 {

diff --git a/modular-structure/app/Domain/Users/Database/Seeds/UsersTableSeed.php b/modular-structure/app/Domain/Users/Database/Seeds/UsersTableSeed.php
@@ -2,11 +2,11 @@
 
 namespace App\Domain\Users\Database\Seeds;
 
-use Illuminate\Database\Seeder;
 use App\Domain\Users\Entities\AuthorizedDevice;
 use App\Domain\Users\Entities\LoginHistory;
 use App\Domain\Users\Entities\Role;
 use App\Domain\Users\Entities\User;
+use Illuminate\Database\Seeder;
 
 class UsersTableSeed extends Seeder
 {

diff --git a/modular-structure/app/Domain/Users/Entities/User.php b/modular-structure/app/Domain/Users/Entities/User.php
@@ -2,6 +2,7 @@
 
 namespace App\Domain\Users\Entities;
 
+use App\Domain\Users\Notifications\ResetPasswordNotification;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Contracts\Translation\HasLocalePreference;
 use Illuminate\Database\Eloquent\Builder;
@@ -10,7 +11,6 @@
 use Illuminate\Notifications\Notifiable;
 use OwenIt\Auditing\Auditable;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
-use App\Domain\Users\Notifications\ResetPasswordNotification;
 use Spatie\Permission\Traits\HasRoles;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 

diff --git a/modular-structure/app/Domain/Users/Events/EmailWasVerifiedEvent.php b/modular-structure/app/Domain/Users/Events/EmailWasVerifiedEvent.php
@@ -2,8 +2,8 @@
 
 namespace App\Domain\Users\Events;
 
-use Illuminate\Queue\SerializesModels;
 use App\Domain\Users\Entities\User;
+use Illuminate\Queue\SerializesModels;
 
 class EmailWasVerifiedEvent
 {

diff --git a/modular-structure/app/Domain/Users/Events/TwoFactorAuthenticationWasDisabled.php b/modular-structure/app/Domain/Users/Events/TwoFactorAuthenticationWasDisabled.php
@@ -2,8 +2,8 @@
 
 namespace App\Domain\Users\Events;
 
-use Illuminate\Queue\SerializesModels;
 use App\Domain\Users\Entities\User;
+use Illuminate\Queue\SerializesModels;
 
 class TwoFactorAuthenticationWasDisabled
 {

diff --git a/modular-structure/app/Domain/Users/Http/Controllers/AuthorizeDeviceController.php b/modular-structure/app/Domain/Users/Http/Controllers/AuthorizeDeviceController.php
@@ -2,10 +2,10 @@
 
 namespace App\Domain\Users\Http\Controllers;
 
-use Exception;
-use Illuminate\Http\Response;
 use App\Domain\Users\Entities\AuthorizedDevice;
 use App\Interfaces\Http\Controllers\Controller;
+use Exception;
+use Illuminate\Http\Response;
 
 class AuthorizeDeviceController extends Controller
 {