Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.7'

* 2.7:
  [RFC][Console] Added console style guide helpers (v2)
  [Validator] Add missing pt_BR translations
  [Translation][Profiler] Added a Translation profiler.
  Add parsing of hexadecimal strings for PHP 7
  [VarDumper] Add filters to casters
  Trim final stop from deprecation message
  [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
  [Validator] Added missing Hungarian translation
  [Validator] Fixed grammar in Hungarian translation
  CS: Unary operators should be placed adjacent to their operands
  CS: Binary operators should be arounded by at least one space
  remove useless tests that fail in php 7
  [Translator] fix test for php 7 compatibility
  [VarDumper] Add VarDumperTestCase and related trait
  Update phpdoc of ProcessBuilder#setPrefix()

Conflicts:
	src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
	src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
	src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
  • Loading branch information...
commit e1b373f419940f8eee1ee3c8ba7c2c3a54dd29b4 2 parents 0a78040 + f66a8c0
@fabpot fabpot authored
View
2  Constraints/IssnValidator.php
@@ -162,7 +162,7 @@ public function validate($value, Constraint $constraint)
for ($i = 0; $i < 7; ++$i) {
// Multiply the first digit by 8, the second by 7, etc.
- $checkSum += (8-$i) * $canonical{$i};
+ $checkSum += (8 - $i) * $canonical{$i};
}
if (0 !== $checkSum % 11) {
View
6 Resources/translations/validators.hu.xlf
@@ -36,7 +36,7 @@
</trans-unit>
<trans-unit id="9">
<source>This field was not expected.</source>
- <target>Ez a mező nem számítottak.</target>
+ <target>Nem várt mező.</target>
</trans-unit>
<trans-unit id="10">
<source>This field is missing.</source>
@@ -306,6 +306,10 @@
<source>The host could not be resolved.</source>
<target>Az állomásnevet nem lehet feloldani.</target>
</trans-unit>
+ <trans-unit id="80">
+ <source>This value does not match the expected {{ charset }} charset.</source>
+ <target>Ez az érték nem az elvárt {{ charset }} karakterkódolást használja.</target>
+ </trans-unit>
</body>
</file>
</xliff>
View
8 Resources/translations/validators.pt_BR.xlf
@@ -302,6 +302,14 @@
<source>An empty file is not allowed.</source>
<target>Arquivo vazio não é permitido.</target>
</trans-unit>
+ <trans-unit id="79">
+ <source>The host could not be resolved.</source>
+ <target>O host não pôde ser resolvido.</target>
+ </trans-unit>
+ <trans-unit id="80">
+ <source>This value does not match the expected {{ charset }} charset.</source>
+ <target>Este valor não corresponde ao charset {{ charset }} esperado.</target>
+ </trans-unit>
</body>
</file>
</xliff>
View
4 Tests/Constraints/FileValidatorTest.php
@@ -165,7 +165,7 @@ public function provideMaxSizeExceededTests()
*/
public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limitAsString, $suffix)
{
- fseek($this->file, $bytesWritten-1, SEEK_SET);
+ fseek($this->file, $bytesWritten - 1, SEEK_SET);
fwrite($this->file, '0');
fclose($this->file);
@@ -213,7 +213,7 @@ public function provideMaxSizeNotExceededTests()
*/
public function testMaxSizeNotExceeded($bytesWritten, $limit)
{
- fseek($this->file, $bytesWritten-1, SEEK_SET);
+ fseek($this->file, $bytesWritten - 1, SEEK_SET);
fwrite($this->file, '0');
fclose($this->file);
Please sign in to comment.
Something went wrong with that request. Please try again.