Skip to content

Commit 3d6393f

Browse files
YevSentYevSent
committed
Merge branch 'MAGETWO-70985' into MPI-PR
2 parents 21802c3 + f6ffeb4 commit 3d6393f

30 files changed

+1109
-94
lines changed

‎app/code/Magento/Payment/Model/Method/AbstractMethod.php

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
use Magento\Payment\Model\InfoInterface;
1313
use Magento\Payment\Model\MethodInterface;
1414
use Magento\Payment\Observer\AbstractDataAssignObserver;
15-
use Magento\Sales\Model\Order\Invoice;
16-
use Magento\Sales\Model\Order\Payment;
1715
use Magento\Quote\Api\Data\PaymentMethodInterface;
16+
use Magento\Sales\Model\Order\Payment;
1817

1918
/**
2019
* Payment method abstract model
@@ -275,6 +274,7 @@ protected function initializeData($data = [])
275274

276275
/**
277276
* {inheritdoc}
277+
* @deprecated 2.1.0
278278
*/
279279
public function setStore($storeId)
280280
{
@@ -283,6 +283,7 @@ public function setStore($storeId)
283283

284284
/**
285285
* {inheritdoc}
286+
* @deprecated 2.1.0
286287
*/
287288
public function getStore()
288289
{
@@ -294,6 +295,7 @@ public function getStore()
294295
*
295296
* @return bool
296297
* @api
298+
* @deprecated 2.1.0
297299
*/
298300
public function canOrder()
299301
{
@@ -305,6 +307,7 @@ public function canOrder()
305307
*
306308
* @return bool
307309
* @api
310+
* @deprecated 2.1.0
308311
*/
309312
public function canAuthorize()
310313
{
@@ -315,7 +318,8 @@ public function canAuthorize()
315318
* Check capture availability
316319
*
317320
* @return bool
318-
* @api
321+
* @apiчс
322+
* @deprecated 2.1.0
319323
*/
320324
public function canCapture()
321325
{
@@ -327,6 +331,7 @@ public function canCapture()
327331
*
328332
* @return bool
329333
* @api
334+
* @deprecated 2.1.0
330335
*/
331336
public function canCapturePartial()
332337
{
@@ -338,6 +343,7 @@ public function canCapturePartial()
338343
*
339344
* @return bool
340345
* @api
346+
* @deprecated 2.1.0
341347
*/
342348
public function canCaptureOnce()
343349
{
@@ -349,6 +355,7 @@ public function canCaptureOnce()
349355
*
350356
* @return bool
351357
* @api
358+
* @deprecated 2.1.0
352359
*/
353360
public function canRefund()
354361
{
@@ -360,6 +367,7 @@ public function canRefund()
360367
*
361368
* @return bool
362369
* @api
370+
* @deprecated 2.1.0
363371
*/
364372
public function canRefundPartialPerInvoice()
365373
{
@@ -371,6 +379,7 @@ public function canRefundPartialPerInvoice()
371379
* @return bool
372380
* @internal param \Magento\Framework\DataObject $payment
373381
* @api
382+
* @deprecated 2.1.0
374383
*/
375384
public function canVoid()
376385
{
@@ -382,6 +391,7 @@ public function canVoid()
382391
* Can be used in admin
383392
*
384393
* @return bool
394+
* @deprecated 2.1.0
385395
*/
386396
public function canUseInternal()
387397
{
@@ -392,6 +402,7 @@ public function canUseInternal()
392402
* Can be used in regular checkout
393403
*
394404
* @return bool
405+
* @deprecated 2.1.0
395406
*/
396407
public function canUseCheckout()
397408
{
@@ -403,6 +414,7 @@ public function canUseCheckout()
403414
*
404415
* @return bool
405416
* @api
417+
* @deprecated 2.1.0
406418
*/
407419
public function canEdit()
408420
{
@@ -414,6 +426,7 @@ public function canEdit()
414426
*
415427
* @return bool
416428
* @api
429+
* @deprecated 2.1.0
417430
*/
418431
public function canFetchTransactionInfo()
419432
{
@@ -428,6 +441,7 @@ public function canFetchTransactionInfo()
428441
* @return array
429442
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
430443
* @api
444+
* @deprecated 2.1.0
431445
*/
432446
public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
433447
{
@@ -439,6 +453,7 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
439453
*
440454
* @return bool
441455
* @api
456+
* @deprecated 2.1.0
442457
*/
443458
public function isGateway()
444459
{
@@ -450,6 +465,7 @@ public function isGateway()
450465
*
451466
* @return bool
452467
* @api
468+
* @deprecated 2.1.0
453469
*/
454470
public function isOffline()
455471
{
@@ -461,6 +477,7 @@ public function isOffline()
461477
*
462478
* @return bool
463479
* @api
480+
* @deprecated 2.1.0
464481
*/
465482
public function isInitializeNeeded()
466483
{
@@ -472,6 +489,7 @@ public function isInitializeNeeded()
472489
*
473490
* @param string $country
474491
* @return bool
492+
* @deprecated 2.1.0
475493
*/
476494
public function canUseForCountry($country)
477495
{
@@ -493,6 +511,7 @@ public function canUseForCountry($country)
493511
* @param string $currencyCode
494512
* @return bool
495513
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
514+
* @deprecated 2.1.0
496515
*/
497516
public function canUseForCurrency($currencyCode)
498517
{
@@ -504,6 +523,7 @@ public function canUseForCurrency($currencyCode)
504523
*
505524
* @return string
506525
* @throws \Magento\Framework\Exception\LocalizedException
526+
* @deprecated 2.1.0
507527
*/
508528
public function getCode()
509529
{
@@ -517,6 +537,7 @@ public function getCode()
517537
* Retrieve block type for method form generation
518538
*
519539
* @return string
540+
* @deprecated 2.1.0
520541
*/
521542
public function getFormBlockType()
522543
{
@@ -528,6 +549,7 @@ public function getFormBlockType()
528549
*
529550
* @return string
530551
* @api
552+
* @deprecated 2.1.0
531553
*/
532554
public function getInfoBlockType()
533555
{
@@ -540,6 +562,7 @@ public function getInfoBlockType()
540562
* @return InfoInterface
541563
* @throws \Magento\Framework\Exception\LocalizedException
542564
* @api
565+
* @deprecated 2.1.0
543566
*/
544567
public function getInfoInstance()
545568
{
@@ -556,6 +579,7 @@ public function getInfoInstance()
556579
* @param InfoInterface $info
557580
* @return void
558581
* @api
582+
* @deprecated 2.1.0
559583
*/
560584
public function setInfoInstance(InfoInterface $info)
561585
{
@@ -568,6 +592,7 @@ public function setInfoInstance(InfoInterface $info)
568592
* @return $this
569593
* @throws \Magento\Framework\Exception\LocalizedException
570594
* @api
595+
* @deprecated 2.1.0
571596
*/
572597
public function validate()
573598
{
@@ -597,6 +622,7 @@ public function validate()
597622
* @throws \Magento\Framework\Exception\LocalizedException
598623
* @api
599624
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
625+
* @deprecated 2.1.0
600626
*/
601627
public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
602628
{
@@ -615,6 +641,7 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
615641
* @throws \Magento\Framework\Exception\LocalizedException
616642
* @api
617643
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
644+
* @deprecated 2.1.0
618645
*/
619646
public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
620647
{
@@ -633,6 +660,7 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
633660
* @throws \Magento\Framework\Exception\LocalizedException
634661
* @api
635662
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
663+
* @deprecated 2.1.0
636664
*/
637665
public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
638666
{
@@ -652,6 +680,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
652680
* @throws \Magento\Framework\Exception\LocalizedException
653681
* @api
654682
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
683+
* @deprecated 2.1.0
655684
*/
656685
public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
657686
{
@@ -668,6 +697,7 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
668697
* @return $this
669698
* @api
670699
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
700+
* @deprecated 2.1.0
671701
*/
672702
public function cancel(\Magento\Payment\Model\InfoInterface $payment)
673703
{
@@ -682,6 +712,7 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
682712
* @throws \Magento\Framework\Exception\LocalizedException
683713
* @api
684714
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
715+
* @deprecated 2.1.0
685716
*/
686717
public function void(\Magento\Payment\Model\InfoInterface $payment)
687718
{
@@ -695,6 +726,7 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
695726
* Whether this method can accept or deny payment
696727
* @return bool
697728
* @api
729+
* @deprecated 2.1.0
698730
*/
699731
public function canReviewPayment()
700732
{
@@ -709,6 +741,7 @@ public function canReviewPayment()
709741
* @throws \Magento\Framework\Exception\LocalizedException
710742
* @api
711743
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
744+
* @deprecated 2.1.0
712745
*/
713746
public function acceptPayment(InfoInterface $payment)
714747
{
@@ -726,6 +759,7 @@ public function acceptPayment(InfoInterface $payment)
726759
* @throws \Magento\Framework\Exception\LocalizedException
727760
* @api
728761
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
762+
* @deprecated 2.1.0
729763
*/
730764
public function denyPayment(InfoInterface $payment)
731765
{
@@ -739,6 +773,7 @@ public function denyPayment(InfoInterface $payment)
739773
* Retrieve payment method title
740774
*
741775
* @return string
776+
* @deprecated 2.1.0
742777
*/
743778
public function getTitle()
744779
{
@@ -752,6 +787,7 @@ public function getTitle()
752787
* @param int|string|null|\Magento\Store\Model\Store $storeId
753788
*
754789
* @return mixed
790+
* @deprecated 2.1.0
755791
*/
756792
public function getConfigData($field, $storeId = null)
757793
{
@@ -772,6 +808,7 @@ public function getConfigData($field, $storeId = null)
772808
* @return $this
773809
* @throws \Magento\Framework\Exception\LocalizedException
774810
* @api
811+
* @deprecated 2.1.0
775812
*/
776813
public function assignData(\Magento\Framework\DataObject $data)
777814
{
@@ -801,6 +838,7 @@ public function assignData(\Magento\Framework\DataObject $data)
801838
*
802839
* @param \Magento\Quote\Api\Data\CartInterface|null $quote
803840
* @return bool
841+
* @deprecated 2.1.0
804842
*/
805843
public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
806844
{
@@ -829,6 +867,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
829867
*
830868
* @param int|null $storeId
831869
* @return bool
870+
* @deprecated 2.1.0
832871
*/
833872
public function isActive($storeId = null)
834873
{
@@ -845,6 +884,7 @@ public function isActive($storeId = null)
845884
* @return $this
846885
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
847886
* @api
887+
* @deprecated 2.1.0
848888
*/
849889
public function initialize($paymentAction, $stateObject)
850890
{
@@ -857,6 +897,7 @@ public function initialize($paymentAction, $stateObject)
857897
*
858898
* @return string
859899
* @api
900+
* @deprecated 2.1.0
860901
*/
861902
public function getConfigPaymentAction()
862903
{
@@ -868,6 +909,7 @@ public function getConfigPaymentAction()
868909
*
869910
* @param array $debugData
870911
* @return void
912+
* @deprecated 2.1.0
871913
*/
872914
protected function _debug($debugData)
873915
{
@@ -884,6 +926,7 @@ protected function _debug($debugData)
884926
* @return bool
885927
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
886928
* @api
929+
* @deprecated 2.1.0
887930
*/
888931
public function getDebugFlag()
889932
{
@@ -896,6 +939,7 @@ public function getDebugFlag()
896939
* @param mixed $debugData
897940
* @return void
898941
* @api
942+
* @deprecated 2.1.0
899943
*/
900944
public function debugData($debugData)
901945
{
@@ -906,6 +950,7 @@ public function debugData($debugData)
906950
* Return replace keys for debug data
907951
*
908952
* @return array
953+
* @deprecated 2.1.0
909954
*/
910955
public function getDebugReplacePrivateDataKeys()
911956
{

‎app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
4343
*
4444
* @param \Magento\Sales\Api\Data\CreditmemoCommentInterface $entity The credit memo comment.
4545
* @return bool
46+
* @throws \Magento\Framework\Exception\CouldNotDeleteException
4647
*/
4748
public function delete(\Magento\Sales\Api\Data\CreditmemoCommentInterface $entity);
4849

@@ -51,6 +52,7 @@ public function delete(\Magento\Sales\Api\Data\CreditmemoCommentInterface $entit
5152
*
5253
* @param \Magento\Sales\Api\Data\CreditmemoCommentInterface $entity The credit memo comment.
5354
* @return \Magento\Sales\Api\Data\CreditmemoCommentInterface Credit memo comment interface.
55+
* @throws \Magento\Framework\Exception\CouldNotSaveException
5456
*/
5557
public function save(\Magento\Sales\Api\Data\CreditmemoCommentInterface $entity);
5658
}

0 commit comments

Comments
 (0)