Merge branch '1.4.x' into 2.0.x

* 1.4.x: Test against PHP 8 Fix pluralization of 'work' and 'experience' Fixed conversion of the word "campus" to singular
doctrine · May 25, 2020 · 3fc1712 · 3fc1712
2 parents 18b9957 + 889b42b
commit 3fc1712
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,9 @@ script:
   - ./vendor/bin/phpunit
 
 jobs:
+  allow_failures:
+    - php: nightly
+
   include:
     - stage: Test
       env: DEPENDENCIES=low
@@ -38,6 +41,12 @@ jobs:
         - wget https://scrutinizer-ci.com/ocular.phar
         - php ocular.phar code-coverage:upload --format=php-clover clover.xml
 
+    - stage: Test
+      php: nightly
+      before_install:
+        - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
+        - composer config platform.php 7.4.99
+
     - stage: Code Quality
       env: CODING_STANDARDS
       install: travis_retry composer install --prefer-dist

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         {"name": "Johannes Schmitt", "email": "[email protected]"}
     ],
     "require": {
-        "php": "^7.2"
+        "php": "^7.2 || ^8.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^7.0",

diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/lib/Doctrine/Inflector/Rules/English/Inflectible.php
@@ -18,6 +18,7 @@ public static function getSingular() : iterable
     {
         yield new Transformation(new Pattern('(s)tatuses$'), '\1\2tatus');
         yield new Transformation(new Pattern('(s)tatus$'), '\1\2tatus');
+        yield new Transformation(new Pattern('(c)ampus$'), '\1\2ampus');
         yield new Transformation(new Pattern('^(.*)(menu)s$'), '\1\2');
         yield new Transformation(new Pattern('(quiz)zes$'), '\\1');
         yield new Transformation(new Pattern('(matr)ices$'), '\1ix');

diff --git a/lib/Doctrine/Inflector/Rules/English/Uninflected.php b/lib/Doctrine/Inflector/Rules/English/Uninflected.php
@@ -87,7 +87,6 @@ private static function getDefault() : iterable
         yield new Pattern('emoji');
         yield new Pattern('equipment');
         yield new Pattern('evidence');
-        yield new Pattern('experience');
         yield new Pattern('faroese');
         yield new Pattern('feedback');
         yield new Pattern('fish');
@@ -189,7 +188,6 @@ private static function getDefault() : iterable
         yield new Pattern('wildebeest');
         yield new Pattern('wood');
         yield new Pattern('wool');
-        yield new Pattern('work');
         yield new Pattern('yengeese');
     }
 }
diff --git a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php
@@ -133,8 +133,7 @@ public function dataSampleWords() : array
             ['equipment', 'equipment'],
             ['equipment', 'equipment'],
             ['evidence', 'evidence'],
-            ['experience', 'experience'],
-            ['experience', 'experience'],
+            ['experience', 'experiences'],
             ['family', 'families'],
             ['faroese', 'faroese'],
             ['fax', 'faxes'],
@@ -431,7 +430,7 @@ public function dataSampleWords() : array
             ['woman', 'women'],
             ['wood', 'wood'],
             ['wool', 'wool'],
-            ['work', 'work'],
+            ['work', 'works'],
             ['yengeese', 'yengeese'],
             ['zombie', 'zombies'],
             ['|ice', '|ices'],
@@ -460,6 +459,7 @@ public function dataSingularsUninflectedWhenSingularized() : array
             ['mafia', 'mafium'],
             ['fascia', 'fascium'],
             ['status', 'statu'],
+            ['campus', 'campu'],
         ];
     }