From 612cc9d698e4144959c016e23a3f096cd3455859 Mon Sep 17 00:00:00 2001 From: sampoyigi <6567634+sampoyigi@users.noreply.github.com> Date: Sat, 22 Feb 2025 14:14:13 +0000 Subject: [PATCH] PHP Linting (Pint) - Fix styling --- src/ApiResources/Coupons.php | 2 +- src/ApiResources/Transformers/CouponsTransformer.php | 2 +- src/Http/Controllers/Coupons.php | 8 ++++---- tests/ExtensionTest.php | 4 ++-- tests/Http/Requests/CouponRequestTest.php | 4 ++-- tests/Models/CouponHistoryTest.php | 2 +- tests/Models/Observers/CouponObserverTest.php | 2 +- tests/Models/Observers/OrderObserverTest.php | 2 +- tests/Models/Scopes/CouponScopeTest.php | 4 +++- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/ApiResources/Coupons.php b/src/ApiResources/Coupons.php index 96c33e1..2e09029 100644 --- a/src/ApiResources/Coupons.php +++ b/src/ApiResources/Coupons.php @@ -4,10 +4,10 @@ namespace Igniter\Coupons\ApiResources; +use Igniter\Api\Classes\ApiController; use Igniter\Api\Http\Actions\RestController; use Igniter\Coupons\ApiResources\Repositories\CouponsRepository; use Igniter\Coupons\ApiResources\Transformers\CouponsTransformer; -use Igniter\Api\Classes\ApiController; use Igniter\Coupons\Http\Requests\CouponRequest; /** diff --git a/src/ApiResources/Transformers/CouponsTransformer.php b/src/ApiResources/Transformers/CouponsTransformer.php index d9c5c8a..3b651e6 100644 --- a/src/ApiResources/Transformers/CouponsTransformer.php +++ b/src/ApiResources/Transformers/CouponsTransformer.php @@ -4,11 +4,11 @@ namespace Igniter\Coupons\ApiResources\Transformers; -use League\Fractal\Resource\Collection; use Igniter\Api\ApiResources\Transformers\CategoryTransformer; use Igniter\Api\ApiResources\Transformers\MenuTransformer; use Igniter\Api\Traits\MergesIdAttribute; use Igniter\Coupons\Models\Coupon; +use League\Fractal\Resource\Collection; use League\Fractal\TransformerAbstract; class CouponsTransformer extends TransformerAbstract diff --git a/src/Http/Controllers/Coupons.php b/src/Http/Controllers/Coupons.php index 8e13591..840bc1b 100644 --- a/src/Http/Controllers/Coupons.php +++ b/src/Http/Controllers/Coupons.php @@ -5,12 +5,12 @@ namespace Igniter\Coupons\Http\Controllers; use Igniter\Admin\Classes\AdminController; -use Igniter\Admin\Http\Actions\ListController; +use Igniter\Admin\Facades\AdminMenu; use Igniter\Admin\Http\Actions\FormController; -use Igniter\Local\Http\Actions\LocationAwareController; -use Igniter\Coupons\Models\Coupon; +use Igniter\Admin\Http\Actions\ListController; use Igniter\Coupons\Http\Requests\CouponRequest; -use Igniter\Admin\Facades\AdminMenu; +use Igniter\Coupons\Models\Coupon; +use Igniter\Local\Http\Actions\LocationAwareController; class Coupons extends AdminController { diff --git a/tests/ExtensionTest.php b/tests/ExtensionTest.php index ffaef34..e9fc6d1 100644 --- a/tests/ExtensionTest.php +++ b/tests/ExtensionTest.php @@ -4,7 +4,6 @@ namespace Igniter\Coupons\Tests; -use stdClass; use Igniter\Cart\Models\Order; use Igniter\Coupons\Extension; use Igniter\Coupons\Models\Actions\RedeemsCoupon; @@ -19,6 +18,7 @@ use Igniter\User\Models\Customer; use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Queue; +use stdClass; it('registers model observers correctly', function(): void { $extension = new class(app()) extends Extension @@ -81,7 +81,7 @@ public function testObservers() 'value' => 10, ]); - event('payregister.paypalexpress.extendFields', [new stdClass(), &$fields, $order, []]); + event('payregister.paypalexpress.extendFields', [new stdClass, &$fields, $order, []]); expect($fields['purchase_units'][0]['amount']['breakdown']['discount'])->toHaveCount(2) ->and($fields['purchase_units'][0]['amount']['breakdown']['discount']['value'])->toBe('10.00'); diff --git a/tests/Http/Requests/CouponRequestTest.php b/tests/Http/Requests/CouponRequestTest.php index af17d46..452dcf5 100644 --- a/tests/Http/Requests/CouponRequestTest.php +++ b/tests/Http/Requests/CouponRequestTest.php @@ -7,7 +7,7 @@ use Igniter\Coupons\Http\Requests\CouponRequest; it('returns correct attribute labels', function(): void { - $request = new CouponRequest(); + $request = new CouponRequest; $attributes = $request->attributes(); @@ -34,7 +34,7 @@ }); it('returns correct validation rules', function(): void { - $request = new CouponRequest(); + $request = new CouponRequest; $request->setRouteResolver(fn(): object => new class { diff --git a/tests/Models/CouponHistoryTest.php b/tests/Models/CouponHistoryTest.php index 8f2e154..da964c3 100644 --- a/tests/Models/CouponHistoryTest.php +++ b/tests/Models/CouponHistoryTest.php @@ -121,7 +121,7 @@ }); it('configures coupon history model correctly', function(): void { - $couponHistory = new CouponHistory(); + $couponHistory = new CouponHistory; expect(class_uses_recursive($couponHistory)) ->toContain(HasCustomer::class) diff --git a/tests/Models/Observers/CouponObserverTest.php b/tests/Models/Observers/CouponObserverTest.php index 613d49f..58e1a8d 100644 --- a/tests/Models/Observers/CouponObserverTest.php +++ b/tests/Models/Observers/CouponObserverTest.php @@ -17,7 +17,7 @@ expect($coupon->menus()->count())->toBe(1) ->and($coupon->categories()->count())->toBe(1); - (new CouponObserver())->deleting($coupon); + (new CouponObserver)->deleting($coupon); expect($coupon->categories()->count())->toBe(0) ->and($coupon->menus()->count())->toBe(0); diff --git a/tests/Models/Observers/OrderObserverTest.php b/tests/Models/Observers/OrderObserverTest.php index 3f591de..9bbc0f2 100644 --- a/tests/Models/Observers/OrderObserverTest.php +++ b/tests/Models/Observers/OrderObserverTest.php @@ -18,7 +18,7 @@ expect($order->coupon_history()->count())->toBe(1); - (new OrderObserver())->deleting($order); + (new OrderObserver)->deleting($order); expect($order->coupon_history()->count())->toBe(0); }); diff --git a/tests/Models/Scopes/CouponScopeTest.php b/tests/Models/Scopes/CouponScopeTest.php index ed5049a..3039486 100644 --- a/tests/Models/Scopes/CouponScopeTest.php +++ b/tests/Models/Scopes/CouponScopeTest.php @@ -9,7 +9,7 @@ use Mockery; beforeEach(function(): void { - $this->couponScope = new CouponScope(); + $this->couponScope = new CouponScope; $this->builder = Mockery::mock(Builder::class); }); @@ -32,6 +32,7 @@ ->with('categories.category_id', $categoryId) ->andReturnSelf(); $callback($query); + return true; })) ->andReturnSelf(); @@ -50,6 +51,7 @@ ->with('menus.menu_id', $menuId) ->andReturnSelf(); $callback($query); + return true; })) ->andReturnSelf();