From a2780357cad436c3feb342742aa4f1b6c79adde5 Mon Sep 17 00:00:00 2001 From: Alex Rock Ancelet Date: Fri, 19 Feb 2016 16:05:47 +0100 Subject: [PATCH 1/3] Simplify markdown for PR template --- .github/PULL_REQUEST_TEMPLATE.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1118d9caa2..4cdf108270 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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 From 73a5d6c68431f14195d77666d68529553b346bac Mon Sep 17 00:00:00 2001 From: Valentin Jonovs Date: Fri, 19 Feb 2016 20:56:38 +0100 Subject: [PATCH 2/3] Improve Norwegian translations --- .../Resources/translations/validators.no.xlf | 2 +- .../Resources/translations/security.no.xlf | 4 +- .../Resources/translations/validators.no.xlf | 208 ++++++++++++++++-- 3 files changed, 189 insertions(+), 25 deletions(-) diff --git a/src/Symfony/Component/Form/Resources/translations/validators.no.xlf b/src/Symfony/Component/Form/Resources/translations/validators.no.xlf index 5e36bd5fec..c64266c991 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.no.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.no.xlf @@ -8,7 +8,7 @@ The uploaded file was too large. Please try to upload a smaller file. - Den opplastede file var for stor. Vennligst last opp en mindre fil. + Den opplastede filen var for stor. Vennligst last opp en mindre fil. The CSRF token is invalid. diff --git a/src/Symfony/Component/Security/Resources/translations/security.no.xlf b/src/Symfony/Component/Security/Resources/translations/security.no.xlf index 3369d43b77..3635916971 100644 --- a/src/Symfony/Component/Security/Resources/translations/security.no.xlf +++ b/src/Symfony/Component/Security/Resources/translations/security.no.xlf @@ -4,7 +4,7 @@ An authentication exception occurred. - En autentiserings feil har skjedd. + En autentiseringsfeil har skjedd. Authentication credentials could not be found. @@ -24,7 +24,7 @@ Not privileged to request the resource. - Ingen tilgang til å be om gitt kilde. + Ingen tilgang til å be om gitt ressurs. Invalid CSRF token. diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf index a8b790c7d8..9b5a20b088 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf @@ -4,27 +4,27 @@ This value should be false. - Verdien skal være falsk. + Verdien må være usann. This value should be true. - Verdien skal være sann. + Verdien må være sann. This value should be of type {{ type }}. - Verdien skal være av typen {{ type }}. + Verdien må være av typen {{ type }}. This value should be blank. - Verdien skal være blank. + Verdien må være blank. The value you selected is not a valid choice. - Verdien skal være en av de gitte valg. + Den valgte verdien er ikke gyldig. You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices. - Du skal velge minst {{ limit }} valg. + Du må velge minst {{ limit }} valg. You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices. @@ -32,11 +32,11 @@ One or more of the given values is invalid. - En eller flere av de oppgitte verdier er ugyldige. + En eller flere av de oppgitte verdiene er ugyldige. This field was not expected. - Dette feltet ikke var forventet. + Dette feltet var ikke forventet. This field is missing. @@ -48,11 +48,11 @@ This value is not a valid datetime. - Verdien er ikke en gyldig dato og tid. + Verdien er ikke en gyldig dato/tid. This value is not a valid email address. - Verdien er ikke en gyldig e-mail adresse. + Verdien er ikke en gyldig e-postadresse. The file could not be found. @@ -60,7 +60,7 @@ The file is not readable. - Filen kan ikke leses. + Filen er ikke lesbar. The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}. @@ -72,19 +72,19 @@ This value should be {{ limit }} or less. - Verdien skal være {{ limit }} eller mindre. + Verdien må være {{ limit }} tegn lang eller mindre. This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less. - Verdien er for lang. Den skal ha {{ limit }} bokstaver eller mindre. + Verdien er for lang. Den må ha {{ limit }} tegn eller mindre. This value should be {{ limit }} or more. - Verdien skal være {{ limit }} eller mer. + Verdien må være {{ limit }} eller mer. This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more. - Verdien er for kort. Den skal ha {{ limit }} tegn eller flere. + Verdien er for kort. Den må ha {{ limit }} tegn eller flere. This value should not be blank. @@ -96,7 +96,7 @@ This value should be null. - Verdien skal være tom (null). + Verdien må være tom (null). This value is not valid. @@ -112,11 +112,11 @@ The two values should be equal. - De to verdier skal være ens. + Verdiene må være identiske. The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}. - Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}. + Filen er for stor. Den maksimale størrelsen er {{ limit }} {{ suffix }}. The file is too large. @@ -128,7 +128,7 @@ This value should be a valid number. - Denne verdi skal være et gyldig tall. + Verdien må være et gyldig tall. This file is not a valid image. @@ -140,15 +140,179 @@ This value is not a valid language. - Denne verdi er ikke et gyldig språk. + Verdien er ikke et gyldig språk. This value is not a valid locale. - Denne verdi er ikke en gyldig lokalitet. + Verdien er ikke en gyldig lokalitet. This value is not a valid country. - Denne verdi er ikke et gyldig land. + Verdien er ikke et gyldig navn på land. + + + This value is already used. + Verdien er allerede brukt. + + + The size of the image could not be detected. + Bildestørrelsen kunne ikke oppdages. + + + The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px. + Bildebredden er for stor ({{ width }} piksler). Tillatt maksimumsbredde er {{ max_width }} piksler. + + + The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px. + Bildebredden er for liten ({{ width }} piksler). Forventet minimumsbredde er {{ min_width }} piksler. + + + The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px. + Bildehøyden er for stor ({{ height }} piksler). Tillatt maksimumshøyde er {{ max_height }} piksler. + + + The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px. + Bildehøyden er for liten ({{ height }} piksler). Forventet minimumshøyde er {{ min_height }} piksler. + + + This value should be the user's current password. + Verdien må være brukerens sitt nåværende passord. + + + This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters. + Verdien må være nøyaktig {{ limit }} tegn. + + + The file was only partially uploaded. + Filen var kun delvis opplastet. + + + No file was uploaded. + Ingen fil var lastet opp. + + + No temporary folder was configured in php.ini. + Den midlertidige mappen (tmp) er ikke konfigurert i php.ini. + + + Cannot write temporary file to disk. + Kan ikke skrive midlertidig fil til disk. + + + A PHP extension caused the upload to fail. + En PHP-utvidelse forårsaket en feil under opplasting. + + + This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more. + Denne samlingen må inneholde {{ limit }} element eller flere.|Denne samlingen må inneholde {{ limit }} elementer eller flere./target> + + + This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less. + Denne samlingen må inneholde {{ limit }} element eller færre.|Denne samlingen må inneholde {{ limit }} elementer eller færre. + + + This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements. + Denne samlingen må inneholde nøyaktig {{ limit }} element.|Denne samlingen må inneholde nøyaktig {{ limit }} elementer. + + + Invalid card number. + Ugyldig kortnummer. + + + Unsupported card type or invalid card number. + Korttypen er ikke støttet eller ugyldig kortnummer. + + + This is not a valid International Bank Account Number (IBAN). + Dette er ikke en gyldig IBAN. + + + This value is not a valid ISBN-10. + Verdien er ikke en gyldig ISBN-10. + + + This value is not a valid ISBN-13. + Verdien er ikke en gyldig ISBN-13. + + + This value is neither a valid ISBN-10 nor a valid ISBN-13. + Verdien er hverken en gyldig ISBN-10 eller ISBN-13. + + + This value is not a valid ISSN. + Verdien er ikke en gyldig ISSN. + + + This value is not a valid currency. + Verdien er ikke gyldig valuta. + + + This value should be equal to {{ compared_value }}. + Verdien må være lik {{ compared_value }}. + + + This value should be greater than {{ compared_value }}. + Verdien må være større enn {{ compared_value }}. + + + This value should be greater than or equal to {{ compared_value }}. + Verdien må være større enn eller lik {{ compared_value }}. + + + This value should be identical to {{ compared_value_type }} {{ compared_value }}. + Verdien må være identisk med {{ compared_value_type }} {{ compared_value }}. + + + This value should be less than {{ compared_value }}. + Verdien må være mindre enn {{ compared_value }}. + + + This value should be less than or equal to {{ compared_value }}. + Verdien må være mindre enn eller lik {{ compared_value }}. + + + This value should not be equal to {{ compared_value }}. + Verdien må ikke være lik {{ compared_value }}. + + + This value should not be identical to {{ compared_value_type }} {{ compared_value }}. + Verdien må ikke være identisk med {{ compared_value_type }} {{ compared_value }}. + + + The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}. + Bildeforholdet er for stort ({{ ratio }}). Tillatt maksimumsbildeforhold er {{ max_ratio }}. + + + The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}. + Bildeforholdet er for lite ({{ ratio }}). Forventet maksimumsbildeforhold er {{ min_ratio }}. + + + The image is square ({{ width }}x{{ height }}px). Square images are not allowed. + Bildet er en kvadrat ({{ width }}x{{ height }}px). Kvadratiske bilder er ikke tillatt. + + + The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed. + Bildet er i liggende retning ({{ width }}x{{ height }}px). Bilder i liggende retning er ikke tillatt. + + + The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed. + Bildet er i stående retning ({{ width }}x{{ height }}px). Bilder i stående retning er ikke tillatt. + + + An empty file is not allowed. + Tomme filer er ikke tilatt. + + + The host could not be resolved. + Vertsnavn kunne ikke løses. + + + This value does not match the expected {{ charset }} charset. + Verdien samsvarer ikke med forventet tegnsett {{ charset }}. + + + This is not a valid Business Identifier Code (BIC). + Dette er ikke en gyldig BIC. From 7aff7f42c1e771995b1498e989307c4be1733f65 Mon Sep 17 00:00:00 2001 From: SpacePossum Date: Sun, 21 Feb 2016 12:34:19 +0100 Subject: [PATCH 3/3] PhpUnitNoDedicateAssertFixer results --- .../CollectionToArrayTransformerTest.php | 8 ++++---- .../Tests/Definition/Builder/TreeBuilderTest.php | 2 +- .../Component/Finder/Tests/Shell/CommandTest.php | 2 +- .../Component/HttpFoundation/Tests/File/FileTest.php | 12 ++++++------ .../HttpFoundation/Tests/File/UploadedFileTest.php | 4 ++-- .../HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php | 2 +- .../Data/Bundle/Reader/JsonBundleReaderTest.php | 2 +- .../Tests/Data/Bundle/Reader/PhpBundleReaderTest.php | 2 +- .../Security/Tests/Core/SecurityContextTest.php | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php b/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php index f8424dda9c..9426d5c09b 100644 --- a/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php +++ b/src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php @@ -27,7 +27,7 @@ class CollectionToArrayTransformerTest extends Propel1TestCase { $result = $this->transformer->transform(new \PropelObjectCollection()); - $this->assertTrue(is_array($result)); + $this->assertInternalType('array', $result); $this->assertCount(0, $result); } @@ -35,7 +35,7 @@ class CollectionToArrayTransformerTest extends Propel1TestCase { $result = $this->transformer->transform(null); - $this->assertTrue(is_array($result)); + $this->assertInternalType('array', $result); $this->assertCount(0, $result); } @@ -54,7 +54,7 @@ class CollectionToArrayTransformerTest extends Propel1TestCase $result = $this->transformer->transform($coll); - $this->assertTrue(is_array($result)); + $this->assertInternalType('array', $result); $this->assertCount(2, $result); $this->assertEquals('foo', $result[0]); $this->assertEquals('bar', $result[1]); @@ -93,7 +93,7 @@ class CollectionToArrayTransformerTest extends Propel1TestCase $this->assertInstanceOf('\PropelObjectCollection', $result); - $this->assertTrue(is_array($data)); + $this->assertInternalType('array', $data); $this->assertCount(2, $data); $this->assertEquals('foo', $data[0]); $this->assertEquals('bar', $data[1]); diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php index 00e27c630a..a146e89c32 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php @@ -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()); } } diff --git a/src/Symfony/Component/Finder/Tests/Shell/CommandTest.php b/src/Symfony/Component/Finder/Tests/Shell/CommandTest.php index e9145127ea..0c19ab47a8 100644 --- a/src/Symfony/Component/Finder/Tests/Shell/CommandTest.php +++ b/src/Symfony/Component/Finder/Tests/Shell/CommandTest.php @@ -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]); } diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php index 90a143367a..d9b9b1f7a3 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php @@ -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); diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php index f6ea340091..2e2d27409c 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php @@ -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); diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php index f0ab05d62e..fe5ecb2ed3 100644 --- a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php @@ -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); } /** diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php index 2cc4607b11..a6183edfe0 100644 --- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php +++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php @@ -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'])); } diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php index 2beaec7ba2..3c58ee7c41 100644 --- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php +++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php @@ -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'])); } diff --git a/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php b/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php index 66958892d3..3fba8d958c 100644 --- a/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php +++ b/src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php @@ -92,6 +92,6 @@ class SecurityContextTest extends \PHPUnit_Framework_TestCase public function testTranslationsAreNotInCore() { - $this->assertFalse(file_exists(__DIR__.'/../../Core/Resources/translations/')); + $this->assertFileNotExists(__DIR__.'/../../Core/Resources/translations/'); } }