woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 18:16:38 +08:00
Code Issues Projects Packages Wiki Activity Actions

Fix psalm errors

Browse source
This commit is contained in:
Alex P 2021-10-28 18:08:53 +03:00
parent b7f628c8c7
commit ea462af3bf
2 changed files with 32 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/ppcp-api-client/src/Entity/PurchaseUnit.php
View file

@ -308,15 +308,20 @@ class PurchaseUnit {
return false;
}
$fee_items_total = $breakdown->item_total() ? $breakdown->item_total()->value() : null;
$fee_tax_total = $breakdown->tax_total() ? $breakdown->tax_total()->value() : null;
$item_total = $breakdown->item_total();
$tax_total = $breakdown->tax_total();
$fee_items_total = $item_total ? $item_total->value() : null;
$fee_tax_total = $tax_total ? $tax_total->value() : null;
foreach ( $items as $item ) {
if ( null !== $fee_items_total ) {
$fee_items_total -= $item->unit_amount()->value() * $item->quantity();
$fee_items_total -= $item->unit_amount()->value() * (float) $item->quantity();
}
if ( null !== $fee_tax_total ) {
$fee_tax_total -= $item->tax()->value() * $item->quantity();
$tax = $item->tax();
if ( $tax && null !== $fee_tax_total ) {
$fee_tax_total -= $tax->value() * (float) $item->quantity();
}
}
@ -327,27 +332,33 @@ class PurchaseUnit {
return true;
}
$amount_total = 0;
if ( $breakdown->shipping() ) {
$amount_total += $breakdown->shipping()->value();
$shipping = $breakdown->shipping();
$discount = $breakdown->discount();
$shipping_discount = $breakdown->shipping_discount();
$handling = $breakdown->handling();
$insurance = $breakdown->insurance();
$amount_total = 0.0;
if ( $shipping ) {
$amount_total += $shipping->value();
}
if ( $breakdown->item_total() ) {
$amount_total += $breakdown->item_total()->value();
if ( $item_total ) {
$amount_total += $item_total->value();
}
if ( $breakdown->discount() ) {
$amount_total -= $breakdown->discount()->value();
if ( $discount ) {
$amount_total -= $discount->value();
}
if ( $breakdown->tax_total() ) {
$amount_total += $breakdown->tax_total()->value();
if ( $tax_total ) {
$amount_total += $tax_total->value();
}
if ( $breakdown->shipping_discount() ) {
$amount_total -= $breakdown->shipping_discount()->value();
if ( $shipping_discount ) {
$amount_total -= $shipping_discount->value();
}
if ( $breakdown->handling() ) {
$amount_total += $breakdown->handling()->value();
if ( $handling ) {
$amount_total += $handling->value();
}
if ( $breakdown->insurance() ) {
$amount_total += $breakdown->insurance()->value();
if ( $insurance ) {
$amount_total += $insurance->value();
}
$amount_value = $amount->value();

49
psalm-baseline.xml
View file

@ -159,35 +159,10 @@
</PossiblyNullReference>
</file>
<file src="modules/ppcp-api-client/src/Entity/PurchaseUnit.php">
<InvalidOperand occurrences="9">
<code>$amount_total += $breakdown-&gt;handling()-&gt;value()</code>
<code>$amount_total += $breakdown-&gt;insurance()-&gt;value()</code>
<code>$amount_total += $breakdown-&gt;item_total()-&gt;value()</code>
<code>$amount_total += $breakdown-&gt;shipping()-&gt;value()</code>
<code>$amount_total += $breakdown-&gt;tax_total()-&gt;value()</code>
<code>$amount_total -= $breakdown-&gt;discount()-&gt;value()</code>
<code>$amount_total -= $breakdown-&gt;shipping_discount()-&gt;value()</code>
<code>$item-&gt;tax()-&gt;value() * $item-&gt;quantity()</code>
<code>$item-&gt;unit_amount()-&gt;value() * $item-&gt;quantity()</code>
</InvalidOperand>
<PossiblyNullReference occurrences="17">
<code>item_total</code>
<code>item_total</code>
<code>tax_total</code>
<code>tax_total</code>
<PossiblyNullReference occurrences="3">
<code>to_array</code>
<code>to_array</code>
<code>to_array</code>
<code>value</code>
<code>value</code>
<code>value</code>
<code>value</code>
<code>value</code>
<code>value</code>
<code>value</code>
<code>value</code>
<code>value</code>
<code>value</code>
</PossiblyNullReference>
</file>
<file src="modules/ppcp-api-client/src/Entity/Refund.php">
@ -768,9 +743,6 @@
</PropertyNotSetInConstructor>
</file>
<file src="modules/ppcp-wc-gateway/src/Processor/OrderProcessor.php">
<MissingReturnType occurrences="1">
<code>set_order_transaction_id</code>
</MissingReturnType>
<PossiblyNullReference occurrences="1">
<code>card</code>
</PossiblyNullReference>
@ -928,25 +900,6 @@
<code>$request['resource']['purchase_units']</code>
</PossiblyNullArrayAccess>
</file>
<file src="modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php">
<InvalidReturnStatement occurrences="4">
<code>rest_ensure_response( $response )</code>
<code>rest_ensure_response( $response )</code>
<code>rest_ensure_response( $response )</code>
<code>rest_ensure_response( $response )</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>\WP_REST_Response</code>
</InvalidReturnType>
<PossiblyNullArgument occurrences="3">
<code>$request['resource']['custom_id']</code>
<code>isset( $request['id'] ) ? $request['id'] : ''</code>
<code>isset( $request['id'] ) ? $request['id'] : ''</code>
</PossiblyNullArgument>
<PossiblyNullArrayAccess occurrences="1">
<code>$request['resource']['custom_id']</code>
</PossiblyNullArrayAccess>
</file>
<file src="modules/ppcp-webhooks/src/Handler/PaymentCaptureRefunded.php">
<InvalidReturnStatement occurrences="4">
<code>rest_ensure_response( $response )</code>