Merge branch '5.4' into 6.2

* 5.4:
  re-allow phpdocumentor/type-resolver 1.7
  skip test using attributes on PHP 7
  [HttpClient] Encode and decode curly brackets {}
  fix: GetSetMethodNormalizer::supportss should not check ignored methods
  Stop stopwatch events in case of exception
  add translations for the filename max length validator option
  [Validator] Update BIC validator IBAN mappings
  [String] Correct inflection of 'codes' and 'names'

Author: nicolas-grekas

Inflector/EnglishInflector.php

@@ -55,6 +55,9 @@ final class EnglishInflector implements InflectorInterface
         // indices (index), appendices (appendix), prices (price)
         ['seci', 4, false, true, ['ex', 'ix', 'ice']],
 
+        // codes (code)
+        ['sedoc', 5, false, true, 'code'],
+
         // selfies (selfie)
         ['seifles', 7, true, true, 'selfie'],
 
@@ -64,6 +67,9 @@ final class EnglishInflector implements InflectorInterface
         // movies (movie)
         ['seivom', 6, true, true, 'movie'],
 
+        // names (name)
+        ['seman', 5, true, false, 'name'],
+
         // conspectuses (conspectus), prospectuses (prospectus)
         ['sesutcep', 8, true, true, 'pectus'],
 

Tests/Inflector/EnglishInflectorTest.php

@@ -54,6 +54,7 @@ public static function singularizeProvider()
             ['children', 'child'],
             ['circuses', ['circus', 'circuse', 'circusis']],
             ['cliffs', 'cliff'],
+            ['codes', 'code'],
             ['committee', 'committee'],
             ['crises', ['cris', 'crise', 'crisis']],
             ['criteria', ['criterion', 'criterium']],
@@ -108,6 +109,7 @@ public static function singularizeProvider()
             ['mice', 'mouse'],
             ['moves', 'move'],
             ['movies', 'movie'],
+            ['names', 'name'],
             ['nebulae', 'nebula'],
             ['neuroses', ['neuros', 'neurose', 'neurosis']],
             ['news', 'news'],