Skip to content

Commit 0d4f3c8

Browse files
solveratsolverat
authored
Merge pull request #3 from dachcom-digital/p11
Pimcore 11 Support
2 parents 3526417 + 70d1481 commit 0d4f3c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+345
-287
lines changed

‎.github/workflows/codeception.yml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
1616

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

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

@@ -38,12 +38,12 @@ jobs:
3838
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3939
strategy:
4040
matrix:
41-
php: [ 8.1 ]
42-
symfony: [ ^5.4 ]
43-
pimcore: [ ~10.6.0 ]
41+
php: [ 8.2 ]
42+
symfony: [ ^6.2 ]
43+
pimcore: [ ~11.0.0 ]
4444
include:
45-
- pimcore: ~10.6.0
46-
template_tag: v10.2.5
45+
- pimcore: ~11.0.0
46+
template_tag: v11.0.0
4747
steps:
4848
- uses: actions/checkout@v2
4949
with:
@@ -82,9 +82,19 @@ jobs:
8282
run: php -v
8383

8484
- name: Setup MySql
85-
run: |
86-
sudo systemctl start mysql
87-
mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
85+
uses: shogo82148/actions-setup-mysql@v1
86+
with:
87+
mysql-version: '8.0'
88+
user: test
89+
password: test
90+
root-password: root
91+
auto-start: true
92+
my-cnf: |
93+
max_allowed_packet=32505856
94+
max_connections=1000
95+
96+
- name: Initial Database
97+
run: mysql -utest -ptest -h127.0.0.1 -e 'CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;'
8898

8999
- name: Setup Chromium
90100
run: |
@@ -115,7 +125,7 @@ jobs:
115125
run: |
116126
composer config "minimum-stability" "dev"
117127
composer config "prefer-stable" true
118-
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
128+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
119129
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
120130
./pimcore-codeception-framework/src/_etc/scripts/composer.sh
121131

‎.github/workflows/ecs.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
1616

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

2020
APP_ENV: test
2121
PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
3737
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3838
strategy:
3939
matrix:
40-
php: [ 8.1 ]
41-
symfony: [ ^5.4 ]
42-
pimcore: [ ~10.6.0 ]
40+
php: [ 8.2 ]
41+
symfony: [ ^6.2 ]
42+
pimcore: [ ~11.0.0 ]
4343
include:
44-
- pimcore: ~10.6.0
45-
template_tag: v10.2.5
44+
- pimcore: ~11.0.0
45+
template_tag: v11.0.0
4646
steps:
4747
- uses: actions/checkout@v2
4848
with:
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
composer config "minimum-stability" "dev"
107107
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
108+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
109109
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
110110
./pimcore-codeception-framework/src/_etc/scripts/composer.sh
111111

‎.github/workflows/php-stan.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
1616

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

2020
APP_ENV: test
2121
PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
3737
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3838
strategy:
3939
matrix:
40-
php: [ 8.1 ]
41-
symfony: [ ^5.4 ]
42-
pimcore: [ ~10.6.0 ]
40+
php: [ 8.2 ]
41+
symfony: [ ^6.2 ]
42+
pimcore: [ ~11.0.0 ]
4343
include:
44-
- pimcore: ~10.6.0
45-
template_tag: v10.2.5
44+
- pimcore: ~11.0.0
45+
template_tag: v11.0.0
4646
steps:
4747
- uses: actions/checkout@v2
4848
with:
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
composer config "minimum-stability" "dev"
107107
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
108+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
109109
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
110110
./pimcore-codeception-framework/src/_etc/scripts/composer.sh
111111

