Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version: 1.1.0 #1183

Merged
merged 22 commits into from
Aug 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 4 additions & 33 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,6 @@ language: php

matrix:
include:
- php: 5.5
dist: trusty
env: COMPOSER_OPTS=""
- php: 5.5
dist: trusty
env: COMPOSER_OPTS="--prefer-lowest"
- php: 5.6
dist: xenial
env: COMPOSER_OPTS=""
- php: 5.6
dist: xenial
env: COMPOSER_OPTS="--prefer-lowest"
- php: 7.0
dist: xenial
env: COMPOSER_OPTS=""
- php: 7.0
dist: xenial
env: COMPOSER_OPTS="--prefer-lowest"
- php: 7.1
dist: bionic
env: COMPOSER_OPTS=""
- php: 7.1
dist: bionic
env: COMPOSER_OPTS="--prefer-lowest"
- php: 7.2
dist: bionic
env: COMPOSER_OPTS=""
Expand All @@ -46,35 +22,30 @@ matrix:
env: COMPOSER_OPTS="--prefer-lowest"
- php: nightly
dist: bionic
env: COMPOSER_OPTS="--ignore-platform-reqs" UPGRADE_PHPSPEC="yes"
env: COMPOSER_OPTS="--ignore-platform-reqs"
- php: nightly
dist: bionic
env: COMPOSER_OPTS="--ignore-platform-reqs --prefer-lowest" UPGRADE_PHPSPEC="yes"
env: COMPOSER_OPTS="--ignore-platform-reqs --prefer-lowest"
allow_failures:
- php: nightly
env: COMPOSER_OPTS="--ignore-platform-reqs" UPGRADE_PHPSPEC="yes"
env: COMPOSER_OPTS="--ignore-platform-reqs"
- php: nightly
env: COMPOSER_OPTS="--ignore-platform-reqs --prefer-lowest" UPGRADE_PHPSPEC="yes"
env: COMPOSER_OPTS="--ignore-platform-reqs --prefer-lowest"

before_install:
- mkdir tests/files

install:
- if [[ "${TRAVIS_PHP_VERSION}" == "5.5" ]]; then composer require phpunit/phpunit:^4.8.36 phpspec/phpspec:^2 --prefer-dist --update-with-dependencies; fi
- travis_retry composer update --prefer-dist $COMPOSER_OPTS

before_script:
- docker run -d --name ftpd_server -p 21:21 -p 30000-30009:30000-30009 -e "PUBLICHOST=localhost" stilliard/pure-ftpd:hardened
- php wait_for_ftp_service.php
- docker exec -it ftpd_server sh -c "(echo test; echo test) | pure-pw useradd bob -f /etc/pure-ftpd/passwd/pureftpd.passwd -m -u ftpuser -d /home/ftpusers/bob"
- wget https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer && chmod +x php-cs-fixer

script:
- if [[ "${UPGRADE_PHPSPEC}" == "yes" ]]; then composer require --dev phpspec/phpspec:^6.1; fi
- vendor/bin/phpunit tests/ftp/*Tests.php
- vendor/bin/phpunit --exclude-group integration --coverage-text --coverage-clover coverage.xml
- vendor/bin/phpspec run
- if [[ "${TRAVIS_PHP_VERSION}" == "7.3" ]]; then ./php-cs-fixer fix --dry-run; fi
- if [[ "${TRAVIS_PHP_VERSION}" == "7.3" ]]; then composer phpstan; fi

after_script:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 1.1.0 - 2020-08-09

## Changes

* Minimum PHP version is now 7.2.5
* MimeType now uses league/mime-type-detection
* Added (internal) League\Flysystem\Util\MimeType::useDetector to change mime-type resolving.

## 1.0.70 - 2020-07-26

### Fixes
Expand Down
14 changes: 6 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
}
],
"require": {
"php": ">=5.5.9",
"ext-fileinfo": "*"
"php": "^7.2.5 || ^8.0",
"ext-fileinfo": "*",
"league/mime-type-detection": "^1.3"
frankdejonge marked this conversation as resolved.
Show resolved Hide resolved
},
"require-dev": {
"phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"phpunit/phpunit": "^5.7.26"
"phpspec/prophecy": "^1.11.1",
"phpunit/phpunit": "^8.5.8"
},
"autoload": {
"psr-4": {
Expand All @@ -36,10 +37,7 @@
"autoload-dev": {
"psr-4": {
"League\\Flysystem\\Stub\\": "stub/"
},
"files": [
"tests/PHPUnitHacks.php"
]
}
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
Expand Down
1 change: 0 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="true"
verbose="true"
>
<testsuites>
Expand Down
225 changes: 0 additions & 225 deletions spec/FilesystemSpec.php

This file was deleted.

Loading