Skip to content

Commit e6616db

Browse files
markus-mosermarkus-moser
committed
Merge remote-tracking branch 'origin/4.0' into 4.x
2 parents 10a1f14 + 65a8dc3 commit e6616db

File tree

246 files changed

+692
-1813
lines changed

Some content is hidden

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

246 files changed

+692
-1813
lines changed

‎.github/workflows/php-cs-fixer.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "PHP-CS-Fixer"
2+
3+
on:
4+
pull_request_target:
5+
branches:
6+
- "[0-9]+.[0-9]+"
7+
- "[0-9]+.x"
8+
- "feature-*"
9+
push:
10+
branches:
11+
- "[0-9]+.[0-9]+"
12+
- "[0-9]+.x"
13+
- "*_actions"
14+
- "feature-*"
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
php-cs-fixer:
21+
permissions:
22+
contents: write # for stefanzweifel/git-auto-commit-action to push code in repo
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v4
26+
with:
27+
ref: ${{ github.event.pull_request.head.ref }}
28+
repository: ${{ github.event.pull_request.head.repo.full_name }}
29+
30+
- name: PHP-CS-Fixer
31+
uses: docker://oskarstark/php-cs-fixer-ga:latest
32+
33+
- uses: stefanzweifel/git-auto-commit-action@v5
34+
with:
35+
commit_message: Apply php-cs-fixer changes

‎.github/workflows/php-style.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Thumbs.db
1212

1313
# PHP-CS-Fixer
1414
/.php_cs
15-
/.php_cs.cache
15+
/.php-cs-fixer.cache
1616

1717
# composer
1818
/composer.lock

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->in([
5+
__DIR__ . '/src',
6+
__DIR__ . '/tests',
7+
])
8+
9+
->exclude([
10+
__DIR__ . '/tests/_output',
11+
__DIR__ . '/tests/_support/_generated',
12+
])
13+
;
14+
15+
// do not enable self_accessor as it breaks pimcore models relying on get_called_class()
16+
$config = new PhpCsFixer\Config();
17+
$config->setRules([
18+
'@PSR1' => true,
19+
'@PSR2' => true,
20+
'array_syntax' => ['syntax' => 'short'],
21+
'list_syntax' => ['syntax' => 'short'],
22+
23+
'header_comment' => [
24+
'comment_type' => 'PHPDoc',
25+
'header' => 'Pimcore' . PHP_EOL . PHP_EOL .
26+
'This source file is available under two different licenses:' . PHP_EOL .
27+
'- GNU General Public License version 3 (GPLv3)' . PHP_EOL .
28+
'- Pimcore Commercial License (PCL)' . PHP_EOL .
29+
'Full copyright and license information is available in' . PHP_EOL .
30+
'LICENSE.md which is distributed with this source code.' . PHP_EOL .
31+
PHP_EOL .
32+
' @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)' . PHP_EOL .
33+
' @license http://www.pimcore.org/license GPLv3 and PCL'
34+
],
35+
36+
'blank_line_before_statement' => true,
37+
'encoding' => true,
38+
'function_typehint_space' => true,
39+
'single_line_comment_style' => true,
40+
'lowercase_cast' => true,
41+
'magic_constant_casing' => true,
42+
'method_argument_space' => ['on_multiline' => 'ignore'],
43+
'class_attributes_separation' => true,
44+
'native_function_casing' => true,
45+
'no_blank_lines_after_class_opening' => true,
46+
'no_blank_lines_after_phpdoc' => true,
47+
'no_empty_comment' => true,
48+
'no_empty_phpdoc' => true,
49+
'no_empty_statement' => true,
50+
'no_extra_blank_lines' => true,
51+
'no_leading_import_slash' => true,
52+
'no_leading_namespace_whitespace' => true,
53+
'no_short_bool_cast' => true,
54+
'no_spaces_around_offset' => true,
55+
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
56+
'no_unneeded_control_parentheses' => true,
57+
'no_unused_imports' => true,
58+
'no_whitespace_before_comma_in_array' => true,
59+
'no_whitespace_in_blank_line' => true,
60+
'object_operator_without_whitespace' => true,
61+
'ordered_imports' => true,
62+
'phpdoc_indent' => true,
63+
'phpdoc_no_useless_inheritdoc' => true,
64+
'phpdoc_scalar' => true,
65+
'phpdoc_separation' => true,
66+
'phpdoc_single_line_var_spacing' => true,
67+
'return_type_declaration' => true,
68+
'short_scalar_cast' => true,
69+
'single_blank_line_before_namespace' => true,
70+
'single_quote' => true,
71+
'space_after_semicolon' => true,
72+
'standardize_not_equals' => true,
73+
'ternary_operator_spaces' => true,
74+
'trailing_comma_in_multiline' => true,
75+
'whitespace_after_comma_in_array' => true,
76+
]);
77+
78+
$config->setFinder($finder);
79+
return $config;

