From a39e34e80f3b49ed4c8180e339c6fa4c83aedab6 Mon Sep 17 00:00:00 2001 From: Jon Baker Date: Tue, 12 May 2020 09:05:56 -0500 Subject: [PATCH 1/3] Fixed conversion of the word "campus" to singular --- lib/Doctrine/Inflector/Rules/English/Inflectible.php | 1 + .../Tests/Inflector/Rules/English/EnglishFunctionalTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/Doctrine/Inflector/Rules/English/Inflectible.php b/lib/Doctrine/Inflector/Rules/English/Inflectible.php index 817fab59..0de97a27 100644 --- 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/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php index e0dfc277..d1047796 100644 --- a/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php +++ b/tests/Doctrine/Tests/Inflector/Rules/English/EnglishFunctionalTest.php @@ -460,6 +460,7 @@ public function dataSingularsUninflectedWhenSingularized() : array ['mafia', 'mafium'], ['fascia', 'fascium'], ['status', 'statu'], + ['campus', 'campu'], ]; } From b99a39c43b6177237b84561c73da625c98a957cd Mon Sep 17 00:00:00 2001 From: Jochen Sengier Date: Thu, 14 May 2020 15:22:10 +0200 Subject: [PATCH 2/3] Fix pluralization of 'work' and 'experience' --- lib/Doctrine/Inflector/Rules/English/Uninflected.php | 2 -- .../Tests/Inflector/Rules/English/EnglishFunctionalTest.php | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/Inflector/Rules/English/Uninflected.php b/lib/Doctrine/Inflector/Rules/English/Uninflected.php index abd4bca9..be37a97b 100644 --- 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 index e0dfc277..f9d75b67 100644 --- 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'], From fbf9699ab41b9e2f7ac3fd0b932a5557bac4f01b Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 25 May 2020 21:47:29 +0200 Subject: [PATCH 3/3] Test against PHP 8 --- .travis.yml | 9 +++++++++ composer.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 731c55cd..52d2141e 100644 --- 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 index aceeb8d4..ab51ba0f 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"} ], "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^7.0",