Browse Source

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

Remove HHVM leftovers
Morris Jobke 5 years ago
parent
commit
a4e8b4ea56
4 changed files with 2 additions and 6 deletions
  1. 0 3
      autotest-hhvm.sh
  2. 1 1
      autotest.sh
  3. 0 1
      build/files-checker.php
  4. 1 1
      tests/lib/Files/Storage/Wrapper/QuotaTest.php

+ 0 - 3
autotest-hhvm.sh

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

+ 1 - 1
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

+ 0 - 1
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',

+ 1 - 1
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);
 	}