Skip to content

Commit f1a4c26

Browse files
committed
Merged branch '4.6'
2 parents c83571e + ea58659 commit f1a4c26

File tree

23 files changed

+303
-313
lines changed

23 files changed

+303
-313
lines changed

phpstan-baseline.neon

Lines changed: 11 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -630,12 +630,6 @@ parameters:
630630
count: 1
631631
path: src/bundle/Core/DependencyInjection/Configuration/ConfigResolver.php
632632

633-
-
634-
message: '#^Offset ''function'' on array\{function\: string, line\?\: int, file\?\: string, class\?\: class\-string, type\?\: ''\-\>''\|''\:\:'', args\?\: array\<mixed\>, object\?\: object\} in isset\(\) always exists and is not nullable\.$#'
635-
identifier: isset.offset
636-
count: 1
637-
path: src/bundle/Core/DependencyInjection/Configuration/ConfigResolver.php
638-
639633
-
640634
message: '#^Parameter \#1 \$string of function strtolower expects string, string\|null given\.$#'
641635
identifier: argument.type
@@ -5929,7 +5923,7 @@ parameters:
59295923
path: src/lib/FieldType/Author/Type.php
59305924

59315925
-
5932-
message: '#^Method Ibexa\\Core\\FieldType\\Author\\Type\:\:toHash\(\) should return list\<array\{id\: int, name\: string, email\: string\}\> but returns array\<int, array\{id\: int, name\: string, email\: string\}\>\.$#'
5926+
message: '#^Method Ibexa\\Core\\FieldType\\Author\\Type\:\:toHash\(\) should return list\<array\{id\: int, name\: string, email\: string\}\> but returns array\<int, non\-empty\-array\>\.$#'
59335927
identifier: return.type
59345928
count: 1
59355929
path: src/lib/FieldType/Author/Type.php
@@ -6258,12 +6252,6 @@ parameters:
62586252
count: 1
62596253
path: src/lib/FieldType/BinaryFile/Type.php
62606254

6261-
-
6262-
message: '#^Method Ibexa\\Core\\FieldType\\BinaryFile\\Type\:\:completeValue\(\) has no return type specified\.$#'
6263-
identifier: missingType.return
6264-
count: 1
6265-
path: src/lib/FieldType/BinaryFile/Type.php
6266-
62676255
-
62686256
message: '#^Method Ibexa\\Core\\FieldType\\BinaryFile\\Type\:\:createValue\(\) has parameter \$inputValue with no value type specified in iterable type array\.$#'
62696257
identifier: missingType.iterableValue
@@ -7164,12 +7152,6 @@ parameters:
71647152
count: 1
71657153
path: src/lib/FieldType/Media/Type.php
71667154

7167-
-
7168-
message: '#^Method Ibexa\\Core\\FieldType\\Media\\Type\:\:completeValue\(\) has no return type specified\.$#'
7169-
identifier: missingType.return
7170-
count: 1
7171-
path: src/lib/FieldType/Media/Type.php
7172-
71737155
-
71747156
message: '#^Method Ibexa\\Core\\FieldType\\Media\\Type\:\:createValue\(\) has parameter \$inputValue with no value type specified in iterable type array\.$#'
71757157
identifier: missingType.iterableValue
@@ -10626,12 +10608,6 @@ parameters:
1062610608
count: 1
1062710609
path: src/lib/Persistence/Cache/PersistenceLogger.php
1062810610

10629-
-
10630-
message: '#^Offset ''class'' might not exist on array\{function\: string, line\?\: int, file\?\: string, class\?\: class\-string, type\?\: ''\-\>''\|''\:\:'', args\?\: array\<mixed\>, object\?\: object\}\.$#'
10631-
identifier: offsetAccess.notFound
10632-
count: 2
10633-
path: src/lib/Persistence/Cache/PersistenceLogger.php
10634-
1063510611
-
1063610612
message: '#^Property Ibexa\\Core\\Persistence\\Cache\\PersistenceLogger\:\:\$calls type has no value type specified in iterable type array\.$#'
1063710613
identifier: missingType.iterableValue
@@ -11232,18 +11208,6 @@ parameters:
1123211208
count: 1
1123311209
path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/CountryConverter.php
1123411210

