solidus_core 3.4.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e5d61f97cd11e88925c26f71b3b19ae3afe9b52b5b6b4648fad0791ffd9ba6
-  data.tar.gz: a78286a729dffebc660f360a8709bf66c39ba783445e35ee9e56eff4cd4c4fb2
+  metadata.gz: 677b2f47102db33dd5b14575dc05d083d724328c5715eb041260fa5eff1888d8
+  data.tar.gz: 80193fd6f6737c2e3d8e5227ef8bbed008bfd98826a26b73be775402615cdd0b
 SHA512:
-  metadata.gz: b0875f1af33311cf2d0af2a9167a548a54e6d8a4e7bc41cdd3e715a55150a52b08fa0e7623adf160f1eefe55faee792a9ae00fc4f53fc547f48c67b6f2b2c499
-  data.tar.gz: 7ff7ddcacc7ee31d1cfd4d0264b551ee44ff62981549986c8a084665018a37b7edc47403233bab679c634211bd7acbcb170fe798ee6d2fd4bd1ffe4dabef52f8
+  metadata.gz: 3862a797f6ae51be78ec7115d8becfe0d741f79d84e9f8223661054338f0deba010d438b29ba8bce3d50579490be97054feabf171fe4d0ce3dbddf6cf0e22436
+  data.tar.gz: 707096c5ad49198707ea0ed90dc11dd0a8debcc845d2b52e30f819cd7b9a22fb473894710db1eb618fe4b7344ca9776af3619378677f5b0b849fdd647d7be96a

data/Rakefile

@@ -5,7 +5,6 @@ require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'spree/testing_support/dummy_app/rake_tasks'
-require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new
 task default: :spec

data/app/helpers/spree/products_helper.rb

@@ -68,7 +68,7 @@ module Spree
     # @return [String] a cache invalidation key for products
     def cache_key_for_products
       count = @products.count
-      max_updated_at = Spree::RailsCompatibility.to_fs((@products.maximum(:updated_at) || Date.today), :number)
+      max_updated_at = (@products.maximum(:updated_at) || Date.today).to_fs(:number)
       "#{I18n.locale}/#{current_pricing_options.cache_key}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
     end
   end

data/app/models/concerns/spree/active_storage_adapter.rb

@@ -7,23 +7,6 @@ module Spree
     extend ActiveSupport::Concern
     include Spree::ActiveStorageAdapter::Normalization
 
-    included do
-      next if Rails.gem_version >= Gem::Version.new('6.1.0.alpha')
-
-      raise <<~MESSAGE
-        Configuration Error: Solidus ActiveStorage attachment adpater requires Rails >= 6.1.0.
-
-        Spree::Config.image_attachment_module preference is set to #{Spree::Config.image_attachment_module}
-        Spree::Config.taxon_attachment_module preference is set to #{Spree::Config.taxon_attachment_module}
-        Rails version is #{Rails.gem_version}
-
-        To solve the problem you can upgrade to a Rails version greater than or equal to 6.1.0
-        or use legacy Paperclip attachment adapter by editing `config/initialiers/spree/rb`:
-        config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
-        config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
-      MESSAGE
-    end
-
     class_methods do
       attr_reader :attachment_name
       attr_reader :attachment_definition

data/app/models/concerns/spree/default_price.rb

@@ -14,15 +14,6 @@ module Spree
       end
     end
 
-    # Returns `#prices` prioritized for being considered as default price
-    #
-    # @deprecated
-    # @return [ActiveRecord::Relation<Spree::Price>]
-    def currently_valid_prices
-      prices.currently_valid
-    end
-    deprecate :currently_valid_prices, deprecator: Spree::Deprecation
-
     # Returns {#default_price} or builds it from {Spree::Variant.default_price_attributes}
     #
     # @return [Spree::Price, nil]
@@ -32,12 +23,6 @@ module Spree
         prices.build(self.class.default_price_attributes)
     end
 
-    # @deprecated Use {#default_price_or_build} instead.
-    def find_or_build_default_price
-      default_price_or_build
-    end
-    deprecate find_or_build_default_price: :default_price_or_build, deprecator: Spree::Deprecation
-
     # Select from {#prices} the one to be considered as the default
     #
     # This method works with the in-memory association, so non-persisted prices

data/app/models/concerns/spree/ransackable_attributes.rb

