summaryrefslogtreecommitdiff
path: root/vendor/nesbot
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/nesbot')
-rw-r--r--vendor/nesbot/carbon/contributing.md12
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Carbon.php4
-rw-r--r--vendor/nesbot/carbon/src/Carbon/CarbonImmutable.php4
-rw-r--r--vendor/nesbot/carbon/src/Carbon/CarbonInterface.php4
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Lang/ca.php15
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Lang/fi.php15
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php5
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Lang/zgh.php4
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Traits/Creator.php13
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Traits/Date.php8
10 files changed, 58 insertions, 26 deletions
diff --git a/vendor/nesbot/carbon/contributing.md b/vendor/nesbot/carbon/contributing.md
index 1cc26c5f91..d2bedac5ae 100644
--- a/vendor/nesbot/carbon/contributing.md
+++ b/vendor/nesbot/carbon/contributing.md
@@ -14,6 +14,18 @@ clear as a code chunk with the output you expect from it (for either bug report
## Code Contributions
+### Where to begin
+
+We use the label **good first issue** to tag issues that could be a good fit for new contributors, see if there are such issues now following this link:
+
+https://github.com/briannesbitt/Carbon/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
+
+Else, check the roadmap to see what we plan to do in next releases:
+
+https://github.com/briannesbitt/Carbon/issues/1681
+
+### Develop locally, then submit changes
+
Fork the [GitHub project](https://github.com/briannesbitt/Carbon) and download it locally:
```shell
diff --git a/vendor/nesbot/carbon/src/Carbon/Carbon.php b/vendor/nesbot/carbon/src/Carbon/Carbon.php
index eb03de5357..b950fe9340 100644
--- a/vendor/nesbot/carbon/src/Carbon/Carbon.php
+++ b/vendor/nesbot/carbon/src/Carbon/Carbon.php
@@ -30,8 +30,8 @@ use DateTime;
* @property int $timestamp seconds since the Unix Epoch
* @property string $englishDayOfWeek the day of week in English
* @property string $shortEnglishDayOfWeek the abbreviated day of week in English
- * @property string $englishMonth the day of week in English
- * @property string $shortEnglishMonth the abbreviated day of week in English
+ * @property string $englishMonth the month in English
+ * @property string $shortEnglishMonth the abbreviated month in English
* @property string $localeDayOfWeek the day of week in current locale LC_TIME
* @property string $shortLocaleDayOfWeek the abbreviated day of week in current locale LC_TIME
* @property string $localeMonth the month in current locale LC_TIME
diff --git a/vendor/nesbot/carbon/src/Carbon/CarbonImmutable.php b/vendor/nesbot/carbon/src/Carbon/CarbonImmutable.php
index 6ca85f73c5..93c7a099d8 100644
--- a/vendor/nesbot/carbon/src/Carbon/CarbonImmutable.php
+++ b/vendor/nesbot/carbon/src/Carbon/CarbonImmutable.php
@@ -30,8 +30,8 @@ use DateTimeImmutable;
* @property int $timestamp seconds since the Unix Epoch
* @property string $englishDayOfWeek the day of week in English
* @property string $shortEnglishDayOfWeek the abbreviated day of week in English
- * @property string $englishMonth the day of week in English
- * @property string $shortEnglishMonth the abbreviated day of week in English
+ * @property string $englishMonth the month in English
+ * @property string $shortEnglishMonth the abbreviated month in English
* @property string $localeDayOfWeek the day of week in current locale LC_TIME
* @property string $shortLocaleDayOfWeek the abbreviated day of week in current locale LC_TIME
* @property string $localeMonth the month in current locale LC_TIME
diff --git a/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php b/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php
index aba318edf0..42acb4f66f 100644
--- a/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php
+++ b/vendor/nesbot/carbon/src/Carbon/CarbonInterface.php
@@ -35,8 +35,8 @@ use ReflectionException;
* @property int $timestamp seconds since the Unix Epoch
* @property string $englishDayOfWeek the day of week in English
* @property string $shortEnglishDayOfWeek the abbreviated day of week in English
- * @property string $englishMonth the day of week in English
- * @property string $shortEnglishMonth the abbreviated day of week in English
+ * @property string $englishMonth the month in English
+ * @property string $shortEnglishMonth the abbreviated month in English
* @property string $localeDayOfWeek the day of week in current locale LC_TIME
* @property string $shortLocaleDayOfWeek the abbreviated day of week in current locale LC_TIME
* @property string $localeMonth the month in current locale LC_TIME
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ca.php b/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
index b51b571d09..05545f9d0d 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
@@ -19,29 +19,30 @@
* - Quentí
* - Víctor Díaz
* - Xavi
+ * - qcardona
*/
return [
'year' => ':count any|:count anys',
'a_year' => 'un any|:count anys',
- 'y' => ':count a.',
+ 'y' => ':count any|:count anys',
'month' => ':count mes|:count mesos',
'a_month' => 'un mes|:count mesos',
- 'm' => ':count me.',
+ 'm' => ':count mes|:count mesos',
'week' => ':count setmana|:count setmanes',
'a_week' => 'una setmana|:count setmanes',
- 'w' => ':count st.',
+ 'w' => ':count setmana|:count setmanes',
'day' => ':count dia|:count dies',
'a_day' => 'un dia|:count dies',
- 'd' => ':count d.',
+ 'd' => ':count d',
'hour' => ':count hora|:count hores',
'a_hour' => 'una hora|:count hores',
- 'h' => ':count h.',
+ 'h' => ':count h',
'minute' => ':count minut|:count minuts',
'a_minute' => 'un minut|:count minuts',
- 'min' => ':count mi.',
+ 'min' => ':count min',
'second' => ':count segon|:count segons',
'a_second' => 'uns segons|:count segons',
- 's' => ':count sg.',
+ 's' => ':count s',
'ago' => 'fa :time',
'from_now' => 'd\'aquí :time',
'after' => ':time després',
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/fi.php b/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
index f3da5808d4..26f089fdfc 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
@@ -33,22 +33,23 @@
* - Petri Kivikangas
* - Nizar Jouini
* - Marko Seppae
+ * - Tomi Mynttinen (Pikseli)
*/
return [
'year' => ':count vuosi|:count vuotta',
- 'y' => ':count vuosi|:count vuotta',
+ 'y' => ':count v',
'month' => ':count kuukausi|:count kuukautta',
- 'm' => ':count kuukausi|:count kuukautta',
+ 'm' => ':count kk',
'week' => ':count viikko|:count viikkoa',
- 'w' => ':count viikko|:count viikkoa',
+ 'w' => ':count vk',
'day' => ':count päivä|:count päivää',
- 'd' => ':count päivä|:count päivää',
+ 'd' => ':count pv',
'hour' => ':count tunti|:count tuntia',
- 'h' => ':count tunti|:count tuntia',
+ 'h' => ':count t',
'minute' => ':count minuutti|:count minuuttia',
- 'min' => ':count minuutti|:count minuuttia',
+ 'min' => ':count min',
'second' => ':count sekunti|:count sekuntia',
- 's' => ':count sekunti|:count sekuntia',
+ 's' => ':count s',
'ago' => ':time sitten',
'from_now' => ':time tästä hetkestä',
'after' => ':time sen jälkeen',
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php
index ef3ea6ae46..a50c19190b 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php
@@ -15,8 +15,13 @@
* - Milos Sakovic
*/
return array_replace_recursive(require __DIR__.'/sr.php', [
+ 'month' => ':count mjesec|:count mjeseca|:count mjeseci',
+ 'week' => ':count nedjelja|:count nedjelje|:count nedjelja',
+ 'second' => ':count sekund|:count sekunde|:count sekundi',
'ago' => 'prije :time',
'from_now' => 'za :time',
'after' => ':time nakon',
'before' => ':time prije',
+ 'week_from_now' => ':count nedjelju|:count nedjelje|:count nedjelja',
+ 'week_ago' => ':count nedjelju|:count nedjelje|:count nedjelja',
]);
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/zgh.php b/vendor/nesbot/carbon/src/Carbon/Lang/zgh.php
index 472fd93920..a65ebbde29 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/zgh.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/zgh.php
@@ -15,8 +15,8 @@
*/
return [
'year' => ':count ⵓⵙⴳⴳⵯⴰⵙ|:count ⵉⵙⴳⴳⵓⵙⴰ',
- 'a_year' => 'un an|:count ⵉⵙⴳⴳⵓⵙⴰ',
- 'y' => ':count an|:count ⵉⵙⴳⴳⵓⵙⴰ',
+ 'a_year' => 'ⵓⵙⴳⴳⵯⴰⵙ|:count ⵉⵙⴳⴳⵓⵙⴰ',
+ 'y' => ':count ⵓⵙⴳⴳⵯⴰⵙ|:count ⵉⵙⴳⴳⵓⵙⴰ',
'month' => ':count ⵡⴰⵢⵢⵓⵔ|:count ⴰⵢⵢⵓⵔⵏ',
'a_month' => 'ⵉⴷⵊ ⵡⴰⵢⵢⵓⵔ|:count ⴰⵢⵢⵓⵔⵏ',
'm' => ':count ⴰⵢⵢⵓⵔⵏ',
diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php b/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php
index 610671c6b7..c91b8647d4 100644
--- a/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php
+++ b/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php
@@ -250,6 +250,13 @@ trait Creator
return static::create(1, 1, 1, 0, 0, 0);
}
+ private static function assertBetween($unit, $value, $min, $max)
+ {
+ if (static::isStrictModeEnabled() && ($value < $min || $value > $max)) {
+ throw new InvalidArgumentException("$unit must be between $min and $max, $value given");
+ }
+ }
+
/**
* Create a new Carbon instance from a specific date and time.
*
@@ -305,6 +312,12 @@ trait Creator
$minute = $minute === null ? $getDefault('minute') : $minute;
$second = (float) ($second === null ? $getDefault('second') : $second);
+ self::assertBetween('month', $month, 0, 99);
+ self::assertBetween('day', $day, 0, 99);
+ self::assertBetween('hour', $hour, 0, 99);
+ self::assertBetween('minute', $minute, 0, 99);
+ self::assertBetween('second', $second, 0, 99);
+
$fixYear = null;
if ($year < 0) {
diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Date.php b/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
index 3bb15d408f..a47b9aab9c 100644
--- a/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
+++ b/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
@@ -36,8 +36,8 @@ use ReflectionException;
* @property int $timestamp seconds since the Unix Epoch
* @property string $englishDayOfWeek the day of week in English
* @property string $shortEnglishDayOfWeek the abbreviated day of week in English
- * @property string $englishMonth the day of week in English
- * @property string $shortEnglishMonth the abbreviated day of week in English
+ * @property string $englishMonth the month in English
+ * @property string $shortEnglishMonth the abbreviated month in English
* @property string $localeDayOfWeek the day of week in current locale LC_TIME
* @property string $shortLocaleDayOfWeek the abbreviated day of week in current locale LC_TIME
* @property string $localeMonth the month in current locale LC_TIME
@@ -796,9 +796,9 @@ trait Date
'englishDayOfWeek' => 'l',
// @property string the abbreviated day of week in English
'shortEnglishDayOfWeek' => 'D',
- // @property string the day of week in English
+ // @property string the month in English
'englishMonth' => 'F',
- // @property string the abbreviated day of week in English
+ // @property string the abbreviated month in English
'shortEnglishMonth' => 'M',
// @property string the day of week in current locale LC_TIME
'localeDayOfWeek' => '%A',