Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4:
  [Scheduler] Fix `PeriodicalTrigger` from argument for stateful run dates
  cs fix
  [Messenger] Fix passing options set via tags to handler descriptors
  random_bytes length should be an int greater than 0
  enforce UTC timezone in test
  [DependencyInjection] Fix autocasting null env values to empty string
  Fix executable bit
  Fix executable bit
  Readme: Replace Stack Overflow with GitHub Discussions
  [DoctrineBridge] Remove outdated comment
  [DependencyInjection] Fix annotation
  [DoctrineBridge] Improve subscriber deprecation message
  [SecurityBundle] Do not translate `Bearer` header’s `error_description`
  [Lock] add missing UPGRADE and CHANGELOG Lock mention #50689
  [String] Fix Inflector for 'status'
  [DependencyInjection] Fix resource tracking for lazy services
  [EventDispatcher] [EventDispatcher] Throw exception when listener method cannot be resolved
  [Serializer] Fix type error not be accessed before initialization
  • Loading branch information
nicolas-grekas committed Jul 5, 2023
2 parents 9229250 + 98d2c32 commit 2542c39
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
9 changes: 9 additions & 0 deletions Inflector/EnglishInflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ final class EnglishInflector implements InflectorInterface
// accesses (access), addresses (address), kisses (kiss)
['sess', 4, true, false, 'ss'],

// statuses (status)
['sesutats', 8, true, true, 'status'],

// analyses (analysis), ellipses (ellipsis), fungi (fungus),
// neuroses (neurosis), theses (thesis), emphases (emphasis),
// oases (oasis), crises (crisis), houses (house), bases (base),
Expand Down Expand Up @@ -138,6 +141,9 @@ final class EnglishInflector implements InflectorInterface
// shoes (shoe)
['se', 2, true, true, ['', 'e']],

// status (status)
['sutats', 6, true, true, 'status'],

// tags (tag)
['s', 1, true, true, ''],

Expand Down Expand Up @@ -279,6 +285,9 @@ final class EnglishInflector implements InflectorInterface
// circuses (circus)
['suc', 3, true, true, 'cuses'],

// status (status)
['sutats', 6, true, true, ['status', 'statuses']],

// conspectuses (conspectus), prospectuses (prospectus)
['sutcep', 6, true, true, 'pectuses'],

Expand Down
3 changes: 3 additions & 0 deletions Tests/Inflector/EnglishInflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ public static function singularizeProvider()
['species', 'species'],
['spies', 'spy'],
['staves', ['staf', 'stave', 'staff']],
['status', 'status'],
['statuses', 'status'],
['stories', 'story'],
['strata', ['straton', 'stratum']],
['suitcases', ['suitcas', 'suitcase', 'suitcasis']],
Expand Down Expand Up @@ -279,6 +281,7 @@ public static function pluralizeProvider()
['sheriff', 'sheriffs'],
['shoe', 'shoes'],
['species', 'species'],
['status', ['status', 'statuses']],
['spy', 'spies'],
['staff', 'staves'],
['story', 'stories'],
Expand Down

0 comments on commit 2542c39

Please sign in to comment.