diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7 

* 2.3:
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  Simplify markdown for PR template

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
	src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
This commit is contained in:
Nicolas Grekas 2016-02-22 17:12:29 +01:00
parent 24cdae71a1 9124c28b10
commit ba35f3d7bb
11 changed files with 209 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -1,10 +1,10 @@
| Q | A
| ------------- | ---
| Bug fix? | [yes|no]
| New feature? | [yes|no]
| BC breaks? | [yes|no]
| Deprecations? | [yes|no]
| Tests pass? | [yes|no]
| Fixed tickets | [comma-separated list of tickets fixed by the PR, if any]
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
| Deprecations? | yes/no
| Tests pass? | yes/no
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
| License | MIT
| Doc PR | [reference to the documentation PR, if any]
| Doc PR | reference to the documentation PR, if any

2
src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
View File

@ -120,7 +120,7 @@ class TreeBuilderTest extends \PHPUnit_Framework_TestCase
$tree = $builder->buildTree();
$children = $tree->getChildren();
$this->assertTrue(is_array($tree->getExample()));
$this->assertInternalType('array', $tree->getExample());
$this->assertEquals('example', $children['child']->getExample());
}
}

2
src/Symfony/Component/Finder/Tests/Shell/CommandTest.php
View File

@ -146,7 +146,7 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$cmd->add('--version');
$result = $cmd->execute();
$this->assertTrue(is_array($result));
$this->assertInternalType('array', $result);
$this->assertNotEmpty($result);
$this->assertRegexp('/PHP|HipHop/', $result[0]);
}

2
src/Symfony/Component/Form/Resources/translations/validators.no.xlf
View File

@ -8,7 +8,7 @@
</trans-unit>
<trans-unit id="29">
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
<target>Den opplastede file var for stor. Vennligst last opp en mindre fil.</target>
<target>Den opplastede filen var for stor. Vennligst last opp en mindre fil.</target>
</trans-unit>
<trans-unit id="30">
<source>The CSRF token is invalid.</source>

12
src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
View File

@ -81,8 +81,8 @@ class FileTest extends \PHPUnit_Framework_TestCase
$movedFile = $file->move($targetDir);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
$this->assertTrue(file_exists($targetPath));
$this->assertFalse(file_exists($path));
$this->assertFileExists($targetPath);
$this->assertFileNotExists($path);
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
@unlink($targetPath);
@ -100,8 +100,8 @@ class FileTest extends \PHPUnit_Framework_TestCase
$file = new File($path);
$movedFile = $file->move($targetDir, 'test.newname.gif');
$this->assertTrue(file_exists($targetPath));
$this->assertFalse(file_exists($path));
$this->assertFileExists($targetPath);
$this->assertFileNotExists($path);
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
@unlink($targetPath);
@ -135,8 +135,8 @@ class FileTest extends \PHPUnit_Framework_TestCase
$movedFile = $file->move($targetDir, $filename);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
$this->assertTrue(file_exists($targetPath));
$this->assertFalse(file_exists($path));
$this->assertFileExists($targetPath);
$this->assertFileNotExists($path);
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
@unlink($targetPath);

4
src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
View File

@ -164,8 +164,8 @@ class UploadedFileTest extends \PHPUnit_Framework_TestCase
$movedFile = $file->move(__DIR__.'/Fixtures/directory');
$this->assertTrue(file_exists($targetPath));
$this->assertFalse(file_exists($path));
$this->assertFileExists($targetPath);
$this->assertFileNotExists($path);
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
@unlink($targetPath);

2
src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
View File