@@ -6,27 +6,6 @@ module Spree::RansackableAttributes
     class_attribute :allowed_ransackable_associations, default: []
     class_attribute :allowed_ransackable_attributes, default: []
     class_attribute :allowed_ransackable_scopes, default: []
-
-    def self.whitelisted_ransackable_associations
-      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_associations, 'use allowed_ransackable_associations instead')
-      allowed_ransackable_associations
-    end
-
-    def self.whitelisted_ransackable_associations=(new_value)
-      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_associations=, 'use allowed_ransackable_associations= instead')
-      self.allowed_ransackable_associations = new_value
-    end
-
-    def self.whitelisted_ransackable_attributes
-      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_attributes, 'use allowed_ransackable_attributes instead')
-      allowed_ransackable_attributes
-    end
-
-    def self.whitelisted_ransackable_attributes=(new_value)
-      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_attributes=, 'use allowed_ransackable_attributes= instead')
-      self.allowed_ransackable_attributes = new_value
-    end
-
     class_attribute :default_ransackable_attributes
     self.default_ransackable_attributes = %w[id]
   end

data/app/models/spree/adjustment.rb

@@ -51,19 +51,6 @@ module Spree
     extend DisplayMoney
     money_methods :amount
 
-    # Returns Adjustments of completed Orders.
-    #
-    # @param excluded_orders [Array<Spree::Order>] Orders to exclude from query
-    # @return [ActiveRecord::Relation] Scoped Adjustments
-    def self.in_completed_orders(excluded_orders: [], exclude_canceled: false)
-      result = joins(:order)
-               .merge(Spree::Order.complete)
-               .where.not(spree_orders: { id: excluded_orders })
-               .distinct
-      exclude_canceled ? result.merge(Spree::Order.not_canceled) : result
-    end
-    deprecate :in_completed_orders, "Please don't use this and rather go through Spree::Promotion#discounted_orders"
-
     def finalize!
       update!(finalized: true)
     end

data/app/models/spree/carton.rb

@@ -42,7 +42,7 @@ class Spree::Carton < Spree::Base
   end
 
   def display_shipped_at
-    Spree::RailsCompatibility.to_fs(shipped_at, :rfc822)
+    shipped_at.to_fs(:rfc822)
   end
 
   def manifest

data/app/models/spree/fulfilment_changer.rb

@@ -17,31 +17,19 @@ module Spree
   # @attr [Integer] quantity How many units we want to move
   #
   class FulfilmentChanger
-    # @note This private constant is only used to deprecate not passing the `track_inventory` argument
-    #   on initialization. It will be removed in Solidus 4.0, please do not use it.
-    TRACK_INVENTORY_NOT_PROVIDED = Object.new.freeze
-    private_constant :TRACK_INVENTORY_NOT_PROVIDED
-
     include ActiveModel::Validations
 
     attr_accessor :current_shipment, :desired_shipment
     attr_reader :variant, :quantity, :current_stock_location, :desired_stock_location, :track_inventory
 
-    def initialize(current_shipment:, desired_shipment:, variant:, quantity:, track_inventory: TRACK_INVENTORY_NOT_PROVIDED)
+    def initialize(current_shipment:, desired_shipment:, variant:, quantity:, track_inventory:)
       @current_shipment = current_shipment
       @desired_shipment = desired_shipment
       @current_stock_location = current_shipment.stock_location
       @desired_stock_location = desired_shipment.stock_location
       @variant = variant
       @quantity = quantity
-      @track_inventory = if track_inventory == TRACK_INVENTORY_NOT_PROVIDED
-        Spree::Deprecation.warn(
-          "Not passing `track_inventory` to `Spree::FulfilmentChanger` is deprecated." \
-        )
-        true
-      else
-        track_inventory
-      end
+      @track_inventory = track_inventory
     end
 
     validates :quantity, numericality: { greater_than: 0 }

data/app/models/spree/option_value.rb

@@ -2,9 +2,7 @@
 
 module Spree
   class OptionValue < Spree::Base
-    # TODO: Remove optional on Solidus v4.0. Don't forget adding a migration to
-    # enforce at the database layer
-    belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :option_values, optional: true
+    belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :option_values
     acts_as_list scope: :option_type
 
     has_many :option_values_variants, dependent: :destroy
@@ -15,15 +13,8 @@ module Spree
 
     after_save :touch, if: :saved_changes?
     after_touch :touch_all_variants
