diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-09 11:53:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 11:53:59 +0300 |
| commit | a4e8b4ea561da64a67e976cbc74ecf6497fcdaab (patch) | |
| tree | 4d936cc224ecaba3cb42b29ef8fb29a9c5feaa97 | |
| parent | 8e1c26b509298c6a7a2d5246f771825e4454d1fd (diff) | |
| parent | 3f2cd13beb8b6f4fc39f1e7d87da4ae675f240b5 (diff) | |
Merge pull request #11696 from nextcloud/refactor/remove-hhvm-leftovers
Remove HHVM leftovers
| -rwxr-xr-x | autotest-hhvm.sh | 3 | ||||
| -rwxr-xr-x | autotest.sh | 2 | ||||
| -rw-r--r-- | build/files-checker.php | 1 | ||||
| -rw-r--r-- | tests/lib/Files/Storage/Wrapper/QuotaTest.php | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/autotest-hhvm.sh b/autotest-hhvm.sh deleted file mode 100755 index 6f3645c3aef..00000000000 --- a/autotest-hhvm.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e -HERE=$(dirname "$0") -PHP_EXE=hhvm "$HERE/autotest.sh" "$@" diff --git a/autotest.sh b/autotest.sh index 8958121a5b8..f0ceca62b40 100755 --- a/autotest.sh +++ b/autotest.sh @@ -22,7 +22,7 @@ BASEDIR=$PWD PRIMARY_STORAGE_CONFIGS="local swift" DBCONFIGS="sqlite mysql mariadb pgsql oci mysqlmb4" -# $PHP_EXE is run through 'which' and as such e.g. 'php' or 'hhvm' is usually +# $PHP_EXE is run through 'which' and as such e.g. 'php' is usually # sufficient. Due to the behaviour of 'which', $PHP_EXE may also be a path # (absolute or not) to an executable, e.g. ./code/projects/php-src/sapi/cli/php. if [ -z "$PHP_EXE" ]; then diff --git a/build/files-checker.php b/build/files-checker.php index 9fa84b58a26..ba9761fe4d1 100644 --- a/build/files-checker.php +++ b/build/files-checker.php @@ -42,7 +42,6 @@ $expectedFiles = [ 'AUTHORS', 'autotest-checkers.sh', 'autotest-external.sh', - 'autotest-hhvm.sh', 'autotest-js.sh', 'autotest.sh', 'bower.json', diff --git a/tests/lib/Files/Storage/Wrapper/QuotaTest.php b/tests/lib/Files/Storage/Wrapper/QuotaTest.php index 546ab69ef6b..adfd60d0532 100644 --- a/tests/lib/Files/Storage/Wrapper/QuotaTest.php +++ b/tests/lib/Files/Storage/Wrapper/QuotaTest.php @@ -179,7 +179,7 @@ class QuotaTest extends \Test\Files\Storage\Storage { $instance = $this->getLimitedStorage(9); $stream = $instance->fopen('files/foo', 'w+'); $meta = stream_get_meta_data($stream); - $expected_type = defined('HHVM_VERSION') ? 'File' : 'user-space'; + $expected_type = 'user-space'; $this->assertEquals($expected_type, $meta['wrapper_type']); fclose($stream); } |