diff --git a/Changelog b/Changelog index 89c0158e7..b03c33231 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-11-27 DariusIII + * Chg: Update laravel/framework to latest version * Chg: Update NameFixer class * Chg: Use $search parameter to create key for cache * Chg: Switch to Cache facade in Predb diff --git a/composer.lock b/composer.lock index 96be8b46b..f18497b28 100644 --- a/composer.lock +++ b/composer.lock @@ -2767,16 +2767,16 @@ }, { "name": "laravel/framework", - "version": "v5.5.21", + "version": "v5.5.22", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6321069a75723d88103526903d3192f0b231544a" + "reference": "2404af887ca8272d721628a99bbc721ac3b692e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6321069a75723d88103526903d3192f0b231544a", - "reference": "6321069a75723d88103526903d3192f0b231544a", + "url": "https://api.github.com/repos/laravel/framework/zipball/2404af887ca8272d721628a99bbc721ac3b692e7", + "reference": "2404af887ca8272d721628a99bbc721ac3b692e7", "shasum": "" }, "require": { @@ -2896,7 +2896,7 @@ "framework", "laravel" ], - "time": "2017-11-14T15:08:13+00:00" + "time": "2017-11-27T15:29:55+00:00" }, { "name": "laravel/tinker", @@ -6193,29 +6193,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.1.1", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2" + "reference": "66465776cfc249844bde6d117abff1d22e06c2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da", "shasum": "" }, "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -6234,7 +6240,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": "2017-08-30T18:51:59+00:00" + "time": "2017-11-27T17:38:31+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -6412,16 +6418,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "1.4.4", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3d478c5f9e8bb02b484a3fdc82693a460d7ee268" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d478c5f9e8bb02b484a3fdc82693a460d7ee268", - "reference": "3d478c5f9e8bb02b484a3fdc82693a460d7ee268", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -6455,7 +6461,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T07:49:00+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template",