Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 09c18ac

Browse filesBrowse files
Merge branch '4.4' into 5.3
* 4.4: [Cache] fix connecting to local Redis sockets Fix appveyor config for deprecations Skip deprecation coming from DBAL 3.2
2 parents 4c65f7e + 04b0574 commit 09c18ac
Copy full SHA for 09c18ac

File tree

Expand file treeCollapse file tree

5 files changed

+5
-2
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+5
-2
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ init:
1212
- SET SYMFONY_DEPRECATIONS_HELPER=strict
1313
- SET ANSICON=121x90 (121x90)
1414
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
15-
- SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
15+
- SET SYMFONY_DEPRECATIONS_HELPER=max[direct]=1
1616
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
1717

1818
install:

‎.github/workflows/integration-tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/integration-tests.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ jobs:
157157
- name: Run tests
158158
run: ./phpunit --group integration -v
159159
env:
160+
SYMFONY_DEPRECATIONS_HELPER: max[direct]=1 # to be removed once DbalLogger is compatible with dbal 3.2+
160161
REDIS_HOST: localhost
161162
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
162163
REDIS_SENTINEL_HOSTS: 'localhost:26379'

‎.github/workflows/unit-tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/unit-tests.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
echo COLUMNS=120 >> $GITHUB_ENV
6464
echo PHPUNIT="$(readlink -f ./phpunit) --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
6565
echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
66+
echo SYMFONY_DEPRECATIONS_HELPER=max[direct]=1 >> $GITHUB_ENV # to be removed once DbalLogger is compatible with dbal 3.2+
6667
6768
SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
6869
SYMFONY_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+')

‎src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public function provideFailedCreateConnection(): array
9696
['redis://localhost:1234'],
9797
['redis://foo@localhost'],
9898
['redis://localhost/123'],
99+
['redis:///some/local/path'],
99100
];
100101
}
101102

‎src/Symfony/Component/Cache/Traits/RedisTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/RedisTrait.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public static function createConnection(string $dsn, array $options = [])
151151
if (preg_match('#/(\d+)$#', $params['path'], $m)) {
152152
$params['dbindex'] = $m[1];
153153
$params['path'] = substr($params['path'], 0, -\strlen($m[0]));
154-
} else {
154+
} elseif (isset($params['host'])) {
155155
throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s", the "dbindex" parameter must be a number.', $dsn));
156156
}
157157
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.