Skip to content

Commit d7fcc6a

Browse files
luneticsNyholm
authored andcommitted
Escape regex for PCRE2 compatibility (#81)
Test against PHP 7.3 Use composer memory limit as env variable for php 5.6
1 parent b8f1e2f commit d7fcc6a

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.travis.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,33 @@ matrix:
3434
fast_finish: true
3535
include:
3636
# Minimum supported Symfony version and latest PHP version
37-
- php: 7.2
37+
- php: 7.3
3838
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
3939
- php: 5.6
40-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
40+
env: COMPOSER_MEMORY_LIMIT=-1 COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
4141

4242
# Test the latest stable release
4343
- php: 5.6
44+
env: COMPOSER_MEMORY_LIMIT=-1
4445
- php: 7.0
4546
env: SYMFONY_PHPUNIT_VERSION="6.3"
4647
- php: 7.1
4748
env: SYMFONY_PHPUNIT_VERSION="6.3"
49+
- php: 7.2
50+
env: COVERAGE=true TEST_COMMAND="composer test-ci"
4851
- php: 7.2
4952
env: COVERAGE=true TEST_COMMAND="composer test-ci"
5053

5154
# Test LTS versions
52-
- php: 7.2
55+
- php: 7.3
5356
env: DEPENDENCIES="dunglas/symfony-lock:^2"
54-
- php: 7.2
57+
- php: 7.3
5558
env: DEPENDENCIES="dunglas/symfony-lock:^3"
56-
- php: 7.2
59+
- php: 7.3
5760
env: DEPENDENCIES="dunglas/symfony-lock:^4"
5861

5962
# Latest commit to master
60-
- php: 7.2
63+
- php: 7.3
6164
env: STABILITY="dev"
6265

6366
allow_failures:

.travis/php.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ apc.use_request_time=0
44

55
extension = memcached.so
66

7-
7+
memory_limit=-1

src/DSN.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ private function parseDsn($dsn)
225225

226226
private function parseHosts($hostString)
227227
{
228-
preg_match_all('/(?P<host>[\w-._]+)(?::(?P<port>\d+))?/mi', $hostString, $matches);
228+
preg_match_all('/(?P<host>[\w\-._]+)(?::(?P<port>\d+))?/mi', $hostString, $matches);
229229

230230
$hosts = [];
231231
foreach ($matches['host'] as $index => $match) {

0 commit comments

Comments
 (0)