Skip to content

Commit d24f686

Browse files
CorepexCorepex
authored
Merge pull request #136 from pimcore/license-switch
License Switch to POCL
2 parents 9f6dc44 + 2117669 commit d24f686

File tree

75 files changed

+638
-1372
lines changed

Some content is hidden

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

75 files changed

+638
-1372
lines changed

‎.github/ISSUE_TEMPLATE/Bug-Report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
attributes:
88
value: |
99
## Important notice
10-
As an open source project we love to work together with our community to improve and develop our products.
10+
As an open core project we love to work together with our community to improve and develop our products.
1111
It's also important for us to make clear that **we're not working for you or your company**,
1212
but we enjoy to work together to solve existing bugs.
1313
So we would love to see PRs with bugfixes, discuss them and we are happy to merge them when they are ready.

‎.github/ISSUE_TEMPLATE/Feature-Request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
attributes:
88
value: |
99
## Important notice
10-
As an open source project we love to work together with our community to improve and develop our products.
10+
As an open core project we love to work together with our community to improve and develop our products.
1111
It's also important for us to make clear that **we're not working for you or your company**,
1212
but we enjoy to work together to improve or add new features to the product.
1313
So we are always ready to discuss features and improvements with our community.

‎.github/ISSUE_TEMPLATE/Improvement.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
attributes:
88
value: |
99
## Important notice
10-
As an open source project we love to work together with our community to improve and develop our products.
10+
As an open core project we love to work together with our community to improve and develop our products.
1111
It's also important for us to make clear that **we're not working for you or your company**,
1212
but we enjoy to work together to improve or add new features to the product.
1313
So we are always ready to discuss features and improvements with our community.

‎.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/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/php-style.yml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
name: PHP Style
1+
name: "PHP-CS-Fixer"
22

3-
on: [push]
3+
on:
4+
push:
5+
branches:
6+
- "[0-9]+.[0-9]+"
7+
- "[0-9]+.x"
48

5-
jobs:
6-
php-cs-fixer:
7-
runs-on: ubuntu-latest
8-
steps:
9-
- uses: actions/checkout@v2
10-
with:
11-
ref: ${{ github.head_ref }}
12-
13-
- name: PHP-CS-Fixer
14-
uses: docker://oskarstark/php-cs-fixer-ga:2.19.0
15-
with:
16-
args: --config=.php_cs.dist --allow-risky yes
9+
permissions:
10+
contents: write
1711

18-
- uses: stefanzweifel/git-auto-commit-action@v4
19-
with:
20-
commit_message: Apply php-cs-fixer changes
12+
jobs:
13+
php-style:
14+
uses: pimcore/workflows-collection-public/.github/workflows/reusable-php-cs-fixer.yaml@main
15+
if: github.repository_owner == 'pimcore'
16+
secrets:
17+
PHP_CS_FIXER_GITHUB_TOKEN: ${{ secrets.PHP_CS_FIXER_GITHUB_TOKEN }}
18+
with:
19+
head_ref: ${{ github.event.pull_request.head.ref }}
20+
repository: ${{ github.event.pull_request.head.repo.full_name }}
21+
config_file: .php-cs-fixer.dist.php

‎.php_cs.dist‎ renamed to ‎.php-cs-fixer.dist.php‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,39 @@
1818
->notPath('/var\/classes/')
1919
;
2020

21-
// do not enable self_accessor as it breaks pimcore models relying on get_called_class()
22-
return PhpCsFixer\Config::create()
23-
->setRules([
21+
$config = new PhpCsFixer\Config();
22+
$config->setRules([
2423
'@PSR1' => true,
2524
'@PSR2' => true,
2625
'array_syntax' => ['syntax' => 'short'],
2726

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

41-
// keep aligned = and => operators as they are: do not force aligning, but do not remove it
42-
'binary_operator_spaces' => ['align_double_arrow' => null, 'align_equals' => null],
43-
44-
'blank_line_before_return' => true,
39+
'blank_line_before_statement' => true,
4540
'encoding' => true,
4641
'function_typehint_space' => true,
47-
'hash_to_slash_comment' => true,
42+
'single_line_comment_style' => true,
4843
'lowercase_cast' => true,
4944
'magic_constant_casing' => true,
50-
'method_argument_space' => ['ensure_fully_multiline' => false],
51-
'method_separation' => true,
45+
'method_argument_space' => ['on_multiline' => 'ignore'],
46+
'class_attributes_separation' => true,
5247
'native_function_casing' => true,
5348
'no_blank_lines_after_class_opening' => true,
5449
'no_blank_lines_after_phpdoc' => true,
5550
'no_empty_comment' => true,
5651
'no_empty_phpdoc' => true,
5752
'no_empty_statement' => true,
58-
'no_extra_consecutive_blank_lines' => true,
53+
'no_extra_blank_lines' => true,
5954
'no_leading_import_slash' => true,
6055
'no_leading_namespace_whitespace' => true,
6156
'no_short_bool_cast' => true,
@@ -80,5 +75,8 @@
8075
'standardize_not_equals' => true,
8176
'ternary_operator_spaces' => true,
8277
'whitespace_after_comma_in_array' => true,
83-
])
84-
->setFinder($finder);
78+
]);
79+
80+
$config->setFinder($finder);
81+
return $config;
82+

0 commit comments

Comments
 (0)