Skip to content

Commit

Permalink
Merge pull request #141 from alcaeus/prepare-2.0
Browse files Browse the repository at this point in the history
Drop legacy inflector classes and prepare 2.0 release
  • Loading branch information
alcaeus authored May 6, 2020
2 parents e809ec9 + 1061783 commit 712e2e4
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 3,820 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/vendor/
/composer.lock
/composer.phar
/phpunit.xml
/.phpunit.result.cache
/phpcs.xml
/.phpcs-cache
/phpstan.neon
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ cache:

before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
- travis_retry composer self-update

install:
- rm composer.lock
- travis_retry composer update --prefer-dist

script:
Expand All @@ -27,7 +25,6 @@ jobs:
- stage: Test
env: DEPENDENCIES=low
install:
- rm composer.lock
- travis_retry composer update --prefer-dist --prefer-lowest

- stage: Test
Expand All @@ -50,3 +47,10 @@ jobs:
env: STATIC_ANALYSIS
install: travis_retry composer install --prefer-dist
script: vendor/bin/phpstan analyse

# Todo: re-enable once 2.1.x-dev is available
# - stage: BC checks
# php: 7.4
# env: BC_CHECK
# post_install: wget -O roave-backward-compatibility-check.phar https://github.com/Roave/BackwardCompatibilityCheck/releases/download/4.4.0/roave-backward-compatibility-check.phar
# script: ./roave-backward-compatibility-check.phar --from=v1.3.0
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-strict-rules": "^0.11",
"phpunit/phpunit": "^7.0"
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector",
"Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
}
},
"autoload-dev": {
"psr-4": {
"Doctrine\\Tests\\Common\\Inflector\\": "tests/Doctrine/Tests/Common/Inflector",
"Doctrine\\Tests\\Inflector\\": "tests/Doctrine/Tests/Inflector"
}
},
Expand Down
Loading

0 comments on commit 712e2e4

Please sign in to comment.