Skip to content

Commit

Permalink
Merge branch 'master' into fix-phpstan-level-recomendation
Browse files Browse the repository at this point in the history
  • Loading branch information
andriitserkovnyi committed Jan 9, 2025
2 parents 7ed8ed3 + c4d15d3 commit aa772ed
Show file tree
Hide file tree
Showing 1,458 changed files with 7,286 additions and 4,179 deletions.
16 changes: 9 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
## PR labels

When the PR is ready for review, add a **TW review needed** label. This lets us keep track of PRs that need to be merged and merge them in time.


## PR Description
Add a meaningful description here that will let us know what you want to fix with this PR or what functionality you want to add.
Describe the context for your changes and the changes you've made.

## Tickets

## Steps before you submit a PR
- Please add tests for the code you add if it's possible.
- Please check out our contribution guide: https://docs.spryker.com/docs/dg/dev/code-contribution-guide.html
- Add a `contribution-license-agreement.txt` file with the following content:
`I hereby agree to Spryker\'s Contribution License Agreement in https://github.com/spryker/spryker-docs/blob/HASH_OF_COMMIT_YOU_ARE_BASING_YOUR_BRANCH_FROM_MASTER_BRANCH/CONTRIBUTING.md.`
If changes are associated with a ticket, add a docs ticket here.

This is a mandatory step to make sure you are aware of the license agreement and agree to it. `HASH_OF_COMMIT_YOU_ARE_BASING_YOUR_BRANCH_FROM_MASTER_BRANCH` is a hash of the commit you are basing your branch from the master branch. You can take it from commits list of master branch before you submit a PR.

## Checklist
- [x] I agree with the Code Contribution License Agreement in CONTRIBUTING.md
15 changes: 9 additions & 6 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,24 @@ commonOptions = {
/twitter.com\/[\.\w\-\/\?]+/,
/www.optimise-it.de\/[\.\w\-\/\?]+/,
/blackfire.io\/[\.\w\-\/\?]+/,
/www.cdata.com\/[\.\w\-\/\?]+/,
/dixa.com\/[\.\w\-\/\?]+/,
/rxjs.dev\/[\.\w\-\/\?]+/,
/www.blackfire.io\/[\.\w\-\/\?]+/,
/linux.die.net\/[\.\w\-\/\?]+/,
# check next url's
/redisdesktop.com\/[\.\w\-\/\?]+/,
/xdebug.org\/[\.\w\-\/\?]+/,
/www.javaworld.com\/[\.\w\-\/\?]+/,
/www.billpay.de\/[\.\w\-\/\?]+/,
/code.visualstudio.com\/[\.\w\-\/\?]+/,
/www.jetbrains.com\/[\.\w\-\/\?]+/,
/docs.spring.io\/[\.\w\-\/\?]+/,
"http://redisdesktop.com/",
"https://developer.computop.com/display/EN/Test+Cards",
"https://www.centralbank.cy/",
"https://www.facebook.com/Spryker/"
/redisdesktop.com\/[\.\w\-\/\?]+/,
/developer.computop.com\/[\.\w\-\/\?]+/,
/www.centralbank.cy\/[\.\w\-\/\?]+/,
/dashboard.algolia.com\/[\.\w\-\/\?]+/,
/www.facebook.com\/[\.\w\-\/\?]+/

],
:ignore_files => [],
:typhoeus => {
Expand Down Expand Up @@ -153,7 +155,8 @@ task :check_pbc do
/docs\/pbc\/\w+\/[\w-]+\/202307\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202403\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202400\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202311\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202311\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202505\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202404\.0\/.+/
]
run_htmlproofer_with_retry("./_site", options)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Adapting your offerings to your customers' needs and locales is crucial for prov

#### Number formatting in the Storefront

For an effortless shopping experience, the localized number formatting is available throughout the Storefront for any user locale. Whether it is a catalog, product details page, cart, checkout, or customer account, your customers and guests can now enjoy their known number format. This helps to avoid any confusion about pricing or quantities.
For an effortless shopping experience, the localized number formatting is available throughout the Storefront for any user locale. Whether it's a catalog, product details page, cart, checkout, or customer account, your customers and guests can now enjoy their known number format. This helps to avoid any confusion about pricing or quantities.

##### Documentation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spryker/twig (3.17.0 or earlier)

