Merge pull request #64 from logeecom/dev

Release version 3.3.1

CHANGELOG.md

@@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## Unreleased
+## [3.3.1](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.3.0...v3.3.1) - 2021-08-23
+**BREAKING CHANGES**
+### Changed
+- Updated order service to set shipment custom reference when creating a draft.
+- Added additional statuses to shipment status mapper.
+- Updated codebase to adhere to the Shopware coding standards. Integrations need to update all classes that extend from the Core `Singleton` class and implement create method that will return an instance of itself.
 
 ## [3.3.0](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.2.2...v3.3.0) - 2021-07-06
 **BREAKING CHANGES**

src/BusinessLogic/Brand/DTO/BrandConfiguration.php

@@ -71,7 +71,7 @@ public function toArray()
      */
     public static function fromArray(array $data)
     {
-        $result = new static();
+        $result = new self();
 
         $result->platformCode = $data['platform_code'];
         $result->shippingServiceSource = $data['shipping_service_source'];

src/BusinessLogic/Controllers/DTO/DashboardStatus.php

@@ -54,4 +54,18 @@ class DashboardStatus extends FrontDto
         'isWarehouseSet',
         'isOrderStatusMappingsSet',
     );
+
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return new self();
+    }
 }

src/BusinessLogic/Controllers/DTO/ModuleState.php

@@ -44,4 +44,18 @@ class ModuleState extends FrontDto
     protected static $fields = array(
         'state',
     );
+
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return new self();
+    }
 }

src/BusinessLogic/Controllers/DTO/OnboardingState.php

@@ -33,4 +33,18 @@ class OnboardingState extends FrontDto
     protected static $fields = array(
         'state',
     );
+
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return new self();
+    }
 }

src/BusinessLogic/Controllers/DTO/RegistrationResponse.php

@@ -54,4 +54,18 @@ class RegistrationResponse extends FrontDto
         'termsAndConditionsUrl',
         'privacyPolicyUrl',
     );
+
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return new self();
+    }
 }

src/BusinessLogic/Controllers/DTO/ShippingMethodConfiguration.php

@@ -121,7 +121,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $result = new static();
+        $result = new self();
 
         $result->id = $raw['id'];
         $result->activated = (bool)static::getDataValue($raw, 'activated', false);

src/BusinessLogic/Country/Country.php

@@ -60,6 +60,20 @@ class Country extends FrontDto
         'postal_code',
     );
 
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return new self();
+    }
+
     /**
      * Transforms raw array data to its DTO.
      *

src/BusinessLogic/Country/CountryService.php

@@ -34,6 +34,18 @@ class CountryService extends BaseService
      */
     protected $brandConfigurationService;
 
+    /**
+     * Creates instance of this class.
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create()
+    {
+        return new self();
+    }
+
     /**
      * Returns a list of supported country DTOs.
      *

src/BusinessLogic/Country/WarehouseCountryService.php

@@ -23,6 +23,18 @@ class WarehouseCountryService extends CountryService
      */
     protected static $instance;
 
+    /**
+     * Creates instance of this class.
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create()
+    {
+        return new self();
+    }
+
     /**
      * Returns a list of supported country DTOs.
      *

src/BusinessLogic/DTO/BaseDto.php

@@ -29,9 +29,7 @@ abstract public function toArray();
      */
     public static function fromArray(array $raw)
     {
-        throw new \BadMethodCallException(
-            'Method "fromArray" not implemented! Given array: ' . print_r($raw, true)
-        );
+        return null;
     }
 
     /**

src/BusinessLogic/DTO/FrontDto.php

@@ -30,6 +30,20 @@ abstract class FrontDto extends DataTransferObject
      */
     protected static $requiredFields = array();
 
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return null;
+    }
+
     /**
      * Transforms raw array data to its DTO.
      *
@@ -43,7 +57,7 @@ public static function fromArray(array $raw)
     {
         static::validate($raw);
 
-        $result = new static();
+        $result = static::create($raw);
         foreach ($raw as $field => $value) {
             if (property_exists(static::CLASS_NAME, $field)) {
                 $result->$field = $value;

src/BusinessLogic/DTO/ValidationError.php

@@ -47,4 +47,18 @@ class ValidationError extends FrontDto
      * @var array
      */
     protected static $fields = array('code', 'field', 'message');
+
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return new self();
+    }
 }

src/BusinessLogic/Http/DTO/Package.php

