Issue #2841365 by vasike, bojanz: Require Drupal 8.3.x

Author: vasike

.travis.yml

@@ -40,7 +40,7 @@ env:
 
     # The environment to use, supported are: drupal-7, drupal-8
     - DRUPAL_TI_ENVIRONMENT="drupal-8"
-    - DRUPAL_TI_CORE_BRANCH="8.2.x"
+    - DRUPAL_TI_CORE_BRANCH="8.3.x"
 
     # Drupal specific variables.
     - DRUPAL_TI_DB="drupal_travis_db"
@@ -104,7 +104,7 @@ before_install:
   # Add the oauth token to prevent GitHub timeouts.
   - git config --global github.accesstoken $GITHUB_OAUTH_TOKEN
   - composer global require "hirak/prestissimo:^0.3"
-  - composer global require "lionsad/drupal_ti:dev-master"
+  - composer global require "lionsad/drupal_ti:dev-master#396d11d200005eb68491d24170da0a98ae7f51b3"
   - composer global require "squizlabs/php_codesniffer:2.*"
   - composer global require "drupal/coder:8.2.*"
   - phpcs --config-set installed_paths $HOME/.composer/vendor/drupal/coder/coder_sniffer

commerce.info.yml

@@ -10,4 +10,4 @@ dependencies:
   - datetime
   - inline_entity_form
   - views
-  - system (>=8.2.0)
+  - system (>=8.3.0)

commerce.services.yml

@@ -50,10 +50,6 @@ services:
     class: Drupal\commerce\Config\ConfigUpdater
     arguments: ['@entity_type.manager', '@config.storage', '@config.factory']
 
-  commerce.time:
-    class: Drupal\commerce\Time
-    arguments: ['@request_stack']
-
   cache_context.country:
     class: Drupal\commerce\Cache\Context\CountryCacheContext
     arguments: ['@commerce.current_country']

composer.json

@@ -5,7 +5,7 @@
     "homepage": "http://drupal.org/project/commerce",
     "license": "GPL-2.0+",
     "require": {
-        "drupal/core": "~8.2",
+        "drupal/core": "~8.3",
         "drupal/address": "~1.0",
         "drupal/entity": "~1.0",
         "drupal/entity_reference_revisions": "~1.0",

modules/cart/src/Form/AddToCartForm.php

@@ -9,8 +9,10 @@
 use Drupal\commerce_order\Resolver\OrderTypeResolverInterface;
 use Drupal\commerce_price\Resolver\ChainPriceResolverInterface;
 use Drupal\commerce_store\StoreContextInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Session\AccountInterface;
@@ -77,6 +79,10 @@ class AddToCartForm extends ContentEntityForm {
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle info.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time.
    * @param \Drupal\commerce_cart\CartManagerInterface $cart_manager
    *   The cart manager.
    * @param \Drupal\commerce_cart\CartProviderInterface $cart_provider
@@ -90,8 +96,8 @@ class AddToCartForm extends ContentEntityForm {
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   The current user.
    */
-  public function __construct(EntityManagerInterface $entity_manager, CartManagerInterface $cart_manager, CartProviderInterface $cart_provider, OrderTypeResolverInterface $order_type_resolver, StoreContextInterface $store_context, ChainPriceResolverInterface $chain_price_resolver, AccountInterface $current_user) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityManagerInterface $entity_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, TimeInterface $time, CartManagerInterface $cart_manager, CartProviderInterface $cart_provider, OrderTypeResolverInterface $order_type_resolver, StoreContextInterface $store_context, ChainPriceResolverInterface $chain_price_resolver, AccountInterface $current_user) {
+    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
 
     $this->cartManager = $cart_manager;
     $this->cartProvider = $cart_provider;
@@ -109,6 +115,8 @@ public function __construct(EntityManagerInterface $entity_manager, CartManagerI
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time'),
       $container->get('commerce_cart.cart_manager'),
       $container->get('commerce_cart.cart_provider'),
       $container->get('commerce_order.chain_order_type_resolver'),

modules/checkout/commerce_checkout.routing.yml

@@ -1,11 +1,3 @@
-entity.commerce_checkout_flow.collection:
-  path: '/admin/commerce/config/checkout-flows'
-  defaults:
-    _entity_list: 'commerce_checkout_flow'
-    _title: 'Checkout flows'
-  requirements:
-    _permission: 'administer commerce_checkout_flow'
-
 commerce_checkout.form:
   path: '/checkout/{commerce_order}/{step}'
   defaults:

modules/checkout/src/Entity/CheckoutFlow.php

@@ -11,6 +11,7 @@
  * @ConfigEntityType(
  *   id = "commerce_checkout_flow",
  *   label = @Translation("Checkout flow"),
+ *   label_collection = @Translation("Checkout flows"),
  *   label_singular = @Translation("checkout flow"),
  *   label_plural = @Translation("checkout flows"),
  *   label_count = @PluralTranslation(

modules/order/commerce_order.routing.yml

@@ -18,22 +18,6 @@ entity.commerce_order.reassign_form:
   requirements:
     _permission: 'administer commerce_order'
 
-entity.commerce_order_type.collection:
-  path: '/admin/commerce/config/order-types'
-  defaults:
-    _entity_list: 'commerce_order_type'
-    _title: 'Order types'
-  requirements:
-    _permission: 'administer commerce_order_type'
-
-entity.commerce_order.collection:
-  path: '/admin/commerce/orders'
-  defaults:
-    _entity_list: 'commerce_order'
-    _title: 'Orders'
-  requirements:
-    _permission: 'administer commerce_order'
-
 entity.commerce_order.user_view:
   path: '/user/{user}/orders/{commerce_order}'
   defaults:
@@ -46,11 +30,3 @@ entity.commerce_order.user_view:
       entity:
         user: 'entity:user'
         commerce_order: 'entity:order'
-
-entity.commerce_order_item_type.collection:
-  path: '/admin/commerce/config/order-item-types'
-  defaults:
-    _entity_list: 'commerce_order_item_type'
-    _title: 'Order item types'
-  requirements:
-    _permission: 'administer commerce_order_type'

modules/order/commerce_order.services.yml

@@ -16,7 +16,7 @@ services:
 
   commerce_order.order_refresh:
     class: Drupal\commerce_order\OrderRefresh
-    arguments: ['@entity_type.manager', '@commerce_price.chain_price_resolver', '@current_user', '@commerce.time']
+    arguments: ['@entity_type.manager', '@commerce_price.chain_price_resolver', '@current_user', '@datetime.time']
     tags:
       - { name: service_collector, call: addProcessor, tag: commerce_order.order_processor }
 

modules/order/src/Entity/Order.php

@@ -18,6 +18,7 @@
  * @ContentEntityType(
  *   id = "commerce_order",
  *   label = @Translation("Order"),
+ *   label_collection = @Translation("Orders"),
  *   label_singular = @Translation("order"),
  *   label_plural = @Translation("orders"),
  *   label_count = @PluralTranslation(
@@ -469,7 +470,7 @@ public function preSave(EntityStorageInterface $storage) {
     $original_state = isset($this->original) ? $this->original->getState()->value : '';
     if ($state == 'completed' && $original_state != 'completed') {
       if (empty($this->getCompletedTime())) {
-        $this->setCompletedTime(REQUEST_TIME);
+        $this->setCompletedTime(\Drupal::time()->getRequestTime());
       }
     }