Skip to content

Commit 4dbf24f

Browse files
solveratsolverat
authored
Merge pull request #6 from dachcom-digital/pimcore_x
Pimcore X Compatibility
2 parents 183fa43 + 8dec3e2 commit 4dbf24f

33 files changed

+321
-679
lines changed

‎.github/workflows/codeception.yml

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,57 @@ jobs:
1111
env:
1212
TEST_BUNDLE_NAME: "DsElasticSearchBundle"
1313
TEST_BUNDLE_INSTALLER_CLASS: false
14-
TEST_BUNDLE_TEST_DIR: "${{ github.workspace }}/tests"
14+
TEST_BUNDLE_TEST_DIR: "${{ github.workspace }}/lib/test-bundle/tests"
1515
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
1616

1717
PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
18-
PIMCORE_CODECEPTION_VERSION: "1.0"
18+
PIMCORE_CODECEPTION_VERSION: "2.0"
1919

20-
PIMCORE_ENVIRONMENT: test
21-
PIMCORE_TEST_DB_DSN: "mysql://root:root@localhost/dachcom_bundle_test"
20+
APP_ENV: test
21+
PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
2222
PIMCORE_TEST_URL: "http://localhost"
23-
PIMCORE_CLASS_DIRECTORY: "${{ github.workspace }}/tests/_output/var/classes/DataObject"
23+
PIMCORE_CLASS_DIRECTORY: "${{ github.workspace }}/lib/test-bundle/tests/_output/var/classes/DataObject"
2424

2525
SYMFONY_DEPRECATIONS_HELPER: "weak"
2626
PIMCORE_PHP_ERROR_REPORTING: 32767
2727

2828
WEBDRIVER_HOST: localhost
2929
WEBDRIVER_URL: "http://localhost:8080/"
3030

31-
MYSQL_ROOT_PASSWORD: root
32-
MYSQL_DATABASE: dachcom_bundle_test
3331
services:
3432
mysql:
3533
image: mysql:8.0
3634
env:
3735
MYSQL_ROOT_PASSWORD: root
38-
MYSQL_DATABASE: dachcom_bundle_test
3936
ports:
4037
- 3306
4138
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
4239
strategy:
4340
matrix:
44-
php: [7.4]
45-
symfony: [^4.4]
46-
pimcore: [~6.6.0, ~6.7.0, ~6.8.0]
41+
php: [8.0]
42+
symfony: [ ^5.3 ]
43+
pimcore: [ ~10.1.0, ~10.2.0 ]
4744
include:
48-
- pimcore: ~6.6.0
49-
template_tag: v2.6.0
50-
- pimcore: ~6.7.0
51-
template_tag: v2.7.0
52-
- pimcore: ~6.8.0
53-
template_tag: v2.8.0
45+
- pimcore: ~10.1.0
46+
template_tag: v10.1.0
47+
- pimcore: ~10.2.0
48+
template_tag: v10.1.4
5449
steps:
5550
- uses: actions/checkout@v2
51+
with:
52+
path: lib/test-bundle
5653

5754
- name: Generate Application Structure
5855
run: |
5956
git clone -b ${{ matrix.template_tag }} --single-branch --depth 1 https://github.com/pimcore/skeleton.git
60-
mv skeleton/app .
57+
mv skeleton/composer.json .
6158
mv skeleton/bin .
59+
mv skeleton/config .
60+
mv skeleton/public .
61+
mv skeleton/src .
62+
mv skeleton/templates .
6263
mv skeleton/var .
63-
mv skeleton/web .
64-
mv skeleton/src/AppBundle src
64+
rm -r skeleton
6565
6666
- name: Setup Pimcore Codeception Framework
6767
env:
@@ -72,7 +72,6 @@ jobs:
7272
ls -al pimcore-codeception-framework
7373
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh
7474
./pimcore-codeception-framework/src/_etc/scripts/setup.sh
75-
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json
7675
7776
- name: Install PHP
7877
uses: shivammathur/setup-php@v2
@@ -84,19 +83,10 @@ jobs:
8483
- name: Check PHP Version
8584
run: php -v
8685

