Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Deprecate unused utilities for 5.5 removal (#13612)
Damian Legawiec6b76d8354477
diff --git a/backend/engines/core/app/helpers/spree/base_helper.rb b/backend/engines/core/app/helpers/spree/base_helper.rbindex 7edb529790..dc198d5d98 100644--- a/backend/engines/core/app/helpers/spree/base_helper.rb+++ b/backend/engines/core/app/helpers/spree/base_helper.rb@@ -204,7 +204,8 @@ module Spreeenddef maximum_quantity- Spree::DatabaseTypeUtilities.maximum_value_for(:integer)+ Spree::Deprecation.warn('BaseHelper#maximum_quantity is deprecated and will be removed in Spree 5.5')+ Spree::DatabaseTypeUtilities::INTEGER_MAXenddef payment_method_icon_tag(payment_method, opts = {})diff --git a/backend/engines/core/app/models/spree/line_item.rb b/backend/engines/core/app/models/spree/line_item.rbindex 7aca9e3259..bd581c1951 100644--- a/backend/engines/core/app/models/spree/line_item.rb+++ b/backend/engines/core/app/models/spree/line_item.rb@@ -30,10 +30,12 @@ module Spreevalidates :variant, :order, presence: true+ DB_INTEGER_MAX = (2**31) - 1+# numericality: :less_than_or_equal_to validation is due to the restriction at the database level# https://github.com/spree/spree/issues/2695#issuecomment-143314161validates :quantity, numericality: {- in: 0..DatabaseTypeUtilities.maximum_value_for(:integer),+ in: 0..DB_INTEGER_MAX,only_integer: true, message: Spree.t('validation.must_be_int')}@@ -226,7 +228,7 @@ module Spree## @return [Integer]def maximum_quantity- @maximum_quantity ||= variant.backorderable? ? Spree::DatabaseTypeUtilities.maximum_value_for(:integer) : variant.total_on_hand+ @maximum_quantity ||= variant.backorderable? ? DB_INTEGER_MAX : variant.total_on_handend# Returns true if the line item variant has digital assetsdiff --git a/backend/engines/core/lib/spree/core/controller_helpers/currency.rb b/backend/engines/core/lib/spree/core/controller_helpers/currency.rbindex e5dd752547..0f54704a84 100644--- a/backend/engines/core/lib/spree/core/controller_helpers/currency.rb+++ b/backend/engines/core/lib/spree/core/controller_helpers/currency.rb@@ -39,8 +39,13 @@ module Spreeend# Returns the list of supported currencies for all stores.+ # @deprecated This method will be removed in Spree 5.5.# @return [Array<String>] the list of supported currencies, eg. `["USD", "EUR"]`def supported_currencies_for_all_stores+ Spree::Deprecation.warn(+ 'supported_currencies_for_all_stores is deprecated and will be removed in Spree 5.5.'+ )+@supported_currencies_for_all_stores ||= begin(Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)diff --git a/backend/engines/core/lib/spree/core/controller_helpers/order.rb b/backend/engines/core/lib/spree/core/controller_helpers/order.rbindex 917bfa2255..81499fe16c 100644--- a/backend/engines/core/lib/spree/core/controller_helpers/order.rb+++ b/backend/engines/core/lib/spree/core/controller_helpers/order.rb@@ -15,8 +15,12 @@ module Spree@order_token ||= cookies.signed[:token] || params[:order_token]end- # Used in the link_to_cart helper.+ # @deprecated Use `current_order` instead. This method will be removed in Spree 5.5.def simple_current_order+ Spree::Deprecation.warn(+ 'simple_current_order is deprecated and will be removed in Spree 5.5. Use current_order instead.'+ )+return @simple_current_order if @simple_current_order@simple_current_order = find_order_by_token_or_userdiff --git a/backend/engines/core/lib/spree/database_type_utilities.rb b/backend/engines/core/lib/spree/database_type_utilities.rbindex 3aaf54efda..9817174891 100644--- a/backend/engines/core/lib/spree/database_type_utilities.rb+++ b/backend/engines/core/lib/spree/database_type_utilities.rb@@ -1,9 +1,16 @@module Spree+ # @deprecated Use the integer constant directly instead, eg. `2_147_483_647` for 4-byte signed integer max.+ # This module will be removed in Spree 5.5.module DatabaseTypeUtilities# Maximum value for a 4-byte signed integer (default database integer type)INTEGER_MAX = (2**31) - 1def self.maximum_value_for(data_type)+ Spree::Deprecation.warn(+ 'Spree::DatabaseTypeUtilities.maximum_value_for is deprecated and will be removed in Spree 5.5. ' \+ 'Use the integer constant directly instead, eg. 2_147_483_647 for 4-byte signed integer max.'+ )+case data_typewhen :integerINTEGER_MAXdiff --git a/backend/engines/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/backend/engines/core/spec/lib/spree/core/controller_helpers/order_spec.rbindex 4dec3ffd7d..f43e2fff56 100644--- a/backend/engines/core/spec/lib/spree/core/controller_helpers/order_spec.rb+++ b/backend/engines/core/spec/lib/spree/core/controller_helpers/order_spec.rb@@ -28,15 +28,24 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller dolet!(:store) { @default_store }describe '#simple_current_order' do- before { allow(controller).to receive_messages(try_spree_current_user: user) }+ before do+ allow(controller).to receive_messages(try_spree_current_user: user)+ allow(Spree::Deprecation).to receive(:warn)+ endit 'returns an empty order' doexpect(controller.simple_current_order.item_count).to eq 0end+it 'returns Spree::Order instance' doallow(controller).to receive_messages(cookies: double(signed: { token: order.token }))expect(controller.simple_current_order).to eq orderend++ it 'emits a deprecation warning' do+ controller.simple_current_order+ expect(Spree::Deprecation).to have_received(:warn).with(/simple_current_order is deprecated/)+ endenddescribe '#current_order' do