Skip to content

Commit

Permalink
Merge branch 'main' into 2.4.8-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff-matthews authored Jan 17, 2025
2 parents 0716e12 + 39fe450 commit ba366de
Show file tree
Hide file tree
Showing 96 changed files with 752 additions and 461 deletions.
1 change: 1 addition & 0 deletions .github/workflows/add-to-project_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:

jobs:
add-to-project:
if: github.event.repository.fork == false
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v4

- name: Get pathPrefix
uses: actions/github-script@v6
uses: actions/github-script@v7
id: get_path_prefix
with:
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
uses: actions/checkout@v4

- name: Get pathPrefix
uses: actions/github-script@v6
uses: actions/github-script@v7
id: get_path_prefix
with:
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
# Use full version number to avoid cases when a next
# released version is buggy
# About slim image: https://github.com/github/super-linter#slim-image
uses: super-linter/super-linter/slim@v7.0.0
uses: super-linter/super-linter/slim@v7.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BRANCH: main
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@ local-test.yml

# yalc
.yalc
yalc.lock
yalc.lock

tmp/
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"url": "https://github.com/AdobeDocs/commerce-php"
},
"dependencies": {
"@adobe/gatsby-theme-aio": "4.14.9",
"@adobe/gatsby-theme-aio": "4.14.17",
"gatsby": "4.22.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
Expand All @@ -27,8 +27,7 @@
"build": "NODE_OPTIONS='--max-old-space-size=8192' gatsby build",
"serve": "NODE_OPTIONS='--max-old-space-size=8192' gatsby serve",
"clean": "gatsby clean",
"test": "remark src/pages --quiet --frail",
"lint": "docker run --rm -e RUN_LOCAL=true --env-file .github/super-linter.env -v \"$PWD\":/tmp/lint github/super-linter:slim-v5"
"test": "remark src/pages --quiet --frail"
},
"packageManager": "[email protected]"
}
36 changes: 19 additions & 17 deletions src/_includes/backward-incompatible-changes/commerce/2.4.6-2.4.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
| Magento\Authorization\Model\CompositeUserContext::\_resetState | [public] Method has been added. |
| Magento\Bundle\Block\Catalog\Product\View\Type\Bundle | Interface has been added. |
| Magento\Bundle\Block\Catalog\Product\View\Type\Bundle::\_resetState | [public] Method has been added. |
| Magento\CatalogImportExport\Model\Export\Product::$\_storeIdToCode | [protected] Property has been removed. |
| Magento\Catalog\Helper\Product\Flat\Indexer | Interface has been added. |
| Magento\Catalog\Helper\Product\Flat\Indexer::\_resetState | [public] Method has been added. |
| Magento\Catalog\Model\Config::$\_storeManager | [protected] Property has been removed. |
Expand All @@ -28,6 +27,7 @@
| Magento\Catalog\Model\Product\Type\Price | Interface has been added. |
| Magento\Catalog\Model\Product\Type\Price::\_resetState | [public] Method has been added. |
| Magento\Catalog\Model\ResourceModel\Product | Interface has been added. |
| Magento\CatalogImportExport\Model\Export\Product::$\_storeIdToCode | [protected] Property has been removed. |
| Magento\CommerceBackendUix\Block\Adminhtml\Order\View\CustomButton | Class was added. |
| Magento\Config\App\Config\Type\System::\_\_debugInfo | [public] Method has been added. |
| Magento\Config\App\Config\Type\System::cleanAndWarmDefaultScopeData | [public] Method has been added. |
Expand All @@ -38,8 +38,6 @@
| Magento\ConfigurableProduct\Model\Product\VariationHandler | Interface has been added. |
| Magento\ConfigurableProduct\Model\Product\VariationHandler::\_resetState | [public] Method has been added. |
| Magento\Csp\Block\Sri\Hashes | Class was added. |
| Magento\CustomerSegment\Model\Customer | Interface has been added. |
| Magento\CustomerSegment\Model\Customer::\_resetState | [public] Method has been added. |
| Magento\Customer\Helper\Address | Interface has been added. |
| Magento\Customer\Helper\Address::\_resetState | [public] Method has been added. |
| Magento\Customer\Model\Address\AbstractAddress | Interface has been added. |
Expand All @@ -48,6 +46,8 @@
| Magento\Customer\Model\Customer::\_resetState | [public] Method has been added. |
| Magento\Customer\Model\CustomerRegistry | Interface has been added. |
| Magento\Customer\Model\CustomerRegistry::\_resetState | [public] Method has been added. |
| Magento\CustomerSegment\Model\Customer | Interface has been added. |
| Magento\CustomerSegment\Model\Customer::\_resetState | [public] Method has been added. |
| Magento\DataExporter\Model\Indexer\FeedIndexer | Class was added. |
| Magento\Directory\Helper\Data | Interface has been added. |
| Magento\Directory\Helper\Data::\_resetState | [public] Method has been added. |
Expand All @@ -58,8 +58,8 @@
| Magento\Directory\Model\ResourceModel\Currency | Interface has been added. |
| Magento\Directory\Model\ResourceModel\Currency::\_resetState | [public] Method has been added. |
| Magento\Eav\Model\Config | Interface has been added. |
| Magento\Eav\Model\Config::$\_storeManager | [protected] Property has been added. |
| Magento\Eav\Model\Config::\_resetState | [public] Method has been added. |
| Magento\Eav\Model\Config::$\_storeManager | [protected] Property has been added. |
| Magento\Eav\Model\Config::getWebsiteId | Method visibility has been changed to higher lever from [private] to [public] |
| Magento\Eav\Model\Config::getWebsiteId | [public] Removed last method parameter(s). |
| Magento\Eav\Model\Entity\AbstractEntity | Interface has been added. |
Expand Down Expand Up @@ -90,14 +90,14 @@
| Magento\Framework\Config\Data\Scoped::$\_cacheId | [protected] Property has been removed. |
| Magento\Framework\Config\Data\Scoped::$\_reader | [protected] Property has been removed. |
| Magento\Framework\Console\Cli::getDefaultCommands | [protected] Method return typing changed. |
| Magento\Framework\Data\Collection | Interface has been added. |
| Magento\Framework\Data\Collection::\_resetState | [public] Method has been added. |
| Magento\Framework\DataObject::\_\_debugInfo | [public] Method has been added. |
| Magento\Framework\DB\Adapter\Pdo\Mysql | Interface has been added. |
| Magento\Framework\DB\Adapter\Pdo\Mysql::\_\_debugInfo | [public] Method has been added. |
| Magento\Framework\DB\Adapter\Pdo\Mysql::\_resetState | [public] Method has been added. |
| Magento\Framework\DataObject::\_\_debugInfo | [public] Method has been added. |
| Magento\Framework\Data\Collection | Interface has been added. |
| Magento\Framework\Data\Collection::\_resetState | [public] Method has been added. |
| Magento\Framework\Filesystem\DirectoryList::\_\_debugInfo | [public] Method has been added. |
| Magento\Framework\Filesystem\Directory\Read::\_\_debugInfo | [public] Method has been added. |
| Magento\Framework\Filesystem\DirectoryList::\_\_debugInfo | [public] Method has been added. |
| Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException | Interface has been added. |
| Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException::getExtensions | [public] Method has been added. |
| Magento\Framework\GraphQl\Query\Resolver\BatchResponse | Interface has been added. |
Expand All @@ -110,6 +110,7 @@
| Magento\Framework\Logger\Handler\Base::\_\_debugInfo | [public] Method has been added. |
| Magento\Framework\Logger\Handler\Base::\_resetState | [public] Method has been added. |
| Magento\Framework\Math\Random::getRandomBytes | [public] Method has been added. |
| Magento\Framework\Mview\View\ChangeLogBatchWalker | Class has been renamed to Magento\Framework\Mview\View\ChangelogBatchWalker. |
| Magento\Framework\Pricing\Price\Collection | Interface has been added. |
| Magento\Framework\Pricing\Price\Collection::\_resetState | [public] Method has been added. |
| Magento\Framework\Registry | Interface has been added. |
Expand Down Expand Up @@ -142,34 +143,34 @@
| Magento\PaymentServicesPaypal\Block\Info | Class was added. |
| Magento\PaymentServicesPaypal\Block\Message | Class was added. |
| Magento\PaymentServicesPaypal\Block\SmartButtons | Class was added. |
| Magento\PaymentServicesPaypal\Block\SmartButtonsCart | Class was added. |
| Magento\PaymentServicesPaypal\Block\SmartButtonsProduct | Class was added. |
| Magento\PaymentServicesPaypal\Block\SmartButtons\Review | Class was added. |
| Magento\PaymentServicesPaypal\Block\SmartButtons\Review\Details | Class was added. |
| Magento\PaymentServicesPaypal\Block\SmartButtonsCart | Class was added. |
| Magento\PaymentServicesPaypal\Block\SmartButtonsProduct | Class was added. |
| Magento\PaymentServicesPaypal\Model\Api\Data\PaymentOrder | Class was added. |
| Magento\PaymentServicesPaypal\Model\Api\PaymentOrderRequest | Class was added. |
| Magento\PaymentServicesPaypal\Model\Api\PaymentSdkRequest | Class was added. |
| Magento\QuickCheckoutAdminPanel\Block\Adminhtml\Index | Class was removed. |
| Magento\QuickCheckout\Block\Adminhtml\Payment\Form | Class was removed. |
| Magento\QuickCheckout\Block\Adminhtml\System\Config\ConfigureCallbackUrl | Class was removed. |
| Magento\QuickCheckout\Block\Adminhtml\System\Config\Fieldset\Custom | Class was removed. |
| Magento\QuickCheckout\Block\Adminhtml\System\Config\Fieldset\Head | Class was removed. |
| Magento\QuickCheckout\Block\Adminhtml\System\Config\ValidateCredentials | Class was removed. |
| Magento\QuickCheckout\Block\Sdk | Class was removed. |
| Magento\QuickCheckoutAdminPanel\Block\Adminhtml\Index | Class was removed. |
| Magento\Quote\Model\Quote\Address::setBaseDiscountAmount | [public] Method has been added. |
| Magento\Quote\Model\Quote\Address\Total\AbstractTotal | Interface has been added. |
| Magento\Quote\Model\Quote\Address\Total\AbstractTotal::\_resetState | [public] Method has been added. |
| Magento\SaaSCommon\Model\ResyncManager | Class was added. |
| Magento\SalesRule\Model\ResourceModel\Rule\Collection::setValidationFilter | [public] Added optional parameter(s). |
| Magento\SalesRule\Model\Rule::getSimpleAction | [public] Method has been added. |
| Magento\SalesSequence\Model\Builder | Interface has been added. |
| Magento\SalesSequence\Model\Builder::\_resetState | [public] Method has been added. |
| Magento\Sales\Model\Order\Config | Interface has been added. |
| Magento\Sales\Model\Order\Config::\_resetState | [public] Method has been added. |
| Magento\Sales\Model\Order\Email\Container\Container | Interface has been added. |
| Magento\Sales\Model\Order\Email\Container\Container::\_resetState | [public] Method has been added. |
| Magento\Sales\Model\ResourceModel\EntityAbstract | Interface has been added. |
| Magento\Sales\Model\ResourceModel\EntityAbstract::\_resetState | [public] Method has been added. |
| Magento\SalesRule\Model\ResourceModel\Rule\Collection::setValidationFilter | [public] Added optional parameter(s). |
| Magento\SalesRule\Model\Rule::getSimpleAction | [public] Method has been added. |
| Magento\SalesSequence\Model\Builder | Interface has been added. |
| Magento\SalesSequence\Model\Builder::\_resetState | [public] Method has been added. |
| Magento\ServicesIdLayout\Block\Adminhtml\Index | Class was added. |
| Magento\Shipping\Model\Carrier\AbstractCarrier::$\_result | [protected] Property has been added. |
| Magento\Store\Model\App\Emulation | Interface has been added. |
Expand All @@ -185,15 +186,16 @@

