diff --git a/.idea/php.xml b/.idea/php.xml index 66602065..f8a701f7 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -125,6 +125,7 @@ + diff --git a/.travis.yml b/.travis.yml index 851191d0..31152520 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: php php: - '7.0' - '7.1' -# - hhvm + - '7.2' services: - mysql diff --git a/composer.json b/composer.json index 415747ef..e43f487b 100755 --- a/composer.json +++ b/composer.json @@ -48,7 +48,8 @@ "nabeel/laravel-installer": "dev-master", "tivie/php-os-detector": "1.1.0", "jackiedo/timezonelist": "^5.0", - "nesbot/carbon": "^1.22" + "nesbot/carbon": "^1.22", + "tremby/laravel-git-version": "^1.1" }, "require-dev": { "phpunit/phpunit": "6.4.0", diff --git a/composer.lock b/composer.lock index 8ee661c0..627c5580 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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" ], - "content-hash": "f2bce1dffa47efbd492ce598ca910d39", + "content-hash": "2f361a73a9d21108cf1e05a2bbfb1626", "packages": [ { "name": "anlutro/l4-settings", @@ -6101,6 +6101,42 @@ ], "time": "2015-02-23T12:40:40+00:00" }, + { + "name": "tremby/laravel-git-version", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/tremby/laravel-git-version.git", + "reference": "8c462c3209f13b4343f38c126a216bbdeabf6598" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tremby/laravel-git-version/zipball/8c462c3209f13b4343f38c126a216bbdeabf6598", + "reference": "8c462c3209f13b4343f38c126a216bbdeabf6598", + "shasum": "" + }, + "require": { + "illuminate/support": ">=4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Tremby\\LaravelGitVersion\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bart Nagel", + "email": "bart@tremby.net" + } + ], + "description": "A helper to get the current git version of the application", + "time": "2017-04-03T23:17:44+00:00" + }, { "name": "vlucas/phpdotenv", "version": "v2.4.0", diff --git a/phpvms.iml b/phpvms.iml index 446ddae4..c7dfee92 100644 --- a/phpvms.iml +++ b/phpvms.iml @@ -94,6 +94,7 @@ + @@ -194,6 +195,7 @@ + @@ -292,6 +294,7 @@ +