From 1c7ba8a966c46822a1b55944eac0a7795922fd0b Mon Sep 17 00:00:00 2001 From: Christian Flach Date: Sun, 4 Mar 2018 12:25:12 +0100 Subject: [PATCH 1/3] Update Vagrant box to ubuntu/xenial --- .gitignore | 1 + README.md | 3 +-- Vagrantfile | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a74cc51..3b365ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /vendor .vagrant/ .idea/ +ubuntu-*.log diff --git a/README.md b/README.md index 641625d..1ccdfef 100644 --- a/README.md +++ b/README.md @@ -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 ======= diff --git a/Vagrantfile b/Vagrantfile index 3870e7e..93d3e48 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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 - 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 From 99659c5c63c8fd1601cf6dbaf01cacb7125a0aec Mon Sep 17 00:00:00 2001 From: Christian Flach Date: Sun, 4 Mar 2018 12:26:00 +0100 Subject: [PATCH 2/3] Require ext-xml (has always been implicitly required anyways) --- composer.json | 3 ++- composer.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 83c809c..bc13f6b 100644 --- a/composer.json +++ b/composer.json @@ -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" diff --git a/composer.lock b/composer.lock index 45f16e6..ce611c3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "84070e3c34cd7bfea5d828f7d2f72737", - "content-hash": "6caf321cfbede33fc2d3d7850976c031", + "content-hash": "b5394ae46ecc917cedd6e22e68d409f9", "packages": [], "packages-dev": [ { @@ -60,7 +59,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -114,7 +113,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -159,7 +158,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30 07:12:33" + "time": "2016-09-30T07:12:33+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -206,7 +205,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2016-11-25T06:54:22+00:00" }, { "name": "phpspec/prophecy", @@ -269,7 +268,7 @@ "spy", "stub" ], - "time": "2016-11-21 14:58:47" + "time": "2016-11-21T14:58:47+00:00" }, { "name": "phpunit/php-code-coverage", @@ -331,7 +330,7 @@ "testing", "xunit" ], - "time": "2015-10-06 15:47:00" + "time": "2015-10-06T15:47:00+00:00" }, { "name": "phpunit/php-file-iterator", @@ -378,7 +377,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -419,7 +418,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -463,7 +462,7 @@ "keywords": [ "timer" ], - "time": "2016-05-12 18:03:57" + "time": "2016-05-12T18:03:57+00:00" }, { "name": "phpunit/php-token-stream", @@ -512,7 +511,7 @@ "keywords": [ "tokenizer" ], - "time": "2016-11-15 14:06:22" + "time": "2016-11-15T14:06:22+00:00" }, { "name": "phpunit/phpunit", @@ -584,7 +583,7 @@ "testing", "xunit" ], - "time": "2016-12-09 02:45:31" + "time": "2016-12-09T02:45:31+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -640,7 +639,7 @@ "mock", "xunit" ], - "time": "2015-10-02 06:51:40" + "time": "2015-10-02T06:51:40+00:00" }, { "name": "sebastian/comparator", @@ -704,7 +703,7 @@ "compare", "equality" ], - "time": "2016-11-19 09:18:40" + "time": "2016-11-19T09:18:40+00:00" }, { "name": "sebastian/diff", @@ -756,7 +755,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2015-12-08T07:14:41+00:00" }, { "name": "sebastian/environment", @@ -806,7 +805,7 @@ "environment", "hhvm" ], - "time": "2016-08-18 05:49:44" + "time": "2016-08-18T05:49:44+00:00" }, { "name": "sebastian/exporter", @@ -873,7 +872,7 @@ "export", "exporter" ], - "time": "2016-06-17 09:04:28" + "time": "2016-06-17T09:04:28+00:00" }, { "name": "sebastian/global-state", @@ -924,7 +923,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/recursion-context", @@ -977,7 +976,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-11-11 19:50:13" + "time": "2015-11-11T19:50:13+00:00" }, { "name": "sebastian/version", @@ -1012,7 +1011,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21 13:59:46" + "time": "2015-06-21T13:59:46+00:00" }, { "name": "symfony/yaml", @@ -1067,7 +1066,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-12-10 10:07:06" + "time": "2016-12-10T10:07:06+00:00" }, { "name": "webmozart/assert", @@ -1117,7 +1116,7 @@ "check", "validate" ], - "time": "2016-11-23 20:04:58" + "time": "2016-11-23T20:04:58+00:00" } ], "aliases": [], @@ -1126,7 +1125,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.3.0" + "php": ">=5.3.0", + "ext-xml": "*" }, "platform-dev": [] } From 94dd5e47d461af4f0abb224968f36c1e96dfdf0b Mon Sep 17 00:00:00 2001 From: Christian Flach Date: Sun, 4 Mar 2018 12:35:45 +0100 Subject: [PATCH 3/3] Install xdebug --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 93d3e48..be8ee2f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,7 +6,7 @@ Vagrant.configure(2) do |config| config.vm.provision "shell", inline: <<-SHELL apt-get -y -qq update - apt-get -y -qq install php-cli php-curl php-xml + apt-get -y -qq install php-cli php-curl php-xml php-xdebug curl --silent https://getcomposer.org/installer | php > /dev/null 2>&1 mv composer.phar /usr/local/bin/composer