Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ApiKeyValidate extends \Magento\Framework\App\Config\Value
private const API_KEY_LENGTH = 16;

/**
* @return void
* @return self
* @throws \Magento\Framework\Exception\ValidatorException
* @throws \Magento\Framework\Exception\FileSystemException
*/
Expand All @@ -23,6 +23,6 @@ public function beforeSave()
throw new \Magento\Framework\Exception\ValidatorException($message);
}

parent::beforeSave();
return parent::beforeSave();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ApiPasswordValidate extends \Magento\Framework\App\Config\Value
private const API_PASSWORD_LENGTH = 32;

/**
* @return void
* @return self
* @throws \Magento\Framework\Exception\ValidatorException
*/
public function beforeSave()
Expand All @@ -21,6 +21,6 @@ public function beforeSave()
throw new \Magento\Framework\Exception\ValidatorException($message);
}

parent::beforeSave();
return parent::beforeSave();
}
}
1 change: 1 addition & 0 deletions Packetery/Checkout/Controller/Adminhtml/Order/Detail.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public function execute(): AbstractResult
return $this->resultRedirectFactory->create()->setPath('*/*/index');
}

/** @var \Magento\Framework\View\Element\AbstractBlock $addressDetailBlock */
$addressDetailBlock = $resultPage->getLayout()->getBlock('packetery_order_address_detail');
$addressDetailBlock->setData('order', $order);
$addressDetailBlock->setData('magentoOrder', $magentoOrder);
Expand Down
10 changes: 9 additions & 1 deletion Packetery/Checkout/Model/Carrier/AbstractCarrier.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@ public function __construct(
}

/**
* {@inheritdoc}
* @return mixed
*/
public function getStore()
{
return parent::getStore();
}

