Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ba35f3d

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
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
2 parents 24cdae7 + 9124c28 commit ba35f3d
Copy full SHA for ba35f3d

File tree

Expand file treeCollapse file tree

11 files changed

+209
-45
lines changed
Filter options
Expand file treeCollapse file tree

11 files changed

+209
-45
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
| Q | A
22
| ------------- | ---
3-
| Bug fix? | [yes|no]
4-
| New feature? | [yes|no]
5-
| BC breaks? | [yes|no]
6-
| Deprecations? | [yes|no]
7-
| Tests pass? | [yes|no]
8-
| Fixed tickets | [comma-separated list of tickets fixed by the PR, if any]
3+
| Bug fix? | yes/no
4+
| New feature? | yes/no
5+
| BC breaks? | yes/no
6+
| Deprecations? | yes/no
7+
| Tests pass? | yes/no
8+
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
99
| License | MIT
10-
| Doc PR | [reference to the documentation PR, if any]
10+
| Doc PR | reference to the documentation PR, if any

‎src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function testDefinitionExampleGetsTransferredToNode()
120120
$tree = $builder->buildTree();
121121
$children = $tree->getChildren();
122122

123-
$this->assertTrue(is_array($tree->getExample()));
123+
$this->assertInternalType('array', $tree->getExample());
124124
$this->assertEquals('example', $children['child']->getExample());
125125
}
126126
}

‎src/Symfony/Component/Finder/Tests/Shell/CommandTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Tests/Shell/CommandTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testExecute()
146146
$cmd->add('--version');
147147
$result = $cmd->execute();
148148

149-
$this->assertTrue(is_array($result));
149+
$this->assertInternalType('array', $result);
150150
$this->assertNotEmpty($result);
151151
$this->assertRegexp('/PHP|HipHop/', $result[0]);
152152
}

‎src/Symfony/Component/Form/Resources/translations/validators.no.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Resources/translations/validators.no.xlf
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</trans-unit>
99
<trans-unit id="29">
1010
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
11-
<target>Den opplastede file var for stor. Vennligst last opp en mindre fil.</target>
11+
<target>Den opplastede filen var for stor. Vennligst last opp en mindre fil.</target>
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid.</source>

‎src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public function testMove()
8181
$movedFile = $file->move($targetDir);
8282
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
8383

84-
$this->assertTrue(file_exists($targetPath));
85-
$this->assertFalse(file_exists($path));
84+
$this->assertFileExists($targetPath);
85+
$this->assertFileNotExists($path);
8686
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
8787

8888
@unlink($targetPath);
@@ -100,8 +100,8 @@ public function testMoveWithNewName()
100100
$file = new File($path);
101101
$movedFile = $file->move($targetDir, 'test.newname.gif');
102102

103-
$this->assertTrue(file_exists($targetPath));
104-
$this->assertFalse(file_exists($path));
103+
$this->assertFileExists($targetPath);
104+
$this->assertFileNotExists($path);
105105
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
106106

107107
@unlink($targetPath);
@@ -135,8 +135,8 @@ public function testMoveWithNonLatinName($filename, $sanitizedFilename)
135135
$movedFile = $file->move($targetDir, $filename);
136136
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
137137

138-
$this->assertTrue(file_exists($targetPath));
139-
$this->assertFalse(file_exists($path));
138+
$this->assertFileExists($targetPath);
139+
$this->assertFileNotExists($path);
140140
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
141141

142142
@unlink($targetPath);

‎src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ public function testMoveLocalFileIsAllowedInTestMode()
164164

165165
$movedFile = $file->move(__DIR__.'/Fixtures/directory');
166166

167-
$this->assertTrue(file_exists($targetPath));
168-
$this->assertFalse(file_exists($path));
167+
$this->assertFileExists($targetPath);
168+
$this->assertFileNotExists($path);
169169
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
170170

171171
@unlink($targetPath);

‎src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testWriteCacheFileCreatesTheFile()
3232
$warmer = new TestCacheWarmer(self::$cacheFile);
3333
$warmer->warmUp(dirname(self::$cacheFile));
3434

35-
$this->assertTrue(file_exists(self::$cacheFile));
35+
$this->assertFileExists(self::$cacheFile);
3636
}
3737

3838
/**

‎src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testReadReturnsArray()
3232
{
3333
$data = $this->reader->read(__DIR__.'/Fixtures/json', 'en');
3434

35-
$this->assertTrue(is_array($data));
35+
$this->assertInternalType('array', $data);
3636
$this->assertSame('Bar', $data['Foo']);
3737
$this->assertFalse(isset($data['ExistsNot']));
3838
}

‎src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testReadReturnsArray()
3232
{
3333
$data = $this->reader->read(__DIR__.'/Fixtures/php', 'en');
3434

35-
$this->assertTrue(is_array($data));
35+
$this->assertInternalType('array', $data);
3636
$this->assertSame('Bar', $data['Foo']);
3737
$this->assertFalse(isset($data['ExistsNot']));
3838
}

‎src/Symfony/Component/Security/Resources/translations/security.no.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Resources/translations/security.no.xlf
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="1">
66
<source>An authentication exception occurred.</source>
7-
<target>En autentiserings feil har skjedd.</target>
7+
<target>En autentiseringsfeil har skjedd.</target>
88
</trans-unit>
99
<trans-unit id="2">
1010
<source>Authentication credentials could not be found.</source>
@@ -24,7 +24,7 @@
2424
</trans-unit>
2525
<trans-unit id="6">
2626
<source>Not privileged to request the resource.</source>
27-
<target>Ingen tilgang til å be om gitt kilde.</target>
27+
<target>Ingen tilgang til å be om gitt ressurs.</target>
2828
</trans-unit>
2929
<trans-unit id="7">
3030
<source>Invalid CSRF token.</source>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.