87-
- name: Start MySql Service
88-
run: |
89-
sudo /etc/init.d/mysql start
90-
91-
- name: Verify MySql Connection
92-
run: |
93-
sudo apt-get update
94-
sudo apt-get install -y mysql-client-8.0
95-
mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES"
96-
9786
- name: Setup MySql
9887
run: |
99-
mysql -uroot -h127.0.0.1 -proot -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
88+
sudo systemctl start mysql
89+
mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
10090
10191
- name: Setup Chromium
10292
run: |
@@ -105,7 +95,7 @@ jobs:
10595
- name: Start Webserver and Chrome
10696
run: |
10797
wget https://get.symfony.com/cli/installer -O - | bash
108-
~/.symfony/bin/symfony server:start --port=8080 --dir=web --force-php-discovery --allow-http --no-tls --daemon
98+
~/.symfony/bin/symfony server:start --port=8080 --dir=public --force-php-discovery --allow-http --no-tls --daemon
10999
110100
- name: Get Composer Cache Directory
111101
id: composer-cache
@@ -125,22 +115,25 @@ jobs:
125115
TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
126116
TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
127117
run: |
118+
composer config "minimum-stability" "dev"
119+
composer config "prefer-stable" true
120+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
128121
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
129122
./pimcore-codeception-framework/src/_etc/scripts/composer.sh
130123
131124
- name: Assets Install
132125
run: |
133-
bin/console assets:install web --relative --symlink
126+
bin/console assets:install public --relative --symlink
134127
135128
- name: Tests
136129
run: |
137130
bin/console cache:warmup --env=test
138-
vendor/bin/codecept run --env github -c ${{ env.GITHUB_WORKSPACE }}
131+
vendor/bin/codecept run --env github -c ${{ github.workspace }}/lib/test-bundle
139132
140133
- name: Log Output
141134
uses: actions/upload-artifact@v2
142135
if: failure()
143136
with:
144137
name: "Logs (PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}, Symfony ${{ matrix.symfony }})"
145-
path: tests/_output/
138+
path: ${{ github.workspace }}/lib/test-bundle/tests/_output/
146139
if-no-files-found: ignore

‎.github/workflows/ecs.yml

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
env:
1212
TEST_BUNDLE_NAME: "DsElasticSearchBundle"
1313
TEST_BUNDLE_INSTALLER_CLASS: false
14-
TEST_BUNDLE_TEST_DIR: "${{ github.workspace }}/tests"
14+
TEST_BUNDLE_TEST_DIR: "${{ github.workspace }}/lib/test-bundle/tests"
1515
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
1616

1717
PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
18-
PIMCORE_CODECEPTION_VERSION: "1.0"
18+
PIMCORE_CODECEPTION_VERSION: "2.0"
1919

20-
PIMCORE_ENVIRONMENT: test
21-
PIMCORE_TEST_DB_DSN: "mysql://root:root@localhost/dachcom_bundle_test"
20+
APP_ENV: test
21+
PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
2222
PIMCORE_TEST_URL: "http://localhost"
2323

2424
SYMFONY_DEPRECATIONS_HELPER: "weak"
@@ -27,37 +27,38 @@ jobs:
2727
WEBDRIVER_HOST: localhost
2828
WEBDRIVER_URL: "http://localhost:8080/"
2929

