Skip to content

Commit 6badf21

Browse files
glennjacobsStyleCIBot
glennjacobs
authored and
StyleCIBot
committed
Apply fixes from StyleCI
1 parent defd8b5 commit 6badf21

File tree

72 files changed

+396
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+396
-288
lines changed

‎database/migrations/2021_08_10_101547_create_media_table.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class CreateMediaTable extends Migration
88
{
99
public function up()
1010
{
11-
if (! Schema::hasTable('media')) {
11+
if (!Schema::hasTable('media')) {
1212
Schema::create('media', function (Blueprint $table) {
1313
$table->bigIncrements('id');
1414

‎database/migrations/2021_08_17_142630_create_activity_log_table.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public function up()
1010
{
1111
$tableName = config('activitylog.table_name');
1212

13-
if (! Schema::hasTable($tableName)) {
13+
if (!Schema::hasTable($tableName)) {
1414
Schema::create($tableName, function (Blueprint $table) {
1515
$table->bigIncrements('id');
1616
$table->string('log_name')->nullable();

‎database/state/ConvertProductTypeAttributesToProducts.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function run()
1313
{
1414
$prefix = config('getcandy.database.table_prefix');
1515

16-
if (! $this->canRun()) {
16+
if (!$this->canRun()) {
1717
return;
1818
}
1919

‎database/state/EnsureDefaultTaxClassExists.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class EnsureDefaultTaxClassExists
99
{
1010
public function run()
1111
{
12-
if (! $this->canRun() || ! $this->shouldRun()) {
12+
if (!$this->canRun() || !$this->shouldRun()) {
1313
return;
1414
}
1515

@@ -32,6 +32,6 @@ protected function canRun()
3232

3333
protected function shouldRun()
3434
{
35-
return ! TaxClass::whereDefault(true)->count();
35+
return !TaxClass::whereDefault(true)->count();
3636
}
3737
}

‎database/state/EnsureUserOrdersHaveACustomer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class EnsureUserOrdersHaveACustomer
1010
{
1111
public function run()
1212
{
13-
if (! $this->canRun()) {
13+
if (!$this->canRun()) {
1414
return;
1515
}
1616

‎src/Actions/Carts/CalculateLine.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ public function __construct(
2020
/**
2121
* Execute the action.
2222
*
23-
* @param CartLine $cartLine
24-
* @param \Illuminate\Database\Eloquent\Collection $customerGroups
23+
* @param CartLine $cartLine
24+
* @param \Illuminate\Database\Eloquent\Collection $customerGroups
25+
*
2526
* @return void
2627
*/
2728
public function execute(

‎src/Actions/Carts/CreateOrder.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public function __construct(OrderReferenceGeneratorInterface $generator)
2323
/**
2424
* Execute the action.
2525
*
26-
* @param \GetCandy\Models\Cart $cart
26+
* @param \GetCandy\Models\Cart $cart
27+
*
2728
* @return void
2829
*/
2930
public function execute(

‎src/Actions/Carts/MergeCart.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ class MergeCart
1111
/**
1212
* Execute the action.
1313
*
14-
* @param CartLine $cartLine
15-
* @param \Illuminate\Database\Eloquent\Collection $customerGroups
14+
* @param CartLine $cartLine
15+
* @param \Illuminate\Database\Eloquent\Collection $customerGroups
16+
*
1617
* @return void
1718
*/
1819
public function execute(Cart $target, Cart $source)

‎src/Actions/Carts/ValidateCartForOrder.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class ValidateCartForOrder
1616
/**
1717
* Execute the action.
1818
*
19-
* @param \GetCandy\Models\Cart $cart
19+
* @param \GetCandy\Models\Cart $cart
20+
*
2021
* @return bool
2122
*/
2223
public function execute(
@@ -31,7 +32,7 @@ public function execute(
3132
}
3233

3334
// Do we have a billing address?
34-
if (! $cart->billingAddress) {
35+
if (!$cart->billingAddress) {
3536
throw new BillingAddressMissingException(
3637
__('getcandy::exceptions.carts.billing_missing')
3738
);
@@ -48,7 +49,7 @@ public function execute(
4849

4950
// Is this cart shippable and if so, does it have a shipping address.
5051
if ($cart->getManager()->isShippable()) {
51-
if (! $cart->shippingAddress) {
52+
if (!$cart->shippingAddress) {
5253
throw new ShippingAddressMissingException(
5354
__('getcandy::exceptions.carts.shipping_missing')
5455
);
@@ -64,7 +65,7 @@ public function execute(
6465
}
6566

6667
// Do we have a shipping option applied?
67-
if (! $cart->getManager()->getShippingOption()) {
68+
if (!$cart->getManager()->getShippingOption()) {
6869
throw new ShippingOptionMissingException();
6970
}
7071
}

‎src/Actions/Collections/SortProducts.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ class SortProducts
1010
/**
1111
* Execute the action.
1212
*
13-
* @param Model $owner
14-
* @param \Illuminate\Support\Collection $groups
13+
* @param Model $owner
14+
* @param \Illuminate\Support\Collection $groups
15+
*
1516
* @return void
1617
*/
1718
public function execute(Collection $collection)

‎src/Actions/Collections/SortProductsByPrice.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ class SortProductsByPrice
1111
/**
1212
* Execute the action.
1313
*
14-
* @param Model $owner
15-
* @param \Illuminate\Support\Collection $groups
14+
* @param Model $owner
15+
* @param \Illuminate\Support\Collection $groups
16+
*
1617
* @return void
1718
*/
1819
public function execute(Collection $products, Currency $currency, $direction = 'asc')

‎src/Actions/Collections/SortProductsBySku.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ class SortProductsBySku
99
/**
1010
* Execute the action.
1111
*
12-
* @param Model $owner
13-
* @param \Illuminate\Support\Collection $groups
12+
* @param Model $owner
13+
* @param \Illuminate\Support\Collection $groups
14+
*
1415
* @return void
1516
*/
1617
public function execute(Collection $products, $direction = 'asc')

‎src/Actions/Taxes/GetTaxZonePostcode.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ class GetTaxZonePostcode
99
/**
1010
* Execute the action.
1111
*
12-
* @param string $postcode
12+
* @param string $postcode
13+
*
1314
* @return null|\GetCandy\Models\TaxZonePostcode
1415
*/
1516
public function execute($postcode)
@@ -20,7 +21,7 @@ public function execute($postcode)
2021
return $postcodeZone;
2122
}
2223

23-
if (! $postcodeZone) {
24+
if (!$postcodeZone) {
2425
return null;
2526
}
2627

@@ -32,7 +33,7 @@ public function execute($postcode)
3233
})->sort(fn ($current, $next) => $current['matches'] < $next['matches'])->first();
3334

3435
// Give up, use default...
35-
if (! $match) {
36+
if (!$match) {
3637
return null;
3738
}
3839

@@ -42,7 +43,8 @@ public function execute($postcode)
4243
/**
4344
* Return the zone or zones which match this postcode.
4445
*
45-
* @param string $postcode
46+
* @param string $postcode
47+
*
4648
* @return \GetCandy\Models\TaxZonePostcode|\Illuminate\Support\Collection
4749
*/
4850
protected function getZoneMatches($postcode)
@@ -59,8 +61,9 @@ protected function getZoneMatches($postcode)
5961
/**
6062
* Match wildcard postcodes and return number of matches.
6163
*
62-
* @param string $wildcard
63-
* @param string $haystack
64+
* @param string $wildcard
65+
* @param string $haystack
66+
*
6467
* @return int
6568
*/
6669
private function matchWildcard($wildcard, $haystack)

‎src/Addons/Manifest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ public function build()
4343
/**
4444
* Format a given composer package into our addon format.
4545
*
46-
* @param array $package
46+
* @param array $package
47+
*
4748
* @return array
4849
*/
4950
protected function formatPackage($package)
5051
{
51-
if (! $provider = $package['extra']['laravel']['providers'][0] ?? null) {
52+
if (!$provider = $package['extra']['laravel']['providers'][0] ?? null) {
5253
return;
5354
}
5455

‎src/Base/AttributeManifestInterface.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ interface AttributeManifestInterface
99
/**
1010
* Add an attribute type.
1111
*
12-
* @param string $classname
12+
* @param string $classname
13+
*
1314
* @return void
1415
*/
1516
public function addType($classname);
@@ -24,7 +25,8 @@ public function getTypes(): Collection;
2425
/**
2526
* Return an attribute type by it's key.
2627
*
27-
* @param string $handle
28+
* @param string $handle
29+
*
2830
* @return string|null
2931
*/
3032
public function getType($handle);

‎src/Base/BaseModel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ abstract class BaseModel extends Model
99
/**
1010
* Create a new instance of the Model.
1111
*
12-
* @param array $attributes
12+
* @param array $attributes
1313
*/
1414
public function __construct(array $attributes = [])
1515
{

‎src/Base/CartSessionInterface.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,19 @@ public function manager();
3333
/**
3434
* Associate a cart to a user.
3535
*
36-
* @param \GetCandy\Models\Cart $cart
37-
* @param \Illuminate\Contracts\Auth\Authenticatable $user
38-
* @param string $policy
36+
* @param \GetCandy\Models\Cart $cart
37+
* @param \Illuminate\Contracts\Auth\Authenticatable $user
38+
* @param string $policy
39+
*
3940
* @return void
4041
*/
4142
public function associate(Cart $cart, Authenticatable $user, $policy);
4243

4344
/**
4445
* Use the given cart and set to the session.
4546
*
46-
* @param \GetCandy\Models\Cart $cart
47+
* @param \GetCandy\Models\Cart $cart
48+
*
4749
* @return void
4850
*/
4951
public function use(Cart $cart);
@@ -58,15 +60,17 @@ public function getSessionKey();
5860
/**
5961
* Set the cart session channel.
6062
*
61-
* @param \GetCandy\Models\Channel $channel
63+
* @param \GetCandy\Models\Channel $channel
64+
*
6265
* @return self
6366
*/
6467
public function setChannel(Channel $channel);
6568

6669
/**
6770
* Set the cart session currency.
6871
*
69-
* @param \GetCandy\Models\Currency $currency
72+
* @param \GetCandy\Models\Currency $currency
73+
*
7074
* @return self
7175
*/
7276
public function setCurrency(Currency $currency);

‎src/Base/Casts/AsAttributeData.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ class AsAttributeData implements Castable
1313
/**
1414
* Get the caster class to use when casting from / to this cast target.
1515
*
16-
* @param array $arguments
16+
* @param array $arguments
17+
*
1718
* @return object|string
1819
*/
1920
public static function castUsing(array $arguments)
2021
{
21-
return new class() implements CastsAttributes
22-
{
22+
return new class() implements CastsAttributes {
2323
public function get($model, $key, $value, $attributes)
2424
{
25-
if (! isset($attributes[$key])) {
25+
if (!isset($attributes[$key])) {
2626
return null;
2727
}
2828

@@ -31,7 +31,7 @@ public function get($model, $key, $value, $attributes)
3131
$returnData = new Collection();
3232

3333
foreach ($data as $key => $item) {
34-
if (! in_array(FieldType::class, class_implements($item['field_type']))) {
34+
if (!in_array(FieldType::class, class_implements($item['field_type']))) {
3535
throw new FieldTypeException('This field type is not supported.');
3636
}
3737
$returnData->put($key, new $item['field_type']($item['value']));

‎src/Base/Casts/Price.php

+10-8
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ class Price implements CastsAttributes
1212
/**
1313
* Cast the given value.
1414
*
15-
* @param \Illuminate\Database\Eloquent\Model $model
16-
* @param string $key
17-
* @param mixed $value
18-
* @param array $attributes
15+
* @param \Illuminate\Database\Eloquent\Model $model
16+
* @param string $key
17+
* @param mixed $value
18+
* @param array $attributes
19+
*
1920
* @return \GetCandy\DataTypes\Price
2021
*/
2122
public function get($model, $key, $value, $attributes)
@@ -46,10 +47,11 @@ public function get($model, $key, $value, $attributes)
4647
/**
4748
* Prepare the given value for storage.
4849
*
49-
* @param \Illuminate\Database\Eloquent\Model $model
50-
* @param string $key
51-
* @param \GetCandy\DataTypes\Price $value
52-
* @param array $attributes
50+
* @param \Illuminate\Database\Eloquent\Model $model
51+
* @param string $key
52+
* @param \GetCandy\DataTypes\Price $value
53+
* @param array $attributes
54+
*
5355
* @return array
5456
*/
5557
public function set($model, $key, $value, $attributes)

‎src/Base/Casts/TaxBreakdown.php

+10-8
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ class TaxBreakdown implements CastsAttributes
1111
/**
1212
* Cast the given value.
1313
*
14-
* @param \Illuminate\Database\Eloquent\Model $model
15-
* @param string $key
16-
* @param mixed $value
17-
* @param array $attributes
14+
* @param \Illuminate\Database\Eloquent\Model $model
15+
* @param string $key
16+
* @param mixed $value
17+
* @param array $attributes
18+
*
1819
* @return \Illuminate\Support\Collection
1920
*/
2021
public function get($model, $key, $value, $attributes)
@@ -33,10 +34,11 @@ public function get($model, $key, $value, $attributes)
3334
/**
3435
* Prepare the given value for storage.
3536
*
36-
* @param \Illuminate\Database\Eloquent\Model $model
37-
* @param string $key
38-
* @param \GetCandy\DataTypes\Price $value
39-
* @param array $attributes
37+
* @param \Illuminate\Database\Eloquent\Model $model
38+
* @param string $key
39+
* @param \GetCandy\DataTypes\Price $value
40+
* @param array $attributes
41+
*
4042
* @return array
4143
*/
4244
public function set($model, $key, $value, $attributes)

0 commit comments

Comments
 (0)