Skip to content

Commit 67969a4

Browse files
lukmziglukmzig
committed
Merge branch '2.x' into add-nesting-for-fieldcollections
2 parents 9e95e42 + 661d7d5 commit 67969a4

File tree

600 files changed

+2785
-4891
lines changed

Some content is hidden

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

600 files changed

+2785
-4891
lines changed

‎.github/ci/files/bin/console‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
#!/usr/bin/env php
22
<?php
33
/**
4-
* Pimcore
5-
*
6-
* This source file is available under two different licenses:
7-
* - GNU General Public License version 3 (GPLv3)
8-
* - Pimcore Enterprise License (PEL)
9-
* Full copyright and license information is available in
10-
* LICENSE.md which is distributed with this source code.
11-
*
12-
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
13-
* @license http://www.pimcore.org/license GPLv3 and PEL
14-
*/
4+
* This source file is available under the terms of the
5+
* Pimcore Open Core License (POCL)
6+
* Full copyright and license information is available in
7+
* LICENSE.md which is distributed with this source code.
8+
*
9+
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.com)
10+
* @license Pimcore Open Core License (POCL)
11+
*/
1512

1613
ob_get_clean();
1714

‎.github/ci/files/config/bundles.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
return [
44
'Pimcore\\Bundle\\GenericDataIndexBundle\\PimcoreGenericDataIndexBundle' => ['all' => true],
5+
'Pimcore\\Bundle\\SeoBundle\\PimcoreSeoBundle' => ['all' => true]
56
];

‎.github/ci/files/kernel/Kernel.php‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<?php
22
/**
3-
* Pimcore
4-
*
5-
* This source file is available under two different licenses:
6-
* - GNU General Public License version 3 (GPLv3)
7-
* - Pimcore Enterprise License (PEL)
8-
* Full copyright and license information is available in
9-
* LICENSE.md which is distributed with this source code.
10-
*
11-
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
12-
* @license http://www.pimcore.org/license GPLv3 and PEL
13-
*/
3+
* This source file is available under the terms of the
4+
* Pimcore Open Core License (POCL)
5+
* Full copyright and license information is available in
6+
* LICENSE.md which is distributed with this source code.
7+
*
8+
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.com)
9+
* @license Pimcore Open Core License (POCL)
10+
*/
1411

1512
namespace App;
1613

‎.github/ci/files/public/index_test.php‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<?php
22
/**
3-
* Pimcore
4-
*
5-
* This source file is available under two different licenses:
6-
* - GNU General Public License version 3 (GPLv3)
7-
* - Pimcore Enterprise License (PEL)
8-
* Full copyright and license information is available in
9-
* LICENSE.md which is distributed with this source code.
10-
*
11-
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
12-
* @license http://www.pimcore.org/license GPLv3 and PEL
13-
*/
3+
* This source file is available under the terms of the
4+
* Pimcore Open Core License (POCL)
5+
* Full copyright and license information is available in
6+
* LICENSE.md which is distributed with this source code.
7+
*
8+
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.com)
9+
* @license Pimcore Open Core License (POCL)
10+
*/
1411

1512
use Pimcore\Tool;
1613
use Symfony\Component\HttpFoundation\Request;

‎.github/workflows/elastic-search-codeception.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
# Enable Later.
55
schedule:
66
- cron: '0 3 * * 1,3,5'
7+
workflow_dispatch:
78
pull_request:
89
branches:
910
- "[0-9]+.[0-9]+"

‎.github/workflows/open-search-codeception.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
# Enable Later.
55
schedule:
66
- cron: '0 3 * * 1,3,5'
7+
workflow_dispatch:
78
pull_request:
89
branches:
910
- "[0-9]+.[0-9]+"

‎.php-cs-fixer.dist.php‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@
1919
'@PSR2' => true,
2020
'array_syntax' => ['syntax' => 'short'],
2121

22-
'header_comment' => [
23-
'comment_type' => 'PHPDoc',
24-
'header' => 'Pimcore' . PHP_EOL . PHP_EOL .
25-
'This source file is available under two different licenses:' . PHP_EOL .
26-
'- GNU General Public License version 3 (GPLv3)' . PHP_EOL .
27-
'- Pimcore Commercial License (PCL)' . PHP_EOL .
28-
'Full copyright and license information is available in' . PHP_EOL .
29-
'LICENSE.md which is distributed with this source code.' . PHP_EOL .
30-
PHP_EOL .
31-
' @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)' . PHP_EOL .
32-
' @license http://www.pimcore.org/license GPLv3 and PCL'
33-
],
22+
'header_comment' => [
23+
'comment_type' => 'PHPDoc',
24+
'header' =>
25+
'This source file is available under the terms of the' . PHP_EOL .
26+
'Pimcore Open Core License (POCL)' . PHP_EOL .
27+
'Full copyright and license information is available in' . PHP_EOL .
28+
'LICENSE.md which is distributed with this source code.' . PHP_EOL .
29+
PHP_EOL .
30+
' @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)' . PHP_EOL .
31+
' @license Pimcore Open Core License (POCL)'
32+
],
3433

3534
'blank_line_before_statement' => true,
3635
'encoding' => true,

‎LICENSE.md‎

Lines changed: 148 additions & 22 deletions
Large diffs are not rendered by default.

‎composer.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pimcore/generic-data-index-bundle",
3-
"license": "GPL-3.0-or-later",
3+
"license": "proprietary",
44
"type": "pimcore-bundle",
55
"description": "Pimcore Generic data index Bundle",
66
"config": {
@@ -21,11 +21,10 @@
2121
"nesbot/carbon": "^3.8.4",
2222
"pimcore/pimcore": "^12.0",
2323
"pimcore/static-resolver-bundle": "^3.0",
24-
"pimcore/opensearch-client": "^1.1",
25-
"pimcore/elasticsearch-client": "^1.1",
24+
"pimcore/opensearch-client": "^2.0",
25+
"pimcore/elasticsearch-client": "^2.0",
2626
"doctrine/orm": "^3.0",
27-
"symfony/scheduler": "^6.4",
28-
"symfony/messenger": "^6.4"
27+
"symfony/scheduler": "^6.4 || ^7.2"
2928
},
3029
"require-dev": {
3130
"roave/security-advisories": "dev-latest",

‎config/pimcore/config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ pimcore_generic_data_index:
9898
document:
9999
published:
100100
type: boolean
101+
index:
102+
type: integer
101103
controller:
102104
type: keyword
103105
template:

0 commit comments

Comments
 (0)