diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh index 7eaf767e..c6fcf9b6 100755 --- a/.travis/deploy_script.sh +++ b/.travis/deploy_script.sh @@ -18,7 +18,7 @@ if [ "$TRAVIS" = "true" ]; then find ./vendor -type d -name ".git" | xargs rm -rf rm -rf .idea phpvms.iml .travis .dpl rm -rf .phpstorm.meta.php _ide_helper.php - php artisan version:show > VERSION + php artisan version:show --format compact --suppress-app-name > VERSION mv .env.dev.example .env echo "creating tarball" diff --git a/composer.json b/composer.json index c87a0b05..f2ff2689 100755 --- a/composer.json +++ b/composer.json @@ -25,11 +25,11 @@ "doctrine/instantiator": "v1.0.5", "prettus/l5-repository": "2.6.28", "spatie/laravel-pjax": "1.3.1", - "symfony/inflector": "v3.4.0", - "symfony/event-dispatcher": "v3.4.0", - "symfony/yaml": "v3.4.0", - "symfony/css-selector": "v3.4.0", - "symfony/dom-crawler": "v3.4.0", + "symfony/inflector": "v3.4.2", + "symfony/event-dispatcher": "v3.4.2", + "symfony/yaml": "v3.4.2", + "symfony/css-selector": "v3.4.2", + "symfony/dom-crawler": "v3.4.2", "league/geotools": "0.7.0", "toin0u/geotools-laravel": "^1.0", "webpatser/laravel-uuid": "3.0.1", @@ -45,7 +45,7 @@ "jackiedo/timezonelist": "5.x", "tivie/php-os-detector": "1.1.0", "santigarcor/laratrust": "5.0.3", - "pragmarx/version": "0.2.1", + "pragmarx/version": "0.2.2", "nabeel/vacentral": "dev-master" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 436333c3..a7ad466c 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": "b571a69e74e128cd9d50dd73cf6c8358", + "content-hash": "d33b35265c5ca3bb63651b34c9f62223", "packages": [ { "name": "composer/semver", @@ -2138,12 +2138,12 @@ "source": { "type": "git", "url": "https://github.com/nabeelio/vacentral-library.git", - "reference": "79093ce128b791755a787a420d344b8adb05e8a4" + "reference": "4b0eb937aa9e9ca1d57fa8e31f2158f8ed9f5ab3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nabeelio/vacentral-library/zipball/79093ce128b791755a787a420d344b8adb05e8a4", - "reference": "79093ce128b791755a787a420d344b8adb05e8a4", + "url": "https://api.github.com/repos/nabeelio/vacentral-library/zipball/4b0eb937aa9e9ca1d57fa8e31f2158f8ed9f5ab3", + "reference": "4b0eb937aa9e9ca1d57fa8e31f2158f8ed9f5ab3", "shasum": "" }, "require": { @@ -2154,7 +2154,8 @@ "require-dev": { "doctrine/instantiator": "v1.0.5", "phpunit/phpunit": "5.7.25", - "phpunit/phpunit-mock-objects": "3.4.4" + "phpunit/phpunit-mock-objects": "3.4.4", + "scriptfusion/phpunit-immediate-exception-printer": "1.3.0" }, "type": "library", "autoload": { @@ -2166,7 +2167,7 @@ "license": [ "MIT" ], - "time": "2017-12-07T20:57:37+00:00" + "time": "2017-12-08T04:00:06+00:00" }, { "name": "nesbot/carbon", @@ -3263,16 +3264,16 @@ }, { "name": "pragmarx/version", - "version": "v0.2.1", + "version": "v0.2.2", "source": { "type": "git", "url": "https://github.com/antonioribeiro/version.git", - "reference": "fd2eec365012f2f6e00a20f39e23e8efb8913ae9" + "reference": "b7180322322e9fb7e57b2541989c12d37a75a94c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/version/zipball/fd2eec365012f2f6e00a20f39e23e8efb8913ae9", - "reference": "fd2eec365012f2f6e00a20f39e23e8efb8913ae9", + "url": "https://api.github.com/repos/antonioribeiro/version/zipball/b7180322322e9fb7e57b2541989c12d37a75a94c", + "reference": "b7180322322e9fb7e57b2541989c12d37a75a94c", "shasum": "" }, "require": { @@ -3320,7 +3321,7 @@ "version", "versioning" ], - "time": "2017-12-02T23:56:29+00:00" + "time": "2017-12-16T05:21:10+00:00" }, { "name": "pragmarx/yaml", @@ -4807,16 +4808,16 @@ }, { "name": "symfony/console", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7" + "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2cdef78de8f54f68ff16a857e710e7302b47d4c7", - "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7", + "url": "https://api.github.com/repos/symfony/console/zipball/9f21adfb92a9315b73ae2ed43138988ee4913d4e", + "reference": "9f21adfb92a9315b73ae2ed43138988ee4913d4e", "shasum": "" }, "require": { @@ -4872,20 +4873,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-12-02T18:20:11+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.0", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908" + "reference": "eac760b414cf1f64362c3dd047b989e4db121332" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/7134b93e90ea7e7881fcb2da006d21b4c5f31908", - "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/eac760b414cf1f64362c3dd047b989e4db121332", + "reference": "eac760b414cf1f64362c3dd047b989e4db121332", "shasum": "" }, "require": { @@ -4925,20 +4926,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-11-05T16:10:10+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/debug", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd" + "reference": "543deab3ffff94402440b326fc94153bae2dfa7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fb2001e5d85f95d8b6ab94ae3be5d2672df128fd", - "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd", + "url": "https://api.github.com/repos/symfony/debug/zipball/543deab3ffff94402440b326fc94153bae2dfa7a", + "reference": "543deab3ffff94402440b326fc94153bae2dfa7a", "shasum": "" }, "require": { @@ -4981,20 +4982,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-11-21T09:01:46+00:00" + "time": "2017-12-12T08:27:14+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.0", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "7bf68716e400997a291ad42c9f9fe7972e6656d2" + "reference": "dc847845c66fa68ad4522ed27e62b9b9dd12ab3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7bf68716e400997a291ad42c9f9fe7972e6656d2", - "reference": "7bf68716e400997a291ad42c9f9fe7972e6656d2", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dc847845c66fa68ad4522ed27e62b9b9dd12ab3b", + "reference": "dc847845c66fa68ad4522ed27e62b9b9dd12ab3b", "shasum": "" }, "require": { @@ -5037,20 +5038,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-11-05T16:10:10+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.0", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4" + "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca20b8f9ef149f40ff656d52965f240d85f7a8e4", - "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b869cbf8a15ca6261689de2c28a7d7f2d0706835", + "reference": "b869cbf8a15ca6261689de2c28a7d7f2d0706835", "shasum": "" }, "require": { @@ -5100,11 +5101,11 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-11-09T14:14:31+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/finder", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -5153,16 +5154,16 @@ }, { "name": "symfony/http-foundation", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d9625c8abb907e0ca2d7506afd7a719a572c766f" + "reference": "59bf131b5460227a2f583a7dbe6b179f98f9e0a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d9625c8abb907e0ca2d7506afd7a719a572c766f", - "reference": "d9625c8abb907e0ca2d7506afd7a719a572c766f", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/59bf131b5460227a2f583a7dbe6b179f98f9e0a5", + "reference": "59bf131b5460227a2f583a7dbe6b179f98f9e0a5", "shasum": "" }, "require": { @@ -5203,20 +5204,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-11-30T14:56:21+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "b101bb29071163563d4c8b537b35845eaf909235" + "reference": "48325096bbda77b983e642d21a4dd9bdde3ab73e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b101bb29071163563d4c8b537b35845eaf909235", - "reference": "b101bb29071163563d4c8b537b35845eaf909235", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/48325096bbda77b983e642d21a4dd9bdde3ab73e", + "reference": "48325096bbda77b983e642d21a4dd9bdde3ab73e", "shasum": "" }, "require": { @@ -5291,11 +5292,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-12-04T23:05:00+00:00" + "time": "2017-12-15T02:05:18+00:00" }, { "name": "symfony/inflector", - "version": "v3.4.0", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", @@ -5670,16 +5671,16 @@ }, { "name": "symfony/process", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea" + "reference": "bb3ef65d493a6d57297cad6c560ee04e2a8f5098" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea", - "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea", + "url": "https://api.github.com/repos/symfony/process/zipball/bb3ef65d493a6d57297cad6c560ee04e2a8f5098", + "reference": "bb3ef65d493a6d57297cad6c560ee04e2a8f5098", "shasum": "" }, "require": { @@ -5715,11 +5716,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-11-22T12:18:49+00:00" + "time": "2017-12-14T19:40:10+00:00" }, { "name": "symfony/property-access", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", @@ -5787,16 +5788,16 @@ }, { "name": "symfony/routing", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d768aa5b25d98188bae3fe4ce3eb2924c97aafac" + "reference": "5f248dfac5e4660c74982eb3dadc71cf58595570" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d768aa5b25d98188bae3fe4ce3eb2924c97aafac", - "reference": "d768aa5b25d98188bae3fe4ce3eb2924c97aafac", + "url": "https://api.github.com/repos/symfony/routing/zipball/5f248dfac5e4660c74982eb3dadc71cf58595570", + "reference": "5f248dfac5e4660c74982eb3dadc71cf58595570", "shasum": "" }, "require": { @@ -5861,20 +5862,20 @@ "uri", "url" ], - "time": "2017-11-24T14:13:49+00:00" + "time": "2017-12-14T22:37:31+00:00" }, { "name": "symfony/serializer", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "ac3e016189682e7d388e00d5c5cd0e84f1c9e55c" + "reference": "64506ebefd1ee31cdc9331e72d586c1338786183" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/ac3e016189682e7d388e00d5c5cd0e84f1c9e55c", - "reference": "ac3e016189682e7d388e00d5c5cd0e84f1c9e55c", + "url": "https://api.github.com/repos/symfony/serializer/zipball/64506ebefd1ee31cdc9331e72d586c1338786183", + "reference": "64506ebefd1ee31cdc9331e72d586c1338786183", "shasum": "" }, "require": { @@ -5939,20 +5940,20 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2017-11-29T13:28:14+00:00" + "time": "2017-12-08T15:24:53+00:00" }, { "name": "symfony/translation", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa" + "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa", - "reference": "e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa", + "url": "https://api.github.com/repos/symfony/translation/zipball/4c5d5582baf2829751a5207659329c1f52eedeb6", + "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6", "shasum": "" }, "require": { @@ -6007,20 +6008,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-11-27T14:23:00+00:00" + "time": "2017-12-12T08:27:14+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ec650a975a8e04e0c114d35eab732981243db3a2" + "reference": "757074cf71b952ce9e75b557538948811c2bf006" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ec650a975a8e04e0c114d35eab732981243db3a2", - "reference": "ec650a975a8e04e0c114d35eab732981243db3a2", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/757074cf71b952ce9e75b557538948811c2bf006", + "reference": "757074cf71b952ce9e75b557538948811c2bf006", "shasum": "" }, "require": { @@ -6076,20 +6077,20 @@ "debug", "dump" ], - "time": "2017-11-30T14:59:23+00:00" + "time": "2017-12-11T22:06:16+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.0", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "b3d0c9c11be3831b84825967dc6b52b5a7b84e04" + "reference": "afe0cd38486505c9703707707d91450cfc1bd536" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/b3d0c9c11be3831b84825967dc6b52b5a7b84e04", - "reference": "b3d0c9c11be3831b84825967dc6b52b5a7b84e04", + "url": "https://api.github.com/repos/symfony/yaml/zipball/afe0cd38486505c9703707707d91450cfc1bd536", + "reference": "afe0cd38486505c9703707707d91450cfc1bd536", "shasum": "" }, "require": { @@ -6134,7 +6135,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-11-29T13:28:14+00:00" + "time": "2017-12-11T20:38:23+00:00" }, { "name": "theseer/tokenizer", @@ -7238,7 +7239,7 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", diff --git a/config/version.yml b/config/version.yml index e83a8731..0519ab87 100644 --- a/config/version.yml +++ b/config/version.yml @@ -9,9 +9,11 @@ cache: key: pragmarx-version time: 60 # minutes = 1 year build: - #mode: number # "number", "git-local" or "git-remote" - mode: git-local # "number", "git-local" or "git-remote" - length: 6 + mode: number # "number", "git-local" or "git-remote" + number: 451e9e + git_absorb: git-local + #mode: git-local + #length: 6 git: #git-local: "git rev-parse --verify HEAD" git-local: "git rev-parse --quiet --verify HEAD 2>/dev/null || echo VERSION"