11235-
-
11236-
message: '#^Parameter \#2 \$array of function implode expects array\|null, array\|bool\|float\|int\|string given\.$#'
11237-
identifier: argument.type
11238-
count: 1
11239-
path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/CountryConverter.php
11240-
11241-
-
11242-
message: '#^Parameter \#2 \$array of function implode expects array\|null, array\|float\|int\<min, \-1\>\|int\<1, max\>\|string\|true given\.$#'
11243-
identifier: argument.type
11244-
count: 1
11245-
path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/CountryConverter.php
11246-
1124711211
-
1124811212
message: '#^Property Ibexa\\Core\\Persistence\\Legacy\\Content\\StorageFieldValue\:\:\$sortKeyString \(string\) does not accept bool\|float\|int\|string\|null\.$#'
1124911213
identifier: assign.propertyType
@@ -11496,12 +11460,6 @@ parameters:
1149611460
count: 1
1149711461
path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/ImageConverter.php
1149811462

11499-
-
11500-
message: '#^Cannot access property \$nodeValue on \(TNode of DOMNode\)\|null\.$#'
11501-
identifier: property.nonObject
11502-
count: 1
11503-
path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/ImageConverter.php
11504-
1150511463
-
1150611464
message: '#^Cannot call method getAttribute\(\) on DOMElement\|null\.$#'
1150711465
identifier: method.nonObject
@@ -12660,12 +12618,6 @@ parameters:
1266012618
count: 1
1266112619
path: src/lib/Persistence/Legacy/Content/Language/MaskGenerator.php
1266212620

12663-
-
12664-
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\Location\\Gateway\:\:create\(\) has parameter \$parentNode with no value type specified in iterable type array\.$#'
12665-
identifier: missingType.iterableValue
12666-
count: 1
12667-
path: src/lib/Persistence/Legacy/Content/Location/Gateway.php
12668-
1266912621
-
1267012622
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\Location\\Gateway\:\:getBasicNodeData\(\) return type has no value type specified in iterable type array\.$#'
1267112623
identifier: missingType.iterableValue
@@ -12756,12 +12708,6 @@ parameters:
1275612708
count: 1
1275712709
path: src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php
1275812710

12759-
-
12760-
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\Location\\Gateway\\DoctrineDatabase\:\:create\(\) has parameter \$parentNode with no value type specified in iterable type array\.$#'
12761-
identifier: missingType.iterableValue
12762-
count: 1
12763-
path: src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php
12764-
1276512711
-
1276612712
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\Location\\Gateway\\DoctrineDatabase\:\:createNodeQueryBuilder\(\) has parameter \$columns with no value type specified in iterable type array\.$#'
1276712713
identifier: missingType.iterableValue
@@ -12906,12 +12852,6 @@ parameters:
1290612852
count: 8
1290712853
path: src/lib/Persistence/Legacy/Content/Location/Gateway/ExceptionConversion.php
1290812854

12909-
-
12910-
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\Location\\Gateway\\ExceptionConversion\:\:create\(\) has parameter \$parentNode with no value type specified in iterable type array\.$#'
12911-
identifier: missingType.iterableValue
12912-
count: 1
12913-
path: src/lib/Persistence/Legacy/Content/Location/Gateway/ExceptionConversion.php
12914-
1291512855
-
1291612856
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Content\\Location\\Gateway\\ExceptionConversion\:\:getBasicNodeData\(\) return type has no value type specified in iterable type array\.$#'
1291712857
identifier: missingType.iterableValue
@@ -15468,30 +15408,6 @@ parameters:
1546815408
count: 1
1546915409
path: src/lib/Persistence/Legacy/SharedGateway/DatabasePlatform/SqliteGateway.php
1547015410

