Skip to content

Commit 8f45626

Browse files
vasikebojanz
vasike
authored and
bojanz
committed
Issue #2841365 by vasike, bojanz: Require Drupal 8.3.x
1 parent 20e44ea commit 8f45626

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+79
-301
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ env:
4040

4141
# The environment to use, supported are: drupal-7, drupal-8
4242
- DRUPAL_TI_ENVIRONMENT="drupal-8"
43-
- DRUPAL_TI_CORE_BRANCH="8.2.x"
43+
- DRUPAL_TI_CORE_BRANCH="8.3.x"
4444

4545
# Drupal specific variables.
4646
- DRUPAL_TI_DB="drupal_travis_db"
@@ -104,7 +104,7 @@ before_install:
104104
# Add the oauth token to prevent GitHub timeouts.
105105
- git config --global github.accesstoken $GITHUB_OAUTH_TOKEN
106106
- composer global require "hirak/prestissimo:^0.3"
107-
- composer global require "lionsad/drupal_ti:dev-master"
107+
- composer global require "lionsad/drupal_ti:dev-master#396d11d200005eb68491d24170da0a98ae7f51b3"
108108
- composer global require "squizlabs/php_codesniffer:2.*"
109109
- composer global require "drupal/coder:8.2.*"
110110
- phpcs --config-set installed_paths $HOME/.composer/vendor/drupal/coder/coder_sniffer

‎commerce.info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ dependencies:
1010
- datetime
1111
- inline_entity_form
1212
- views
13-
- system (>=8.2.0)
13+
- system (>=8.3.0)

‎commerce.services.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ services:
5050
class: Drupal\commerce\Config\ConfigUpdater
5151
arguments: ['@entity_type.manager', '@config.storage', '@config.factory']
5252

