Merge pull request #2252 from dpfaffenbauer/next

[Next] Pimcore 11 compatibility

.docker/nginx.conf

@@ -4,11 +4,11 @@
 # }
 
 upstream php-pimcore10 {
- server coreshop-php:9000;
+ server coreshop-next-php:9000;
 }
 
 upstream php-pimcore10-debug {
- server coreshop-php-debug:9000;
+ server coreshop-next-php-debug:9000;
 }
 
 server {

.github/workflows/behat.yml

@@ -1,9 +1,9 @@
 name: Behat
 on:
  push:
- branches: [ '2.2', '3.0', '3.1', 'next' ]
+ branches: [ '3.0', '3.1', 'next' ]
  pull_request:
- branches: [ '2.2', '3.0', '3.1', 'next' ]
+ branches: [ '3.0', '3.1', 'next' ]
  release:
  types: [ created ]
  schedule:
@@ -26,20 +26,19 @@ jobs:
  PIMCORE_INSTALL_MYSQL_PORT: "3306"
  PIMCORE_KERNEL_CLASS: 'Kernel'
  PIMCORE_CLASS_DIRECTORY: 'var/tmp/behat/var/classes'
- PIMCORE_WRITE_TARGET_STATICROUTES: 'settings-store'
 
  strategy:
  matrix:
- php: [ 8.0, 8.1 ]
- pimcore: [ ~10.5, ~10.6 ]
- dependencies: [ highest, lowest ]
+ php: [ 8.1, 8.2 ]
+ pimcore: [ ^11.0 ]
+ dependencies: [ highest ]
  exclude:
  - php: 8.1
  dependencies: lowest
 
  services:
  database:
- image: "mariadb:10.5"
+ image: "mysql:8"
  env:
  MYSQL_ROOT_PASSWORD: root
  ports:
@@ -94,7 +93,7 @@ jobs:
  run: bin/console assets:install --symlink
 
  - name: Install Pimcore
- run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --ignore-existing-config --env=test --skip-database-config
+ run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --env=test --skip-database-config
 
  - name: Install CoreShop
  run: |

.github/workflows/behat_ui.yml

@@ -1,9 +1,9 @@
 name: Behat UI
 on:
  push:
- branches: [ '2.2', '3.0', '3.1', 'next' ]
+ branches: [ '3.0', '3.1', 'next' ]
  pull_request:
- branches: [ '2.2', '3.0', '3.1', 'next' ]
+ branches: [ '3.0', '3.1', 'next' ]
  release:
  types: [ created ]
  schedule:
@@ -27,20 +27,19 @@ jobs:
  PANTHER_CHROME_ARGUMENTS: "--disable-dev-shm-usage"
  PIMCORE_KERNEL_CLASS: 'Kernel'
  PIMCORE_CLASS_DIRECTORY: 'var/tmp/behat/var/classes'
- PIMCORE_WRITE_TARGET_STATICROUTES: 'settings-store'
 
  strategy:
  matrix:
- php: [ 8.0, 8.1 ]
- pimcore: [ ~10.5, ~10.6 ]
- dependencies: [ highest, lowest ]
+ php: [ 8.1, 8.2 ]
+ pimcore: [ ^11.0 ]
+ dependencies: [ highest ]
  exclude:
  - php: 8.1
  dependencies: lowest
 
  services:
  database:
- image: "mariadb:10.5"
+ image: "mysql:8"
  env:
  MYSQL_ROOT_PASSWORD: root
  ports:
@@ -97,7 +96,7 @@ jobs:
  run: bin/console assets:install --symlink
 
  - name: Install Pimcore
- run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --ignore-existing-config --env=test --skip-database-config
+ run: PIMCORE_KERNEL_CLASS=Kernel vendor/bin/pimcore-install --env=test --skip-database-config
 
  - name: Install CoreShop
  run: |
@@ -111,7 +110,7 @@ jobs:
  run: symfony server:start --port=9080 --dir=public --daemon --no-tls
 
  - name: Run Behat
- run: vendor/bin/behat --strict --no-interaction -vvv --config behat.yml.dist -p ui
+ 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

.github/workflows/codestyles.yml

@@ -25,7 +25,7 @@ jobs:
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
- php-version: 8.0 # the lowest PHP version working with ECS
+ php-version: 8.1
 
  - name: Install PHP dependencies
  run: composer update --no-interaction --no-scripts

.github/workflows/docs_next.yml

@@ -0,0 +1,37 @@
+name: Docs
+on:
+ push:
+ branches: [ 'next' ]
+ paths:
+ - 'docs/**'
+
+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/next'
+ with:
+ path: 'docs/build/'
+ destination: 'cors-wolke-coreshop-docs/next'
+ parent: false

.github/workflows/packages_bundles.yml

@@ -1,9 +1,9 @@
 name: Packages Bundles
 on:
  push:
- branches: [ '2.2', '3.0', '3.1', 'next' ]
+ branches: [ '3.0', '3.1', 'next' ]
  pull_request:
- branches: [ '2.2', '3.0', '3.1', 'next' ]
+ branches: [ '3.0', '3.1', 'next' ]
  release:
  types: [ created ]
  schedule:
@@ -31,9 +31,9 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- php: [ 8.0, 8.1 ]
- pimcore: [ ~10.5, ~10.6 ]
- dependencies: [ highest, lowest ]
+ php: [ 8.1, 8.2 ]
+ pimcore: [ ^11.0 ]
+ dependencies: [ highest ]
  package: "${{ fromJson(needs.list.outputs.packages) }}"
  exclude:
  - php: 8.1

.github/workflows/packages_components.yml

@@ -31,9 +31,9 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- php: [ 8.0, 8.1 ]
- pimcore: [ ~10.5, ~10.6 ]
- dependencies: [ highest, lowest ]
+ php: [ 8.1, 8.2 ]
+ pimcore: [ ^11.0 ]
+ dependencies: [ highest ]
  package: "${{ fromJson(needs.list.outputs.packages) }}"
  exclude:
  - php: 8.1