/**
* @return bool|\Magento\Framework\DataObject|\Magento\Shipping\Model\Rate\Result|null
*/
public function collectRates(RateRequest $request)
{
Expand Down
7 changes: 2 additions & 5 deletions Packetery/Checkout/Model/Carrier/Facade.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function createHybridCarrierCached(array &$cache, string $carrierCode, ?i

/**
* @param \Packetery\Checkout\Model\Carrier\AbstractDynamicCarrier[] $carriers
* @return string[]
* @return array{value: string, label: \Magento\Framework\Phrase}[]
*/
public function getVendorCodesOptions(array $carriers): array
{
Expand Down Expand Up @@ -190,12 +190,9 @@ private function getDynamicCarrier(AbstractCarrier $carrier, ?int $carrierId): ?
return $carrier->getPacketeryBrain()->getDynamicCarrierById($carrierId);
}

/**
* @param string $carrierCode
* @return \Packetery\Checkout\Model\Carrier\AbstractCarrier
*/
public function getMagentoCarrier(string $carrierCode): AbstractCarrier
{
// @phpstan-ignore-next-line
return $this->carrierFactory->get($carrierCode);
}

Expand Down
13 changes: 5 additions & 8 deletions Packetery/Checkout/Model/Carrier/Imp/Packetery/Carrier.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class Carrier extends \Packetery\Checkout\Model\Carrier\AbstractCarrier
/** @var \Packetery\Checkout\Model\Carrier\Imp\Packetery\Brain */
protected $packeteryBrain;

/** @var \Packetery\Checkout\Model\Carrier\Imp\Packetery\Config */
protected $packeteryConfig;

/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
Expand All @@ -31,18 +34,12 @@ public function __construct(
parent::__construct($scopeConfig, $rateErrorFactory, $logger, $brain, $data);
}

/**
* @return \Packetery\Checkout\Model\Carrier\Imp\Packetery\Brain
*/
public function getPacketeryBrain(): \Packetery\Checkout\Model\Carrier\AbstractBrain
public function getPacketeryBrain(): \Packetery\Checkout\Model\Carrier\Imp\Packetery\Brain
{
return $this->packeteryBrain;
}

/**
* @return \Packetery\Checkout\Model\Carrier\Imp\Packetery\Config
*/
public function getPacketeryConfig(): AbstractConfig
public function getPacketeryConfig(): \Packetery\Checkout\Model\Carrier\Imp\Packetery\Config
{
return $this->packeteryConfig;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function isAssignableToPricingRule(): bool

/**
* @param int|null $dynamicCarrierId
* @return \Packetery\Checkout\Model\Carrier|null
* @return \Packetery\Checkout\Model\Carrier\Imp\PacketeryPacketaDynamic\DynamicCarrier|null
*/
public function getDynamicCarrierById(?int $dynamicCarrierId): ?AbstractDynamicCarrier
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class Carrier extends \Packetery\Checkout\Model\Carrier\AbstractCarrier
/** @var \Packetery\Checkout\Model\Carrier\Imp\PacketeryPacketaDynamic\Brain */
protected $packeteryBrain;

/** @var \Packetery\Checkout\Model\Carrier\Imp\PacketeryPacketaDynamic\Config */
protected $packeteryConfig;

/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
Expand All @@ -31,20 +34,14 @@ public function __construct(
parent::__construct($scopeConfig, $rateErrorFactory, $logger, $brain, $data);
}

/**
* @return \Packetery\Checkout\Model\Carrier\Imp\PacketeryPacketaDynamic\Brain
*/
public function getPacketeryBrain(): \Packetery\Checkout\Model\Carrier\AbstractBrain
public function getPacketeryBrain(): \Packetery\Checkout\Model\Carrier\Imp\PacketeryPacketaDynamic\Brain
{
return parent::getPacketeryBrain();
return $this->packeteryBrain;
}

/**
* @return \Packetery\Checkout\Model\Carrier\Imp\PacketeryPacketaDynamic\Config
*/
public function getPacketeryConfig(): \Packetery\Checkout\Model\Carrier\Config\AbstractConfig
public function getPacketeryConfig(): \Packetery\Checkout\Model\Carrier\Imp\PacketeryPacketaDynamic\Config
{
return parent::getPacketeryConfig();
return $this->packeteryConfig;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Packetery/Checkout/Model/Carrier/ShippingRateCode.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static function isPacketery(string $code): bool

/**
* @param string $rateCode
* @return static
* @return self
*/
public static function fromString(string $rateCode): self
{
Expand Down
2 changes: 1 addition & 1 deletion Packetery/Checkout/Model/HybridCarrier.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static function fromAbstractDynamic(\Packetery\Checkout\Model\Carrier\Abs
* @param string $method
* @param string $country
* @param array $vendorCodeOptions
* @return static
* @return self
*/
public static function fromAbstract(\Packetery\Checkout\Model\Carrier\AbstractCarrier $carrier, string $method, string $country, array $vendorCodeOptions): self
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ protected function _construct()
*/
public function getItems()
{
// @phpstan-ignore-next-line
return parent::getItems();
}

Expand Down
9 changes: 9 additions & 0 deletions Packetery/Checkout/Model/ResourceModel/Order/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ protected function _construct()
$this->_init('Packetery\Checkout\Model\Order', 'Packetery\Checkout\Model\ResourceModel\Order');
}

/**
* @return \Packetery\Checkout\Model\Order[]
*/
public function getItems()
{
// @phpstan-ignore-next-line
return parent::getItems();
}

/**
* @return string
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ protected function _construct()
*/
public function getItems()
{
// @phpstan-ignore-next-line
return parent::getItems();
}

Expand All @@ -37,6 +38,7 @@ public function getItems()
public function getFirstRecord(): ?\Packetery\Checkout\Model\Pricingrule
{
$this->load();
/** @var \Packetery\Checkout\Model\Pricingrule[] $items */
$items = $this->_items;

return array_shift($items);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,11 @@ public function savePricingRule(array $postData, array $weightRules): \Packetery
*/
public function setPricingRuleEnabled(int $id, bool $enabled): void
{
$rule = $this->pricingRuleCollectionFactory->create()->getItemById($id);
$rule->setData('enabled', $enabled);
$rule->save();
/** @var \Packetery\Checkout\Model\ResourceModel\Pricingrule\Collection $collection */
$collection = $this->pricingRuleCollectionFactory->create();
$collection->addFilter('id', $id);
$collection->setDataToAll('enabled', $enabled);
$collection->save();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ protected function _construct()
*/
public function getItems()
{
// @phpstan-ignore-next-line
return parent::getItems();
}
}
4 changes: 0 additions & 4 deletions Packetery/Checkout/Model/Weight/Calculator.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,15 @@ public function getItemsWeight(array $allVisibleItems): float

foreach ($allVisibleItems as $item) {
if ($item->getProductType() === 'configurable') {
/** @var \Magento\Catalog\Model\Product $configurableProduct */
$configurableProduct = $item->getProduct();
if ($configurableProduct->isVirtual()) {
$configurableWeight = 0.0;
} else {
$configurableWeight = $configurableProduct->getWeight();
}

/** @var Item[] $children */
$children = ($item->getChildren() ?: []); // contains only ordered items
foreach ($children as $child) {
/** @var \Magento\Catalog\Model\Product $childProduct */
$childProduct = $child->getProduct();
if ($childProduct->isVirtual()) {
$productWeights[$childProduct->getId()] = 0.0;
Expand All @@ -62,7 +59,6 @@ public function getItemsWeight(array $allVisibleItems): float
}

foreach ($allVisibleItems as $item) {
/** @var \Magento\Catalog\Model\Product $product */
$product = $item->getProduct();
if ($item->getProductType() === 'simple' && !array_key_exists($product->getId(), $productWeights)) {
if ($product->isVirtual()) {
Expand Down
36 changes: 34 additions & 2 deletions Packetery/Checkout/Model/Weight/Item.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static function transformItems(array $items): array

/**
* @param \Magento\Quote\Model\Quote\Item $item
* @return static
* @return self
*/
public static function fromQuoteItem(\Magento\Quote\Model\Quote\Item $item): self
{
Expand All @@ -49,7 +49,7 @@ public static function fromQuoteItem(\Magento\Quote\Model\Quote\Item $item): sel

/**
* @param \Magento\Sales\Model\Order\Item $item
* @return static
* @return self
*/
public static function fromOrderItem(\Magento\Sales\Model\Order\Item $item): self
{
Expand All @@ -66,4 +66,36 @@ public static function fromOrderItem(\Magento\Sales\Model\Order\Item $item): sel

return $instance;
}

/**
* @return string
*/
public function getProductType()
{
return parent::getProductType();
}

/**
* @return self[]
*/
public function getChildren()
{
return $this->getData('children');
}

/**
* @return int
*/
public function getQty()
{
return $this->getData('qty');
}

/**
* @return \Magento\Catalog\Model\Product
*/
public function getProduct()
{
return $this->getData('product');
}
}
1 change: 1 addition & 0 deletions Packetery/Checkout/Observer/Sales/AddressPlaceAfter.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function execute(
\Magento\Framework\Event\Observer $observer
) {
$orderId = $observer->getData('order_id');
/** @var \Magento\Sales\Model\Order $order */
$order = $this->orderRepository->get($orderId);
$orderNumber = $order->getIncrementId();
$shippingAddress = $order->getShippingAddress();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
$order = $transport['order'];
$collection = $this->orderCollectionFactory->create();
$collection->addFilter('order_number', $order->getData('increment_id'));
/** @var \Packetery\Checkout\Model\Order|null $packeteryOrder */
$items = ( $collection->getItems() ?: [] );
/** @var \Packetery\Checkout\Model\Order|null $packeteryOrder */
$packeteryOrder = array_shift($items);

$transport['packetery_is_pickup_point'] = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,5 @@ protected function _initSelect()
);

$this->addFilterToMap('availableName', 'available');

return $this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,5 @@ protected function _initSelect()
'main_table' => new Expression('(' . $subQuery->assemble() . ')'),
]
);

return $this;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
/** @var \Packetery\Checkout\Block\Adminhtml\Order\AddressDetail $block */
/** @var \Magento\Framework\View\Element\AbstractBlock $block */
/** @var \Packetery\Checkout\Model\Order $packeteryOrder */
$packeteryOrder = $block->getData('order');
$packeteryMagentoOrder = $block->getData('magentoOrder');
Expand Down
5 changes: 4 additions & 1 deletion phpstan-config.neon
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
parameters:
bootstrapFiles:
- phpstan-autoload.php
level: 1
level: 3
fileExtensions:
- php
- phtml
paths:
- ./Packetery/Checkout
ignoreErrors:
- '#Call to an undefined method Magento\\(.*)+\(\)\.#' # It is typical for Magento related code to use PHP magic.
- '#Call to an undefined static method Magento\\(.*)+\(\)\.#'