Skip to content

Commit e8cea6a

Browse files
markus-mosermarkus-moser
committed
Merge branch '1.0' into 1.x
# Conflicts: # .github/workflows/qodana.yml # src/Service/Workspace/QueryService.php # tests/Unit/Service/Workspace/QueryServiceTest.php
2 parents 4c27f19 + 44a5880 commit e8cea6a

File tree

337 files changed

+2369
-672
lines changed

Some content is hidden

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

337 files changed

+2369
-672
lines changed

‎.php-cs-fixer.dist.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222
'header_comment' => [
2323
'comment_type' => 'PHPDoc',
2424
'header' => 'Pimcore' . PHP_EOL . PHP_EOL .
25-
'This source file is available under following license:' . PHP_EOL .
25+
'This source file is available under two different licenses:' . PHP_EOL .
26+
'- GNU General Public License version 3 (GPLv3)' . PHP_EOL .
2627
'- 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 .
2730
PHP_EOL .
2831
' @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)' . PHP_EOL .
29-
' @license http://www.pimcore.org/license PCL'
32+
' @license http://www.pimcore.org/license GPLv3 and PCL'
3033
],
3134

3235
'blank_line_before_statement' => true,

‎LICENSE.md

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
11
# License
22
Copyright (C) Pimcore GmbH
33

4-
This software is available under following license:
4+
This software is available under two different licenses:
5+
* GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
6+
* Pimcore Commercial License (PCL)
7+
8+
The default Pimcore license, without a valid Pimcore Commercial License agreement, is the Open-Source GPLv3 license.
9+
10+
## GNU General Public License version 3 (GPLv3)
11+
If you decide to choose the GPLv3 license, you must comply with the following terms:
12+
13+
This program is free software: you can redistribute it and/or modify
14+
it under the terms of the GNU General Public License as published by
15+
the Free Software Foundation, either version 3 of the License, or
16+
(at your option) any later version.
17+
18+
This program is distributed in the hope that it will be useful,
19+
but WITHOUT ANY WARRANTY; without even the implied warranty of
20+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
GNU General Public License for more details.
22+
23+
You should have received a copy of the GNU General Public License
24+
along with this program. If not, see <http://www.gnu.org/licenses/>.
525

626
## Pimcore Commercial License (PCL)
7-
Commercial and supported versions of the program - also known as
27+
Alternatively, commercial and supported versions of the program - also known as
828
Commercial Distributions - must be used in accordance with the terms and conditions
9-
contained in a separate written agreement between you and Pimcore GmbH.
29+
contained in a separate written agreement between you and Pimcore GmbH.
1030
For more information about the Pimcore Commercial License (PCL) please contact [email protected].
31+

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pimcore/generic-data-index-bundle",
3-
"license": "proprietary",
3+
"license": "GPL-3.0-or-later",
44
"type": "pimcore-bundle",
55
"description": "Pimcore Generic data index Bundle",
66
"config": {

‎gpl-3.0.txt

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Attribute/OpenSearch/AsSearchModifierHandler.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Attribute\OpenSearch;

‎src/Command/Update/IndexUpdateCommand.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Command\Update;

‎src/Controller/DefaultController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Controller;

‎src/DependencyInjection/Compiler/SearchModifierHandlerPass.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\DependencyInjection\Compiler;

‎src/DependencyInjection/Compiler/ServiceLocatorPass.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\DependencyInjection\Compiler;

‎src/DependencyInjection/Configuration.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\DependencyInjection;

‎src/DependencyInjection/PimcoreGenericDataIndexExtension.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\DependencyInjection;

‎src/Entity/IndexQueue.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Entity;

‎src/Enum/DependencyInjection/CompilerPassTag.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\DependencyInjection;

‎src/Enum/Messenger/TransportName.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\Messenger;

‎src/Enum/Permission/PermissionTypes.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\Permission;

‎src/Enum/Permission/UserPermissionTypes.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\Permission;

‎src/Enum/Search/SortDirection.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\Search;

‎src/Enum/SearchIndex/ElementType.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex;

‎src/Enum/SearchIndex/FieldCategory.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex;

‎src/Enum/SearchIndex/FieldCategory/SystemField.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex\FieldCategory;

‎src/Enum/SearchIndex/FieldCategory/SystemField/Asset/DocumentSystemField.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex\FieldCategory\SystemField\Asset;

‎src/Enum/SearchIndex/FieldCategory/SystemField/Asset/ImageSystemField.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex\FieldCategory\SystemField\Asset;

‎src/Enum/SearchIndex/FieldCategory/SystemField/Asset/VideoSystemField.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex\FieldCategory\SystemField\Asset;

‎src/Enum/SearchIndex/FieldCategory/SystemField/SystemFieldTrait.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
/**
55
* Pimcore
66
*
7-
* This source file is available under following license:
7+
* This source file is available under two different licenses:
8+
* - GNU General Public License version 3 (GPLv3)
89
* - Pimcore Commercial License (PCL)
10+
* Full copyright and license information is available in
11+
* LICENSE.md which is distributed with this source code.
912
*
1013
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
11-
* @license http://www.pimcore.org/license PCL
14+
* @license http://www.pimcore.org/license GPLv3 and PCL
1215
*/
1316

1417
namespace Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex\FieldCategory\SystemField;

0 commit comments

Comments
 (0)