Merge pull request #155 from loadpartner/garrett/tms-82-move-carriers…

…-to-carrier-folder

fix for phpstan check not working with tty + carrier folder

_ide_helper_actions.php

@@ -11,7 +11,7 @@
  * @method static dispatchSync(string $name)
  * @method static dispatchNow(string $name)
  * @method static dispatchAfterResponse(string $name)
- * @method static \App\Models\Carrier run(string $name)
+ * @method static \App\Models\Carriers\Carrier run(string $name)
  */
 class CreateCarrier
 {
@@ -25,7 +25,7 @@ class CreateCarrier
  * @method static dispatchSync(\App\Models\Carriers\CarrierSaferReport $carrierSaferReport)
  * @method static dispatchNow(\App\Models\Carriers\CarrierSaferReport $carrierSaferReport)
  * @method static dispatchAfterResponse(\App\Models\Carriers\CarrierSaferReport $carrierSaferReport)
- * @method static \App\Models\Carrier run(\App\Models\Carriers\CarrierSaferReport $carrierSaferReport)
+ * @method static \App\Models\Carriers\Carrier run(\App\Models\Carriers\CarrierSaferReport $carrierSaferReport)
  */
 class CreateCarrierFromSaferReport
 {
@@ -59,15 +59,15 @@ class FmcsaNameLookup
 {
 }
 /**
- * @method static \Lorisleiva\Actions\Decorators\JobDecorator|\Lorisleiva\Actions\Decorators\UniqueJobDecorator makeJob(\App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static \Lorisleiva\Actions\Decorators\UniqueJobDecorator makeUniqueJob(\App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static \Illuminate\Foundation\Bus\PendingDispatch dispatch(\App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchIf(bool $boolean, \App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchUnless(bool $boolean, \App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static dispatchSync(\App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static dispatchNow(\App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static dispatchAfterResponse(\App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
- * @method static \App\Models\Carrier run(\App\Models\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static \Lorisleiva\Actions\Decorators\JobDecorator|\Lorisleiva\Actions\Decorators\UniqueJobDecorator makeJob(\App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static \Lorisleiva\Actions\Decorators\UniqueJobDecorator makeUniqueJob(\App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static \Illuminate\Foundation\Bus\PendingDispatch dispatch(\App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchIf(bool $boolean, \App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchUnless(bool $boolean, \App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static dispatchSync(\App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static dispatchNow(\App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static dispatchAfterResponse(\App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
+ * @method static \App\Models\Carriers\Carrier run(\App\Models\Carriers\Carrier $carrier, ?string $name = null, ?string $mc_number = null, ?string $dot_number = null, ?int $physical_location_id = null, ?string $contact_email = null, ?string $contact_phone = null)
  */
 class UpdateCarrierGeneral
 {

app/Actions/Carriers/CreateCarrier.php

@@ -2,8 +2,8 @@
 
 namespace App\Actions\Carriers;
 
-use App\Http\Resources\CarrierResource;
-use App\Models\Carrier;
+use App\Http\Resources\Carriers\CarrierResource;
+use App\Models\Carriers\Carrier;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 

app/Actions/Carriers/CreateCarrierFromSaferReport.php

@@ -2,8 +2,8 @@
 
 namespace App\Actions\Carriers;
 
-use App\Http\Resources\CarrierResource;
-use App\Models\Carrier;
+use App\Http\Resources\Carriers\CarrierResource;
+use App\Models\Carriers\Carrier;
 use App\Models\Carriers\CarrierSaferReport;
 use App\Models\Location;
 use Lorisleiva\Actions\ActionRequest;

app/Actions/Carriers/FmcsaDOTLookup.php

@@ -2,10 +2,10 @@
 
 namespace App\Actions\Carriers;
 
-use App\Http\Resources\CarrierResource;
+use App\Http\Resources\Carriers\CarrierResource;
 use App\Http\Resources\Carriers\CarrierSaferReportResource;
 use App\Integrations\FmcsaService;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Carriers\CarrierSaferReport;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;

app/Actions/Carriers/FmcsaNameLookup.php

@@ -2,10 +2,10 @@
 
 namespace App\Actions\Carriers;
 
-use App\Http\Resources\CarrierResource;
+use App\Http\Resources\Carriers\CarrierResource;
 use App\Http\Resources\Carriers\CarrierSaferReportResource;
 use App\Integrations\FmcsaService;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Carriers\CarrierSaferReport;
 use Illuminate\Support\Collection;
 use Lorisleiva\Actions\ActionRequest;

app/Actions/Carriers/UpdateCarrierGeneral.php

@@ -2,8 +2,8 @@
 
 namespace App\Actions\Carriers;
 
-use App\Http\Resources\CarrierResource;
-use App\Models\Carrier;
+use App\Http\Resources\Carriers\CarrierResource;
+use App\Models\Carriers\Carrier;
 use App\Rules\ValidPhoneNumber;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;

app/Console/Commands/DemoEnvironmentSetup.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Facility;
 use App\Models\Location;
 use App\Models\Customers\Customer;

app/Console/Commands/PreCommitChecks.php

@@ -62,10 +62,11 @@ public function handle()
         return in_array(false, $this->checks) ? 1 : 0;
     }
 
-    protected function runProcess(array $command, string $check, callable $successCallback, array $env = []): void
+    protected function runProcess(array $command, string $check, callable $successCallback, array $env = [], bool $tty = true): void
     {
         try {
             $process = new Process($command);
+            $process->setTty($tty);
 
             if ($env) {
                 $process->setEnv($env);
@@ -79,6 +80,12 @@ protected function runProcess(array $command, string $check, callable $successCa
 
             $this->checks[$check] = $successCallback($output, $process);
         } catch (\Exception $e) {
+            if (str_contains($e->getMessage(), 'TTY') && $tty === true) {
+                logger()->info("TTY error, running without TTY");
+                $this->runProcess($command, $check, $successCallback, $env, false);
+                return;
+            }
+
             $this->error("Failed to run $check: " . $e->getMessage());
         }
     }
@@ -87,7 +94,6 @@ protected function runProcess(array $command, string $check, callable $successCa
     protected function getSuccessCallback(string $check): callable
     {
         return match($check) {
-            'phpstan' => fn($output, $process) => str_contains($output, '[OK] No errors'),
             default => fn($output, $process) => $process->isSuccessful()
         };
     }

app/Enums/Contactable.php

@@ -2,7 +2,7 @@
 declare(strict_types=1);
 namespace App\Enums;
 
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Customers\Customer;
 use App\Models\Shipments\Shipment;
 

app/Enums/Notable.php

@@ -2,7 +2,7 @@
 declare(strict_types=1);
 namespace App\Enums;
 
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Customers\Customer;
 use App\Models\Shipments\Shipment;
 

app/Http/Controllers/CarrierController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\CarrierResource;
-use App\Models\Carrier;
+use App\Http\Resources\Carriers\CarrierResource;
+use App\Models\Carriers\Carrier;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 

app/Http/Controllers/Shipments/ShipmentController.php

@@ -15,7 +15,7 @@
 use App\Http\Resources\ShipmentStopResource;
 use App\Http\Resources\TrailerSizeResource;
 use App\Http\Resources\TrailerTypeResource;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Facility;
 use App\Models\Shipments\TrailerSize;
 use App\Models\Shipments\TrailerType;

app/Http/Resources/CarrierResource.php → app/Http/Resources/Carriers/CarrierResource.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Carriers;
 
+use App\Http\Resources\LocationResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Models\Carrier
+ * @mixin \App\Models\Carriers\Carrier
  */
 class CarrierResource extends JsonResource
 {

app/Http/Resources/Carriers/CarrierSaferReportResource.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Resources\Carriers;
 
-use App\Http\Resources\CarrierResource;
+use App\Http\Resources\Carriers\CarrierResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Http/Resources/ShipmentResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Http\Resources\Carriers\CarrierResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 

app/Models/Carrier.php → app/Models/Carriers/Carrier.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Carriers;
 
-use App\Http\Resources\CarrierResource;
+use App\Http\Resources\Carriers\CarrierResource;
+use App\Models\Location;
 use App\Traits\HasOrganization;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;

app/Models/Carriers/CarrierSaferReport.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Carriers;
 
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Collection;

app/Models/Shipments/Shipment.php

@@ -3,7 +3,7 @@
 namespace App\Models\Shipments;
 
 use App\Http\Resources\ShipmentResource;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Customers\Customer;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\HasOrganization;

app/Policies/CarrierPolicy.php

@@ -2,7 +2,7 @@
 
 namespace App\Policies;
 
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\User;
 use Illuminate\Auth\Access\Response;
 

database/factories/CarrierFactory.php → database/factories/Carriers/CarrierFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Carriers;
 
 use App\Models\Location;
 use App\Models\Organizations\Organization;
@@ -9,7 +9,7 @@
 use Illuminate\Support\Str;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Carrier>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Carriers\Carrier>
  */
 class CarrierFactory extends Factory
 {

database/factories/Shipments/ShipmentFactory.php

@@ -4,7 +4,7 @@
 
 use App\Models\Location;
 use App\Models\Organizations\Organization;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Shipments\Shipment;
 use App\Models\Shipments\TrailerType;
 use Illuminate\Database\Eloquent\Factories\Factory;

database/factories/Shipments/ShipmentStopFactory.php

@@ -5,7 +5,7 @@
 use App\Enums\StopType;
 use App\Models\Location;
 use App\Models\Organizations\Organization;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Shipments\Shipment;
 use App\Models\Shipments\TrailerType;
 use Illuminate\Database\Eloquent\Factories\Factory;

database/seeders/DemoEnvironmentSeeder.php

@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Facility;
 use App\Models\Location;
 use App\Models\Shipments\Shipment;

tests/Feature/Carriers/CarrierSecurityTest.php

@@ -6,7 +6,7 @@
 use App\Models\Location;
 use App\Models\Organizations\Organization;
 use App\Models\User;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use Illuminate\Support\Facades\Context;
 use Inertia\Testing\AssertableInertia;
 

tests/Feature/Shipments/ShipmentSecurityTest.php

@@ -1,7 +1,7 @@
 <?php
 
 use App\Actions\Shipments\CreateShipment;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Facility;
 use App\Models\Customers\Customer;
 use App\Models\Organizations\Organization;

tests/Unit/Actions/Carriers/CarrierTest.php

@@ -4,7 +4,7 @@
 
 use App\Actions\Carriers\CreateCarrier;
 use App\Actions\Carriers\UpdateCarrierGeneral;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Location;
 use Illuminate\Support\Facades\DB;
 

tests/Unit/Actions/Shipments/ShipmentTest.php

@@ -8,7 +8,7 @@
 use App\Actions\Shipments\UpdateShipmentGeneral;
 use App\Actions\Shipments\UpdateShipmentCustomers;
 use App\Actions\Shipments\UpdateShipmentCarrierDetails;
-use App\Models\Carrier;
+use App\Models\Carriers\Carrier;
 use App\Models\Facility;
 use App\Models\Customers\Customer;
 use App\Models\Shipments\Shipment;