-    after_save do
-      Spree::Deprecation.warn <<~MSG if option_type.nil?
-        Having an option_value with no associated option_type will be deprecated
-        on Solidus v4.0
-      MSG
-    end
 
-    # TODO: Remove allow_nil once option_type is required on Solidus v4.0
-    delegate :name, :presentation, to: :option_type, prefix: :option_type, allow_nil: true
+    delegate :name, :presentation, to: :option_type, prefix: :option_type
 
     self.allowed_ransackable_attributes = %w[name presentation]
 

data/app/models/spree/order.rb

@@ -395,18 +395,6 @@ module Spree
       Spree::CreditCard.where(id: credit_card_ids)
     end
 
-    # TODO: Remove on Solidus 4.0
-    # @api private
-    def finalize!
-      Spree::Deprecation.warn <<~MSG
-        Calling `Spree::Order#finalize!` is discouraged. Instead, use
-        `Spree::Order#complete!`, which goes through all the needed safety
-        checks before finalizing an order. This method will be removed
-        altogether on Solidus 4.0.
-      MSG
-      finalize
-    end
-
     def fulfill!
       shipments.each { |shipment| shipment.update_state if shipment.persisted? }
       updater.update_shipment_state
@@ -534,7 +522,7 @@ module Spree
         state: 'cart',
         updated_at: Time.current
       )
-      self.next if line_items.any?
+      self.next
     end
 
     def refresh_shipment_rates
@@ -571,8 +559,7 @@ module Spree
     end
 
     def has_non_reimbursement_related_refunds?
-      refunds.non_reimbursement.exists? ||
-        payments.where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'").exists? # how old versions of spree stored refunds
+      refunds.non_reimbursement.exists?
     end
 
     def tax_total
@@ -779,16 +766,17 @@ module Spree
       self.email = user.email if user
     end
 
-    # Determine if email is required (we don't want validation errors before we hit the checkout)
+    # Determine if the email is required for this order
+    #
+    # We don't require email for orders in the cart state or address state because those states
+    # precede the entry of an email address.
+    #
+    # @return [Boolean] true if the email is required
+    # @note This method was called require_email before.
     def email_required?
       true unless new_record? || ['cart', 'address'].include?(state)
     end
 
-    def require_email
-      Spree::Deprecation.warn "Use email_required? instead", caller(1)
-      email_required?
-    end
-
     def ensure_inventory_units
       if has_checkout_step?("delivery")
         inventory_validator = Spree::Config.stock.inventory_validator_class.new

data/app/models/spree/order_updater.rb

@@ -162,9 +162,6 @@ module Spree
       order.included_tax_total = all_items.sum(&:included_tax_total) + order_tax_adjustments.select(&:included?).sum(&:amount)
       order.additional_tax_total = all_items.sum(&:additional_tax_total) + order_tax_adjustments.reject(&:included?).sum(&:amount)
 
-      # TODO: Delete this line in Solidus 4.0, when it is run in `update_promotions`.
-      order.promo_total = all_items.sum(&:promo_total) + adjustments.select(&:eligible?).select(&:promotion?).sum(&:amount)
-
       update_order_total
     end
 
@@ -200,32 +197,6 @@ module Spree
       Spree::Config.promotion_adjuster_class.new(order).call
     end
 
-    # DEPRECATED; this functionality is handled in #update_promotions
-    def update_item_promotions
-      [*line_items, *shipments].each do |item|
-        promotion_adjustments = item.adjustments.select(&:promotion?)
-
-        promotion_adjustments.each(&:recalculate)
-        Spree::Config.promotion_chooser_class.new(promotion_adjustments).update
-
-        item.promo_total = promotion_adjustments.select(&:eligible?).sum(&:amount)
-      end
-    end
-    deprecate update_item_promotions: :update_promotions, deprecator: Spree::Deprecation
-
-    # Update and select the best promotion adjustment for the order.
-    # We don't update the order.promo_total yet. Order totals are updated later
-    # in #update_adjustment_total since they include the totals from the order's
-    # line items and/or shipments.
-    #
-    # DEPRECATED; this functionality is handled in #update_promotions
-    def update_order_promotions
-      promotion_adjustments = order.adjustments.select(&:promotion?)
-      promotion_adjustments.each(&:recalculate)
-      Spree::Config.promotion_chooser_class.new(promotion_adjustments).update
-    end
-    deprecate update_order_promotions: :update_promotions, deprecator: Spree::Deprecation
-
     def update_taxes
       Spree::Config.tax_adjuster_class.new(order).adjust!
 

