diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..6f98deb --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,10 @@ +filter: + excluded_paths: + - 'tests/*' + +imports: + - php + +tools: + external_code_coverage: true + diff --git a/.travis.yml b/.travis.yml index 4c530be..0830730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ php: - 5.5 - 5.6 - 7.0 - - hhvm env: global: @@ -12,10 +11,15 @@ env: - APP_NAME=files_external_ftp - DB=sqlite matrix: - - FTPD=pure-ftpd +# - FTPD=pure-ftpd - FTPD=proftpd - FTPD=vsftpd +branches: + only: + - master + - /^stable\d+(\.\d+)?$/ + before_install: - sudo apt-get update -qq - sudo apt-get install -yqq bc $FTPD @@ -29,6 +33,7 @@ before_install: - wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB - cd ../core + - php occ app:enable files_external - php occ app:enable $APP_NAME script: @@ -46,6 +51,4 @@ script: - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi" matrix: - allow_failures: - - php: hhvm fast_finish: true diff --git a/README.md b/README.md index 2b7be32..2110e2a 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,8 @@ # files_external_ftp Flysystem based ftp backend for ownCloud -Requires ownCloud 8.2 pre-alpha or later +Requires ownCloud 9.2 or later - - -[![Build Status](https://travis-ci.org/icewind1991/files_external_ftp.svg?branch=master)](https://travis-ci.org/icewind1991/files_external_ftp) - -[![Code Coverage](https://scrutinizer-ci.com/g/icewind1991/files_external_ftp/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/icewind1991/files_external_ftp/?branch=master) - -[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/icewind1991/files_external_ftp/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/icewind1991/files_external_ftp/?branch=master) +[![Build Status](https://travis-ci.org/owncloud/files_external_ftp.svg?branch=master)](https://travis-ci.org/owncloud/files_external_ftp) +[![Code Coverage](https://scrutinizer-ci.com/g/owncloud/files_external_ftp/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/owncloud/files_external_ftp/?branch=master) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/owncloud/files_external_ftp/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/owncloud/files_external_ftp/?branch=master) diff --git a/appinfo/info.xml b/appinfo/info.xml index 2eb50aa..c311255 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,11 +5,12 @@ FTP backend for files_external AGPL Robin Appelman + 0.1.0 - + diff --git a/appinfo/version b/appinfo/version deleted file mode 100644 index 6e8bf73..0000000 --- a/appinfo/version +++ /dev/null @@ -1 +0,0 @@ -0.1.0 diff --git a/lib/ftp.php b/lib/ftp.php index 4b65cc3..619fc24 100644 --- a/lib/ftp.php +++ b/lib/ftp.php @@ -20,6 +20,7 @@ */ namespace OCA\Files_External_FTP; +use League\Flysystem\FileNotFoundException; use OC\Files\Storage\Flysystem; use OC\Files\Storage\PolyFill\CopyDirectory; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 107769d..6d0640a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -4,7 +4,8 @@ require_once __DIR__ . '/../../../lib/base.php'; -\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests'); +\OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true); +\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/', true); if (!class_exists('PHPUnit_Framework_TestCase')) { require_once('PHPUnit/Autoload.php');