Release - 2.0-beta15 (#471)

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+### 2.0-beta15 - 2022-08-10
+
+### Fixed
+
+- `doctrine/dbal` locked to `3.3.7` due to issue with Sqlite
+
+### Changed
+
+- You can now specify how media conversions will work via a class in the config.
+
 ### 2.0-beta14 - 2022-08-03
 
 ### Added

config/media.php

@@ -1,22 +1,9 @@
 <?php
 
+use GetCandy\Base\StandardMediaConversions;
+
 return [
-    'transformations' => [
-        'zoom' => [
-            'width'  => 500,
-            'height' => 500,
-        ],
-        'large' => [
-            'width'  => 800,
-            'height' => 800,
-        ],
-        'medium' => [
-            'width'  => 500,
-            'height' => 500,
-        ],
-        'small' => [
-            'width'  => 300,
-            'height' => 300,
-        ],
+    'conversions' => [
+        StandardMediaConversions::class,
     ],
 ];

config/orders.php

@@ -26,20 +26,20 @@
     'draft_status' => 'awaiting-payment',
     'statuses'     => [
         'awaiting-payment' => [
-            'label'         => 'Awaiting Payment',
-            'color'         => '#848a8c',
-            'mailers'       => [],
+            'label' => 'Awaiting Payment',
+            'color' => '#848a8c',
+            'mailers' => [],
             'notifications' => [],
         ],
         'payment-received' => [
-            'label'         => 'Payment Received',
-            'color'         => '#6a67ce',
-            'mailers'       => [],
+            'label' => 'Payment Received',
+            'color' => '#6a67ce',
+            'mailers' => [],
             'notifications' => [],
         ],
         'dispatched'  => [
-            'label'         => 'Dispatched',
-            'mailers'       => [],
+            'label' => 'Dispatched',
+            'mailers' => [],
             'notifications' => [],
         ],
     ],

config/payments.php

@@ -5,7 +5,7 @@
 
     'types' => [
         'cash-in-hand' => [
-            'driver'     => 'offline',
+            'driver' => 'offline',
             'authorized' => 'payment-offline',
         ],
     ],

database/factories/OrderFactory.php

@@ -26,8 +26,8 @@ public function definition(): array
             'tax_breakdown'  => [
                 [
                     'description'       => 'VAT',
-                    'total'             => 200,
-                    'percentage'        => 20,
+                    'total'      => 200,
+                    'percentage' => 20,
                 ],
             ],
             'tax_total'             => $taxTotal,

database/factories/OrderLineFactory.php

@@ -30,8 +30,8 @@ public function definition(): array
             'tax_breakdown'    => [
                 [
                     'description'       => 'VAT',
-                    'total'             => 200,
-                    'percentage'        => 20,
+                    'total'      => 200,
+                    'percentage' => 20,
                 ],
             ],
             'tax_total' => $this->faker->numberBetween(1, 5000),

database/migrations/2021_08_10_101547_create_media_table.php

@@ -8,7 +8,7 @@ class CreateMediaTable extends Migration
 {
     public function up()
     {
-        if (!Schema::hasTable('media')) {
+        if (! Schema::hasTable('media')) {
             Schema::create('media', function (Blueprint $table) {
                 $table->bigIncrements('id');
 

database/migrations/2021_08_17_142630_create_activity_log_table.php

@@ -10,7 +10,7 @@ public function up()
     {
         $tableName = config('activitylog.table_name');
 
-        if (!Schema::hasTable($tableName)) {
+        if (! Schema::hasTable($tableName)) {
             Schema::create($tableName, function (Blueprint $table) {
                 $table->bigIncrements('id');
                 $table->string('log_name')->nullable();

database/state/ConvertProductTypeAttributesToProducts.php

@@ -13,7 +13,7 @@ public function run()
     {
         $prefix = config('getcandy.database.table_prefix');
 
-        if (!$this->canRun()) {
+        if (! $this->canRun()) {
             return;
         }
 

database/state/EnsureDefaultTaxClassExists.php

@@ -9,7 +9,7 @@ class EnsureDefaultTaxClassExists
 {
     public function run()
     {
-        if (!$this->canRun() || !$this->shouldRun()) {
+        if (! $this->canRun() || ! $this->shouldRun()) {
             return;
         }
 
@@ -32,6 +32,6 @@ protected function canRun()
 
     protected function shouldRun()
     {
-        return !TaxClass::whereDefault(true)->count();
+        return ! TaxClass::whereDefault(true)->count();
     }
 }

database/state/EnsureUserOrdersHaveACustomer.php

@@ -10,7 +10,7 @@ class EnsureUserOrdersHaveACustomer
 {
     public function run()
     {
-        if (!$this->canRun()) {
+        if (! $this->canRun()) {
             return;
         }
 

src/Actions/Carts/CalculateLine.php

@@ -14,9 +14,8 @@ class CalculateLine
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\CartLine                $cartLine
-     * @param \Illuminate\Database\Eloquent\Collection $customerGroups
-     *
+     * @param  \GetCandy\Models\CartLine  $cartLine
+     * @param  \Illuminate\Database\Eloquent\Collection  $customerGroups
      * @return \GetCandy\Models\CartLine
      */
     public function execute(
@@ -30,7 +29,7 @@ public function execute(
         $unitQuantity = $purchasable->getUnitQuantity();
 
         // we check if any cart line modifiers have already specified a unit price in their calculating() method
-        if (!($price = $cartLine->unitPrice) instanceof Price) {
+        if (! ($price = $cartLine->unitPrice) instanceof Price) {
             $priceResponse = Pricing::currency($cart->currency)
                 ->qty($cartLine->quantity)
                 ->currency($cart->currency)
@@ -48,8 +47,7 @@ public function execute(
         $unitPrice = (int) round(
             (($price->decimal / $purchasable->getUnitQuantity())
                 * $cart->currency->factor),
-            $cart->currency->decimal_places
-        );
+            $cart->currency->decimal_places);
 
         $subTotal = $unitPrice * $cartLine->quantity;
 

src/Actions/Carts/CreateOrder.php

@@ -16,8 +16,7 @@ class CreateOrder
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Cart $cart
-     *
+     * @param  \GetCandy\Models\Cart  $cart
      * @return void
      */
     public function execute(
@@ -50,9 +49,9 @@ public function execute(
                 'tax_breakdown'      => $cart->taxBreakdown->map(function ($tax) {
                     return [
                         'description'       => $tax['description'],
-                        'identifier'        => $tax['identifier'],
-                        'percentage'        => $tax['amounts']->sum('percentage'),
-                        'total'             => $tax['total']->value,
+                        'identifier'   => $tax['identifier'],
+                        'percentage' => $tax['amounts']->sum('percentage'),
+                        'total'      => $tax['total']->value,
                     ];
                 })->values(),
                 'tax_total'             => $cart->taxTotal->value,
@@ -81,9 +80,9 @@ public function execute(
                     'tax_breakdown'    => $line->taxBreakdown->amounts->map(function ($amount) {
                         return [
                             'description' => $amount->description,
-                            'identifier'  => $amount->identifier,
-                            'percentage'  => $amount->percentage,
-                            'total'       => $amount->price->value,
+                            'identifier' => $amount->identifier,
+                            'percentage' => $amount->percentage,
+                            'total'      => $amount->price->value,
                         ];
                     })->values(),
                     'tax_total' => $line->taxAmount->value,
@@ -121,9 +120,9 @@ public function execute(
                     'tax_breakdown'    => $shippingAddress->taxBreakdown->amounts->map(function ($amount) {
                         return [
                             'description' => $amount->description,
-                            'identifier'  => $amount->identifier,
-                            'percentage'  => $amount->percentage,
-                            'total'       => $amount->price->value,
+                            'identifier' => $amount->identifier,
+                            'percentage' => $amount->percentage,
+                            'total'      => $amount->price->value,
                         ];
                     })->values(),
                     'tax_total' => $shippingAddress->shippingTaxTotal->value,

src/Actions/Carts/MergeCart.php

@@ -10,9 +10,8 @@ class MergeCart
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Cart $target
-     * @param \GetCandy\Models\Cart $source
-     *
+     * @param  \GetCandy\Models\Cart  $target
+     * @param  \GetCandy\Models\Cart  $source
      * @return \GetCandy\Models\Cart
      */
     public function execute(Cart $target, Cart $source)

src/Actions/Carts/ValidateCartForOrder.php

@@ -16,8 +16,7 @@ class ValidateCartForOrder
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Cart $cart
-     *
+     * @param  \GetCandy\Models\Cart  $cart
      * @return void
      */
     public function execute(
@@ -32,7 +31,7 @@ public function execute(
         }
 
         // Do we have a billing address?
-        if (!$cart->billingAddress) {
+        if (! $cart->billingAddress) {
             throw new BillingAddressMissingException(
                 __('getcandy::exceptions.carts.billing_missing')
             );
@@ -49,7 +48,7 @@ public function execute(
 
         // Is this cart shippable and if so, does it have a shipping address.
         if ($cart->getManager()->isShippable()) {
-            if (!$cart->shippingAddress) {
+            if (! $cart->shippingAddress) {
                 throw new ShippingAddressMissingException(
                     __('getcandy::exceptions.carts.shipping_missing')
                 );
@@ -65,7 +64,7 @@ public function execute(
             }
 
             // Do we have a shipping option applied?
-            if (!$cart->getManager()->getShippingOption()) {
+            if (! $cart->getManager()->getShippingOption()) {
                 throw new ShippingOptionMissingException();
             }
         }

src/Actions/Collections/SortProducts.php

@@ -10,8 +10,7 @@ class SortProducts
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Collection $collection
-     *
+     * @param  \GetCandy\Models\Collection  $collection
      * @return void
      */
     public function execute(Collection $collection)

src/Actions/Collections/SortProductsByPrice.php

@@ -11,10 +11,9 @@ class SortProductsByPrice
     /**
      * Execute the action.
      *
-     * @param \Illuminate\Support\Collection $products
-     * @param \GetCandy\Models\Currency      $currency
-     * @param string                         $direction
-     *
+     * @param  \Illuminate\Support\Collection  $products
+     * @param  \GetCandy\Models\Currency  $currency
+     * @param  string  $direction
      * @return void
      */
     public function execute(Collection $products, Currency $currency, $direction = 'asc')

src/Actions/Collections/SortProductsBySku.php

@@ -9,9 +9,8 @@ class SortProductsBySku
     /**
      * Execute the action.
      *
-     * @param \Illuminate\Support\Collection $products
-     * @param string                         $direction
-     *
+     * @param  \Illuminate\Support\Collection  $products
+     * @param  string  $direction
      * @return \Illuminate\Support\Collection
      */
     public function execute(Collection $products, $direction = 'asc')

src/Actions/Orders/GenerateOrderReference.php

@@ -9,17 +9,16 @@ class GenerateOrderReference
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\CartLine                $cartLine
-     * @param \Illuminate\Database\Eloquent\Collection $customerGroups
-     *
+     * @param  \GetCandy\Models\CartLine  $cartLine
+     * @param  \Illuminate\Database\Eloquent\Collection  $customerGroups
      * @return \GetCandy\Models\CartLine
      */
     public function execute(
         Order $order
     ) {
         $generator = config('getcandy.orders.reference_generator');
 
-        if (!$generator) {
+        if (! $generator) {
             return null;
         }
 

src/Actions/Taxes/GetTaxZonePostcode.php

@@ -9,8 +9,7 @@ class GetTaxZonePostcode
     /**
      * Execute the action.
      *
-     * @param string $postcode
-     *
+     * @param  string  $postcode
      * @return null|\GetCandy\Models\TaxZonePostcode
      */
     public function execute($postcode)
@@ -21,7 +20,7 @@ public function execute($postcode)
             return $postcodeZone;
         }
 
-        if (!$postcodeZone) {
+        if (! $postcodeZone) {
             return null;
         }
 
@@ -33,7 +32,7 @@ public function execute($postcode)
         })->sort(fn ($current, $next) => $current['matches'] < $next['matches'])->first();
 
         // Give up, use default...
-        if (!$match) {
+        if (! $match) {
             return null;
         }
 
@@ -43,8 +42,7 @@ public function execute($postcode)
     /**
      * Return the zone or zones which match this postcode.
      *
-     * @param string $postcode
-     *
+     * @param  string  $postcode
      * @return \GetCandy\Models\TaxZonePostcode|\Illuminate\Support\Collection
      */
     protected function getZoneMatches($postcode)
@@ -61,9 +59,8 @@ protected function getZoneMatches($postcode)
     /**
      * Match wildcard postcodes and return number of matches.
      *
-     * @param string $wildcard
-     * @param string $haystack
-     *
+     * @param  string  $wildcard
+     * @param  string  $haystack
      * @return int
      */
     private function matchWildcard($wildcard, $haystack)