wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11696 from nextcloud/refactor/remove-hhvm-leftovers

Browse source 
Remove HHVM leftovers
This commit is contained in:
Morris Jobke 2018-10-09 10:53:59 +02:00 committed by GitHub
commit a4e8b4ea56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
autotest-hhvm.sh
View file

@ -1,3 +0,0 @@
#!/bin/sh -e
HERE=$(dirname "$0")
PHP_EXE=hhvm "$HERE/autotest.sh" "$@"

2
autotest.sh
View file

@ -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

1
build/files-checker.php
View file

@ -42,7 +42,6 @@ $expectedFiles = [
'AUTHORS',
'autotest-checkers.sh',
'autotest-external.sh',
'autotest-hhvm.sh',
'autotest-js.sh',
'autotest.sh',
'bower.json',

2
tests/lib/Files/Storage/Wrapper/QuotaTest.php
View file

@ -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);
}