mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 09:02:12 +00:00
[UPMERGE] 1.13 -> 2.0 (#15683)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout git merge upstream/2.0 --no-commit ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and change the commit title to ``` Resolve conflicts between 1.13 and 2.0 ```
This commit is contained in:
commit
9d6088fe0c
17 changed files with 54 additions and 2 deletions
5
.github/workflows/auto-merge.yaml
vendored
5
.github/workflows/auto-merge.yaml
vendored
|
|
@ -3,8 +3,13 @@ name: Auto-merge
|
|||
on:
|
||||
pull_request: ~
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
auto-merge:
|
||||
permissions:
|
||||
pull-requests: write
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
|
|
|||
3
.github/workflows/ci__full.yaml
vendored
3
.github/workflows/ci__full.yaml
vendored
|
|
@ -10,6 +10,9 @@ concurrency:
|
|||
group: ci-${{ github.workflow }}-${{ github.ref }}-full
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
static-checks:
|
||||
strategy:
|
||||
|
|
|
|||
3
.github/workflows/ci__minimal.yaml
vendored
3
.github/workflows/ci__minimal.yaml
vendored
|
|
@ -16,6 +16,9 @@ concurrency:
|
|||
group: ci-${{ github.workflow }}-${{ github.ref }}-minimal
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
static-checks:
|
||||
name: Static checks
|
||||
|
|
|
|||
3
.github/workflows/ci__unstable.yaml
vendored
3
.github/workflows/ci__unstable.yaml
vendored
|
|
@ -19,6 +19,9 @@ concurrency:
|
|||
group: ci-${{ github.workflow }}-${{ github.ref }}-unstable
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
e2e-unstable:
|
||||
name: End-to-end tests (Unstable)
|
||||
|
|
|
|||
3
.github/workflows/ci_e2e-custom.yaml
vendored
3
.github/workflows/ci_e2e-custom.yaml
vendored
|
|
@ -10,6 +10,9 @@ on:
|
|||
type: string
|
||||
default: ""
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
behat-no-js-unstable-symfony:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/ci_e2e-mariadb.yaml
vendored
3
.github/workflows/ci_e2e-mariadb.yaml
vendored
|
|
@ -14,6 +14,9 @@ on:
|
|||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
get-matrix:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/ci_e2e-mysql.yaml
vendored
3
.github/workflows/ci_e2e-mysql.yaml
vendored
|
|
@ -14,6 +14,9 @@ on:
|
|||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
get-matrix:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/ci_e2e-pgsql.yaml
vendored
3
.github/workflows/ci_e2e-pgsql.yaml
vendored
|
|
@ -14,6 +14,9 @@ on:
|
|||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
get-matrix:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/ci_e2e-unstable.yaml
vendored
3
.github/workflows/ci_e2e-unstable.yaml
vendored
|
|
@ -10,6 +10,9 @@ on:
|
|||
default: false
|
||||
workflow_dispatch: ~
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
behat-no-js-unstable:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/ci_packages-unstable.yaml
vendored
3
.github/workflows/ci_packages-unstable.yaml
vendored
|
|
@ -14,6 +14,9 @@ on:
|
|||
type: boolean
|
||||
default: false
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
get-matrix:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/ci_packages.yaml
vendored
3
.github/workflows/ci_packages.yaml
vendored
|
|
@ -14,6 +14,9 @@ on:
|
|||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
get-matrix:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/ci_static-checks.yaml
vendored
3
.github/workflows/ci_static-checks.yaml
vendored
|
|
@ -14,6 +14,9 @@ on:
|
|||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
get-matrix:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
3
.github/workflows/documentation.yaml
vendored
3
.github/workflows/documentation.yaml
vendored
|
|
@ -16,6 +16,9 @@ on:
|
|||
cron: "0 1 * * 6" # Run at 1am every Saturday
|
||||
workflow_dispatch: ~
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
4
.github/workflows/refactor.yaml
vendored
4
.github/workflows/refactor.yaml
vendored
|
|
@ -6,6 +6,10 @@ on:
|
|||
cron: "0 2 * * *" # Run every day at 2am
|
||||
workflow_dispatch: ~
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
coding-standard:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ on:
|
|||
release:
|
||||
types: [created]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
4
.github/workflows/upmerge_pr.yaml
vendored
4
.github/workflows/upmerge_pr.yaml
vendored
|
|
@ -6,6 +6,10 @@ on:
|
|||
cron: "0 2 * * *"
|
||||
workflow_dispatch: ~
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
upmerge:
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ final class RequestHeaderBasedLocaleContext implements LocaleContextInterface
|
|||
{
|
||||
private const NO_CODE_VALID_STUB = 'NO_CODE_VALID_STUB';
|
||||
|
||||
/** @var array<array-key, string> $availableLocalesCodes */
|
||||
/** @var array<array-key, string> */
|
||||
private array $availableLocalesCodes = [];
|
||||
|
||||
public function __construct(private RequestStack $requestStack, private LocaleProviderInterface $localeProvider)
|
||||
|
|
@ -44,7 +44,7 @@ final class RequestHeaderBasedLocaleContext implements LocaleContextInterface
|
|||
if ([] === $this->availableLocalesCodes) {
|
||||
$this->availableLocalesCodes = array_unique(array_merge(
|
||||
[$this->localeProvider->getDefaultLocaleCode()],
|
||||
$this->localeProvider->getAvailableLocalesCodes()
|
||||
$this->localeProvider->getAvailableLocalesCodes(),
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue