Skip to content

Commit d9bc276

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (27 commits) feat: add completion for DebugAutowiring search argument [Routing] Add support for aliasing routes [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS [Console] Open CompleteCommand for custom outputs [Intl] Update the ICU data to 70.1 [Messenger] Add completion for failed messages commands. Fix tests Fixing missing full_stack variable that's needed by toolbar.html.twig [PropertyInfo] Bump phpstan/phpdoc-parser [Security] Backport type fixes [VarExporter] escape unicode chars involved in directionality [Framework] Add completion to debug:container [Messenger] Add completion to command messenger:consume [Intl] Update the ICU data to 70.1 Fix more generic types Default access_decision_manager.strategy option with merge. Fix typos Update validators.ca.xlf Add missing Validator translations for Estonian ... Signed-off-by: Alexander M. Turek <me@derrabus.de>
2 parents d405d19 + 6d0e438 commit d9bc276

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Adapter/CollectionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
interface CollectionInterface extends \Countable, \IteratorAggregate, \ArrayAccess
2323
{
2424
/**
25-
* @return array<int, Entry>
25+
* @return list<Entry>
2626
*/
2727
public function toArray(): array;
2828
}

Adapter/ExtLdap/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class Collection implements CollectionInterface
2222
{
2323
private Connection $connection;
2424
private Query $search;
25+
/** @var list<Entry> */
2526
private array $entries;
2627

2728
public function __construct(Connection $connection, Query $search)

Adapter/ExtLdap/ConnectionOptions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ final class ConnectionOptions
5252
public const X_TLS_RANDOM_FILE = 0x6009;
5353
public const X_TLS_CRLFILE = 0x6010;
5454
public const X_TLS_PACKAGE = 0x6011;
55-
public const X_TLS_CRLCHECK = 0x600b;
56-
public const X_TLS_DHFILE = 0x600e;
55+
public const X_TLS_CRLCHECK = 0x600B;
56+
public const X_TLS_DHFILE = 0x600E;
5757
public const X_SASL_MECH = 0x6100;
5858
public const X_SASL_REALM = 0x6101;
5959
public const X_SASL_AUTHCID = 0x6102;

0 commit comments

Comments
 (0)