data/app/models/spree/payment.rb

@@ -16,7 +16,6 @@ module Spree
     belongs_to :source, polymorphic: true, optional: true
     belongs_to :payment_method, -> { with_discarded }, class_name: 'Spree::PaymentMethod', inverse_of: :payments, optional: true
 
-    has_many :offsets, -> { offset_payment }, class_name: "Spree::Payment", foreign_key: :source_id
     has_many :log_entries, as: :source
     has_many :state_changes, as: :stateful
     has_many :capture_events, class_name: 'Spree::PaymentCaptureEvent'
@@ -45,19 +44,6 @@ module Spree
 
     scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
     scope :with_state, ->(state) { where(state: state.to_s) }
-    # "offset" is reserved by activerecord
-    # TODO: When removing the method we can also:
-    #   - Remove the `.offsets` association
-    #   - Remove the `#offsets_total` method
-    #   - Remove offsets count from the `#credit_allowed` method
-    #   - Remove offsets check from `Spree::Order#has_non_reimbursement_related_refunds?
-    def self.offset_payment
-      Spree::Deprecation.warn <<~MSG
-        `Spree::Payment offsets` are deprecated. Use the refund system (`Spree::Refund`) instead.
-      MSG
-
-      where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'")
-    end
 
     scope :checkout, -> { with_state('checkout') }
     scope :completed, -> { with_state('completed') }
@@ -100,22 +86,11 @@ module Spree
         end || amount
     end
 
-    # The total amount of the offsets (for old-style refunds) for this payment.
-    #
-    # @return [BigDecimal] the total amount of this payment's offsets
-    def offsets_total
-      offsets.pluck(:amount).sum
-    end
-
     # The total amount this payment can be credited.
     #
-    # @return [BigDecimal] the amount of this payment minus the offsets
-    #   (old-style refunds) and refunds
+    # @return [BigDecimal] the amount of this payment minus refunds
     def credit_allowed
-      amount - (
-        (self.class.where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed' AND source_id = ?", id).sum(:amount)).abs +
-        refunds.sum(:amount)
-      )
+      amount - refunds.sum(:amount)
     end
 
     # @return [Boolean] true when this payment can be credited
@@ -183,16 +158,9 @@ module Spree
 
     def validate_source
       if source && !source.valid?
-        if Gem::Requirement.new(">= 6.1").satisfied_by?(Rails.gem_version)
-          source.errors.each do |error|
-            field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{error.attribute}")
-            errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error.message}")
-          end
-        else
-          source.errors.each do |field, error|
-            field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
-            errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error}")
-          end
+        source.errors.each do |error|
+          field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{error.attribute}")
+          errors.add(I18n.t(source.class.to_s.demodulize.underscore, scope: 'spree'), "#{field_name} #{error.message}")
         end
       end
       if errors.any?

data/app/models/spree/product/scopes.rb

@@ -214,11 +214,6 @@ module Spree
             where(subquery.arel.exists)
           end
 
-          def self.with_variant_sku_cont(sku)
-            Spree::Deprecation.warn("use .with_kept_variant_sku_cont instead")
-            with_kept_variant_sku_cont(sku)
-          end
-
           class << self
             private
 

data/app/models/spree/product.rb

@@ -96,7 +96,6 @@ module Spree
              :display_price,
              :has_default_price?,
              :images,
-             :price_for,
              :price_for_options,
              :rebuild_vat_prices=,
              to: :find_or_build_master
@@ -134,7 +133,7 @@ module Spree
 
     self.allowed_ransackable_associations = %w[stores variants_including_master master variants]
     self.allowed_ransackable_attributes = %w[name slug]
-    self.allowed_ransackable_scopes = %i[available with_discarded with_variant_sku_cont with_all_variant_sku_cont with_kept_variant_sku_cont]
+    self.allowed_ransackable_scopes = %i[available with_discarded with_all_variant_sku_cont with_kept_variant_sku_cont]
 
     # @return [Boolean] true if there are any variants
     def has_variants?
@@ -337,14 +336,8 @@ module Spree
     # If the master is invalid, the Product object will be assigned its errors
     def validate_master
       unless master.valid?
