Skip to content
This repository has been archived by the owner on Apr 1, 2024. It is now read-only.

Commit

Permalink
Update minimum version, remove namespace-related options
Browse files Browse the repository at this point in the history
Default has flipped, these are no longer needed, and we want to test
that everything works without them.

Also removed the `|| true` from the composer install line - this was
only needed as the autoloader failed due to missing options, which are
no longer needed.
  • Loading branch information
fredemmott committed Aug 31, 2020
1 parent e29d4e2 commit 3156276
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .hhconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ user_attributes=
disable_static_local_variables = true
disable_primitive_refinement=true
disallow_array_literal = true
disable_xhp_element_mangling=true
enable_xhp_class_modifier=true
disable_xhp_children_declarations=true
check_xhp_attribute = true
allowed_decl_fixme_codes=2049,2053,4045,4047
Expand Down
7 changes: 3 additions & 4 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ php --version
cd $(mktemp -d)
curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
)
composer install || true
composer install

hhvm -dhhvm.hack.lang.enable_xhp_class_modifier=true -dhhvm.hack.lang.disable_xhp_element_mangling=true vendor/bin/hh-autoload
hh_client
hhvm -dhhvm.hack.lang.enable_xhp_class_modifier=true -dhhvm.hack.lang.disable_xhp_element_mangling=true vendor/bin/hacktest tests/
hhvm -dhhvm.hack.lang.enable_xhp_class_modifier=true -dhhvm.hack.lang.disable_xhp_element_mangling=true vendor/bin/hhast-lint
hhvm vendor/bin/hacktest tests/
hhvm vendor/bin/hhast-lint
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: required
language: generic
services: docker
env:
- HHVM_VERSION=4.46-latest
- HHVM_VERSION=4.73-latest
- HHVM_VERSION=latest
- HHVM_VERSION=nightly
install:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"homepage": "https://github.com/facebook/xhp-lib",
"license": ["MIT"],
"require": {
"hhvm": "^4.46",
"hhvm": "^4.73",
"hhvm/type-assert": "^3.0|^4.0"
},
"require-dev": {
Expand Down

0 comments on commit 3156276

Please sign in to comment.