diff --git a/Changelog b/Changelog index 2d5a899b3..6a57a4c25 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-01-28 DariusIII + * Chg: Update nesbot/carbon (2.10.0 => 2.10.1) * Fix: Fix safe backfill * Chg: Make settingValue function silent for undefined index * Fix: Fix check for not empty collections table in Forking class diff --git a/composer.json b/composer.json index ac873a2b3..13047ed5e 100755 --- a/composer.json +++ b/composer.json @@ -121,7 +121,7 @@ "messerli90/igdb": "^1.0", "mhor/php-mediainfo": "^4.1", "monolog/monolog": "^1.22", - "nesbot/carbon": "2.10.0 as 1.35.0", + "nesbot/carbon": "2.10.1 as 1.35.0", "ntimyeboah/laravel-database-trigger": "^1.0", "pear/net_nntp": "^1.5", "php-ffmpeg/php-ffmpeg": "^0.13.0", diff --git a/composer.lock b/composer.lock index 29d0a8b13..6bfb771f1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1f36ace330670dae32bb36330126c385", + "content-hash": "4df6289a36736e87575b1a20493226a5", "packages": [ { "name": "aharen/omdbapi", @@ -3635,16 +3635,16 @@ }, { "name": "nesbot/carbon", - "version": "2.10.0", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "69ff95a9ccdfd5e907678ae844b3fc402110d1a3" + "reference": "39a8ebfffc2a75de9d2ade3f0e12c7e11669f7ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/69ff95a9ccdfd5e907678ae844b3fc402110d1a3", - "reference": "69ff95a9ccdfd5e907678ae844b3fc402110d1a3", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/39a8ebfffc2a75de9d2ade3f0e12c7e11669f7ce", + "reference": "39a8ebfffc2a75de9d2ade3f0e12c7e11669f7ce", "shasum": "" }, "require": { @@ -3653,11 +3653,11 @@ "symfony/translation": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^7.1.5" - }, - "suggest": { - "friendsofphp/php-cs-fixer": "Needed for the `composer phpcs` command. Allow to automatically fix code style.", - "phpstan/phpstan": "Needed for the `composer phpstan` command. Allow to detect potential errors." + "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", + "phpmd/phpmd": "^2.6", + "phpstan/phpstan": "^0.10.8", + "phpunit/phpunit": "^7.1.5", + "squizlabs/php_codesniffer": "^3.4" }, "type": "library", "extra": { @@ -3690,7 +3690,7 @@ "datetime", "time" ], - "time": "2019-01-02T21:35:25+00:00" + "time": "2019-01-14T09:25:45+00:00" }, { "name": "neutron/temporary-filesystem", @@ -12084,7 +12084,7 @@ { "alias": "1.35.0", "alias_normalized": "1.35.0.0", - "version": "2.10.0.0", + "version": "2.10.1.0", "package": "nesbot/carbon" } ],