-        if Gem::Requirement.new(">= 6.1").satisfied_by?(Rails.gem_version)
-          master.errors.each do |error|
-            errors.add(error.attribute, error.message)
-          end
-        else
-          master.errors.each do |att, error|
-            errors.add(att, error)
-          end
+        master.errors.each do |error|
+          errors.add(error.attribute, error.message)
         end
       end
     end

data/app/models/spree/promotion/rules/item_total.rb

@@ -9,8 +9,6 @@ module Spree
       # To add extra operators please override `self.operators_map` or any other helper method.
       # To customize the error message you can also override `ineligible_message`.
       class ItemTotal < PromotionRule
-        include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-
         preference :amount, :decimal, default: 100.00
         preference :currency, :string, default: ->{ Spree::Config[:currency] }
         preference :operator, :string, default: 'gt'
@@ -29,15 +27,6 @@ module Spree
           end
         end
 
-        # @deprecated
-        OPERATORS = operators_map.keys.map(&:to_s)
-        deprecate_constant(
-          :OPERATORS,
-          :operators_map,
-          message: "OPERATORS is deprecated! Use `operators_map.keys.map(&:to_s)` instead.",
-          deprecator: Spree::Deprecation,
-        )
-
         def applicable?(promotable)
           promotable.is_a?(Spree::Order)
         end

data/app/models/spree/promotion.rb

@@ -2,9 +2,6 @@
 
 module Spree
   class Promotion < Spree::Base
-
-    autoload(:MATCH_POLICIES, "spree/promotion/match_policies")
-
     UNACTIVATABLE_ORDER_STATES = ["complete", "awaiting_return", "returned"]
 
     attr_reader :eligibility_errors
@@ -167,27 +164,13 @@ module Spree
       specific_rules = rules.select { |rule| rule.applicable?(promotable) }
       return [] if specific_rules.none?
 
-      if match_all?
-        # If there are rules for this promotion, but no rules for this
-        # particular promotable, then the promotion is ineligible by default.
-        unless specific_rules.all?(&eligible)
-          @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
-          return nil
-        end
-        specific_rules
-      else
-        Spree::Deprecation.warn(
-        <<~WARN
-          Your promotion "#{name}" with ID #{id} has a match_policy of 'any'.
-          This is deprecated, please split the promotion into separate promotions for each rule.
-        WARN
-        )
-        unless specific_rules.any?(&eligible)
-          @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
-          return nil
-        end
-        specific_rules.select(&eligible)
+      # If there are rules for this promotion, but no rules for this
+      # particular promotable, then the promotion is ineligible by default.
+      unless specific_rules.all?(&eligible)
+        @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
+        return nil
       end
+      specific_rules
     end
 
     def products
@@ -224,9 +207,7 @@ module Spree
         if rules.blank?
           true
         else
-          rules.send(match_all? ? :all? : :any?) do |rule|
-            rule.actionable? line_item
-          end
+          rules.all? { |rule| rule.actionable? line_item }
         end
       else
         false
@@ -271,10 +252,6 @@ module Spree
       self[:path] = nil if self[:path].blank?
     end
 
-    def match_all?
-      match_policy == "all"
-    end
-
     def apply_automatically_disallowed_with_paths
       return unless apply_automatically
 

data/app/models/spree/promotion_rule.rb

@@ -18,11 +18,6 @@ module Spree
       []
     end
 
-    def self.for(promotable)
-      all.select { |rule| rule.applicable?(promotable) }
-    end
-    deprecate :for, "Please select promotion rules by their applicable status on the promotable instead."
-
     def applicable?(_promotable)
       raise NotImplementedError, "applicable? should be implemented in a sub-class of Spree::PromotionRule"
     end

data/app/models/spree/taxon.rb

@@ -18,11 +18,11 @@ module Spree
     after_update :update_child_permalinks, if: :saved_change_to_permalink?
 
     validates :name, presence: true
-    validates :name, uniqueness: { scope: :parent_id, message: :must_be_unique_under_same_parent }, if: -> { Spree::Config.extra_taxon_validations}
+    validates :name, uniqueness: { scope: :parent_id, message: :must_be_unique_under_same_parent }
     validates :meta_keywords, length: { maximum: 255 }
     validates :meta_description, length: { maximum: 255 }
     validates :meta_title, length: { maximum: 255 }
-    validates :taxonomy_id, uniqueness: { scope: :parent_id, message: :can_have_only_one_root }, if: -> { Spree::Config.extra_taxon_validations && root? }
+    validates :taxonomy_id, uniqueness: { message: :can_have_only_one_root }, if: -> { root? }
 
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy

