diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-04-26 07:02:12 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-04-26 07:02:12 +0100 |
| commit | 6a2416b2a351803acb53b4d61c3b75e01ef259b6 (patch) | |
| tree | fe185c0377205abb9bd98b211b58a78fb631eba3 /vendor/nesbot | |
| parent | 58654f783848d535923c92c043d49188036d8b08 (diff) | |
| download | webtrees-6a2416b2a351803acb53b4d61c3b75e01ef259b6.tar.gz webtrees-6a2416b2a351803acb53b4d61c3b75e01ef259b6.tar.bz2 webtrees-6a2416b2a351803acb53b4d61c3b75e01ef259b6.zip | |
Update vendor dependencies
Diffstat (limited to 'vendor/nesbot')
| -rw-r--r-- | vendor/nesbot/carbon/composer.json | 4 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/CarbonInterface.php | 11 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Factory.php | 2 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/FactoryImmutable.php | 2 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Lang/ar.php | 2 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Lang/tr.php | 15 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Traits/Difference.php | 4 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Traits/Localization.php | 2 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Traits/Options.php | 12 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Translator.php | 12 |
10 files changed, 51 insertions, 15 deletions
diff --git a/vendor/nesbot/carbon/composer.json b/vendor/nesbot/carbon/composer.json index 1b8920faa7..79454f9e7d 100644 --- a/vendor/nesbot/carbon/composer.json +++ b/vendor/nesbot/carbon/composer.json @@ -28,9 +28,9 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", - "kylekatarnls/multi-tester": "^0.1", + "kylekatarnls/multi-tester": "^1.1", "phpmd/phpmd": "^2.6", - "phpstan/phpstan": "^0.10.8", + "phpstan/phpstan": "^0.11", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, diff --git a/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php b/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php index 958c801cbe..3593b6deb9 100644 --- a/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php +++ b/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php @@ -615,6 +615,13 @@ interface CarbonInterface extends DateTimeInterface, JsonSerializable public function __construct($time = null, $tz = null); /** + * Show truthy properties on var_dump(). + * + * @return array + */ + public function __debugInfo(); + + /** * Get a part of the Carbon object * * @param string $name @@ -1858,6 +1865,8 @@ interface CarbonInterface extends DateTimeInterface, JsonSerializable public static function getFormatsToIsoReplacements(); /** + * Return default humanDiff() options (merged flags as integer). + * * @return int */ public static function getHumanDiffOptions(); @@ -2389,6 +2398,8 @@ interface CarbonInterface extends DateTimeInterface, JsonSerializable public function isYesterday(); /** + * Format in the current language using ISO replacement patterns. + * * @param string $format * @param string|null $originalFormat provide context if a chunk has been passed alone * diff --git a/vendor/nesbot/carbon/src/Carbon/Factory.php b/vendor/nesbot/carbon/src/Carbon/Factory.php index 43e888e794..688dbd8bc8 100644 --- a/vendor/nesbot/carbon/src/Carbon/Factory.php +++ b/vendor/nesbot/carbon/src/Carbon/Factory.php @@ -57,7 +57,7 @@ namespace Carbon; * @method array getDays() Get the days of the week * @method string|null getFallbackLocale() Get the fallback locale. * @method array getFormatsToIsoReplacements() List of replacements from date() format to isoFormat(). - * @method int getHumanDiffOptions() @return int + * @method int getHumanDiffOptions() Return default humanDiff() options (merged flags as integer). * @method array getIsoUnits() Returns list of locale units for ISO formatting. * @method Carbon getLastErrors() {@inheritdoc} * @method string getLocale() Get the current translator locale. diff --git a/vendor/nesbot/carbon/src/Carbon/FactoryImmutable.php b/vendor/nesbot/carbon/src/Carbon/FactoryImmutable.php index d6788d6d46..16d8ef0693 100644 --- a/vendor/nesbot/carbon/src/Carbon/FactoryImmutable.php +++ b/vendor/nesbot/carbon/src/Carbon/FactoryImmutable.php @@ -57,7 +57,7 @@ namespace Carbon; * @method array getDays() Get the days of the week * @method string|null getFallbackLocale() Get the fallback locale. * @method array getFormatsToIsoReplacements() List of replacements from date() format to isoFormat(). - * @method int getHumanDiffOptions() @return int + * @method int getHumanDiffOptions() Return default humanDiff() options (merged flags as integer). * @method array getIsoUnits() Returns list of locale units for ISO formatting. * @method CarbonImmutable getLastErrors() {@inheritdoc} * @method string getLocale() Get the current translator locale. diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ar.php b/vendor/nesbot/carbon/src/Carbon/Lang/ar.php index b5d1e9b10e..df85ab72b9 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/ar.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/ar.php @@ -63,7 +63,7 @@ return [ 'meridiem' => ['ص', 'م'], 'weekdays' => ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'], 'weekdays_short' => ['أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة', 'سبت'], - 'weekdays_min' => ['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س'], + 'weekdays_min' => ['ح', 'اث', 'ثل', 'أر', 'خم', 'ج', 'س'], 'months' => $months, 'months_short' => $months, 'first_day_of_week' => 6, diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/tr.php b/vendor/nesbot/carbon/src/Carbon/Lang/tr.php index ab5c29b9c7..655618acc9 100644 --- a/vendor/nesbot/carbon/src/Carbon/Lang/tr.php +++ b/vendor/nesbot/carbon/src/Carbon/Lang/tr.php @@ -18,29 +18,30 @@ * - JD Isaacks * - Murat Yüksel * - Baran Şengül + * - Selami (selamialtin) */ return [ 'year' => ':count yıl', 'a_year' => '{1}bir yıl|]1,Inf[:count yıl', - 'y' => ':count yıl', + 'y' => ':countyıl', 'month' => ':count ay', 'a_month' => '{1}bir ay|]1,Inf[:count ay', - 'm' => ':count ay', + 'm' => ':countay', 'week' => ':count hafta', 'a_week' => '{1}bir hafta|]1,Inf[:count hafta', - 'w' => ':count hafta', + 'w' => ':counth', 'day' => ':count gün', 'a_day' => '{1}bir gün|]1,Inf[:count gün', - 'd' => ':count gün', + 'd' => ':countg', 'hour' => ':count saat', 'a_hour' => '{1}bir saat|]1,Inf[:count saat', - 'h' => ':count saat', + 'h' => ':countsa', 'minute' => ':count dakika', 'a_minute' => '{1}bir dakika|]1,Inf[:count dakika', - 'min' => ':count dakika', + 'min' => ':countdk', 'second' => ':count saniye', 'a_second' => '{1}birkaç saniye|]1,Inf[:count saniye', - 's' => ':count saniye', + 's' => ':countsn', 'ago' => ':time önce', 'from_now' => ':time sonra', 'after' => ':time sonra', diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Difference.php b/vendor/nesbot/carbon/src/Carbon/Traits/Difference.php index 2df1e64214..21753c8685 100644 --- a/vendor/nesbot/carbon/src/Carbon/Traits/Difference.php +++ b/vendor/nesbot/carbon/src/Carbon/Traits/Difference.php @@ -454,7 +454,7 @@ trait Difference { $hoursDiff = $this->floatDiffInHours($date, $absolute); - return ($hoursDiff < 0 ? -1 : 1) * $this->diffInDays($date) + ($hoursDiff % static::HOURS_PER_DAY) / static::HOURS_PER_DAY; + return ($hoursDiff < 0 ? -1 : 1) * $this->diffInDays($date) + fmod($hoursDiff, static::HOURS_PER_DAY) / static::HOURS_PER_DAY; } /** @@ -584,7 +584,7 @@ trait Difference { $hoursDiff = $this->floatDiffInRealHours($date, $absolute); - return ($hoursDiff < 0 ? -1 : 1) * $this->diffInDays($date) + ($hoursDiff % static::HOURS_PER_DAY) / static::HOURS_PER_DAY; + return ($hoursDiff < 0 ? -1 : 1) * $this->diffInDays($date) + fmod($hoursDiff, static::HOURS_PER_DAY) / static::HOURS_PER_DAY; } /** diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php b/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php index cd5a08dfda..80eddc7c36 100644 --- a/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php +++ b/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php @@ -329,7 +329,7 @@ trait Localization foreach ($fromTranslations as $index => $word) { if (preg_match("/^$word\$/i", $chunk)) { - return $toTranslations[$index]; + return $toTranslations[$index] ?? ''; } } diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Options.php b/vendor/nesbot/carbon/src/Carbon/Traits/Options.php index bef2d1764b..779f2371d6 100644 --- a/vendor/nesbot/carbon/src/Carbon/Traits/Options.php +++ b/vendor/nesbot/carbon/src/Carbon/Traits/Options.php @@ -403,4 +403,16 @@ trait Options return $settings; } + + /** + * Show truthy properties on var_dump(). + * + * @return array + */ + public function __debugInfo() + { + return array_filter(get_object_vars($this), function ($var) { + return $var; + }); + } } diff --git a/vendor/nesbot/carbon/src/Carbon/Translator.php b/vendor/nesbot/carbon/src/Carbon/Translator.php index cf8f7a3bff..a0fd622982 100644 --- a/vendor/nesbot/carbon/src/Carbon/Translator.php +++ b/vendor/nesbot/carbon/src/Carbon/Translator.php @@ -365,4 +365,16 @@ class Translator extends Translation\Translator return false; } + + /** + * Show locale on var_dump(). + * + * @return array + */ + public function __debugInfo() + { + return [ + 'locale' => $this->getLocale(), + ]; + } } |
