8000 Merge branch '2.8' into 3.1 · symfony/symfony@d13c424 · GitHub
[go: up one dir, main page]
Skip to content

Commit d13c424

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.1
* 2.8: [Routing] Reorder assert parameters Added missing czech validators translation of not expected charset Workaround another buggy PHP warning Add czech translation for Url and Length validator Add slovak translation for Url and Length validator
2 parents 540842a + 5e2093a commit d13c424

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

‎src/Symfony/Component/Process/ExecutableFinder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function find($name, $default = null, array $extraDirs = array())
6060
if (@is_dir($path)) {
6161
$dirs[] = $path;
6262
} else {
63-
if (basename($path) == $name && is_executable($path)) {
63+
if (basename($path) == $name && @is_executable($path)) {
6464
return $path;
6565
}
6666
}

‎src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ public function testDumpWithRoutes()
7777
$relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
7878
$relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
7979

80-
$this->assertEquals($absoluteUrlWithParameter, 'http://localhost/app.php/testing/bar');
81-
$this->assertEquals($absoluteUrlWithoutParameter, 'http://localhost/app.php/testing2');
82-
$this->assertEquals($relativeUrlWithParameter, '/app.php/testing/bar');
83-
$this->assertEquals($relativeUrlWithoutParameter, '/app.php/testing2');
80+
$this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
81+
$this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
82+
$this->assertEquals('/app.php/testing/bar', $relativeUrlWithParameter);
83+
$this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
8484
}
8585

8686
public function testDumpWithTooManyRoutes()
@@ -108,10 +108,10 @@ public function testDumpWithTooManyRoutes()
108108
$relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
109109
$relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
110110

111-
$this->assertEquals($absoluteUrlWithParameter, 'http://localhost/app.php/testing/bar');
112-
$this->assertEquals($absoluteUrlWithoutParameter, 'http://localhost/app.php/testing2');
113-
$this->assertEquals($relativeUrlWithParameter, '/app.php/testing/bar');
114-
$this->assertEquals($relativeUrlWithoutParameter, '/app.php/testing2');
111+
$this->assertEquals('http://localhost/app.php/testing/bar', $absoluteUrlWithParameter);
112+
$this->assertEquals('http://localhost/app.php/testing2', $absoluteUrlWithoutParameter);
113+
$this->assertEquals('/app.php/testing/bar', $relativeUrlWithParameter);
114+
$this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
115115
}
116116

117117
/**
@@ -151,7 +151,7 @@ public function testDumpForRouteWithDefaults()
151151
$projectUrlGenerator = new \DefaultRoutesUrlGenerator(new RequestContext());
152152
$url = $projectUrlGenerator->generate('Test', array());
153153

154-
$this->assertEquals($url, '/testing');
154+
$this->assertEquals('/testing', $url);
155155
}
156156

157157
public function testDumpWithSchemeRequirement()
@@ -166,15 +166,15 @@ public function testDumpWithSchemeRequirement()
166166
$absoluteUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_URL);
167167
$relativeUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
168168

169-
$this->assertEquals($absoluteUrl, 'ftp://localhost/app.php/testing');
170-
$this->assertEquals($relativeUrl, 'ftp://localhost/app.php/testing');
169+
$this->assertEquals('ftp://localhost/app.php/testing', $absoluteUrl);
170+
$this->assertEquals('ftp://localhost/app.php/testing', $relativeUrl);
171171

172172
$projectUrlGenerator = new \SchemeUrlGenerator(new RequestContext('/app.php', 'GET', 'localhost', 'https'));
173173

174174
$absoluteUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_URL);
175175
$relativeUrl = $projectUrlGenerator->generate('Test1', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
176176

177-
$this->assertEquals($absoluteUrl, 'https://localhost/app.php/testing');
178-
$this->assertEquals($relativeUrl, '/app.php/testing');
177+
$this->assertEquals('https://localhost/app.php/testing', $absoluteUrl);
178+
$this->assertEquals('/app.php/testing', $relativeUrl);
179179
}
180180
}

‎src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,14 @@
302302
<source>An empty file is not allowed.</source>
303303
<target>Soubor nesmí být prázdný.</target>
304304
</trans-unit>
305+
<trans-unit id="79">
306+
<source>The host could not be resolved.</source>
307+
<target>Hostitele nebylo možné rozpoznat.</target>
308+
</trans-unit>
309+
<trans-unit id="80">
310+
<source>This value does not match the expected {{ ch B422 arset }} charset.</source>
311+
<target>Tato hodnota neodpovídá očekávané znakové sadě {{ charset }}.</target>
312+
</trans-unit>
305313
</body>
306314
</file>
307315
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.sk.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,14 @@
302302
<source>An empty file is not allowed.</source>
303303
<target>Súbor nesmie byť prázdny.</target>
304304
</trans-unit>
305+
<trans-unit id="79">
306+
<source>The host could not be resolved.</source>
307+
<target>Hostiteľa nebolo možné rozpoznať.</target>
308+
</trans-unit>
309+
<trans-unit id="80">
310+
<source>This value does not match the expected {{ charset }} charset.</source>
311+
<target>Táto hodnota nezodpovedá očakávanej znakovej sade {{ charset }}.</target>
312+
</trans-unit>
305313
</body>
306314
</file>
307315
</xliff>

0 commit comments

Comments
 (0)
0