‎.php_cs.dist‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ For a first impression have a look at our [Demo](https://demo.pimcore.fun/). For
2929
The following sections provide shortcuts into the documentation to start working with the Customer Management Framework (CMF) for Pimcore:
3030
- See the [Getting Started](#getting-started) section for an overview of the CMF Framework architecture or information about the installation process.
3131
- See the [Customer-Related Data](#customer-related-data) section for details about the management of customer-related data with the CMF Framework.
32-
- See the [Platform Topics](#platform-topics) section for documentation about services provided by the CMF Framework.
32+
- See the [Provided Services](#provided-services) section for documentation about services provided by the CMF Framework.
3333

3434
### Getting Started
3535
* [Architecture Overview](./doc/01_Architecture-Overview.md)

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
5-
count: 1
6-
path: src/ActionTrigger/EventHandler/DefaultEventHandler.php
7-
8-
-
9-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
10-
count: 1
11-
path: src/Controller/Admin/ActivitiesController.php
12-
13-
-
14-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
15-
count: 2
16-
path: src/Controller/Admin/CustomersController.php
17-
18-
-
19-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
20-
count: 1
21-
path: src/Controller/Admin/DuplicatesController.php
22-
233
-
244
message: "#^Parameter \\#1 \\$segments of class CustomerManagementFrameworkBundle\\\\CustomerList\\\\Filter\\\\CustomerSegment constructor expects array\\<Pimcore\\\\Model\\\\DataObject\\\\CustomerSegment\\>, array\\<int\\<0, max\\>, CustomerManagementFrameworkBundle\\\\Model\\\\CustomerSegmentInterface\\> given\\.$#"
255
reportUnmatched: false
@@ -37,11 +17,6 @@ parameters:
3717
count: 1
3818
path: src/CustomerView/DefaultCustomerView.php
3919

40-
-
41-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
42-
count: 1
43-
path: src/DuplicatesIndex/DefaultMariaDbDuplicatesIndex.php
44-
4520
-
4621
message: "#^Result of && is always false\\.$#"
4722
count: 1
@@ -107,41 +82,11 @@ parameters:
10782
count: 1
10883
path: src/Newsletter/ProviderHandler/Mailchimp/CliSyncProcessor.php
10984

110-
-
111-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
112-
count: 2
113-
path: src/Newsletter/Queue/DefaultNewsletterQueue.php
114-
115-
-
116-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
117-
count: 1
118-
path: src/RESTApi/CustomersHandler.php
119-
120-
-
121-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
122-
count: 1
123-
path: src/RESTApi/SegmentGroupsHandler.php
124-
125-
-
126-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
127-
count: 1
128-
path: src/RESTApi/SegmentsHandler.php
129-
13085
-
13186
message: "#^Call to an undefined method CustomerManagementFrameworkBundle\\\\RESTApi\\\\SegmentsOfCustomerHandler\\:\\:createRoute\\(\\)\\.$#"
13287
count: 1
13388
path: src/RESTApi/SegmentsOfCustomerHandler.php
13489

135-
-
136-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
137-
count: 1
138-
path: src/SegmentBuilder/AgeSegmentBuilder.php
139-
140-
-
141-
message: "#^Call to an undefined method Knp\\\\Component\\\\Pager\\\\Pagination\\\\PaginationInterface\\:\\:getPaginationData\\(\\)\\.$#"
142-
count: 1
143-
path: src/SegmentManager/SegmentBuilderExecutor/DefaultSegmentBuilderExecutor.php
144-
14590
-
14691
message: "#^If condition is always false\\.$#"
14792
count: 1

‎src/ActionTrigger/Action/AddTrackedSegment.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
class AddTrackedSegment extends AbstractAction
2525
{
2626
const OPTION_REMOVE_OTHER_SEGMENTS_FROM_SEGMENT_GROUP = 'removeOtherSegmentsFromGroup';
27+
2728
const OPTION_INCREASE_SEGMENT_APPLICATION_COUNTER = 'increaseSegmentApplicationCounter';
29+
2830
const OPTION_CONSIDER_PROFILING_CONSENT = 'considerProfilingConsent';
2931

3032
protected $name = 'AddTrackedSegment';

‎src/ActionTrigger/Action/ChangeFieldValue.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
class ChangeFieldValue extends AbstractAction
2222
{
2323
const OPTION_FIELD = 'field';
24+
2425
const OPTION_VALUE = 'value';
2526

2627
public function process(

‎src/ActionTrigger/Action/SendMail.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
class SendMail extends AbstractAction
2424
{
2525
const OPTION_CONSIDER_PROFILING_CONSENT = 'considerProfilingConsent';
26+
2627
const OPTION_EMAIL_DOCUMENT = 'emailDoc';
28+
2729
const OPTION_SEND_TO_CUSTOMER = 'toCustomer';
30+
2831
protected $name = 'SendMail';
2932

3033
public function process(

0 commit comments

Comments
 (0)