Merge remote-tracking branch 'upstream/4.0' into bugfix/store-without…

…-currency

.docker/nginx.conf

@@ -3,12 +3,8 @@
 # include mime.types;
 # }
 
-upstream php-pimcore10 {
- server coreshop-4-php:9000;
-}
-
-upstream php-pimcore10-debug {
- server coreshop-4-php-debug:9000;
+upstream php-pimcore11 {
+ server coreshop4-php:9000;
 }
 
 server {
@@ -121,7 +117,6 @@ server {
  #try_files $fastcgi_script_name =404;
  # include fastcgi.conf if needed
  include fastcgi_params;
-
  # Bypass the fact that try_files resets $fastcgi_path_info
  # see: http://trac.nginx.org/nginx/ticket/321
  set $path_info $fastcgi_path_info;
@@ -134,12 +129,7 @@ server {
  # Mitigate https://httpoxy.org/ vulnerabilities
  fastcgi_param HTTP_PROXY "";
 
- # If Xdebug session is requested, pass it to the Xdebug enabled container
- if ($http_cookie ~* "XDEBUG_SESSION") {
- fastcgi_pass php-pimcore10-debug;
- }
-
- fastcgi_pass php-pimcore10;
+ fastcgi_pass php-pimcore11;
  # Prevents URIs that include the front controller. This will 404:
  # http://domain.tld/index.php/some-path
  # Remove the internal directive to allow URIs like this
@@ -155,10 +145,10 @@ server {
  allow 127.0.0.1;
  # add additional IP's or Ranges
  deny all;
- fastcgi_pass php-pimcore10;
+ fastcgi_pass php-pimcore11;
  }
  location /fpm-ping {
- fastcgi_pass php-pimcore10;
+ fastcgi_pass php-pimcore11;
  }
  }
  # nginx Status

.env

@@ -1 +1,2 @@
 PIMCORE_KERNEL_CLASS=Kernel
+APP_DEBUG=1

.github/workflows/behat.yml

@@ -2,10 +2,22 @@ name: Behat
 on:
  push:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  pull_request:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  release:
  types: [ created ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs.yaml'
+ - 'README.md'
  schedule:
  - cron: "0 1 * * 1"
 
@@ -25,12 +37,11 @@ jobs:
  PIMCORE_INSTALL_MYSQL_DATABASE: "coreshop_test"
  PIMCORE_INSTALL_MYSQL_PORT: "3306"
  PIMCORE_KERNEL_CLASS: 'Kernel'
- PIMCORE_CLASS_DIRECTORY: 'var/tmp/behat/var/classes'
 
  strategy:
  matrix:
  php: [ 8.1, 8.2 ]
- pimcore: [ ^11.0 ]
+ pimcore: [ ~11.1.0, ~11.2.0 ]
  dependencies: [ highest ]
  exclude:
  - php: 8.1
@@ -47,7 +58,7 @@ jobs:
  name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2
@@ -68,7 +79,7 @@ jobs:
  run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
  - name: Cache composer dependencies
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ${{ steps.composer-cache.outputs.dir }}
  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/behat_ui.yml

@@ -2,8 +2,16 @@ name: Behat UI
 on:
  push:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  pull_request:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  release:
  types: [ created ]
  schedule:
@@ -26,12 +34,11 @@ jobs:
  PANTHER_EXTERNAL_BASE_URI: "http://localhost:9080/index_test.php"
  PANTHER_CHROME_ARGUMENTS: "--disable-dev-shm-usage"
  PIMCORE_KERNEL_CLASS: 'Kernel'
- PIMCORE_CLASS_DIRECTORY: 'var/tmp/behat/var/classes'
 
  strategy:
  matrix:
  php: [ 8.1, 8.2 ]
- pimcore: [ ^11.0 ]
+ pimcore: [ ~11.1.0, ~11.2.0 ]
  dependencies: [ highest ]
  exclude:
  - php: 8.1
@@ -49,7 +56,7 @@ jobs:
  name: "${{ matrix.pimcore }}, PHP ${{ matrix.php }}, Deps ${{ matrix.dependencies }}"
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2
@@ -71,7 +78,7 @@ jobs:
  run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
  - name: Cache composer dependencies
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ${{ steps.composer-cache.outputs.dir }}
  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -113,15 +120,15 @@ jobs:
  run: vendor/bin/behat --strict --no-interaction -vvv -f progress --config behat.yml.dist -p ui
 
  - name: Upload Behat logs
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  if: failure()
  with:
  name: "Behat logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.pimcore }})"
  path: etc/build/
  if-no-files-found: ignore
 
  - name: Upload Pimcore logs
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  if: failure()
  with:
  name: "Pimcore logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.pimcore }})"

.github/workflows/codestyles.yml

@@ -18,7 +18,7 @@ jobs:
  branch: [ '4.0' ]
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  ref: ${{ matrix.branch }}
 

.github/workflows/docs_next.yml

@@ -1,37 +1,19 @@
-name: Docs
+name: "Documentation"
 on:
+ pull_request:
+ paths:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  push:
- branches: [ '4.0' ]
  paths:
  - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
+
+permissions:
+ contents: read
 
 jobs:
  docs:
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Set Node.js 18.x
- uses: actions/setup-node@v3
- with:
- node-version: 18.x
-
- - name: Setup and Generate
- run: | 
- cd docs
- npm install
- npm run build
-
- - name: Authenticate to Google Cloud
- uses: 'google-github-actions/auth@v0'
- with:
- credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
-
- - name: Upload Folder
- uses: 'google-github-actions/upload-cloud-storage@v0'
- if: github.ref == 'refs/heads/4.0'
- with:
- path: 'docs/build/'
- destination: 'cors-wolke-coreshop-docs/4.0.0'
- parent: false
+ uses: coreshop/workflow-collection/.github/workflows/docs.yml@v1

.github/workflows/gitsplit.yml

@@ -9,6 +9,10 @@ on:
  - 3.0
  - 3.1
  - 4.0
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  release:
  types: [ published ]
 
@@ -25,7 +29,7 @@ jobs:
  -
  name: Gitsplit Cache
  id: gitsplit-cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: cache
  key: gitsplit-cache

.github/workflows/packages_bundles.yml

@@ -2,8 +2,16 @@ name: Packages Bundles
 on:
  push:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  pull_request:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  release:
  types: [ created ]
  schedule:
@@ -15,7 +23,7 @@ jobs:
  name: "Create a list of packages"
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: "List Packages"
  id: create-list
@@ -32,15 +40,15 @@ jobs:
  fail-fast: false
  matrix:
  php: [ 8.1, 8.2 ]
- pimcore: [ ^11.0 ]
+ pimcore: [ ~11.1.0, ~11.2.0 ]
  dependencies: [ highest ]
  package: "${{ fromJson(needs.list.outputs.packages) }}"
  exclude:
  - php: 8.1
  dependencies: lowest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2
@@ -53,7 +61,7 @@ jobs:
  run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
  - name: Cache Composer
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ${{ steps.composer-cache.outputs.dir }}
  key: ${{ runner.os }}-php-${{ matrix.php }}-package-${{ matrix.package }}-composer-${{ hashFiles(format('src/CoreShop/{0}/composer.json', matrix.package)) }}

.github/workflows/packages_components.yml

@@ -2,8 +2,16 @@ name: Packages Components
 on:
  push:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  pull_request:
  branches: [ '4.0' ]
+ paths-ignore:
+ - 'docs/**'
+ - '.github/workflows/docs_next.yml'
+ - 'README.md'
  release:
  types: [ created ]
  schedule:
@@ -15,7 +23,7 @@ jobs:
  name: "Create a list of packages"
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: "List Packages"
  id: create-list
@@ -32,15 +40,15 @@ jobs:
  fail-fast: false
  matrix:
  php: [ 8.1, 8.2 ]
- pimcore: [ ^11.0 ]
+ pimcore: [ ~11.1.0, ~11.2.0 ]
  dependencies: [ highest ]
  package: "${{ fromJson(needs.list.outputs.packages) }}"
  exclude:
  - php: 8.1
  dependencies: lowest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Install PHP
  uses: shivammathur/setup-php@v2
@@ -53,7 +61,7 @@ jobs:
  run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
  - name: Cache Composer
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ${{ steps.composer-cache.outputs.dir }}
  key: ${{ runner.os }}-php-${{ matrix.php }}-package-${{ matrix.package }}-composer-${{ hashFiles(format('src/CoreShop/{0}/composer.json', matrix.package)) }}