data/app/models/spree/taxonomy.rb

@@ -5,7 +5,7 @@ module Spree
     acts_as_list
 
     validates :name, presence: true
-    validates :name, uniqueness: true, if: -> { Spree::Config.extra_taxonomy_validations }
+    validates :name, uniqueness: true
 
     has_many :taxons, inverse_of: :taxonomy
     has_one :root, -> { where parent_id: nil }, class_name: "Spree::Taxon", dependent: :destroy

data/app/models/spree/variant/price_selector.rb

@@ -3,7 +3,7 @@
 module Spree
   class Variant < Spree::Base
     # This class is responsible for selecting a price for a variant given certain pricing options.
-    # A variant can have multiple or even dynamic prices. The `price_for`
+    # A variant can have multiple or even dynamic prices. The `price_for_options`
     # method determines which price applies under the given circumstances.
     #
     class PriceSelector
@@ -22,19 +22,6 @@ module Spree
         @variant = variant
       end
 
-      # The variant's price, given a set of pricing options
-      # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
-      # @return [Spree::Money, nil] The most specific price for this set of pricing options.
-      def price_for(price_options)
-        Spree::Deprecation.warn(
-          "price_for is deprecated and will be removed. The price_for method
-          should return a Spree::Price as described. Please use
-          #price_for_options and adjust your frontend code to explicitly call
-          &.money where required"
-        )
-        price_for_options(price_options)&.money
-      end
-
       # The variant's Spree::Price record, given a set of pricing options
       # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
       # @return [Spree::Price, nil] The most specific price for this set of pricing options.

data/app/models/spree/variant.rb

@@ -39,6 +39,7 @@ module Spree
     delegate :shipping_category, :shipping_category_id,
       to: :product, prefix: true
     delegate :tax_rates, to: :tax_category
+    delegate :price_for_options, to: :price_selector
 
     has_many :inventory_units, inverse_of: :variant
     has_many :line_items, inverse_of: :variant
@@ -287,12 +288,6 @@ module Spree
       @price_selector ||= Spree::Config.variant_price_selector_class.new(self)
     end
 
-    # Chooses an appropriate price for the given pricing options
-    # This has been deprecated in favor of #price_for_options.
-    #
-    # @see Spree::Variant::PriceSelector#price_for_options
-    delegate :price_for, to: :price_selector
-
     # Returns the difference in price from the master variant
     def price_difference_from_master(pricing_options = Spree::Config.default_pricing_options)
       master_price = product.master.price_for_options(pricing_options)
@@ -306,17 +301,6 @@ module Spree
       diff && diff.zero?
     end
 
-    def price_for_options(price_options)
-      if price_selector.respond_to?(:price_for_options)
-        price_selector.price_for_options(price_options)
-      else
-        money = price_for(price_options)
-        return if money.nil?
-
-        Spree::Price.new(amount: money.to_d, variant: self, currency: price_options.currency)
-      end
-    end
-
     # Generates a friendly name and sku string.
     #
     # @return [String]

data/db/migrate/20210815004823_add_unique_index_to_option_values_variants.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexToOptionValuesVariants < ActiveRecord::Migration[5.2]
+  def up
+    remove_index :spree_option_values_variants, [:variant_id, :option_value_id]
+    add_index :spree_option_values_variants, [:variant_id, :option_value_id],
+              name: "index_option_values_variants_on_variant_id_and_option_value_id",
+              unique: true
+  end
+
+  def down
+    remove_index :spree_option_values_variants, [:variant_id, :option_value_id]
+    add_index :spree_option_values_variants, [:variant_id, :option_value_id],
+              name: "index_option_values_variants_on_variant_id_and_option_value_id"
+  end
+end

data/db/migrate/20230321161854_change_column_null_option_values_option_type_id.rb

@@ -0,0 +1,5 @@
+class ChangeColumnNullOptionValuesOptionTypeId < ActiveRecord::Migration[5.2]
+  def change
+    change_column_null(:spree_option_values, :option_type_id, false)
+  end
+end

data/db/migrate/20230322085416_remove_match_policy_from_spree_promotion.rb

@@ -0,0 +1,5 @@
+class RemoveMatchPolicyFromSpreePromotion < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :spree_promotions, :match_policy, :string, default: "all"
+  end
+end