15471-
-
15472-
message: '#^Argument of an invalid type array\<Ibexa\\Core\\Persistence\\Legacy\\SharedGateway\\Gateway\>\|iterable supplied for foreach, only iterables are supported\.$#'
15473-
identifier: foreach.nonIterable
15474-
count: 1
15475-
path: src/lib/Persistence/Legacy/SharedGateway/GatewayFactory.php
15476-
15477-
-
15478-
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\SharedGateway\\GatewayFactory\:\:__construct\(\) has parameter \$gateways with no value type specified in iterable type iterable\.$#'
15479-
identifier: missingType.iterableValue
15480-
count: 1
15481-
path: src/lib/Persistence/Legacy/SharedGateway/GatewayFactory.php
15482-
15483-
-
15484-
message: '#^Property Ibexa\\Core\\Persistence\\Legacy\\SharedGateway\\GatewayFactory\:\:\$gateways \(array\<Ibexa\\Core\\Persistence\\Legacy\\SharedGateway\\Gateway\>\|iterable\) does not accept iterable\.$#'
15485-
identifier: assign.propertyType
15486-
count: 1
15487-
path: src/lib/Persistence/Legacy/SharedGateway/GatewayFactory.php
15488-
15489-
-
15490-
message: '#^Property Ibexa\\Core\\Persistence\\Legacy\\SharedGateway\\GatewayFactory\:\:\$gateways has unknown class iterable as its type\.$#'
15491-
identifier: class.notFound
15492-
count: 1
15493-
path: src/lib/Persistence/Legacy/SharedGateway/GatewayFactory.php
15494-
1549515411
-
1549615412
message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Token\\AbstractGateway\:\:getAliasedColumns\(\) has parameter \$columns with no value type specified in iterable type array\.$#'
1549715413
identifier: missingType.iterableValue
@@ -28608,30 +28524,6 @@ parameters:
2860828524
count: 1
2860928525
path: tests/integration/Core/Repository/FieldType/RelationIntegrationTest.php
2861028526

28611-
-
28612-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationIntegrationTest\:\:testCopyContentCopiesFieldRelations\(\) has no return type specified\.$#'
28613-
identifier: missingType.return
28614-
count: 1
28615-
path: tests/integration/Core/Repository/FieldType/RelationIntegrationTest.php
28616-
28617-
-
28618-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationIntegrationTest\:\:testCreateContentRelationsProcessedCorrect\(\) has no return type specified\.$#'
28619-
identifier: missingType.return
28620-
count: 1
28621-
path: tests/integration/Core/Repository/FieldType/RelationIntegrationTest.php
28622-
28623-
-
28624-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationIntegrationTest\:\:testSubtreeCopyContentCopiesFieldRelations\(\) has no return type specified\.$#'
28625-
identifier: missingType.return
28626-
count: 1
28627-
path: tests/integration/Core/Repository/FieldType/RelationIntegrationTest.php
28628-
28629-
-
28630-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationIntegrationTest\:\:testUpdateContentRelationsProcessedCorrect\(\) has no return type specified\.$#'
28631-
identifier: missingType.return
28632-
count: 1
28633-
path: tests/integration/Core/Repository/FieldType/RelationIntegrationTest.php
28634-
2863528527
-
2863628528
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationListIntegrationTest\:\:assertFieldDataLoadedCorrect\(\) has no return type specified\.$#'
2863728529
identifier: missingType.return
@@ -28686,30 +28578,6 @@ parameters:
2868628578
count: 1
2868728579
path: tests/integration/Core/Repository/FieldType/RelationListIntegrationTest.php
2868828580

28689-
-
28690-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationListIntegrationTest\:\:testCopyContentCopiesFieldRelations\(\) has no return type specified\.$#'
28691-
identifier: missingType.return
28692-
count: 1
28693-
path: tests/integration/Core/Repository/FieldType/RelationListIntegrationTest.php
28694-
28695-
-
28696-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationListIntegrationTest\:\:testCreateContentRelationsProcessedCorrect\(\) has no return type specified\.$#'
28697-
identifier: missingType.return
28698-
count: 1
28699-
path: tests/integration/Core/Repository/FieldType/RelationListIntegrationTest.php
28700-
28701-
-
28702-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationListIntegrationTest\:\:testSubtreeCopyContentCopiesFieldRelations\(\) has no return type specified\.$#'
28703-
identifier: missingType.return
28704-
count: 1
28705-
path: tests/integration/Core/Repository/FieldType/RelationListIntegrationTest.php
28706-
28707-
-
28708-
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\RelationListIntegrationTest\:\:testUpdateContentRelationsProcessedCorrect\(\) has no return type specified\.$#'
28709-
identifier: missingType.return
28710-
count: 1
28711-
path: tests/integration/Core/Repository/FieldType/RelationListIntegrationTest.php
28712-
2871328581
-
2871428582
message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\FieldType\\SearchBaseIntegrationTestCase\:\:assertFindResult\(\) has no return type specified\.$#'
2871528583
identifier: missingType.return
@@ -47028,36 +46896,6 @@ parameters:
4702846896
count: 1
4702946897
path: tests/lib/Persistence/Cache/PersistenceHandlerTest.php
4703046898

47031-
-
47032-
message: '#^Method Ibexa\\Tests\\Core\\Persistence\\Cache\\PersistenceLoggerTest\:\:testGetCallValues\(\) has no return type specified\.$#'
47033-
identifier: missingType.return
47034-
count: 1
47035-
path: tests/lib/Persistence/Cache/PersistenceLoggerTest.php
47036-
47037-
-
47038-
message: '#^Method Ibexa\\Tests\\Core\\Persistence\\Cache\\PersistenceLoggerTest\:\:testGetCalls\(\) has no return type specified\.$#'
47039-
identifier: missingType.return
47040-
count: 1
47041-
path: tests/lib/Persistence/Cache/PersistenceLoggerTest.php
47042-
47043-
-
47044-
message: '#^Method Ibexa\\Tests\\Core\\Persistence\\Cache\\PersistenceLoggerTest\:\:testGetName\(\) has no return type specified\.$#'
47045-
identifier: missingType.return
47046-
count: 1
47047-
path: tests/lib/Persistence/Cache/PersistenceLoggerTest.php
47048-
47049-
-
47050-
message: '#^Method Ibexa\\Tests\\Core\\Persistence\\Cache\\PersistenceLoggerTest\:\:testLogCall\(\) has no return type specified\.$#'
47051-
identifier: missingType.return
47052-
count: 1
47053-
path: tests/lib/Persistence/Cache/PersistenceLoggerTest.php
47054-
47055-
-
47056-
message: '#^Result of method Ibexa\\Core\\Persistence\\Cache\\PersistenceLogger\:\:logCall\(\) \(void\) is used\.$#'
47057-
identifier: method.void
47058-
count: 1
47059-
path: tests/lib/Persistence/Cache/PersistenceLoggerTest.php
47060-
4706146899
-
4706246900
message: '#^Method Ibexa\\Tests\\Core\\Persistence\\Cache\\SectionHandlerTest\:\:providerForCachedLoadMethodsHit\(\) return type has no value type specified in iterable type array\.$#'
4706346901
identifier: missingType.iterableValue
@@ -60105,7 +59943,7 @@ parameters:
6010559943
-
6010659944
message: '#^Access to an undefined property Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Language\:\:\$notDefined\.$#'
6010759945
identifier: property.notFound
60108-
count: 2
59946+
count: 1
6010959947
path: tests/lib/Repository/Values/Content/LanguageTest.php
6011059948

6011159949
-
@@ -60141,7 +59979,7 @@ parameters:
6014159979
-
6014259980
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\Content\\Location\:\:\$notDefined\.$#'
6014359981
identifier: property.notFound
60144-
count: 2
59982+
count: 1
6014559983
path: tests/lib/Repository/Values/Content/LocationTest.php
6014659984

6014759985
-
@@ -60159,7 +59997,7 @@ parameters:
6015959997
-
6016059998
message: '#^Access to an undefined property Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Section\:\:\$notDefined\.$#'
6016159999
identifier: property.notFound
60162-
count: 2
60000+
count: 1
6016360001
path: tests/lib/Repository/Values/Content/SectionTest.php
6016460002

6016560003
-
@@ -60195,7 +60033,7 @@ parameters:
6019560033
-
6019660034
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\Content\\TrashItem\:\:\$notDefined\.$#'
6019760035
identifier: property.notFound
60198-
count: 2
60036+
count: 1
6019960037
path: tests/lib/Repository/Values/Content/TrashItemTest.php
6020060038

6020160039
-
@@ -60279,7 +60117,7 @@ parameters:
6027960117
-
6028060118
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\ObjectState\\ObjectStateGroup\:\:\$notDefined\.$#'
6028160119
identifier: property.notFound
60282-
count: 2
60120+
count: 1
6028360121
path: tests/lib/Repository/Values/ObjectState/ObjectStateGroupTest.php
6028460122

6028560123
-
@@ -60345,7 +60183,7 @@ parameters:
6034560183
-
6034660184
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\ObjectState\\ObjectState\:\:\$notDefined\.$#'
6034760185
identifier: property.notFound
60348-
count: 2
60186+
count: 1
6034960187
path: tests/lib/Repository/Values/ObjectState/ObjectStateTest.php
6035060188

6035160189
-
@@ -60411,7 +60249,7 @@ parameters:
6041160249
-
6041260250
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\User\\Policy\:\:\$notDefined\.$#'
6041360251
identifier: property.notFound
60414-
count: 2
60252+
count: 1
6041560253
path: tests/lib/Repository/Values/User/PolicyTest.php
6041660254

6041760255
-
@@ -60453,7 +60291,7 @@ parameters:
6045360291
-
6045460292
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\User\\Role\:\:\$notDefined\.$#'
6045560293
identifier: property.notFound
60456-
count: 2
60294+
count: 1
6045760295
path: tests/lib/Repository/Values/User/RoleTest.php
6045860296

6045960297
-
@@ -60495,7 +60333,7 @@ parameters:
6049560333
-
6049660334
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\User\\UserGroup\:\:\$notDefined\.$#'
6049760335
identifier: property.notFound
60498-
count: 2
60336+
count: 1
6049960337
path: tests/lib/Repository/Values/User/UserGroupTest.php
6050060338

6050160339
-
@@ -60549,7 +60387,7 @@ parameters:
6054960387
-
6055060388
message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\User\\User\:\:\$notDefined\.$#'
6055160389
identifier: property.notFound
60552-
count: 2
60390+
count: 1
6055360391
path: tests/lib/Repository/Values/User/UserTest.php
6055460392

6055560393
-

src/bundle/Core/DependencyInjection/Configuration/ConfigResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ private function logTooEarlyLoadedListIfNeeded($paramName)
281281
// Lookup trace to find last service being loaded as possible blame for eager loading
282282
// Abort if one of the earlier services is detected to be "safe", aka updatable
283283
foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 35) as $t) {
284-
if (!isset($t['function']) || $t['function'] === 'getParameter' || $t['function'] === __FUNCTION__) {
284+
if ($t['function'] === 'getParameter' || $t['function'] === __FUNCTION__) {
285285
continue;
286286
}
287287

src/contracts/Persistence/Content/Location/CreateStruct.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class CreateStruct extends ValueObject
7373
* This is allowed to be set to true, this will mean this should become main location
7474
* (@todo Find a better way to deal with being able to create the main location)
7575
*
76-
* @var mixed|true
76+
* @var int|true
7777
*/
7878
public $mainLocationId = true;
7979

src/lib/FieldType/Author/Type.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ class Type extends FieldType implements TranslationContainerInterface
3030
* Flag which stands for setting Author FieldType empty by default.
3131
* It is used in a content type edit view.
3232
*/
33-
public const DEFAULT_VALUE_EMPTY = 0;
33+
public const int DEFAULT_VALUE_EMPTY = 0;
3434

3535
/**
3636
* Flag which stands for prefilling Author FieldType with current user by default.
3737
* It is used in a content type edit view.
3838
*/
39-
public const DEFAULT_CURRENT_USER = 1;
39+
public const int DEFAULT_CURRENT_USER = 1;
4040

4141
protected $settingsSchema = [
4242
'defaultAuthor' => [

0 commit comments

Comments
 (0)