@ -32,7 +32,7 @@ class CacheWarmerTest extends \PHPUnit_Framework_TestCase
$warmer = new TestCacheWarmer(self::$cacheFile);
$warmer->warmUp(dirname(self::$cacheFile));
$this->assertTrue(file_exists(self::$cacheFile));
$this->assertFileExists(self::$cacheFile);
}
/**

2
src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
View File

@ -32,7 +32,7 @@ class JsonBundleReaderTest extends \PHPUnit_Framework_TestCase
{
$data = $this->reader->read(__DIR__.'/Fixtures/json', 'en');
$this->assertTrue(is_array($data));
$this->assertInternalType('array', $data);
$this->assertSame('Bar', $data['Foo']);
$this->assertFalse(isset($data['ExistsNot']));
}

2
src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
View File

@ -32,7 +32,7 @@ class PhpBundleReaderTest extends \PHPUnit_Framework_TestCase
{
$data = $this->reader->read(__DIR__.'/Fixtures/php', 'en');
$this->assertTrue(is_array($data));
$this->assertInternalType('array', $data);
$this->assertSame('Bar', $data['Foo']);
$this->assertFalse(isset($data['ExistsNot']));
}

4
src/Symfony/Component/Security/Resources/translations/security.no.xlf
View File

@ -4,7 +4,7 @@
<body>
<trans-unit id="1">
<source>An authentication exception occurred.</source>
<target>En autentiserings feil har skjedd.</target>
<target>En autentiseringsfeil har skjedd.</target>
</trans-unit>
<trans-unit id="2">
<source>Authentication credentials could not be found.</source>
@ -24,7 +24,7 @@
</trans-unit>
<trans-unit id="6">
<source>Not privileged to request the resource.</source>
<target>Ingen tilgang til å be om gitt kilde.</target>
<target>Ingen tilgang til å be om gitt ressurs.</target>
</trans-unit>
<trans-unit id="7">
<source>Invalid CSRF token.</source>

208
src/Symfony/Component/Validator/Resources/translations/validators.no.xlf
View File

@ -4,27 +4,27 @@
<body>
<trans-unit id="1">
<source>This value should be false.</source>
<target>Verdien skal være falsk.</target>
<target>Verdien må være usann.</target>
</trans-unit>
<trans-unit id="2">
<source>This value should be true.</source>
<target>Verdien skal være sann.</target>
<target>Verdien må være sann.</target>
</trans-unit>
<trans-unit id="3">
<source>This value should be of type {{ type }}.</source>
<target>Verdien skal være av typen {{ type }}.</target>
<target>Verdien må være av typen {{ type }}.</target>
</trans-unit>
<trans-unit id="4">
<source>This value should be blank.</source>
<target>Verdien skal være blank.</target>
<target>Verdien må være blank.</target>
</trans-unit>
<trans-unit id="5">
<source>The value you selected is not a valid choice.</source>
<target>Verdien skal være en av de gitte valg.</target>
<target>Den valgte verdien er ikke gyldig.</target>
</trans-unit>
<trans-unit id="6">
<source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
<target>Du skal velge minst {{ limit }} valg.</target>
<target>Du må velge minst {{ limit }} valg.</target>
</trans-unit>
<trans-unit id="7">
<source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
@ -32,11 +32,11 @@
</trans-unit>
<trans-unit id="8">
<source>One or more of the given values is invalid.</source>
<target>En eller flere av de oppgitte verdier er ugyldige.</target>
<target>En eller flere av de oppgitte verdiene er ugyldige.</target>
</trans-unit>
<trans-unit id="9">
<source>This field was not expected.</source>
<target>Dette feltet ikke var forventet.</target>
<target>Dette feltet var ikke forventet.</target>
</trans-unit>
<trans-unit id="10">
<source>This field is missing.</source>
@ -48,11 +48,11 @@
</trans-unit>
<trans-unit id="12">
<source>This value is not a valid datetime.</source>
<target>Verdien er ikke en gyldig dato og tid.</target>
<target>Verdien er ikke en gyldig dato/tid.</target>
</trans-unit>
<trans-unit id="13">
<source>This value is not a valid email address.</source>
<target>Verdien er ikke en gyldig e-mail adresse.</target>
<target>Verdien er ikke en gyldig e-postadresse.</target>
</trans-unit>
<trans-unit id="14">
<source>The file could not be found.</source>
@ -60,7 +60,7 @@
</trans-unit>
<trans-unit id="15">
<source>The file is not readable.</source>
<target>Filen kan ikke leses.</target>
<target>Filen er ikke lesbar.</target>
</trans-unit>
<trans-unit id="16">
<source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
@ -72,19 +72,19 @@
</trans-unit>
<trans-unit id="18">
<source>This value should be {{ limit }} or less.</source>
<target>Verdien skal være {{ limit }} eller mindre.</target>
<target>Verdien må være {{ limit }} tegn lang eller mindre.</target>
</trans-unit>
<trans-unit id="19">
<source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
<target>Verdien er for lang. Den skal ha {{ limit }} bokstaver eller mindre.</target>
<target>Verdien er for lang. Den må ha {{ limit }} tegn eller mindre.</target>
</trans-unit>
<trans-unit id="20">
<source>This value should be {{ limit }} or more.</source>
<target>Verdien skal være {{ limit }} eller mer.</target>
<target>Verdien må være {{ limit }} eller mer.</target>
</trans-unit>
<trans-unit id="21">
<source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
<target>Verdien er for kort. Den skal ha {{ limit }} tegn eller flere.</target>
<target>Verdien er for kort. Den må ha {{ limit }} tegn eller flere.</target>
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
@ -96,7 +96,7 @@
</trans-unit>
<trans-unit id="24">
<source>This value should be null.</source>
<target>Verdien skal være tom (null).</target>
<target>Verdien må være tom (null).</target>
</trans-unit>
<trans-unit id="25">
<source>This value is not valid.</source>
@ -112,11 +112,11 @@
</trans-unit>
<trans-unit id="31">
<source>The two values should be equal.</source>
<target>De to verdier skal være ens.</target>
<target>Verdiene må være identiske.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}.</target>
<target>Filen er for stor. Den maksimale størrelsen er {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>
@ -128,7 +128,7 @@
</trans-unit>
<trans-unit id="35">
<source>This value should be a valid number.</source>
<target>Denne verdi skal være et gyldig tall.</target>
<target>Verdien må være et gyldig tall.</target>
</trans-unit>
<trans-unit id="36">
<source>This file is not a valid image.</source>
@ -140,15 +140,179 @@
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
<target>Denne verdi er ikke et gyldig språk.</target>
<target>Verdien er ikke et gyldig språk.</target>
</trans-unit>
<trans-unit id="39">
<source>This value is not a valid locale.</source>
<target>Denne verdi er ikke en gyldig lokalitet.</target>
<target>Verdien er ikke en gyldig lokalitet.</target>
</trans-unit>
<trans-unit id="40">
<source>This value is not a valid country.</source>
<target>Denne verdi er ikke et gyldig land.</target>
<target>Verdien er ikke et gyldig navn på land.</target>
</trans-unit>
<trans-unit id="41">
<source>This value is already used.</source>
<target>Verdien er allerede brukt.</target>
</trans-unit>
<trans-unit id="42">
<source>The size of the image could not be detected.</source>
<target>Bildestørrelsen kunne ikke oppdages.</target>
</trans-unit>
<trans-unit id="43">
<source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
<target>Bildebredden er for stor ({{ width }} piksler). Tillatt maksimumsbredde er {{ max_width }} piksler.</target>
</trans-unit>
<trans-unit id="44">
<source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
<target>Bildebredden er for liten ({{ width }} piksler). Forventet minimumsbredde er {{ min_width }} piksler.</target>
</trans-unit>
<trans-unit id="45">
<source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
<target>Bildehøyden er for stor ({{ height }} piksler). Tillatt maksimumshøyde er {{ max_height }} piksler.</target>
</trans-unit>
<trans-unit id="46">
<source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
<target>Bildehøyden er for liten ({{ height }} piksler). Forventet minimumshøyde er {{ min_height }} piksler.</target>
</trans-unit>
<trans-unit id="47">
<source>This value should be the user's current password.</source>
<target>Verdien må være brukerens sitt nåværende passord.</target>
</trans-unit>
<trans-unit id="48">
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
<target>Verdien må være nøyaktig {{ limit }} tegn.</target>
</trans-unit>
<trans-unit id="49">
<source>The file was only partially uploaded.</source>
<target>Filen var kun delvis opplastet.</target>
</trans-unit>
<trans-unit id="50">
<source>No file was uploaded.</source>
<target>Ingen fil var lastet opp.</target>
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
<target>Den midlertidige mappen (tmp) er ikke konfigurert i php.ini.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
<target>Kan ikke skrive midlertidig fil til disk.</target>
</trans-unit>
<trans-unit id="53">
<source>A PHP extension caused the upload to fail.</source>
<target>En PHP-utvidelse forårsaket en feil under opplasting.</target>
</trans-unit>
<trans-unit id="54">
<source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
<target>Denne samlingen må inneholde {{ limit }} element eller flere.|Denne samlingen må inneholde {{ limit }} elementer eller flere./target>
</trans-unit>
<trans-unit id="55">
<source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
<target>Denne samlingen må inneholde {{ limit }} element eller færre.|Denne samlingen må inneholde {{ limit }} elementer eller færre.</target>
</trans-unit>
<trans-unit id="56">
<source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
<target>Denne samlingen må inneholde nøyaktig {{ limit }} element.|Denne samlingen må inneholde nøyaktig {{ limit }} elementer.</target>
</trans-unit>
<trans-unit id="57">
<source>Invalid card number.</source>
<target>Ugyldig kortnummer.</target>
</trans-unit>
<trans-unit id="58">
<source>Unsupported card type or invalid card number.</source>
<target>Korttypen er ikke støttet eller ugyldig kortnummer.</target>
</trans-unit>
<trans-unit id="59">
<source>This is not a valid International Bank Account Number (IBAN).</source>
<target>Dette er ikke en gyldig IBAN.</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
<target>Verdien er ikke en gyldig ISBN-10.</target>
</trans-unit>
<trans-unit id="61">
<source>This value is not a valid ISBN-13.</source>
<target>Verdien er ikke en gyldig ISBN-13.</target>
</trans-unit>
<trans-unit id="62">
<source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
<target>Verdien er hverken en gyldig ISBN-10 eller ISBN-13.</target>
</trans-unit>
<trans-unit id="63">
<source>This value is not a valid ISSN.</source>
<target>Verdien er ikke en gyldig ISSN.</target>
</trans-unit>
<trans-unit id="64">
<source>This value is not a valid currency.</source>
<target>Verdien er ikke gyldig valuta.</target>
</trans-unit>
<trans-unit id="65">
<source>This value should be equal to {{ compared_value }}.</source>
<target>Verdien må være lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="66">
<source>This value should be greater than {{ compared_value }}.</source>
<target>Verdien må være større enn {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="67">
<source>This value should be greater than or equal to {{ compared_value }}.</source>
<target>Verdien må være større enn eller lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="68">
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Verdien må være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="69">
<source>This value should be less than {{ compared_value }}.</source>
<target>Verdien må være mindre enn {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="70">
<source>This value should be less than or equal to {{ compared_value }}.</source>
<target>Verdien må være mindre enn eller lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="71">
<source>This value should not be equal to {{ compared_value }}.</source>
<target>Verdien må ikke være lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="72">
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Verdien må ikke være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="73">
<source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
<target>Bildeforholdet er for stort ({{ ratio }}). Tillatt maksimumsbildeforhold er {{ max_ratio }}.</target>
</trans-unit>
<trans-unit id="74">
<source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
<target>Bildeforholdet er for lite ({{ ratio }}). Forventet maksimumsbildeforhold er {{ min_ratio }}.</target>
</trans-unit>
<trans-unit id="75">
<source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
<target>Bildet er en kvadrat ({{ width }}x{{ height }}px). Kvadratiske bilder er ikke tillatt.</target>
</trans-unit>
<trans-unit id="76">
<source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
<target>Bildet er i liggende retning ({{ width }}x{{ height }}px). Bilder i liggende retning er ikke tillatt.</target>
</trans-unit>
<trans-unit id="77">
<source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
<target>Bildet er i stående retning ({{ width }}x{{ height }}px). Bilder i stående retning er ikke tillatt.</target>
</trans-unit>
<trans-unit id="78">
<source>An empty file is not allowed.</source>
<target>Tomme filer er ikke tilatt.</target>
</trans-unit>
<trans-unit id="79">
<source>The host could not be resolved.</source>
<target>Vertsnavn kunne ikke løses.</target>
</trans-unit>
<trans-unit id="80">
<source>This value does not match the expected {{ charset }} charset.</source>
<target>Verdien samsvarer ikke med forventet tegnsett {{ charset }}.</target>
</trans-unit>
<trans-unit id="81">
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Dette er ikke en gyldig BIC.</target>
</trans-unit>
</body>
</file>