Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.8'

* 2.8: (21 commits)
  Fix merge
  Fix typo
  Various fixes esp. on Windows
  Fix the validation of form resources to register the default theme
  Fix the retrieval of the value with property path when using a loader
  [appveyor] minor enhancements
  [Process] Disable failing tests on Windows
  [Translation] Fix the string casting in the XliffFileLoader
  Windows and Intl fixes
  Add appveyor.yml for C.I. on Windows
  [VarDumper] fixed HtmlDumper to target specific the head tag
  [travis] merge php: nightly and deps=high test-matrix lines
  consistently use str_replace to unify directory separators
  Support omitting the <target> node in an .xlf file.
  Fix the handling of values for multiple choice types
  moved PHP nightly to PHP 7.0
  fixed tests using deprecation features
  [Form] made deprecation notice more precise
  fixed CS
  Fix BC break after split of ACL from core
  ...

Conflicts:
	.travis.yml
	composer.json
	src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
	src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
	src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
	src/Symfony/Component/Locale/Tests/LocaleTest.php
  • Loading branch information...
commit f4cbafcb1f8fa0855e1eba96594f56782e701301 2 parents ad5c259 + 4cc39a0
@nicolas-grekas nicolas-grekas authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 Tests/ClassMapGeneratorTest.php
View
4 Tests/ClassMapGeneratorTest.php
@@ -137,10 +137,10 @@ public function testCreateMapFinderSupport()
protected function assertEqualsNormalized($expected, $actual, $message = null)
{
foreach ($expected as $ns => $path) {
- $expected[$ns] = strtr($path, '\\', '/');
+ $expected[$ns] = str_replace('\\', '/', $path);
}
foreach ($actual as $ns => $path) {
- $actual[$ns] = strtr($path, '\\', '/');
+ $actual[$ns] = str_replace('\\', '/', $path);
}
$this->assertEquals($expected, $actual, $message);
}

0 comments on commit f4cbafc

Please sign in to comment.
Something went wrong with that request. Please try again.