‎.gitignore

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
######################
2+
# Compiled source #
3+
######################
4+
*.com
5+
*.class
6+
*.dll
7+
*.exe
8+
*.o
9+
*.so
10+
11+
######################
12+
# Packages #
13+
######################
14+
# it's better to unpack these files and commit the raw source
15+
# git has its own built in compression methods
16+
*.7z
17+
*.dmg
18+
*.gz
19+
*.iso
20+
*.jar
21+
22+
######################
23+
# Logs and databases #
24+
######################
25+
*.log
26+
27+
######################
28+
# Global #
29+
######################
30+
.DS_Store
31+
.DS_Store\?
32+
._*
33+
.Spotlight-V100
34+
.Trashes
35+
Icon\?
36+
*.sublime-workspace
37+
*.sublime-project
38+
atlassian-ide-plugin.xml
39+
.idea/
40+
.project
41+
ehthumbs.db
42+
Thumbs.db
43+
Vagrantfile
44+
.vagrant
45+
php-cgi.core
46+
.sass-cache
47+
48+
# codeception (only stage *.dist.yaml config files)
49+
/codeception.yaml
50+
/tests/codeception.yaml
51+
/tests/*.suite.yaml
52+
/tests/_output/*
53+
/tests/_data/*
54+
!/tests/_data/.gitkeep
55+
/tests/Support/_generated/*

‎README.md

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ An index storage extension for [Pimcore Dynamic Search](https://github.com/dachc
99
Store data with the opensearch index service.
1010

1111
## Release Plan
12-
| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
13-
|---------|----------------------------|----------------------------|--------------|----------------------|--------------------------------------------------------------------------------------------------------|
14-
| **1.x** | `10.0` - `10.6` | `^5.4` | 09.03.2023 | Yes (Bugs, Features) | master |
12+
| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
13+
|---------|----------------------------|----------------------------|--------------|----------------------|--------|
14+
| **2.x** | `11.0` | `^6.2` | -- | Yes (Bugs, Features) | master |
15+
| **1.x** | `10.0` - `10.6` | `^5.4` | 09.03.2023 | No | 1.x |
1516
***
1617

1718
## Installation
1819
```json
1920
"require" : {
20-
"dachcom-digital/dynamic-search" : "~2.0.0",
21-
"dachcom-digital/dynamic-search-index-provider-opensearch" : "~1.0.0"
21+
"dachcom-digital/dynamic-search" : "~3.0.0",
22+
"dachcom-digital/dynamic-search-index-provider-opensearch" : "~2.0.0"
2223
}
2324
```
2425

@@ -27,7 +28,7 @@ You need to install / enable the Dynamic Search Bundle first.
2728
Read more about it [here](https://github.com/dachcom-digital/pimcore-dynamic-search#installation).
2829
After that, proceed as followed:
2930

30-
### Enabling via `config/bundles.php`:
31+
Add Bundle to `bundles.php`:
3132
```php
3233
<?php
3334

@@ -36,23 +37,6 @@ return [
3637
];
3738
```
3839

39-
### Enabling via `Kernel.php`:
40-
```php
41-
<?php
42-
43-
namespace App;
44-
45-
use Pimcore\HttpKernel\BundleCollection\BundleCollection;
46-
47-
class Kernel extends \Pimcore\Kernel
48-
{
49-
public function registerBundlesToCollection(BundleCollection $collection): void
50-
{
51-
$collection->addBundle(new \DsOpenSearchBundle\DsOpenSearchBundle());
52-
}
53-
}
54-
```
55-
5640
***
5741

5842
## Basic Setup
@@ -119,20 +103,20 @@ dynamic_search:
119103
120104
## Provider Options
121105
122-
| Name | Default Value | Description |
123-
|:-------------------------------------|:-----------------------|:------------|
124-
|`index` | [] | |
125-
|`analysis` | [] | |
106+
| Name | Default Value | Description |
107+
|:-----------|:--------------|:------------|
108+
| `index` | [] | |
109+
| `analysis` | [] | |
126110

127111
***
128112

129113
## Index Fields
130114
**Available Index Fields**:
131115

132-
| Name | Description |
133-
|:------------------|:------------|
134-
|`dynamic` | TBD |
135-
|`explicit` | TBD |
116+
| Name | Description |
117+
|:-----------|:------------|
118+
| `dynamic` | TBD |
119+
| `explicit` | TBD |
136120

137121
***
138122

@@ -145,9 +129,9 @@ You're able to modify the search by hooking via `dynamic_search.output_channel.m
145129
**Identifier**: `opensearch_search`
146130
**Available Options**:
147131

148-
| Name | Default Value | Description |
149-
|:---------------------------------|:--------------|:------------|
150-
|`result_limit` | 10 | |
132+
| Name | Default Value | Description |
133+
|:---------------|:--------------|:------------|
134+
| `result_limit` | 10 | |
151135

152136
### Multi Search
153137
**Identifier**: `TBD`
@@ -191,3 +175,6 @@ $ bin/console dynamic-search:os:rebuild-index -c default
191175
## Copyright and License
192176
Copyright: [DACHCOM.DIGITAL](http://dachcom-digital.com)
193177
For licensing details please visit [LICENSE.md](./LICENSE.md)
178+
179+
## Upgrade Info
180+
Before updating, please [check our upgrade notes!](./UPGRADE.md)

‎UPGRADE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Upgrade Notes
2+
3+
## Migrating from Version 1.x to Version 2.0.0
4+
5+
### Global Changes
6+
- Recommended folder structure by symfony adopted

‎codeception.dist.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
namespace: DachcomBundle\Test
2+
support_namespace: Support
23
actor: Tester
34
paths:
45
tests: tests
5-
output: tests/_output
6-
data: tests/_data
7-
support: tests/_support
86
envs: tests/_envs
7+
output: tests/_output
98
log: tests/_output/var/logs
9+
data: tests/_data
10+
support: tests/Support
11+
bootstrap: _bootstrap.php
1012
settings:
11-
bootstrap: _bootstrap.php
1213
memory_limit: -1
1314
colors: true
1415
params:
1516
- env
1617
extensions:
1718
enabled:
18-
- Codeception\Extension\RunFailed
19+
- Codeception\Extension\RunFailed

0 commit comments

Comments
 (0)