Update travis build scripts

Fix a typo

Author: TysonAndre

.phan/config.php

@@ -3,7 +3,7 @@
 use \Phan\Issue;
 
 /**
- * This configuration will be read and overlayed on top of the
+ * This configuration will be read and overlaid on top of the
  * default configuration. Command line arguments will be applied
  * after this file is read.
  *

.travis.yml

@@ -4,12 +4,20 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3.0RC1
+
+# TODO: Clean up 'sudo: required' once https://github.com/travis-ci/travis-ci/issues/9717 is resolved
+dist: xenial
+sudo: required
 
 cache:
   directories:
     - $HOME/.composer/cache
+    - $HOME/.cache/phan-ast/build
 
 before_install:
+  - sudo apt-get update -y
+  - sudo apt-get install -y libzip4
   - ./tests/setup.sh
 
 install:

tests/setup.sh

@@ -1,67 +1,45 @@
 #!/usr/bin/env bash
-# php-ast installation and configuration script, taken from Etsy/Phan
+# php-ast installation and configuration script, taken from https://github.com/phan/phan
+# NOTE: You may want to replace all of this with `pecl install ast` or `pecl install ast-0.1.7`
+# in your own scripts to ensure stable versions are installed instead of development versions.
+set -xeu
+
+if [[ "x$TRAVIS" == "x" ]]; then
+    echo "This should only be run in travis"
+    exit 1
+fi
 
-function build {
-    phpize
-    ./configure
-    make
-}
+# Ensure the build directory exist
+PHP_VERSION_ID=$(php -r "echo PHP_VERSION_ID;")
+PHAN_BUILD_DIR="$HOME/.cache/phan-ast-build"
+EXPECTED_AST_FILE="$PHAN_BUILD_DIR/build/php-ast-$PHP_VERSION_ID.so"
 
-function cleanBuild {
-    make clean
-    build
-}
+[[ -d "$PHAN_BUILD_DIR" ]] || mkdir -p "$PHAN_BUILD_DIR"
 
-function install {
-    make install
-    echo "extension=ast.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-}
+cd "$PHAN_BUILD_DIR"
 
-# Ensure the build directory exists
-[[ -d "build" ]] || mkdir build
+if [[ ! -e "$EXPECTED_AST_FILE" ]]; then
+  echo "No cached extension found. Building..."
+  rm -rf php-ast build
+  mkdir build
 
-# Ensure that the PHP version hasn't changed under us. If it has, we'll have to
-# rebuild the extension.
-if [[ -e "build/phpversion.txt" ]]; then
-  if ! diff -q build/phpversion.txt <(php -r "echo PHP_VERSION_ID;"); then
-    # Something has changed, so nuke the build/ast directory if it exists.
-    echo "New version of PHP detected. Removing build/ast so we can do a fresh build."
-    rm -rf build/ast
-  fi
-fi
+  git clone --depth 1 https://github.com/nikic/php-ast.git php-ast
 
-# Ensure that we have a copy of the ast extension source code.
-if [[ ! -e "build/ast/config.m4" ]]; then
-    # If build/ast exists, but build/ast/config.m4 doesn't, nuke it and start over.
-    [[ ! -d "build/ast" ]] || rm -rf build/ast
-    git clone --depth 1 https://github.com/nikic/php-ast.git build/ast
-fi
+  pushd php-ast
+  # Install the ast extension
+  phpize
+  ./configure
+  make
 
-# Install the ast extension
-pushd ./build/ast
-  # If we don't have ast.so, we have to build it.
-  if [[ ! -e "modules/ast.so" ]]; then
-      echo "No cached extension found. Building..."
-      build
-  else
-      # If there are new commits, we need to rebuild the extension.
-      git fetch origin master
-      newCommits=$(git rev-list HEAD...origin/master --count)
-      if [[ "$newCommits" != "0" ]]; then
-          echo "New commits found upstream. Updating and rebuilding..."
-          git pull origin master
-          cleanBuild
-      else
-          echo "Using cached extension."
-      fi
-  fi
+  cp modules/ast.so "$EXPECTED_AST_FILE"
+  popd
+else
+  echo "Using cached extension."
+fi
 
-  # No matter what, we still have to move the .so into place and enable it.
-  install
-popd
+php -r 'function_exists("ast\parse_code") || exit("Failed to enable php-ast");'
 
-# Note the PHP version for later builds.
-php -r "echo PHP_VERSION_ID;" > build/phpversion.txt
+echo "extension=$EXPECTED_AST_FILE" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 # Disable xdebug, since we aren't currently gathering code coverage data and
 # having xdebug slows down Composer a bit.