8000 Merge branch '3.4' into 4.0 · symfony/symfony@b99a5a4 · GitHub
[go: up one dir, main page]
Skip to content

Commit b99a5a4

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.0
* 3.4: Remove mentions of "beta" in composer.json files bug #27299 [Cache] memcache connect should not add duplicate entries on sequential calls simple-phpunit: remove outdated appveryor workaround
2 parents b2e93cf + 51f36e7 commit b99a5a4

File tree

5 files changed

+14
-28
lines changed

5 files changed

+14
-28
lines changed

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,6 @@ if ($components) {
188188
}
189189
}
190190

191-
// Fixes for colors support on appveyor
192-
// See https://github.com/appveyor/ci/issues/373
193-
$colorFixes = array(
194-
array("S\033[0m\033[0m\033[36m\033[1mS", "E\033[0m\033[0m\033[31m\033[1mE", "I\033[0m\033[0m\033[33m\033[1mI", "F\033[0m\033[0m\033[41m\033[37mF"),
195-
array("SS", "EE", "II", "FF"),
196-
);
197-
$colorFixes[0] = array_merge($colorFixes[0], $colorFixes[0]);
198-
$colorFixes[1] = array_merge($colorFixes[1], $colorFixes[1]);
199-
200191
while ($runningProcs) {
201192
usleep(300000);
202193
$terminatedProcs = array();
@@ -212,20 +203,7 @@ if ($components) {
212203
foreach ($terminatedProcs as $component => $procStatus) {
213204
foreach (array('out', 'err') as $file) {
214205
$file = "$component/phpunit.std$file";
215-
216-
if ('\\' === DIRECTORY_SEPARATOR) {
217-
$h = fopen($file, 'rb');
218-
while (false !== $line = fgets($h)) {
219-
echo str_replace($colorFixes[0], $colorFixes[1], preg_replace(
220-
'/(\033\[[0-9]++);([0-9]++m)(?:(.)(\033\[0m))?/',
221-
"$1m\033[$2$3$4$4",
222-
$line
223-
));
224-
}
225-
fclose($h);
226-
} else {
227-
readfile($file);
228-
}
206+
readfile($file);
229207
unlink($file);
230208
}
231209

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"twig/twig": "~1.34|~2.4"
4545
},
4646
"conflict": {
47-
"symfony/security": "4.1.0-beta1|4.1.0-beta2",
4847
"symfony/var-dumper": "<3.4",
4948
"symfony/event-dispatcher": "<3.4",
5049
"symfony/framework-bundle": "<3.4",

‎src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ public function createSimpleCache($defaultLifetime = 0)
4545
return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
4646
}
4747

48+
public function testCreatePersistentConnectionShouldNotDupServerList()
49+
{
50+
$instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('persistent_id' => 'persistent'));
51+
$this->assertCount(1, $instance->getServerList());
52+
53+
$instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('persistent_id' => 'persistent'));
54+
$this->assertCount(1, $instance->getServerList());
55+
}
56+
4857
public function testOptions()
4958
{
5059
$client = MemcachedCache::createConnection(array(), array(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ public static function createConnection($servers, array $options = array())
169169
}
170170

171171
if ($oldServers !== $newServers) {
172-
// before resetting, ensure $servers is valid
173-
$client->addServers($servers);
174172
$client->resetServerList();
173+
$client->addServers($servers);
175174
}
175+
} else {
176+
$client->addServers($servers);
176177
}
177-
$client->addServers($servers);
178178

179179
if (null !== $username || null !== $password) {
180180
if (!method_exists($client, 'setSaslAuthData')) {

‎src/Symfony/Component/Security/Http/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"psr/log": "~1.0"
3030
},
3131
"conflict": {
32-
"symfony/security-csrf": "<3.4.11|~4.0,<4.0.11|~4.1,<=4.1.0-beta2"
32+
"symfony/security-csrf": "<3.4.11|~4.0,<4.0.11"
3333
},
3434
"suggest": {
3535
"symfony/security-csrf": "For using tokens to protect authentication/logout attempts",

0 commit comments

Comments
 (0)
0