Upgrato to 4.1 oro platform compatibility

Form/Type/PayPalExpressSettingsType.php

@@ -67,8 +67,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ChoiceType::class,
                 [
                     'choices'           => $this->actionsProvider->getActionNames(),
-                    'choices_as_values' => true,
-                    'choice_label'      => function ($action) {
+                    'choice_label'      => function ($action, $key) {
                         return $this->translator->trans(
                             sprintf('oro.paypal_express.settings.payment_action.%s', $action)
                         );
@@ -103,7 +102,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'    => 'oro.paypal_express.settings.client_id.label',
                 'tooltip'  => 'oro.paypal_express.settings.client_id.tooltip',
-                'required' => true
+                'required' => true,
+                'constraints' => [new NotBlank()]
             ]
         );
         $builder->add($this->addCryptedTransformer($clientIdFieldBuilder));
@@ -114,7 +114,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'    => 'oro.paypal_express.settings.client_secret.label',
                 'tooltip'  => 'oro.paypal_express.settings.client_secret.tooltip',
-                'required' => true
+                'required' => true,
+                'constraints' => [new NotBlank()]
             ]
         );
         $builder->add($this->addCryptedTransformer($clientSecretFieldBuilder));
@@ -125,7 +126,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label'    => 'oro.paypal_express.settings.sandbox_mode.label',
                 'tooltip'  => 'oro.paypal_express.settings.sandbox_mode.tooltip',
-                'required' => false,
+                'required' => false
             ]
         );
     }

Method/Translator/LineItemTranslator.php

@@ -6,7 +6,7 @@
 use Oro\Bundle\LocaleBundle\Formatter\NumberFormatter;
 use Oro\Bundle\PaymentBundle\Model\LineItemOptionModel;
 use Oro\Bundle\PaymentBundle\Model\Surcharge;
-use Oro\Bundle\PaymentBundle\Provider\ExtractOptionsProvider;
+use Oro\Bundle\PayPalBundle\OptionsProvider\OptionsProviderInterface;
 use Oro\Bundle\PayPalExpressBundle\Transport\DTO\ItemInfo;
 use Oro\Bundle\PricingBundle\SubtotalProcessor\Model\LineItemsAwareInterface;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -21,7 +21,7 @@ class LineItemTranslator
     const PAYPAL_NAME_LIMIT = 36;
 
     /**
-     * @var ExtractOptionsProvider
+     * @var OptionsProviderInterface
      */
     protected $optionsProvider;
 
@@ -41,10 +41,10 @@ class LineItemTranslator
     protected $rounder;
 
     /**
-     * @param ExtractOptionsProvider $optionsProvider
+     * @param OptionsProviderInterface $optionsProvider
      * @param TranslatorInterface    $translator
      */
-    public function __construct(ExtractOptionsProvider $optionsProvider, TranslatorInterface $translator)
+    public function __construct(OptionsProviderInterface $optionsProvider, TranslatorInterface $translator)
     {
         $this->optionsProvider = $optionsProvider;
         $this->translator = $translator;
@@ -75,7 +75,8 @@ public function setRounder(RoundingServiceInterface $roundingService)
      */
     public function getPaymentItems(LineItemsAwareInterface $paymentItem, Surcharge $surcharge, $currency)
     {
-        $lineItems = $this->optionsProvider->getLineItemPaymentOptions($paymentItem);
+        $lineItems = $this->optionsProvider->getLineItemOptions($paymentItem);
+
         if (!$lineItems) {
             return [];
         }

Resources/config/method.yml

@@ -36,7 +36,7 @@ services:
         public: false
         class: Oro\Bundle\PayPalExpressBundle\Method\Translator\LineItemTranslator
         arguments:
-            - '@oro_payment.provider.extract_options'
+            - '@oro_paypal.options_provider.options'
             - '@translator'
         calls:
             - ['setCurrencyFormatter', ['@oro_locale.formatter.number']]

Resources/public/js/app/components/express-checkout-component.js

@@ -1,12 +1,11 @@
 define(function(require) {
     'use strict';
 
-    var ExpressCheckoutComponent;
-    var _ = require('underscore');
-    var mediator = require('oroui/js/mediator');
-    var BaseComponent = require('oroui/js/app/components/base/component');
+    const _ = require('underscore');
+    const mediator = require('oroui/js/mediator');
+    const BaseComponent = require('oroui/js/app/components/base/component');
 
-    ExpressCheckoutComponent = BaseComponent.extend({
+    const ExpressCheckoutComponent = BaseComponent.extend({
         /**
          * @property {Object}
          */

Resources/views/layouts/default/config/jsmodules.yml

@@ -0,0 +1,3 @@
+dynamic-imports:
+    oropaypalexpress:
+        - oropaypalexpress/js/app/components/express-checkout-component

composer.json

@@ -14,25 +14,20 @@
         "exclude-from-classmap": ["/Tests/"]
     },
     "require": {
-        "php": ">=7.0",
-        "oro/commerce": "3.1.*",
-        "paypal/rest-api-sdk-php": "1.13.*"
+        "oro/commerce": "4.1.*",
+        "paypal/rest-api-sdk-php": "1.14.*"
     },
     "repositories": {
         "oro": {
             "type": "composer",
             "url": "https://packagist.orocrm.com"
-        },
-        "asset-packagist": {
-            "type": "composer",
-            "url": "https://asset-packagist.orocrm.com"
         }
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }