Skip to content

Commit

Permalink
Merge pull request #2 from courtney-miles/imprv/1/Php7Compatibility
Browse files Browse the repository at this point in the history
PHP 7 compatibility
  • Loading branch information
courtney-miles authored Jan 15, 2018
2 parents bb3ff20 + 43987a8 commit f96e992
Show file tree
Hide file tree
Showing 5 changed files with 313 additions and 424 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ language: php

php:
- '5.6'
- '7.0'
- '7.1'
- '7.2'

before_script:
- composer self-update
Expand Down
2 changes: 2 additions & 0 deletions Vagrantfile.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Vagrant.configure("2") do |config|
config.vm.network "private_network", ip: "192.168.33.11"
config.vm.hostname = "scotchbox"
config.vm.synced_folder ".", "/var/www", :mount_options => ["dmode=777", "fmode=666"]

config.vm.provision "shell", path: "./vagrant/provision.sh"

# Optional NFS. Make sure to remove other synced_folder line too
#config.vm.synced_folder ".", "/var/www", :nfs => { :mount_options => ["dmode=777","fmode=666"] }
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php" : "~5.6.0"
"php" : "5.6 - 7.2"
},
"require-dev": {
"phpunit/phpunit" : "~5.0",
Expand Down
Loading

0 comments on commit f96e992

Please sign in to comment.