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 c099d86

Browse filesBrowse files
Merge branch '4.1'
* 4.1: [travis] fix composer.lock invalidation for deps=low fix typo
2 parents e675597 + f4c8311 commit c099d86
Copy full SHA for c099d86

File tree

3 files changed

+4
-4
lines changed
Filter options

3 files changed

+4
-4
lines changed

‎.github/rm-invalid-lowest-lock-files.php

Copy file name to clipboardExpand all lines: .github/rm-invalid-lowest-lock-files.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ function getContentHash(array $composerJson)
4848

4949
foreach ($dirs as $dir) {
5050
if (!file_exists($dir.'/composer.lock') || !$composerLock = @json_decode(file_get_contents($dir.'/composer.lock'), true)) {
51-
echo "$dir/composer.lock not found or invalid.\n";
5251
@unlink($dir.'/composer.lock');
5352
continue;
5453
}
@@ -62,7 +61,8 @@ function getContentHash(array $composerJson)
6261
@unlink($dir.'/composer.lock');
6362
continue;
6463
}
65-
$composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'], getRelevantContent($composerJson));
64+
$composerLock += array('packages' => array(), 'packages-dev' => array());
65+
$composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'] + $composerLock['packages-dev'], getRelevantContent($composerJson));
6666
}
6767

6868
$referencedCommits = array();

‎src/Symfony/Component/Messenger/Tests/Asynchronous/Transport/Serialization/SerializerConfigurationTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Asynchronous/Transport/Serialization/SerializerConfigurationTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
class SerializerConfigurationTest extends TestCase
2222
{
23-
public function testSerialiazable()
23+
public function testSerializable()
2424
{
2525
$config = new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('Default', 'Extra')));
2626

‎src/Symfony/Component/Messenger/Tests/Middleware/Configuration/ValidationConfigurationTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Middleware/Configuration/ValidationConfigurationTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function testConfig()
2929
$this->assertSame($groups, $config->getGroups());
3030
}
3131

32-
public function testSerialiazable()
32+
public function testSerializable()
3333
{
3434
$this->assertTrue(is_subclass_of(ValidationConfiguration::class, \Serializable::class, true));
3535
$this->assertEquals($config = new ValidationConfiguration(array('Default', 'Extra')), unserialize(serialize($config)));

0 commit comments

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