53-
commerce.time:
54-
class: Drupal\commerce\Time
55-
arguments: ['@request_stack']
56-
5753
cache_context.country:
5854
class: Drupal\commerce\Cache\Context\CountryCacheContext
5955
arguments: ['@commerce.current_country']

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"homepage": "http://drupal.org/project/commerce",
66
"license": "GPL-2.0+",
77
"require": {
8-
"drupal/core": "~8.2",
8+
"drupal/core": "~8.3",
99
"drupal/address": "~1.0",
1010
"drupal/entity": "~1.0",
1111
"drupal/entity_reference_revisions": "~1.0",

‎modules/cart/src/Form/AddToCartForm.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
use Drupal\commerce_order\Resolver\OrderTypeResolverInterface;
1010
use Drupal\commerce_price\Resolver\ChainPriceResolverInterface;
1111
use Drupal\commerce_store\StoreContextInterface;
12-
use Drupal\Core\Entity\EntityManagerInterface;
12+
use Drupal\Component\Datetime\TimeInterface;
1313
use Drupal\Core\Entity\ContentEntityForm;
14+
use Drupal\Core\Entity\EntityManagerInterface;
15+
use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
1416
use Drupal\Core\Form\FormStateInterface;
1517
use Drupal\Core\Link;
1618
use Drupal\Core\Session\AccountInterface;
@@ -77,6 +79,10 @@ class AddToCartForm extends ContentEntityForm {
7779
*
7880
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
7981
* The entity manager.
82+
* @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
83+
* The entity type bundle info.
84+
* @param \Drupal\Component\Datetime\TimeInterface $time
85+
* The time.
8086
* @param \Drupal\commerce_cart\CartManagerInterface $cart_manager
8187
* The cart manager.
8288
* @param \Drupal\commerce_cart\CartProviderInterface $cart_provider
@@ -90,8 +96,8 @@ class AddToCartForm extends ContentEntityForm {
9096
* @param \Drupal\Core\Session\AccountInterface $current_user
9197
* The current user.
9298
*/
93-
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) {
94-
parent::__construct($entity_manager);
99+
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) {
100+
parent::__construct($entity_manager, $entity_type_bundle_info, $time);
95101

96102
$this->cartManager = $cart_manager;
97103
$this->cartProvider = $cart_provider;
@@ -109,6 +115,8 @@ public function __construct(EntityManagerInterface $entity_manager, CartManagerI
109115
public static function create(ContainerInterface $container) {
110116
return new static(
111117
$container->get('entity.manager'),
118+
$container->get('entity_type.bundle.info'),
119+
$container->get('datetime.time'),
112120
$container->get('commerce_cart.cart_manager'),
113121
$container->get('commerce_cart.cart_provider'),
114122
$container->get('commerce_order.chain_order_type_resolver'),

‎modules/checkout/commerce_checkout.routing.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
entity.commerce_checkout_flow.collection:
2-
path: '/admin/commerce/config/checkout-flows'
3-
defaults:
4-
_entity_list: 'commerce_checkout_flow'
5-
_title: 'Checkout flows'
6-
requirements:
7-
_permission: 'administer commerce_checkout_flow'
8-
91
commerce_checkout.form:
102
path: '/checkout/{commerce_order}/{step}'
113
defaults:

‎modules/checkout/src/Entity/CheckoutFlow.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* @ConfigEntityType(
1212
* id = "commerce_checkout_flow",
1313
* label = @Translation("Checkout flow"),
14+
* label_collection = @Translation("Checkout flows"),
1415
* label_singular = @Translation("checkout flow"),
1516
* label_plural = @Translation("checkout flows"),
1617
* label_count = @PluralTranslation(

‎modules/order/commerce_order.routing.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,6 @@ entity.commerce_order.reassign_form:
1818
requirements:
1919
_permission: 'administer commerce_order'
2020

21-
entity.commerce_order_type.collection:
22-
path: '/admin/commerce/config/order-types'
23-
defaults:
24-
_entity_list: 'commerce_order_type'
25-
_title: 'Order types'
26-
requirements:
27-
_permission: 'administer commerce_order_type'
28-
29-
entity.commerce_order.collection:
30-
path: '/admin/commerce/orders'
31-
defaults:
32-
_entity_list: 'commerce_order'
33-
_title: 'Orders'
34-
requirements:
35-
_permission: 'administer commerce_order'
36-
3721
entity.commerce_order.user_view:
3822
path: '/user/{user}/orders/{commerce_order}'
3923
defaults:
@@ -46,11 +30,3 @@ entity.commerce_order.user_view:
4630
entity:
4731
user: 'entity:user'
4832
commerce_order: 'entity:order'
49-
50-
entity.commerce_order_item_type.collection:
51-
path: '/admin/commerce/config/order-item-types'
52-
defaults:
53-
_entity_list: 'commerce_order_item_type'
54-
_title: 'Order item types'
55-
requirements:
56-
_permission: 'administer commerce_order_type'

‎modules/order/commerce_order.services.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616

1717
commerce_order.order_refresh:
1818
class: Drupal\commerce_order\OrderRefresh
19-
arguments: ['@entity_type.manager', '@commerce_price.chain_price_resolver', '@current_user', '@commerce.time']
19+
arguments: ['@entity_type.manager', '@commerce_price.chain_price_resolver', '@current_user', '@datetime.time']
2020
tags:
2121
- { name: service_collector, call: addProcessor, tag: commerce_order.order_processor }
2222

‎modules/order/src/Entity/Order.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
* @ContentEntityType(
1919
* id = "commerce_order",
2020
* label = @Translation("Order"),
21+
* label_collection = @Translation("Orders"),
2122
* label_singular = @Translation("order"),
2223
* label_plural = @Translation("orders"),
2324
* label_count = @PluralTranslation(
@@ -469,7 +470,7 @@ public function preSave(EntityStorageInterface $storage) {
469470
$original_state = isset($this->original) ? $this->original->getState()->value : '';
470471
if ($state == 'completed' && $original_state != 'completed') {
471472
if (empty($this->getCompletedTime())) {
472-
$this->setCompletedTime(REQUEST_TIME);
473+
$this->setCompletedTime(\Drupal::time()->getRequestTime());
473474
}
474475
}
475476

‎modules/order/src/Entity/OrderItemType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* @ConfigEntityType(
1111
* id = "commerce_order_item_type",
1212
* label = @Translation("Order item type"),
13+
* label_collection = @Translation("Order item types"),
1314
* label_singular = @Translation("order item type"),
1415
* label_plural = @Translation("order item types"),
1516
* label_count = @PluralTranslation(

‎modules/order/src/Entity/OrderType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* @ConfigEntityType(
1111
* id = "commerce_order_type",
1212
* label = @Translation("Order type"),
13+
* label_collection = @Translation("Order types"),
1314
* label_singular = @Translation("order type"),
1415
* label_plural = @Translation("order types"),
1516
* label_count = @PluralTranslation(

‎modules/order/src/EventSubscriber/TimestampEventSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function onPlaceTransition(WorkflowTransitionEvent $event) {
2727
/** @var \Drupal\commerce_order\Entity\OrderInterface $order */
2828
$order = $event->getEntity();
2929
if (empty($order->getPlacedTime())) {
30-
$order->setPlacedTime(REQUEST_TIME);
30+
$order->setPlacedTime(\Drupal::time()->getRequestTime());
3131
}
3232
}
3333

‎modules/order/src/Form/OrderForm.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
use Drupal\Component\Utility\Html;
66
use Drupal\Core\Datetime\DateFormatterInterface;
7+
use Drupal\Component\Datetime\TimeInterface;
78
use Drupal\Core\Entity\ContentEntityForm;
89
use Drupal\Core\Entity\EntityManagerInterface;
10+
use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
911
use Drupal\Core\Form\FormStateInterface;
1012
use Symfony\Component\DependencyInjection\ContainerInterface;
1113

@@ -26,11 +28,15 @@ class OrderForm extends ContentEntityForm {
2628
*
2729
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
2830
* The entity manager.
31+
* @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
32+
* The entity type bundle info.
33+
* @param \Drupal\Component\Datetime\TimeInterface $time
34+
* The time.
2935
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
3036
* The date formatter.
3137
*/
32-
public function __construct(EntityManagerInterface $entity_manager, DateFormatterInterface $date_formatter) {
33-
parent::__construct($entity_manager);
38+
public function __construct(EntityManagerInterface $entity_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, TimeInterface $time, DateFormatterInterface $date_formatter) {
39+
parent::__construct($entity_manager, $entity_type_bundle_info, $time);
3440

3541
$this->dateFormatter = $date_formatter;
3642
}
@@ -41,6 +47,8 @@ public function __construct(EntityManagerInterface $entity_manager, DateFormatte
4147
public static function create(ContainerInterface $container) {
4248
return new static(
4349
$container->get('entity.manager'),
50+
$container->get('entity_type.bundle.info'),
51+
$container->get('datetime.time'),
4452
$container->get('date.formatter')
4553
);
4654
}

‎modules/order/src/OrderRefresh.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Drupal\commerce_order;
44

55
use Drupal\commerce\Context;
6-
use Drupal\commerce\TimeInterface;
6+
use Drupal\Component\Datetime\TimeInterface;
77
use Drupal\commerce_order\Entity\OrderInterface;
88
use Drupal\commerce_order\Entity\OrderType;
99
use Drupal\commerce_price\Resolver\ChainPriceResolverInterface;
@@ -39,7 +39,7 @@ class OrderRefresh implements OrderRefreshInterface {
3939
/**
4040
* The time.
4141
*
42-
* @var \Drupal\commerce\TimeInterface
42+
* @var \Drupal\Component\Datetime\TimeInterface
4343
*/
4444
protected $time;
4545

@@ -59,7 +59,7 @@ class OrderRefresh implements OrderRefreshInterface {
5959
* The chain price resolver.
6060
* @param \Drupal\Core\Session\AccountInterface $current_user
6161
* The current user.
62-
* @param \Drupal\commerce\TimeInterface $time
62+
* @param \Drupal\Component\Datetime\TimeInterface $time
6363
* The time.
6464
*/
6565
public function __construct(EntityTypeManagerInterface $entity_type_manager, ChainPriceResolverInterface $chain_price_resolver, AccountInterface $current_user, TimeInterface $time) {

‎modules/order/tests/src/Functional/OrderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public function testOrderTimestamps() {
8686
$transition = $order->getState()->getWorkflow()->getTransition('place');
8787
$order->getState()->applyTransition($transition);
8888
$order->save();
89-
$this->assertEquals($order->getPlacedTime(), REQUEST_TIME);
90-
$this->assertEquals($order->getCompletedTime(), REQUEST_TIME);
89+
$this->assertEquals($order->getPlacedTime(), \Drupal::time()->getRequestTime());
90+
$this->assertEquals($order->getCompletedTime(), \Drupal::time()->getRequestTime());
9191
}
9292

9393
}

‎modules/order/tests/src/Kernel/OrderRefreshTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Drupal\Tests\commerce_order\Kernel;
44

5-
use Drupal\commerce\TimeInterface;
5+
use Drupal\Component\Datetime\TimeInterface;
66
use Drupal\commerce_order\Entity\Order;
77
use Drupal\commerce_order\Entity\OrderType;
88
use Drupal\commerce_order\OrderRefresh;

‎modules/payment/commerce_payment.routing.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ entity.commerce_payment.collection:
3535
requirements:
3636
_permission: 'administer commerce_payment'
3737

38-
entity.commerce_payment_gateway.collection:
39-
path: '/admin/commerce/config/payment-gateways'
40-
defaults:
41-
_entity_list: 'commerce_payment_gateway'
42-
_title: 'Payment gateways'
43-
requirements:
44-
_permission: 'administer commerce_payment_gateway'
45-
4638
entity.commerce_payment_method.add_form:
4739
path: '/user/{user}/payment-methods/add'
4840
defaults:

‎modules/payment/src/Entity/Payment.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* @ContentEntityType(
1515
* id = "commerce_payment",
1616
* label = @Translation("Payment"),
17+
* label_collection = @Translation("Payments"),
1718
* label_singular = @Translation("payment"),
1819
* label_plural = @Translation("payments"),
1920
* label_count = @PluralTranslation(

‎modules/payment/src/Entity/PaymentGateway.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* @ConfigEntityType(
1212
* id = "commerce_payment_gateway",
1313
* label = @Translation("Payment gateway"),
14+
* label_collection = @Translation("Payment gateways"),
1415
* label_singular = @Translation("payment gateway"),
1516
* label_plural = @Translation("payment gateways"),
1617
* label_count = @PluralTranslation(

‎modules/payment/src/Entity/PaymentMethod.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* @ContentEntityType(
1616
* id = "commerce_payment_method",
1717
* label = @Translation("Payment method"),
18+
* label_collection = @Translation("Payment methods"),
1819
* label_singular = @Translation("payment method"),
1920
* label_plural = @Translation("payment methods"),
2021
* label_count = @PluralTranslation(
@@ -188,7 +189,7 @@ public function setDefault($default) {
188189
*/
189190
public function isExpired() {
190191
$expires = $this->getExpiresTime();
191-
return $expires > 0 && $expires <= REQUEST_TIME;
192+
return $expires > 0 && $expires <= \Drupal::time()->getRequestTime();
192193
}
193194

194195
/**

‎modules/payment/src/PaymentMethodStorage.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace Drupal\commerce_payment;
44

55
use Drupal\commerce\CommerceContentEntityStorage;
6-
use Drupal\commerce\TimeInterface;
76
use Drupal\commerce_payment\Entity\PaymentGatewayInterface;
87
use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\SupportsStoredPaymentMethodsInterface;
8+
use Drupal\Component\Datetime\TimeInterface;
99
use Drupal\Core\Cache\CacheBackendInterface;
1010
use Drupal\Core\Database\Connection;
1111
use Drupal\Core\Entity\EntityManagerInterface;
@@ -24,7 +24,7 @@ class PaymentMethodStorage extends CommerceContentEntityStorage implements Payme
2424
/**
2525
* The time.
2626
*
27-
* @var \Drupal\commerce\TimeInterface
27+
* @var \Drupal\Component\Datetime\TimeInterface
2828
*/
2929
protected $time;
3030

@@ -43,7 +43,7 @@ class PaymentMethodStorage extends CommerceContentEntityStorage implements Payme
4343
* The language manager.
4444
* @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
4545
* The event dispatcher.
46-
* @param \Drupal\commerce\TimeInterface $time
46+
* @param \Drupal\Component\Datetime\TimeInterface $time
4747
* The time.
4848
*/
4949
public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityManagerInterface $entity_manager, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, EventDispatcherInterface $event_dispatcher, TimeInterface $time) {
@@ -63,7 +63,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
6363
$container->get('cache.entity'),
6464
$container->get('language_manager'),
6565
$container->get('event_dispatcher'),
66-
$container->get('commerce.time')
66+
$container->get('datetime.time')
6767
);
6868
}
6969

‎modules/payment/tests/src/Functional/PaymentAdminTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Drupal\commerce_payment\Entity\Payment;
66
use Drupal\commerce_price\Price;
7+
use Drupal\Core\Url;
78
use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
89

910
/**
@@ -122,14 +123,16 @@ protected function setUp() {
122123
'store_id' => $this->store,
123124
]);
124125

125-
$this->paymentUri = 'admin/commerce/orders/' . $this->order->id() . '/payments';
126+
$this->paymentUri = Url::fromRoute('entity.commerce_payment.collection', [
127+
'commerce_order' => $this->order->id(),
128+
])->toString();
126129
}
127130

128131
/**
129132
* Tests that a Payments tab is visible on the order page.
130133
*/
131134
public function testPaymentTab() {
132-
$this->drupalGet('admin/commerce/orders/' . $this->order->id());
135+
$this->drupalGet($this->order->toUrl());
133136
$this->assertSession()->linkExists('Payments');
134137
$this->assertSession()->linkByHrefExists($this->paymentUri);
135138
}

‎modules/payment_example/src/Plugin/Commerce/PaymentGateway/OffsiteRedirect.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function onReturn(OrderInterface $order, Request $request) {
8080
'test' => $this->getMode() == 'test',
8181
'remote_id' => $request->query->get('txn_id'),
8282
'remote_state' => $request->query->get('payment_status'),
83-
'authorized' => REQUEST_TIME,
83+
'authorized' => \Drupal::time()->getRequestTime(),
8484
]);
8585
$payment->save();
8686
drupal_set_message('Payment was processed');

0 commit comments

Comments
 (0)