30-
MYSQL_ROOT_PASSWORD: root
31-
MYSQL_DATABASE: dachcom_bundle_test
3230
services:
3331
mysql:
3432
image: mysql:8.0
3533
env:
3634
MYSQL_ROOT_PASSWORD: root
37-
MYSQL_DATABASE: dachcom_bundle_test
3835
ports:
3936
- 3306
4037
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
4138
strategy:
4239
matrix:
43-
php: [7.4]
44-
symfony: [^4.4]
45-
pimcore: [^6.8]
40+
php: [ 8.0 ]
41+
symfony: [ ^5.3 ]
42+
pimcore: [ ~10.1.0 ]
4643
include:
47-
- pimcore: ^6.8
48-
template_tag: v2.8.0
49-
44+
- pimcore: ~10.1.0
45+
template_tag: v10.1.0
5046
steps:
5147
- uses: actions/checkout@v2
48+
with:
49+
path: lib/test-bundle
5250

5351
- name: Generate Application Structure
5452
run: |
5553
git clone -b ${{ matrix.template_tag }} --single-branch --depth 1 https://github.com/pimcore/skeleton.git
56-
mv skeleton/app .
54+
mv skeleton/composer.json .
5755
mv skeleton/bin .
56+
mv skeleton/config .
57+
mv skeleton/public .
58+
mv skeleton/src .
59+
mv skeleton/templates .
5860
mv skeleton/var .
59-
mv skeleton/web .
60-
mv skeleton/src/AppBundle src
61+
rm -r skeleton
6162
6263
- name: Setup Pimcore Codeception Framework
6364
env:
@@ -68,7 +69,6 @@ jobs:
6869
ls -al pimcore-codeception-framework
6970
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh
7071
./pimcore-codeception-framework/src/_etc/scripts/setup.sh
71-
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json
7272
7373
- name: Install PHP
7474
uses: shivammathur/setup-php@v2
@@ -80,19 +80,10 @@ jobs:
8080
- name: Check PHP Version
8181
run: php -v
8282

83-
- name: Start MySql Service
84-
run: |
85-
sudo /etc/init.d/mysql start
86-
87-
- name: Verify MySql Connection
88-
run: |
89-
sudo apt-get update
90-
sudo apt-get install -y mysql-client-8.0
91-
mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES"
92-
9383
- name: Setup MySql
9484
run: |
95-
mysql -uroot -h127.0.0.1 -proot -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
85+
sudo systemctl start mysql
86+
mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
9687
9788
- name: Get Composer Cache Directory
9889
id: composer-cache
@@ -112,15 +103,18 @@ jobs:
112103
TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
113104
TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
114105
run: |
106+
composer config "minimum-stability" "dev"
107+
composer config "prefer-stable" true
108+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
115109
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
116110
./pimcore-codeception-framework/src/_etc/scripts/composer.sh
117111
118112
- name: Assets Install
119113
run: |
120-
bin/console assets:install web --relative --symlink
114+
bin/console assets:install public --relative --symlink
121115
122116
- name: Easy Coding Standard Check
123117
continue-on-error: true
124118
run: |
125119
bin/console cache:warmup --env=test
126-
vendor/bin/ecs check src/DsElasticSearchBundle --config ecs.php
120+
vendor/bin/ecs check ${{ github.workspace }}/lib/test-bundle/src/DsElasticSearchBundle --config ${{ github.workspace }}/lib/test-bundle/ecs.php

‎.github/workflows/php-stan.yml

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
env:
1212
TEST_BUNDLE_NAME: "DsElasticSearchBundle"
1313
TEST_BUNDLE_INSTALLER_CLASS: false
14-
TEST_BUNDLE_TEST_DIR: "${{ github.workspace }}/tests"
14+
TEST_BUNDLE_TEST_DIR: "${{ github.workspace }}/lib/test-bundle/tests"
1515
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
1616

1717
PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
18-
PIMCORE_CODECEPTION_VERSION: "1.0"
18+
PIMCORE_CODECEPTION_VERSION: "2.0"
1919

20-
PIMCORE_ENVIRONMENT: test
21-
PIMCORE_TEST_DB_DSN: "mysql://root:root@localhost/dachcom_bundle_test"
20+
APP_ENV: test
21+
PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
2222
PIMCORE_TEST_URL: "http://localhost"
2323

