Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit c099d8675f06 · 2018-08-24T14:41:40.000+02:00
* 4.1:
  [travis] fix composer.lock invalidation for deps=low
  fix typo
diff --git a/.github/rm-invalid-lowest-lock-files.php b/.github/rm-invalid-lowest-lock-files.php
@@ -48,7 +48,6 @@ function getContentHash(array $composerJson)
 
 foreach ($dirs as $dir) {
     if (!file_exists($dir.'/composer.lock') || !$composerLock = @json_decode(file_get_contents($dir.'/composer.lock'), true)) {
-        echo "$dir/composer.lock not found or invalid.\n";
         @unlink($dir.'/composer.lock');
         continue;
     }
@@ -62,7 +61,8 @@ function getContentHash(array $composerJson)
         @unlink($dir.'/composer.lock');
         continue;
     }
-    $composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'], getRelevantContent($composerJson));
+    $composerLock += array('packages' => array(), 'packages-dev' => array());
+    $composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'] + $composerLock['packages-dev'], getRelevantContent($composerJson));
 }
 
 $referencedCommits = array();
diff --git a/src/Symfony/Component/Messenger/Tests/Asynchronous/Transport/Serialization/SerializerConfigurationTest.php b/src/Symfony/Component/Messenger/Tests/Asynchronous/Transport/Serialization/SerializerConfigurationTest.php
@@ -20,7 +20,7 @@
  */
 class SerializerConfigurationTest extends TestCase
 {
-    public function testSerialiazable()
+    public function testSerializable()
     {
         $config = new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('Default', 'Extra')));
 
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/Configuration/ValidationConfigurationTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/Configuration/ValidationConfigurationTest.php
@@ -29,7 +29,7 @@ public function testConfig()
         $this->assertSame($groups, $config->getGroups());
     }
 
-    public function testSerialiazable()
+    public function testSerializable()
     {
         $this->assertTrue(is_subclass_of(ValidationConfiguration::class, \Serializable::class, true));
         $this->assertEquals($config = new ValidationConfiguration(array('Default', 'Extra')), unserialize(serialize($config)));

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ function getContentHash(array $composerJson)`
`48`	`48`
`49`	`49`	`foreach ($dirs as $dir) {`
`50`	`50`	`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";`
`52`	`51`	`@unlink($dir.'/composer.lock');`
`53`	`52`	`continue;`
`54`	`53`	`}`
`@@ -62,7 +61,8 @@ function getContentHash(array $composerJson)`
`62`	`61`	`@unlink($dir.'/composer.lock');`
`63`	`62`	`continue;`
`64`	`63`	`}`
`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));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$referencedCommits = array();`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class SerializerConfigurationTest extends TestCase`
`22`	`22`	`{`
`23`		`- public function testSerialiazable()`
	`23`	`+ public function testSerializable()`
`24`	`24`	`{`
`25`	`25`	`$config = new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('Default', 'Extra')));`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function testConfig()`
`29`	`29`	`$this->assertSame($groups, $config->getGroups());`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function testSerialiazable()`
	`32`	`+ public function testSerializable()`
`33`	`33`	`{`
`34`	`34`	`$this->assertTrue(is_subclass_of(ValidationConfiguration::class, \Serializable::class, true));`
`35`	`35`	`$this->assertEquals($config = new ValidationConfiguration(array('Default', 'Extra')), unserialize(serialize($config)));`