Skip to content

Commit 2246bd2

Browse files
authored
Merge pull request #117 from cmfcmf/update-vagrant
Explicitly require php-xml and update vagrant box
2 parents 045e765 + aeb7a12 commit 2246bd2

File tree

5 files changed

+34
-32
lines changed

5 files changed

+34
-32
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/vendor
22
.vagrant/
33
.idea/
4+
ubuntu-*.log

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ I'm happy about every **pull request** or **issue** you find and open to help
6363
making this API **more awesome**.
6464

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

6968
License
7069
=======

Vagrantfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
# vi: set ft=ruby :
33

44
Vagrant.configure(2) do |config|
5-
config.vm.box = "ubuntu/trusty64"
5+
config.vm.box = "ubuntu/xenial64"
66

77
config.vm.provision "shell", inline: <<-SHELL
8-
sudo apt-get update
9-
sudo apt-get install -y php5-cli php5-curl
8+
apt-get -y -qq update
9+
apt-get -y -qq install php-cli php-curl php-xml php-xdebug
1010
11-
sudo curl --silent https://getcomposer.org/installer | php > /dev/null 2>&1
12-
sudo mv composer.phar /usr/local/bin/composer
11+
curl --silent https://getcomposer.org/installer | php > /dev/null 2>&1
12+
mv composer.phar /usr/local/bin/composer
13+
echo "cd /vagrant" >> /home/ubuntu/.bashrc
1314
SHELL
1415
end

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"source": "https://github.com/cmfcmf/OpenWeatherMap-PHP-Api.git"
1818
},
1919
"require": {
20-
"php": ">=5.3.0"
20+
"php": ">=5.3.0",
21+
"ext-xml": "*"
2122
},
2223
"require-dev": {
2324
"phpunit/phpunit": "^4.8 || ^5.0.5"

composer.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)