| What changed | How it changed |
| --- | --- |
| Magento\AdobeCommerceWebhooksAdminUi\Api\HookRepositoryInterface | Interface was added. |
| Magento\AdobeCommerceWebhooks\Model\Filter\Converter\FieldConverterInterface | Interface was added. |
| Magento\AdobeCommerceWebhooks\Model\HeaderResolverInterface | Interface was added. |
| Magento\AdobeCommerceWebhooksAdminUi\Api\HookRepositoryInterface | Interface was added. |
| Magento\AdvancedRule\Model\Condition\FilterInterface::isCoupon | [public] Method has been added. |
| Magento\AdvancedRule\Model\Condition\FilterInterface::setIsCoupon | [public] Method has been added. |
| Magento\Catalog\Api\ProductAttributeIsFilterableManagementInterface | Interface was added. |
| Magento\CommerceBackendUix\Api\Data\MassActionInterface | Interface was added. |
| Magento\CommerceBackendUix\Api\MassActionRepositoryInterface | Interface was added. |
| Magento\Framework\Indexer\StateInterface::STATUS\_SUSPENDED | Constant has been added. |
| Magento\Framework\Mview\View\ChangeLogBatchWalkerInterface | Interface has been renamed to Magento\Framework\Mview\View\ChangelogBatchWalkerInterface. |
| Magento\Framework\ObjectManager\ResetAfterRequestInterface | Interface was added. |
| Magento\ImportJsonApi\Api\Data\SourceDataInterface | Interface was added. |
| Magento\ImportJsonApi\Api\StartImportInterface | Interface was added. |
Expand All @@ -214,9 +216,9 @@
| Magento\SaaSCommon\Model\Http\ConverterInterface | Interface was added. |
| Magento\ServicesId\Model\ServicesClientInterface | Interface was added. |
| Magento\ServicesId\Model\ServicesConfigInterface | Interface was added. |
| Magento\Vault\Api\Data\PaymentTokenInterface::WEBSITE\_ID | Constant has been added. |
| Magento\Vault\Api\Data\PaymentTokenInterface::getWebsiteId | [public] Method has been added. |
| Magento\Vault\Api\Data\PaymentTokenInterface::setWebsiteId | [public] Method has been added. |
| Magento\Vault\Api\Data\PaymentTokenInterface::WEBSITE\_ID | Constant has been added. |

#### Database changes {#b2b-246-247-database}

Expand Down
Loading

0 comments on commit ba366de

Please sign in to comment.