Skip to content

Explicitly require php-xml and update vagrant box #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/vendor
.vagrant/
.idea/
ubuntu-*.log
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ I'm happy about every **pull request** or **issue** you find and open to help
making this API **more awesome**.

You can use [Vagrant](https://vagrantup.com) to kick-start your development.
Simply run `vagrant up`, `vagrant ssh` and `cd` into `/vagrant` to start
developing.
Simply run `vagrant up` and `vagrant ssh` to start a PHP VM.

License
=======
Expand Down
11 changes: 6 additions & 5 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
# vi: set ft=ruby :

Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/trusty64"
config.vm.box = "ubuntu/xenial64"

config.vm.provision "shell", inline: <<-SHELL
sudo apt-get update
sudo apt-get install -y php5-cli php5-curl
apt-get -y -qq update
apt-get -y -qq install php-cli php-curl php-xml php-xdebug

sudo curl --silent https://getcomposer.org/installer | php > /dev/null 2>&1
sudo mv composer.phar /usr/local/bin/composer
curl --silent https://getcomposer.org/installer | php > /dev/null 2>&1
mv composer.phar /usr/local/bin/composer
echo "cd /vagrant" >> /home/ubuntu/.bashrc
SHELL
end
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"source": "https://github.com/cmfcmf/OpenWeatherMap-PHP-Api.git"
},
"require": {
"php": ">=5.3.0"
"php": ">=5.3.0",
"ext-xml": "*"
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0.5"
Expand Down
48 changes: 24 additions & 24 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.