Move models into Models dir

app/Actions/GetFailedSpeedtestData.php

@@ -2,7 +2,7 @@
 
 namespace App\Actions;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use Carbon\Carbon;
 use DB;

app/Actions/GetLatestSpeedtestData.php

@@ -4,7 +4,7 @@ namespace App\Actions;
 
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use DB;
 use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface;
 

app/Actions/GetSpeedtestTimeData.php

@@ -3,7 +3,7 @@
 namespace App\Actions;
 
 use App\Helpers\SettingsHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use Carbon\Carbon;
 use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface;

app/Helpers/BackupHelper.php

@@ -2,7 +2,7 @@
 
 namespace App\Helpers;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use DateTime;
 use Exception;

app/Helpers/EmailVerificationHelper.php

@@ -3,7 +3,7 @@
 namespace App\Helpers;
 
 use App\Auth\EmailVerification;
-use App\User;
+use App\Models\User;
 
 class EmailVerificationHelper {
     public static function checkVerificationAttempt($userID, $token)

app/Helpers/SettingsHelper.php

@@ -3,7 +3,7 @@
 namespace App\Helpers;
 
 use App\Events\TestNotificationEvent;
-use App\Setting;
+use App\Models\Setting;
 use Cache;
 use Carbon\Carbon;
 

app/Helpers/SpeedtestHelper.php

@@ -2,7 +2,7 @@
 
 namespace App\Helpers;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use App\Utils\OoklaTester;
 use Carbon\Carbon;
 use Exception;

app/Http/Controllers/AuthController.php

@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
 use App\LoginSession;
 use App\Rules\CurrentPasswordMatches;
-use App\User;
+use App\Models\User;
 use DateTime;
 use Hash;
 use Illuminate\Support\Facades\Request as RequestFacade;

app/Http/Controllers/SettingsController.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Helpers\SettingsHelper;
 use App\Rules\Cron;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;

app/Http/Controllers/SpeedtestController.php

@@ -9,7 +9,7 @@ use App\Actions\QueueSpeedtest;
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
 use App\Jobs\SpeedtestJob;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Http\Request;

app/Interfaces/SpeedtestProvider.php

@@ -2,7 +2,7 @@
 
 namespace App\Interfaces;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 
 interface SpeedtestProvider
 {

app/Models/Setting.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Casts\CommaSeparatedArrayCast;
 use App\Helpers\SettingsHelper;

app/Models/Speedtest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

app/Models/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -107,7 +107,7 @@ class User extends Authenticatable implements JWTSubject
 
     public function setPasswordAttribute($password)
     {
-        if ( !empty($password) ) {
+        if (!empty($password)) {
             $this->attributes['password'] = Hash::make($password);
         }
     }

app/Observers/SpeedtestObserver.php

@@ -3,7 +3,7 @@
 namespace App\Observers;
 
 use App\Exceptions\InfluxDBNotEnabledException;
-use App\Speedtest;
+use App\Models\Speedtest;
 use App\Utils\InfluxDB\InfluxDB;
 use Exception;
 use Log;

app/Providers/EventServiceProvider.php

@@ -11,7 +11,7 @@ use App\Listeners\SpeedtestFailedListener;
 use App\Listeners\SpeedtestOverviewListener;
 use App\Listeners\TestNotificationListener;
 use App\Observers\SpeedtestObserver;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;

app/Utils/InfluxDB/InfluxDB.php

@@ -5,7 +5,7 @@ namespace App\Utils\InfluxDB;
 use App\Exceptions\InfluxDBConnectionErrorException;
 use App\Exceptions\InfluxDBNotEnabledException;
 use App\Helpers\SettingsHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use InfluxDB\Client as Version1;
 use InfluxDB2\Client as Version2;
 use App\Utils\InfluxDB\InfluxDBWrapperInterface as Client;

app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php

@@ -2,7 +2,7 @@
 
 namespace App\Utils\InfluxDB;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use InfluxDB\Client;
 use InfluxDB\Database;

app/Utils/InfluxDB/InfluxDBWrapperInterface.php

@@ -2,7 +2,7 @@
 
 namespace App\Utils\InfluxDB;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 
 interface InfluxDBWrapperInterface
 {

app/Utils/OoklaTester.php

@@ -6,7 +6,7 @@ use App\Exceptions\SpeedtestFailureException;
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
 use App\Interfaces\SpeedtestProvider;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Cache;
 use Exception;
 use JsonException;

database/factories/SpeedtestFactory.php

@@ -2,7 +2,7 @@
 
 namespace Database\Factories;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class SpeedtestFactory extends Factory

database/factories/UserFactory.php

@@ -2,7 +2,7 @@
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
-use App\User;
+use App\Models\User;
 use Faker\Generator as Faker;
 use Illuminate\Support\Str;
 

database/migrations/2014_10_12_000000_create_users_table.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_05_18_211812_create_settings_table.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_06_21_171849_add_notifications_settings.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_07_06_105930_add_graph_settings.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_07_07_215412_add_notification_agent_settings.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_08_12_123941_add_healthchecks_settings.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_08_21_133343_add_authentication_settings.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_08_21_204656_add_conditional_notifications_settings.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_08_28_192136_add_show_failed_tests_setting.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_09_10_231121_add_widget_card_settings.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_12_19_211232_add_schedule_enabled_setting.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_12_19_234248_add_app_name_setting.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2020_12_20_001345_add_custom_healthchecks_setting.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2021_03_07_101259_add_speedtest_provider_setting.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2021_03_07_121716_update_speedtest_server_settings_text.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2021_04_10_082758_add_visible_columns_setting.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2021_04_10_102320_add_hidden_columns_setting.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/migrations/2021_04_10_182503_add_influx_db_settings.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use App\Setting;
+use App\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;

database/seeders/SpeedtestSeeder.php

@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Database\Seeder;
 
 class SpeedtestSeeder extends Seeder

routes/api.php

@@ -7,7 +7,7 @@ use App\Http\Controllers\HomepageDataController;
 use App\Http\Controllers\SettingsController;
 use App\Http\Controllers\SpeedtestController;
 use App\Http\Controllers\UpdateController;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 

tests/Feature/APISpeedtestTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Speedtest;
+use App\Models\Speedtest;
 use Faker\Factory;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;

tests/Unit/Controllers/SpeedtestController/DeleteTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Unit\Controllers\SpeedtestController;
 
 use App\Http\Controllers\SpeedtestController;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 

tests/Unit/Controllers/SpeedtestController/LatestTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Unit\Controllers\SpeedtestController;
 
 use App\Http\Controllers\SpeedtestController;
-use App\Speedtest;
+use App\Models\Speedtest;
 use DB;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;

tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper;
 
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use InvalidArgumentException;
 use Tests\TestCase;

tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Unit\Helpers\SpeedtestHelper;
 
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 

tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper;
 
 use App\Helpers\SettingsHelper;
 use App\Helpers\SpeedtestHelper;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 

tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestCompleteListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;

tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestCompleteListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;

tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestFailedListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;

tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestFailedListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;

tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestOverviewListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;

tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener;
 
 use App\Helpers\SettingsHelper;
 use App\Listeners\SpeedtestOverviewListener;
-use App\Speedtest;
+use App\Models\Speedtest;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use stdClass;