Skip to content

Commit 5cea38a

Browse files
mnoconmnocon
committed
Fixed merge
1 parent 85d4f16 commit 5cea38a

File tree

2 files changed

+1
-84
lines changed

2 files changed

+1
-84
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"ibexa/discounts-codes": "~5.0.x-dev",
7676
"ibexa/product-catalog-symbol-attribute": "~5.0.x-dev",
7777
"ibexa/core-search": "~5.0.x-dev",
78-
"qossmic/deptrac": "^2.0"
78+
"qossmic/deptrac": "^2.0",
7979
"ibexa/messenger": "~5.0.x-dev"
8080
},
8181
"scripts": {

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: '#^Method App\\AI\\REST\\Output\\ValueObjectVisitor\\AudioText\:\:visit\(\) has parameter \$data with no type specified\.$#'
5-
identifier: missingType.parameter
6-
count: 1
7-
path: code_samples/ai_actions/src/AI/REST/Output/ValueObjectVisitor/AudioText.php
8-
93
-
104
message: '#^Class App\\Form\\Type\\TextToTextOptionsType extends generic class Symfony\\Component\\Form\\AbstractType but does not specify its types\: TData$#'
115
identifier: missingType.generics
@@ -210,12 +204,6 @@ parameters:
210204
count: 1
211205
path: code_samples/api/rest_api/src/Rest/ValueObjectVisitor/Greeting.php
212206

213-
-
214-
message: '#^Method App\\Rest\\ValueObjectVisitor\\Greeting\:\:visit\(\) has parameter \$data with no type specified\.$#'
215-
identifier: missingType.parameter
216-
count: 1
217-
path: code_samples/api/rest_api/src/Rest/ValueObjectVisitor/Greeting.php
218-
219207
-
220208
message: '#^Parameter \#1 \.\.\.\$arrays of function array_merge expects array, iterable\<Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\URLAlias\> given\.$#'
221209
identifier: argument.type
@@ -246,11 +234,6 @@ parameters:
246234
count: 1
247235
path: code_samples/back_office/content_type/src/EventListener/TextAnchorMenuTabListener.php
248236

249-
-
250-
message: '#^Method Ibexa\\Bundle\\Core\\Imagine\\PlaceholderProvider\:\:getPlaceholder\(\) has parameter \$options with no value type specified in iterable type array\.$#'
251-
identifier: missingType.iterableValue
252-
count: 1
253-
path: code_samples/back_office/images/src/PlaceholderProvider.php
254237
-
255238
message: '#^Method App\\Security\\MyPolicyProvider\:\:getFiles\(\) return type has no value type specified in iterable type array\.$#'
256239
identifier: missingType.iterableValue
@@ -377,18 +360,6 @@ parameters:
377360
count: 1
378361
path: code_samples/customer_portal/src/Form/VerifyType.php
379362

380-
-
381-
message: '#^Property App\\Command\\ManageDiscountsCommand\:\:\$defaultName has no type specified\.$#'
382-
identifier: missingType.property
383-
count: 1
384-
path: code_samples/discounts/src/Command/ManageDiscountsCommand.php
385-
386-
-
387-
message: '#^Access to protected property Ibexa\\Contracts\\ContentForms\\Data\\Content\\FieldData\:\:\$fieldDefinition\.$#'
388-
identifier: property.protected
389-
count: 1
390-
path: code_samples/field_types/2dpoint_ft/src/FieldType/Point2D/Type.php
391-
392363
-
393364
message: '#^Method App\\FieldType\\Point2D\\Type\:\:getSettingsSchema\(\) return type has no value type specified in iterable type array\.$#'
394365
identifier: missingType.iterableValue
@@ -431,24 +402,12 @@ parameters:
431402
count: 1
432403
path: code_samples/field_types/2dpoint_ft/steps/step_3/Point2DType.php
433404

434-
-
435-
message: '#^Access to protected property Ibexa\\Contracts\\ContentForms\\Data\\Content\\FieldData\:\:\$fieldDefinition\.$#'
436-
identifier: property.protected
437-
count: 1
438-
path: code_samples/field_types/2dpoint_ft/steps/step_3/Type.php
439-
440405
-
441406
message: '#^Method App\\FieldType\\Point2D\\Type\:\:mapFieldValueForm\(\) has parameter \$fieldForm with generic interface Symfony\\Component\\Form\\FormInterface but does not specify its types\: TData$#'
442407
identifier: missingType.generics
443408
count: 1
444409
path: code_samples/field_types/2dpoint_ft/steps/step_3/Type.php
445410

446-
-
447-
message: '#^Access to protected property Ibexa\\Contracts\\ContentForms\\Data\\Content\\FieldData\:\:\$fieldDefinition\.$#'
448-
identifier: property.protected
449-
count: 1
450-
path: code_samples/field_types/2dpoint_ft/steps/step_6/Type.php
451-
452411
-
453412
message: '#^Method App\\FieldType\\Point2D\\Type\:\:getSettingsSchema\(\) return type has no value type specified in iterable type array\.$#'
454413
identifier: missingType.iterableValue
@@ -467,12 +426,6 @@ parameters:
467426
count: 1
468427
path: code_samples/field_types/generic_ft/src/FieldType/HelloWorld/Comparison/Comparable.php
469428

470-
-
471-
message: '#^Access to protected property Ibexa\\Contracts\\ContentForms\\Data\\Content\\FieldData\:\:\$fieldDefinition\.$#'
472-
identifier: property.protected
473-
count: 1
474-
path: code_samples/field_types/generic_ft/src/FieldType/HelloWorld/Type.php
475-
476429
-
477430
message: '#^Method App\\FieldType\\HelloWorld\\Type\:\:mapFieldValueForm\(\) has parameter \$fieldForm with generic interface Symfony\\Component\\Form\\FormInterface but does not specify its types\: TData$#'
478431
identifier: missingType.generics
@@ -689,12 +642,6 @@ parameters:
689642
count: 1
690643
path: code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationResultExtractor.php
691644

692-
-
693-
message: '#^Class App\\Query\\Aggregation\\PriorityRangeAggregation extends generic class Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\Aggregation\\AbstractRangeAggregation but does not specify its types\: TValue$#'
694-
identifier: missingType.generics
695-
count: 1
696-
path: code_samples/search/custom/src/Query/Aggregation/PriorityRangeAggregation.php
697-
698645
-
699646
message: '#^Argument of an invalid type stdClass supplied for foreach, only iterables are supported\.$#'
700647
identifier: foreach.nonIterable
@@ -708,32 +655,11 @@ parameters:
708655
path: code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
709656

710657
-
711-
<<<<<<< HEAD
712-
message: '#^Method App\\Query\\Aggregation\\Solr\\PriorityRangeAggregationVisitor\:\:visit\(\) has parameter \$aggregation with generic class Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\Aggregation\\AbstractRangeAggregation but does not specify its types\: TValue$#'
713-
identifier: missingType.generics
714-
count: 1
715-
path: code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
716-
717-
-
718-
=======
719-
>>>>>>> origin/fix-custom-limitation-example
720658
message: '#^Method App\\Query\\Criterion\\Elasticsearch\\CameraManufacturerVisitor\:\:visit\(\) return type has no value type specified in iterable type array\.$#'
721659
identifier: missingType.iterableValue
722660
count: 1
723661
path: code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
724662

725-
-
726-
message: '#^Method App\\Query\\Criterion\\Solr\\CameraManufacturerVisitor\:\:canVisit\(\) has no return type specified\.$#'
727-
identifier: missingType.return
728-
count: 1
729-
path: code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
730-
731-
-
732-
message: '#^Method App\\Query\\Criterion\\Solr\\CameraManufacturerVisitor\:\:visit\(\) has no return type specified\.$#'
733-
identifier: missingType.return
734-
count: 1
735-
path: code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
736-
737663
-
738664
message: '#^Parameter \#2 \$array of function array_map expects array, array\<bool\|float\|int\|string\>\|bool\|float\|int\|string given\.$#'
739665
identifier: argument.type
@@ -807,15 +733,6 @@ parameters:
807733
path: code_samples/user_management/oauth_google/src/OAuth/GoogleResourceOwnerMapper.php
808734

809735
-
810-
<<<<<<< HEAD
811-
message: '#^Offset ''data'' might not exist on array\<string, mixed\>\|null\.$#'
812-
identifier: offsetAccess.notFound
813-
count: 1
814-
path: code_samples/workflow/custom_workflow/src/EventListener/LegalTransitionListener.php
815-
816-
-
817-
=======
818-
>>>>>>> origin/fix-custom-limitation-example
819736
message: '#^Parameter \#2 \$transition of method Ibexa\\Contracts\\Workflow\\Event\\Action\\AbstractTransitionWorkflowActionListener\:\:getActionMetadata\(\) expects Symfony\\Component\\Workflow\\Transition, Symfony\\Component\\Workflow\\Transition\|null given\.$#'
820737
identifier: argument.type
821738
count: 1

0 commit comments

Comments
 (0)