diff --git a/Vagrantfile b/Vagrantfile index f53734dc4..25e0fd1f4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,24 +7,29 @@ require 'yaml' VAGRANTFILE_API_VERSION ||= "2" confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__)) -homesteadYamlPath = "Homestead.yaml" -homesteadJsonPath = "Homestead.json" +homesteadYamlPath = File.expand_path("Homestead.yaml", File.dirname(__FILE__)) +homesteadJsonPath = File.expand_path("Homestead.json", File.dirname(__FILE__)) afterScriptPath = "after.sh" aliasesPath = "aliases" require File.expand_path(confDir + '/scripts/homestead.rb') -Vagrant.require_version '>= 1.8.4' +Vagrant.require_version '>= 1.9.0' Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| if File.exist? aliasesPath then - config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases" + config.vm.provision "file", source: aliasesPath, destination: "/tmp/bash_aliases" + config.vm.provision "shell" do |s| + s.inline = "awk '{ sub(\"\r$\", \"\"); print }' /tmp/bash_aliases > /home/vagrant/.bash_aliases" + end end if File.exist? homesteadYamlPath then settings = YAML::load(File.read(homesteadYamlPath)) elsif File.exist? homesteadJsonPath then settings = JSON.parse(File.read(homesteadJsonPath)) + else + abort "Homestead settings file not found in #{confDir}" end Homestead.configure(config, settings) diff --git a/composer.json b/composer.json index eb3c466a1..aa82dad1d 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,14 @@ "predis/predis": "^1.1", "roumen/feed": "~2.10", "roumen/sitemap": "2.4.*", + "watson/active": "^2.0", "zizaco/entrust": "dev-master" }, "require-dev": { "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", "phpunit/phpunit": "~5.0", - "laravel/homestead": "4.0.x-dev" + "laravel/homestead": "^5" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 6f097223b..f8993f541 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": "daf1463dfe4d2ddda2dfe147eda3fc54", - "content-hash": "0f772035731d0c843ca1d4a812e7aae0", + "content-hash": "02d0fce5890100a1ec0a56bb348c804e", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -38,7 +37,7 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24 07:27:01" + "time": "2014-10-24T07:27:01+00:00" }, { "name": "doctrine/annotations", @@ -106,7 +105,7 @@ "docblock", "parser" ], - "time": "2016-12-30 15:59:45" + "time": "2016-12-30T15:59:45+00:00" }, { "name": "doctrine/cache", @@ -176,7 +175,7 @@ "cache", "caching" ], - "time": "2016-10-29 11:16:17" + "time": "2016-10-29T11:16:17+00:00" }, { "name": "doctrine/collections", @@ -243,7 +242,7 @@ "collections", "iterator" ], - "time": "2017-01-03 10:49:41" + "time": "2017-01-03T10:49:41+00:00" }, { "name": "doctrine/common", @@ -316,7 +315,7 @@ "persistence", "spl" ], - "time": "2017-01-13 14:02:13" + "time": "2017-01-13T14:02:13+00:00" }, { "name": "doctrine/dbal", @@ -387,7 +386,7 @@ "persistence", "queryobject" ], - "time": "2017-02-04 21:20:13" + "time": "2017-02-04T21:20:13+00:00" }, { "name": "doctrine/inflector", @@ -454,7 +453,7 @@ "singularize", "string" ], - "time": "2015-11-06 14:35:42" + "time": "2015-11-06T14:35:42+00:00" }, { "name": "doctrine/lexer", @@ -508,7 +507,7 @@ "lexer", "parser" ], - "time": "2014-09-09 13:34:57" + "time": "2014-09-09T13:34:57+00:00" }, { "name": "erusev/parsedown", @@ -550,7 +549,7 @@ "markdown", "parser" ], - "time": "2016-11-02 15:56:58" + "time": "2016-11-02T15:56:58+00:00" }, { "name": "facebook/webdriver", @@ -599,7 +598,7 @@ "selenium", "webdriver" ], - "time": "2017-01-13 15:48:08" + "time": "2017-01-13T15:48:08+00:00" }, { "name": "graham-campbell/markdown", @@ -661,7 +660,7 @@ "laravel", "markdown" ], - "time": "2017-01-01 13:30:44" + "time": "2017-01-01T13:30:44+00:00" }, { "name": "guzzlehttp/psr7", @@ -719,7 +718,7 @@ "stream", "uri" ], - "time": "2016-06-24 23:00:38" + "time": "2016-06-24T23:00:38+00:00" }, { "name": "intervention/image", @@ -781,7 +780,7 @@ "thumbnail", "watermark" ], - "time": "2017-02-04 10:37:19" + "time": "2017-02-04T10:37:19+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -824,7 +823,7 @@ "homepage": "http://www.acci.cz" } ], - "time": "2014-04-08 15:00:19" + "time": "2014-04-08T15:00:19+00:00" }, { "name": "jakub-onderka/php-console-highlighter", @@ -868,7 +867,7 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20 18:58:01" + "time": "2015-04-20T18:58:01+00:00" }, { "name": "jenssegers/rollbar", @@ -920,7 +919,7 @@ "monitoring", "rollbar" ], - "time": "2017-01-25 08:34:12" + "time": "2017-01-25T08:34:12+00:00" }, { "name": "laracasts/flash", @@ -963,7 +962,7 @@ } ], "description": "Easy flash notifications", - "time": "2016-07-11 20:46:02" + "time": "2016-07-11T20:46:02+00:00" }, { "name": "laravel/dusk", @@ -1147,7 +1146,7 @@ "framework", "laravel" ], - "time": "2017-02-03 19:47:35" + "time": "2017-02-03T19:47:35+00:00" }, { "name": "laravel/tinker", @@ -1205,7 +1204,7 @@ "laravel", "psysh" ], - "time": "2016-12-30 18:13:17" + "time": "2016-12-30T18:13:17+00:00" }, { "name": "laravelcollective/html", @@ -1259,7 +1258,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "http://laravelcollective.com", - "time": "2017-01-26 19:27:05" + "time": "2017-01-26T19:27:05+00:00" }, { "name": "league/commonmark", @@ -1328,7 +1327,7 @@ "markdown", "parser" ], - "time": "2016-12-19 00:11:43" + "time": "2016-12-19T00:11:43+00:00" }, { "name": "league/csv", @@ -1385,7 +1384,7 @@ "read", "write" ], - "time": "2015-12-11 09:28:14" + "time": "2015-12-11T09:28:14+00:00" }, { "name": "league/flysystem", @@ -1468,7 +1467,7 @@ "sftp", "storage" ], - "time": "2017-01-30 17:41:17" + "time": "2017-01-30T17:41:17+00:00" }, { "name": "monolog/monolog", @@ -1546,7 +1545,7 @@ "logging", "psr-3" ], - "time": "2016-11-26 00:15:39" + "time": "2016-11-26T00:15:39+00:00" }, { "name": "mtdowling/cron-expression", @@ -1590,7 +1589,7 @@ "cron", "schedule" ], - "time": "2017-01-23 04:29:33" + "time": "2017-01-23T04:29:33+00:00" }, { "name": "nesbot/carbon", @@ -1643,7 +1642,7 @@ "datetime", "time" ], - "time": "2017-01-16 07:55:07" + "time": "2017-01-16T07:55:07+00:00" }, { "name": "nikic/php-parser", @@ -1694,7 +1693,7 @@ "parser", "php" ], - "time": "2017-02-03 21:57:31" + "time": "2017-02-03T21:57:31+00:00" }, { "name": "paragonie/random_compat", @@ -1742,7 +1741,7 @@ "pseudorandom", "random" ], - "time": "2016-11-07 23:38:38" + "time": "2016-11-07T23:38:38+00:00" }, { "name": "predis/predis", @@ -1792,7 +1791,7 @@ "predis", "redis" ], - "time": "2016-06-16 16:22:20" + "time": "2016-06-16T16:22:20+00:00" }, { "name": "psr/http-message", @@ -1842,7 +1841,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -1889,7 +1888,7 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "psy/psysh", @@ -1962,7 +1961,7 @@ "interactive", "shell" ], - "time": "2017-01-15 17:54:13" + "time": "2017-01-15T17:54:13+00:00" }, { "name": "ramsey/uuid", @@ -2044,7 +2043,7 @@ "identifier", "uuid" ], - "time": "2016-11-22 19:21:44" + "time": "2016-11-22T19:21:44+00:00" }, { "name": "rollbar/rollbar", @@ -2094,7 +2093,7 @@ "logging", "monitoring" ], - "time": "2016-07-05 15:50:29" + "time": "2016-07-05T15:50:29+00:00" }, { "name": "roumen/feed", @@ -2145,7 +2144,7 @@ "laravel", "rss" ], - "time": "2016-07-17 13:06:35" + "time": "2016-07-17T13:06:35+00:00" }, { "name": "roumen/sitemap", @@ -2193,7 +2192,7 @@ "generator", "laravel" ], - "time": "2015-10-12 17:24:13" + "time": "2015-10-12T17:24:13+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -2247,7 +2246,7 @@ "mail", "mailer" ], - "time": "2016-12-29 10:02:40" + "time": "2016-12-29T10:02:40+00:00" }, { "name": "symfony/console", @@ -2310,7 +2309,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-02-06 12:04:21" + "time": "2017-02-06T12:04:21+00:00" }, { "name": "symfony/css-selector", @@ -2363,7 +2362,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-01-02 20:32:22" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/debug", @@ -2420,7 +2419,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28 02:37:08" + "time": "2017-01-28T02:37:08+00:00" }, { "name": "symfony/event-dispatcher", @@ -2480,7 +2479,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-01-02 20:32:22" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/finder", @@ -2529,7 +2528,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02 20:32:22" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/http-foundation", @@ -2582,7 +2581,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-02-02 13:47:35" + "time": "2017-02-02T13:47:35+00:00" }, { "name": "symfony/http-kernel", @@ -2664,7 +2663,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-02-06 13:15:19" + "time": "2017-02-06T13:15:19+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -2723,7 +2722,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/process", @@ -2772,7 +2771,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-02-03 12:11:38" + "time": "2017-02-03T12:11:38+00:00" }, { "name": "symfony/routing", @@ -2847,7 +2846,7 @@ "uri", "url" ], - "time": "2017-01-28 02:37:08" + "time": "2017-01-28T02:37:08+00:00" }, { "name": "symfony/translation", @@ -2911,7 +2910,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-01-21 17:06:35" + "time": "2017-01-21T17:06:35+00:00" }, { "name": "symfony/var-dumper", @@ -2974,7 +2973,7 @@ "debug", "dump" ], - "time": "2017-01-24 12:58:58" + "time": "2017-01-24T12:58:58+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3021,7 +3020,7 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2016-09-20 12:50:39" + "time": "2016-09-20T12:50:39+00:00" }, { "name": "vlucas/phpdotenv", @@ -3071,23 +3070,24 @@ "env", "environment" ], - "time": "2016-09-01 10:05:43" + "time": "2016-09-01T10:05:43+00:00" }, { "name": "watson/active", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/dwightwatson/active.git", - "reference": "51f7dc592271d6f06c58a389005e3c504b200f1f" + "reference": "be090ea9c6d18bbb6f76998f44946c7f16ec5906" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/active/zipball/51f7dc592271d6f06c58a389005e3c504b200f1f", - "reference": "51f7dc592271d6f06c58a389005e3c504b200f1f", + "url": "https://api.github.com/repos/dwightwatson/active/zipball/be090ea9c6d18bbb6f76998f44946c7f16ec5906", + "reference": "be090ea9c6d18bbb6f76998f44946c7f16ec5906", "shasum": "" }, "require": { + "illuminate/config": "~5.0", "illuminate/http": "~5.0", "illuminate/routing": "~5.0", "illuminate/support": "~5.0", @@ -3122,7 +3122,7 @@ "laravel", "routing" ], - "time": "2015-11-20 06:01:23" + "time": "2017-05-07T20:27:05+00:00" }, { "name": "zizaco/entrust", @@ -3190,7 +3190,7 @@ "permission", "roles" ], - "time": "2016-12-29 06:24:46" + "time": "2016-12-29T06:24:46+00:00" } ], "packages-dev": [ @@ -3246,7 +3246,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "fzaninotto/faker", @@ -3294,7 +3294,7 @@ "faker", "fixtures" ], - "time": "2016-04-29 12:21:54" + "time": "2016-04-29T12:21:54+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -3339,29 +3339,33 @@ "keywords": [ "test" ], - "time": "2015-05-11 14:41:42" + "time": "2015-05-11T14:41:42+00:00" }, { "name": "laravel/homestead", - "version": "dev-master", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/laravel/homestead.git", - "reference": "133c09dd2872af46efa0324a5c985a8c707efc69" + "reference": "77f1f01f6ec504c7f3adcb220d73c831a8dcc2bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/homestead/zipball/133c09dd2872af46efa0324a5c985a8c707efc69", - "reference": "133c09dd2872af46efa0324a5c985a8c707efc69", + "url": "https://api.github.com/repos/laravel/homestead/zipball/77f1f01f6ec504c7f3adcb220d73c831a8dcc2bb", + "reference": "77f1f01f6ec504c7f3adcb220d73c831a8dcc2bb", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.6 || ^7.0", "symfony/console": "~2.3|~3.0", - "symfony/process": "~2.3|~3.0" + "symfony/process": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" }, "bin": [ - "homestead" + "bin/homestead" ], "type": "library", "extra": { @@ -3385,19 +3389,19 @@ } ], "description": "A virtual machine for web artisans.", - "time": "2017-02-06 03:10:50" + "time": "2017-04-26T15:43:12+00:00" }, { "name": "mockery/mockery", "version": "0.9.7", "source": { "type": "git", - "url": "https://github.com/padraic/mockery.git", + "url": "https://github.com/mockery/mockery.git", "reference": "4de7969f4664da3cef1ccd83866c9f59378c3371" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/padraic/mockery/zipball/4de7969f4664da3cef1ccd83866c9f59378c3371", + "url": "https://api.github.com/repos/mockery/mockery/zipball/4de7969f4664da3cef1ccd83866c9f59378c3371", "reference": "4de7969f4664da3cef1ccd83866c9f59378c3371", "shasum": "" }, @@ -3450,7 +3454,7 @@ "test double", "testing" ], - "time": "2016-12-19 14:50:55" + "time": "2016-12-19T14:50:55+00:00" }, { "name": "myclabs/deep-copy", @@ -3492,7 +3496,7 @@ "object", "object graph" ], - "time": "2017-01-26 22:05:40" + "time": "2017-01-26T22:05:40+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -3546,7 +3550,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -3591,7 +3595,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", @@ -3638,7 +3642,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2016-11-25T06:54:22+00:00" }, { "name": "phpspec/prophecy", @@ -3701,7 +3705,7 @@ "spy", "stub" ], - "time": "2016-11-21 14:58:47" + "time": "2016-11-21T14:58:47+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3764,7 +3768,7 @@ "testing", "xunit" ], - "time": "2017-01-20 15:06:43" + "time": "2017-01-20T15:06:43+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3811,7 +3815,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -3852,7 +3856,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -3896,7 +3900,7 @@ "keywords": [ "timer" ], - "time": "2016-05-12 18:03:57" + "time": "2016-05-12T18:03:57+00:00" }, { "name": "phpunit/php-token-stream", @@ -3945,7 +3949,7 @@ "keywords": [ "tokenizer" ], - "time": "2016-11-15 14:06:22" + "time": "2016-11-15T14:06:22+00:00" }, { "name": "phpunit/phpunit", @@ -4027,7 +4031,7 @@ "testing", "xunit" ], - "time": "2017-02-05 15:31:31" + "time": "2017-02-05T15:31:31+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4086,7 +4090,7 @@ "mock", "xunit" ], - "time": "2016-12-08 20:27:08" + "time": "2016-12-08T20:27:08+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4131,7 +4135,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2016-02-13 06:45:14" + "time": "2016-02-13T06:45:14+00:00" }, { "name": "sebastian/comparator", @@ -4195,7 +4199,7 @@ "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", @@ -4247,7 +4251,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2015-12-08T07:14:41+00:00" }, { "name": "sebastian/environment", @@ -4297,7 +4301,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -4364,7 +4368,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -4415,7 +4419,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -4461,7 +4465,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-11-19 07:35:10" + "time": "2016-11-19T07:35:10+00:00" }, { "name": "sebastian/recursion-context", @@ -4514,7 +4518,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -4556,7 +4560,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -4599,7 +4603,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/yaml", @@ -4654,7 +4658,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-01-21 17:06:35" + "time": "2017-01-21T17:06:35+00:00" }, { "name": "webmozart/assert", @@ -4704,15 +4708,14 @@ "check", "validate" ], - "time": "2016-11-23 20:04:58" + "time": "2016-11-23T20:04:58+00:00" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { "laravel/dusk": 20, - "zizaco/entrust": 20, - "laravel/homestead": 20 + "zizaco/entrust": 20 }, "prefer-stable": false, "prefer-lowest": false,