Skip to content

Commit c8ec00d

Browse files
author
Christian Fasching
committed
updated license header config and other stuff
1 parent 395d890 commit c8ec00d

File tree

6 files changed

+727
-687
lines changed

6 files changed

+727
-687
lines changed

.editorconfig

+14
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,17 @@ charset = utf-8
55
end_of_line = lf
66
indent_style = space
77
indent_size = 4
8+
9+
[*.php]
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
trim_trailing_whitespace = false
15+
16+
[*.yml]
17+
indent_size = 4
18+
19+
[composer.json]
20+
indent_style = space
21+
indent_size = 2

.gitignore

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
1-
.idea
1+
.DS_Store
2+
Thumbs.db
3+
*.log
4+
5+
# PHP-CS-Fixer
6+
/.php_cs
7+
/.php_cs.cache
28

39
# composer
410
composer.lock
511

12+
# PhpStorm / IDEA
13+
.idea
14+
.idea_modules
15+
# NetBeans
16+
nbproject
17+
618
# npm
719
/node_modules

.php_cs.dist

+13-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ return PhpCsFixer\Config::create()
1212
'@PSR2' => true,
1313
'array_syntax' => ['syntax' => 'short'],
1414

15-
'header_comment' => ['commentType' => 'PHPDoc',
16-
'header' => 'Pimcore Customer Management Framework Bundle' . PHP_EOL .
17-
'Full copyright and license information is available in' . PHP_EOL .
18-
'License.md which is distributed with this source code.' . PHP_EOL .
19-
PHP_EOL .
20-
'@copyright Copyright (C) Elements.at New Media Solutions GmbH' . PHP_EOL .
21-
'@license GPLv3'
22-
],
15+
'header_comment' => [
16+
'commentType' => 'PHPDoc',
17+
'header' => 'Pimcore' . PHP_EOL . PHP_EOL .
18+
'This source file is available under two different licenses:' . PHP_EOL .
19+
'- GNU General Public License version 3 (GPLv3)' . PHP_EOL .
20+
'- Pimcore Enterprise License (PEL)' . PHP_EOL .
21+
'Full copyright and license information is available in' . PHP_EOL .
22+
'LICENSE.md which is distributed with this source code.' . PHP_EOL .
23+
PHP_EOL .
24+
' @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)' . PHP_EOL .
25+
' @license http://www.pimcore.org/license GPLv3 and PEL'
26+
],
2327

2428
// keep aligned = and => operators as they are: do not force aligning, but do not remove it
2529
'binary_operator_spaces' => ['align_double_arrow' => null, 'align_equals' => null],
@@ -30,6 +34,7 @@ return PhpCsFixer\Config::create()
3034
'hash_to_slash_comment' => true,
3135
'lowercase_cast' => true,
3236
'magic_constant_casing' => true,
37+
'method_argument_space' => ['ensure_fully_multiline' => false],
3338
'method_separation' => true,
3439
'native_function_casing' => true,
3540
'no_blank_lines_after_class_opening' => true,

0 commit comments

Comments
 (0)