@@ -59,7 +59,7 @@ public function __construct($weight = 0.0, $width = 0.0, $height = 0.0, $length
      */
     public static function defaultPackage()
     {
-        return new static(1, 10, 10, 10);
+        return new self(1, 10, 10, 10);
     }
 
     /**
@@ -71,7 +71,7 @@ public static function defaultPackage()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new static();
+        $instance = new self();
         $instance->weight = static::getDataValue($raw, 'weight', 0.0);
         $instance->length = static::getDataValue($raw, 'length', 0.0);
         $instance->height = static::getDataValue($raw, 'height', 0.0);

src/BusinessLogic/Http/DTO/ParcelInfo.php

@@ -98,6 +98,20 @@ public static function defaultParcel()
         );
     }
 
+    /**
+     * Creates instance of this class.
+     *
+     * @param array $data
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create(array $data)
+    {
+        return new self();
+    }
+
     /**
      * Generates validation errors for the payload.
      *

src/BusinessLogic/Http/DTO/PostalCode.php

@@ -51,7 +51,7 @@ class PostalCode extends DataTransferObject
      */
     public static function fromArray(array $raw)
     {
-        $instance = new static();
+        $instance = new self();
 
         $instance->zipcode = !empty($raw['zipcode']) ? $raw['zipcode'] : '';
         $instance->city = !empty($raw['city']['name']) ? $raw['city']['name'] : '';

src/BusinessLogic/Http/DTO/PostalZone.php

@@ -51,7 +51,7 @@ class PostalZone extends DataTransferObject
      */
     public static function fromArray(array $raw)
     {
-        $instance = new static();
+        $instance = new self();
 
         $instance->id = static::getDataValue($raw, 'id');
         $instance->name = static::getDataValue($raw, 'name');

src/BusinessLogic/Http/DTO/Shipment.php

@@ -118,7 +118,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $shipment = new static();
+        $shipment = new self();
         $date = static::getDataValue($raw, 'order_date');
         if ($date) {
             $shipment->orderDate = \DateTime::createFromFormat('Y-m-d', $date);

src/BusinessLogic/Http/DTO/ShipmentLabel.php

@@ -58,7 +58,7 @@ public function __construct($link, $printed = false, $createTimestamp = 0)
      */
     public static function fromArray(array $batchRaw)
     {
-        return new static(
+        return new self(
             static::getDataValue($batchRaw, 'link'),
             static::getDataValue($batchRaw, 'printed', false),
             static::getDataValue($batchRaw, 'createTime', 0)

src/BusinessLogic/Http/DTO/ShippingService.php

@@ -89,7 +89,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new static();
+        $instance = new self();
 
         $instance->id = (int)self::getDataValue($raw, 'service_id');
         $instance->enabled = (bool)self::getDataValue($raw, 'enabled');

src/BusinessLogic/Http/DTO/ShippingServiceDetails.php

@@ -175,7 +175,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new static();
+        $instance = new self();
 
         $instance->id = self::getDataValue($raw, 'id');
         $instance->carrierName = self::getDataValue($raw, 'carrier_name');

src/BusinessLogic/Http/DTO/ShippingServiceSearch.php

@@ -119,7 +119,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $instance = new static();
+        $instance = new self();
 
         $instance->serviceId = self::getDataValue($raw, 'service_id', null);
         $instance->fromCountry = self::getDataValue($raw, 'from[country]');

src/BusinessLogic/Http/DTO/SystemInfo.php

@@ -45,7 +45,7 @@ class SystemInfo extends DataTransferObject
      */
     public static function fromArray(array $raw)
     {
-        $instance = new static();
+        $instance = new self();
 
         $instance->systemId = !empty($raw['system_id']) ? $raw['system_id'] : null;
         $instance->systemName = !empty($raw['system_name']) ? $raw['system_name'] : '';

src/BusinessLogic/Http/DTO/Tracking.php

@@ -53,7 +53,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $tracking = new static();
+        $tracking = new self();
         $tracking->timestamp = static::getDataValue($raw, 'timestamp');
         $tracking->description = static::getDataValue($raw, 'description');
         $tracking->city = static::getDataValue($raw, 'city');

src/BusinessLogic/Http/DTO/User.php

@@ -60,7 +60,7 @@ public function toArray()
      */
     public static function fromArray(array $raw)
     {
-        $user = new static();
+        $user = new self();
 
         $user->firstName = static::getDataValue($raw, 'name');
         $user->lastName = static::getDataValue($raw, 'surname');

src/BusinessLogic/Location/LocationService.php

@@ -63,6 +63,18 @@ protected function __construct()
         $this->configuration = ServiceRegister::getService(Configuration::CLASS_NAME);
     }
 
+    /**
+     * Creates instance of this class.
+     *
+     * @return static
+     *
+     * @noinspection PhpDocSignatureInspection
+     */
+    public static function create()
+    {
+        return new self();
+    }
+
     /**
      * Returns array of locations for this shipping method.
      *

src/BusinessLogic/Order/Objects/TrackingHistory.php

@@ -37,7 +37,7 @@ class TrackingHistory
      */
     public static function fromArray(array $raw)
     {
-        $result = new static();
+        $result = new self();
         $result->setCity($raw['city']);
         $result->setDescription($raw['description']);
         $result->setTimestamp($raw['timestamp']);