2424
SYMFONY_DEPRECATIONS_HELPER: "weak"
@@ -27,36 +27,38 @@ jobs:
2727
WEBDRIVER_HOST: localhost
2828
WEBDRIVER_URL: "http://localhost:8080/"
2929

30-
MYSQL_ROOT_PASSWORD: root
31-
MYSQL_DATABASE: dachcom_bundle_test
3230
services:
3331
mysql:
3432
image: mysql:8.0
3533
env:
3634
MYSQL_ROOT_PASSWORD: root
37-
MYSQL_DATABASE: dachcom_bundle_test
3835
ports:
3936
- 3306
4037
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
4138
strategy:
4239
matrix:
43-
php: [7.4]
44-
symfony: [^4.4]
45-
pimcore: [^6.8]
40+
php: [ 8.0 ]
41+
symfony: [ ^5.3 ]
42+
pimcore: [ ~10.1.0 ]
4643
include:
47-
- pimcore: ^6.8
48-
template_tag: v2.8.0
44+
- pimcore: ~10.1.0
45+
template_tag: v10.1.0
4946
steps:
5047
- uses: actions/checkout@v2
48+
with:
49+
path: lib/test-bundle
5150

5251
- name: Generate Application Structure
5352
run: |
5453
git clone -b ${{ matrix.template_tag }} --single-branch --depth 1 https://github.com/pimcore/skeleton.git
55-
mv skeleton/app .
54+
mv skeleton/composer.json .
5655
mv skeleton/bin .
56+
mv skeleton/config .
57+
mv skeleton/public .
58+
mv skeleton/src .
59+
mv skeleton/templates .
5760
mv skeleton/var .
58-
mv skeleton/web .
59-
mv skeleton/src/AppBundle src
61+
rm -r skeleton
6062
6163
- name: Setup Pimcore Codeception Framework
6264
env:
@@ -67,7 +69,6 @@ jobs:
6769
ls -al pimcore-codeception-framework
6870
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh
6971
./pimcore-codeception-framework/src/_etc/scripts/setup.sh
70-
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json
7172
7273
- name: Install PHP
7374
uses: shivammathur/setup-php@v2
@@ -79,19 +80,10 @@ jobs:
7980
- name: Check PHP Version
8081
run: php -v
8182

82-
- name: Start MySql Service
83-
run: |
84-
sudo /etc/init.d/mysql start
85-
86-
- name: Verify MySql Connection
87-
run: |
88-
sudo apt-get update
89-
sudo apt-get install -y mysql-client-8.0
90-
mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES"
91-
9283
- name: Setup MySql
9384
run: |
94-
mysql -uroot -h127.0.0.1 -proot -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
85+
sudo systemctl start mysql
86+
mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
9587
9688
- name: Get Composer Cache Directory
9789
id: composer-cache
@@ -111,14 +103,17 @@ jobs:
111103
TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
112104
TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
113105
run: |
106+
composer config "minimum-stability" "dev"
107+
composer config "prefer-stable" true
108+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
114109
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
115110
./pimcore-codeception-framework/src/_etc/scripts/composer.sh
116111
117112
- name: Assets Install
118113
run: |
119-
bin/console assets:install web --relative --symlink
114+
bin/console assets:install public --relative --symlink
120115
121116
- name: Php Stan
122117
run: |
123118
bin/console cache:warmup --env=test
124-
vendor/bin/phpstan analyse -c phpstan.neon -a tests/_phpstan-bootstrap.php src -l 2
119+
vendor/bin/phpstan analyse -c${{ github.workspace }}/lib/test-bundle/phpstan.neon -a ${{ github.workspace }}/lib/test-bundle/tests/_phpstan-bootstrap.php ${{ github.workspace }}/lib/test-bundle/src -l 4

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# License
2-
Copyright (C) 2017 DACHCOM.DIGITAL
2+
Copyright (C) 2021 DACHCOM.DIGITAL
33

44
This software is available under the GNU General Public License version 3 (GPLv3).
55

0 commit comments

Comments
 (0)