## Missing validation of the wishlist name on adding an item

Due to the way the characters are handled, it was possible to abuse the name in a way that the constructed URL linked to another resource of the shop instead of the wishlist.
Because of the way the characters are handled, it was possible to abuse the name in a way that the constructed URL linked to another resource of the shop instead of the wishlist.

**Changes:**
Wishlist module:
Expand Down Expand Up @@ -330,7 +330,7 @@ composer update codeception/codeception
Make sure that for the codeception/codeception module, the current version is equal to or later than 4.1.22.

## Known vulnerabilities in frontend dependencies
- The datatables.net package is vulnerable to Prototype Pollution due to an incomplete fix.
- The datatables.net package is vulnerable to Prototype Pollution because of an incomplete fix.
- Known Regular Expression Denial of Service (ReDoS) vulnerabilities in the hosted-git-info package.
- Known vulnerabilities in the lodash package (Command Injection, ReDoS, Prototype Pollution).
- Known vulnerabilities in the ssri package (ReDoS).
Expand Down
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ versions:
'202311.0': '202311.0'
'202404.0': '202404.0'
'202410.0': '202410.0'
'202505.0': '202505.0'

# versioned categories - these must match corresponding directories
versioned_categories:
Expand Down
2 changes: 2 additions & 0 deletions _data/sidebars/about_all_sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ entries:
- title: Releases
url: /docs/about/all/releases/product-and-code-releases.html
nested:
- title: Security release notes 202412.0
url: /docs/about/all/releases/security-release-notes-202412.0.html
- title: Release notes 202410.0
url: /docs/about/all/releases/release-notes-202410.0.html
- title: Security release notes 202409.0
Expand Down
2 changes: 1 addition & 1 deletion _data/sidebars/ca_dev_sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ entries:
nested:
- title: Assets, logs, or pipelines are not visible in AWS Management Console
url: /docs/ca/dev/troubleshooting/troubleshooting-deployment-issues/assets-logs-or-pipelines-are-not-visible-in-aws-management-console.html
- title: Deployment fails due to a failed docker authentication
- title: Deployment fails because of a failed docker authentication
url: /docs/ca/dev/troubleshooting/troubleshooting-deployment-issues/deployment-fails-due-to-a-failed-docker-authentication.html
- title: Jenkins does not restart
url: /docs/ca/dev/troubleshooting/troubleshooting-deployment-issues/jenkins-does-not-restart.html
Expand Down
21 changes: 19 additions & 2 deletions _data/sidebars/dg_dev_sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,8 @@ entries:

- title: Internationalization and multi-store
nested:
- title: Adding stores in a multi-database setup
url: /docs/dg/dev/internationalization-and-multi-store/adding-stores-in-a-multi-database-setup.html
- title: Handling internationalization
url: /docs/dg/dev/internationalization-and-multi-store/handling-internationalization.html
- title: Managing glossary keys
Expand Down Expand Up @@ -1620,8 +1622,23 @@ entries:
url: /docs/dg/dev/acp/integrate-acp-payment-apps-with-spryker-oms-configuration.html
- title: Retaining ACP apps when running destructive deployments
url: /docs/dg/dev/acp/retaining-acp-apps-when-running-destructive-deployments.html
- title: APIs and overview diagrams for payment service providers
url: /docs/dg/dev/acp/apis-and-overview-diagrams-for-payment-service-providers.html
- title: APIs and flows for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/apis-and-flows-for-payment-service-providers.html
nested:
- title: Asynchronous API for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/asynchronous-api-for-payment-service-providers.html
- title: Configure and disconnect flows for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/configure-and-disconnect-flows-for-payment-service-providers.html
- title: Headless express checkout payment flow for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/headless-express-checkout-payment-flow-for-payment-service-providers.html
- title: Headless payment flow for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/headless-payment-flow-for-payment-service-providers.html
- title: Hosted payment page flow for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/hosted-payment-page-flow-for-payment-service-providers.html
- title: OMS payment flow for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/oms-payment-flow-for-payment-service-providers.html
- title: Synchronous API for payment service providers
url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/synchronous-api-for-payment-service-providers.html
# - title: Develop an app
# url: /docs/dg/dev/acp/develop-an-app/develop-an-app.html
# nested:
Expand Down
Loading

0 comments on commit aa772ed

Please sign in to comment.