Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Bug-Report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
attributes:
value: |
## Important notice
As an open source project we love to work together with our community to improve and develop our products.
As an open core project we love to work together with our community to improve and develop our products.
It's also important for us to make clear that **we're not working for you or your company**,
but we enjoy to work together to solve existing bugs.
So we would love to see PRs with bugfixes, discuss them and we are happy to merge them when they are ready.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Feature-Request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
attributes:
value: |
## Important notice
As an open source project we love to work together with our community to improve and develop our products.
As an open core project we love to work together with our community to improve and develop our products.
It's also important for us to make clear that **we're not working for you or your company**,
but we enjoy to work together to improve or add new features to the product.
So we are always ready to discuss features and improvements with our community.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Improvement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
attributes:
value: |
## Important notice
As an open source project we love to work together with our community to improve and develop our products.
As an open core project we love to work together with our community to improve and develop our products.
It's also important for us to make clear that **we're not working for you or your company**,
but we enjoy to work together to improve or add new features to the product.
So we are always ready to discuss features and improvements with our community.
Expand Down
23 changes: 11 additions & 12 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,17 @@
'@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],

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

'blank_line_before_statement' => true,
'encoding' => true,
Expand Down
171 changes: 146 additions & 25 deletions LICENSE.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pimcore/elasticsearch-client",
"license": "GPL-3.0+",
"license": "proprietary",
"type": "symfony-bundle",
"config": {
"sort-packages": true
Expand Down
674 changes: 0 additions & 674 deletions gpl-3.0.txt

This file was deleted.

11 changes: 4 additions & 7 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<?php

/**
* Pimcore
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Commercial License (PCL)
* This source file is available under the terms of the
* Pimcore Open Core License (POCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PCL
* @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)
* @license Pimcore Open Core License (POCL)
*/

namespace Pimcore\Bundle\ElasticsearchClientBundle\DependencyInjection;
Expand Down
11 changes: 4 additions & 7 deletions src/DependencyInjection/PimcoreElasticsearchClientExtension.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<?php

/**
* Pimcore
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Commercial License (PCL)
* This source file is available under the terms of the
* Pimcore Open Core License (POCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PCL
* @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)
* @license Pimcore Open Core License (POCL)
*/

namespace Pimcore\Bundle\ElasticsearchClientBundle\DependencyInjection;
Expand Down
11 changes: 4 additions & 7 deletions src/EsClientFactory.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<?php

/**
* Pimcore
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Commercial License (PCL)
* This source file is available under the terms of the
* Pimcore Open Core License (POCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PCL
* @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)
* @license Pimcore Open Core License (POCL)
*/

namespace Pimcore\Bundle\ElasticsearchClientBundle;
Expand Down
11 changes: 4 additions & 7 deletions src/PimcoreElasticsearchClientBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
declare(strict_types=1);

/**
* Pimcore
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Commercial License (PCL)
* This source file is available under the terms of the
* Pimcore Open Core License (POCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PCL
* @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)
* @license Pimcore Open Core License (POCL)
*/

namespace Pimcore\Bundle\ElasticsearchClientBundle;
Expand Down
11 changes: 4 additions & 7 deletions src/SearchClient/ElasticsearchClientInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
declare(strict_types=1);

/**
* Pimcore
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Commercial License (PCL)
* This source file is available under the terms of the
* Pimcore Open Core License (POCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PCL
* @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)
* @license Pimcore Open Core License (POCL)
*/

namespace Pimcore\Bundle\ElasticsearchClientBundle\SearchClient;
Expand Down
11 changes: 4 additions & 7 deletions src/SearchClient/SearchClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
declare(strict_types=1);

/**
* Pimcore
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Commercial License (PCL)
* This source file is available under the terms of the
* Pimcore Open Core License (POCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PCL
* @copyright Copyright (c) Pimcore GmbH (https://www.pimcore.com)
* @license Pimcore Open Core License (POCL)
*/

namespace Pimcore\Bundle\ElasticsearchClientBundle\SearchClient;
Expand Down