Simple Calendar – Google Calendar Plugin

Version Description

November 12, 2015 =
Fix: Fixed bug where calendar days were off by one day.

Release Info

Developer	pderksen
Plugin	Simple Calendar – Google Calendar Plugin
Version	3.0.2
Comparing to
See all releases

Code changes from version 3.0.1 to 3.0.2

Files changed (87) hide show

google-calendar-events.php +6 -9
includes/feeds/admin/grouped-calendars-admin.php +1 -1
includes/feeds/grouped-calendars.php +1 -1
includes/functions/shared.php +1 -1
readme.txt +7 -4
vendor/autoload_52.php +1 -1
vendor/composer/autoload_namespaces.php +0 -1
vendor/composer/autoload_psr4.php +1 -0
vendor/composer/autoload_real_52.php +3 -3
vendor/composer/installed.json +15 -16
vendor/nesbot/carbon/composer.json +12 -3
vendor/nesbot/carbon/readme.md +7 -4
vendor/nesbot/carbon/src/Carbon/Carbon.php +302 -248
vendor/nesbot/carbon/src/Carbon/CarbonInterval.php +53 -47
vendor/nesbot/carbon/src/Carbon/Lang/ar.php +5 -6
vendor/nesbot/carbon/src/Carbon/Lang/az.php +1 -2
vendor/nesbot/carbon/src/Carbon/Lang/bg.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/bn.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/ca.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/cs.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/da.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/de.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/el.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/en.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/eo.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/es.php +2 -3
vendor/nesbot/carbon/src/Carbon/Lang/eu.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/fa.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/fi.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/fo.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/fr.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/he.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/hr.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/hu.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/id.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/it.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/ja.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/ko.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/lt.php +1 -2
vendor/nesbot/carbon/src/Carbon/Lang/lv.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/ms.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/nl.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/no.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/pl.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/pt.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php +2 -3
vendor/nesbot/carbon/src/Carbon/Lang/ro.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/ru.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/sk.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/sl.php +18 -19
vendor/nesbot/carbon/src/Carbon/Lang/sr.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/sv.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/th.php +0 -2
vendor/nesbot/carbon/src/Carbon/Lang/tr.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/uk.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/uz.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/vi.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/zh-TW.php +0 -1
vendor/nesbot/carbon/src/Carbon/Lang/zh.php +0 -1
vendor/symfony/translation/DataCollectorTranslator.php +0 -4
vendor/symfony/translation/Exception/ExceptionInterface.php +0 -2
vendor/symfony/translation/Exception/InvalidResourceException.php +0 -2
vendor/symfony/translation/Exception/NotFoundResourceException.php +0 -2
vendor/symfony/translation/IdentityTranslator.php +0 -12
vendor/symfony/translation/Loader/ArrayLoader.php +0 -4
vendor/symfony/translation/Loader/CsvFileLoader.php +1 -15
vendor/symfony/translation/Loader/LoaderInterface.php +0 -4
vendor/symfony/translation/Loader/PhpFileLoader.php +0 -4
vendor/symfony/translation/Loader/QtFileLoader.php +0 -4
vendor/symfony/translation/Loader/XliffFileLoader.php +0 -4
vendor/symfony/translation/Loader/YamlFileLoader.php +0 -4
vendor/symfony/translation/LoggingTranslator.php +0 -4
vendor/symfony/translation/MessageCatalogue.php +0 -30
vendor/symfony/translation/MessageCatalogueInterface.php +0 -30
vendor/symfony/translation/MessageSelector.php +0 -4
vendor/symfony/translation/PluralizationRules.php +2 -2
vendor/symfony/translation/Tests/DataCollectorTranslatorTest.php +0 -6
vendor/symfony/translation/Tests/Dumper/IcuResFileDumperTest.php +3 -4
vendor/symfony/translation/Tests/Loader/IcuDatFileLoaderTest.php +3 -7
vendor/symfony/translation/Tests/Loader/IcuResFileLoaderTest.php +3 -7
vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php +0 -7
vendor/symfony/translation/Tests/Loader/LocalizedTestCase.php +1 -1
vendor/symfony/translation/Tests/Loader/XliffFileLoaderTest.php +3 -4
vendor/symfony/translation/Tests/LoggingTranslatorTest.php +0 -7
vendor/symfony/translation/Translator.php +0 -22
vendor/symfony/translation/TranslatorInterface.php +0 -10
vendor/symfony/translation/composer.json +0 -1

google-calendar-events.php CHANGED Viewed

	@@ -1,19 +1,16 @@
1	<?php
2	/**
3	* Plugin Name: Simple Calendar
4	- * Plugin URI: https://~~wordpress~~.~~org/plugins/google-calendar-events/~~
5	- * Description: ~~Show~~ ~~off your~~ Google ~~calendar~~ in ~~grid~~ ~~(month)~~ or ~~list~~ ~~view,~~ in a ~~post,~~ ~~page~~ or ~~widget,~~ ~~and in a style that matches your site~~.
6	- *
7	- * Version: 3.0.1
8	- *
9	* Author: Moonstone Media
10	- * Author URI: ~~http~~://~~moonstonemediagroup~~.~~com~~
11	- *
12	* Text Domain: google-calendar-events
13	* Domain Path: /languages
14	*
15	* @package SimpleCalendar
16	- * @copyright ~~2014-~~2015 Moonstone Media/Phil Derksen. All rights reserved.
17	*/
18
19	// Exit if accessed directly.
	@@ -32,7 +29,7 @@ if ( version_compare( PHP_VERSION, '5.3.0' ) === -1 ) {
32	$this_plugin_path = trailingslashit( dirname( __FILE__ ) );
33	$this_plugin_dir = plugin_dir_url( __FILE__ );
34	$this_plugin_constants = array(
35	- 'SIMPLE_CALENDAR_VERSION' => '3.0.1',
36	'SIMPLE_CALENDAR_MAIN_FILE' => __FILE__,
37	'SIMPLE_CALENDAR_URL' => $this_plugin_dir,
38	'SIMPLE_CALENDAR_ASSETS' => $this_plugin_dir . 'assets/',


1	<?php
2	/**
3	* Plugin Name: Simple Calendar
4	+ * Plugin URI: https://simplecalendar.io
5	+ * Description: Add Google Calendar events to your WordPress site in minutes. Beautiful calendar displays. Fully responsive.
6	+ * Version: 3.0.2


7	* Author: Moonstone Media
8	+ * Author URI: https://simplecalendar.io

9	* Text Domain: google-calendar-events
10	* Domain Path: /languages
11	*
12	* @package SimpleCalendar
13	+ * @copyright 2015 Moonstone Media/Phil Derksen. All rights reserved.
14	*/
15
16	// Exit if accessed directly.

29	$this_plugin_path = trailingslashit( dirname( __FILE__ ) );
30	$this_plugin_dir = plugin_dir_url( __FILE__ );
31	$this_plugin_constants = array(
32	+ 'SIMPLE_CALENDAR_VERSION' => '3.0.2',
33	'SIMPLE_CALENDAR_MAIN_FILE' => __FILE__,
34	'SIMPLE_CALENDAR_URL' => $this_plugin_dir,
35	'SIMPLE_CALENDAR_ASSETS' => $this_plugin_dir . 'assets/',

includes/feeds/admin/grouped-calendars-admin.php CHANGED Viewed

	@@ -81,7 +81,7 @@ class Grouped_Calendars_Admin {
81	<div id="grouped-calendars-settings-panel" class="simcal-panel">
82	<table>
83	<thead>
84	- <tr><th colspan="2"><?php _e( 'Grouped ~~Calendars~~ settings', 'google-calendar-events' ); ?></th></tr>
85	</thead>
86	<tbody class="simcal-panel-section">
87	<tr class="simcal-panel-field">


81	<div id="grouped-calendars-settings-panel" class="simcal-panel">
82	<table>
83	<thead>
84	+ <tr><th colspan="2"><?php _e( 'Grouped Calendar settings', 'google-calendar-events' ); ?></th></tr>
85	</thead>
86	<tbody class="simcal-panel-section">
87	<tr class="simcal-panel-field">

includes/feeds/grouped-calendars.php CHANGED Viewed

	@@ -43,7 +43,7 @@ class Grouped_Calendars extends Feed {
43	parent::__construct( $calendar );
44
45	$this->type = 'grouped-calendars';
46	- $this->name = __( 'Grouped ~~Calendars~~', 'google-calendar-events' );
47
48	if ( $this->post_id > 0 ) {
49	$this->set_source();


43	parent::__construct( $calendar );
44
45	$this->type = 'grouped-calendars';
46	+ $this->name = __( 'Grouped Calendar', 'google-calendar-events' );
47
48	if ( $this->post_id > 0 ) {
49	$this->set_source();

includes/functions/shared.php CHANGED Viewed

	@@ -234,7 +234,7 @@ function simcal_get_calendar_names_i18n( $group, $style = 'full' ) {
234	$format = 'short' == $style ? 'M' : 'F';
235	$length = 11;
236	} elseif ( 'day' == $group ) {
237	- $date->next( 6 );
238	$format = 'short' == $style ? 'D' : 'l';
239	$length = 6;
240	} elseif ( 'meridiem' == $group ) {


234	$format = 'short' == $style ? 'M' : 'F';
235	$length = 11;
236	} elseif ( 'day' == $group ) {
237	+ $date->next( 0 );
238	$format = 'short' == $style ? 'D' : 'l';
239	$length = 6;
240	} elseif ( 'meridiem' == $group ) {

readme.txt CHANGED Viewed

	@@ -3,7 +3,7 @@ Contributors: moonstonemedia, pderksen, nickyoung87, nekojira, rosshanney
3	Tags: calendar, calendars, calendar manager, custom calendar, custom calendars, event, events, events feed, google calendar, google
4	Requires at least: 4.0
5	Tested up to: 4.4
6	- Stable tag: 3.0.1
7	License: GPLv2 or later
8	License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
	@@ -11,7 +11,7 @@ Add Google Calendar events to your WordPress site in minutes. Beautiful calendar
11
12	== Description ==
13
14	- Simple Calendar is the easiest way to add Google Calendar events to your WordPress site. Keep managing everything in Google Calendar. Fine tune the display of your calendars to your liking. Add advanced features with add-ons.
15
16	= SIMPLE CALENDAR FEATURES =
17
	@@ -27,7 +27,7 @@ Add Google Calendar events to your WordPress site in minutes. Beautiful calendar
27	* Fully extensible to support add-ons with advanced features for more specific needs.
28	* Open source with code hosted on GitHub. [Contributions welcome!](https://github.com/moonstonemedia/Simple-Calendar)
29
30	- >[Love ~~our~~ plugin? Please consider purchasing our Google Calendar Pro add-on](https://simplecalendar.io/addons/google-calendar-pro/?utm_source=wordpress.org&utm_medium=link&utm_campaign=simple-cal-readme&utm_content=description)
31
32	= GOOGLE CALENDAR PRO ADD-ON FEATURES =
33
	@@ -77,8 +77,11 @@ We'd love your help! Here's a few things you can do:
77
78	== Changelog ==
79



80	= 3.0.1 - November 9, 2015 =
81	- * Fix: Fixed a bug with ~~the~~ update script being skipped via attachment to activation hook.
82
83	= 3.0.0 - November 8, 2015 =
84	* Announcement: Plugin renamed to Simple Calendar.


3	Tags: calendar, calendars, calendar manager, custom calendar, custom calendars, event, events, events feed, google calendar, google
4	Requires at least: 4.0
5	Tested up to: 4.4
6	+ Stable tag: 3.0.2
7	License: GPLv2 or later
8	License URI: http://www.gnu.org/licenses/gpl-2.0.html
9

11
12	== Description ==
13
14	+ [Simple Calendar](https://simplecalendar.io) is the easiest way to add Google Calendar events to your WordPress site. Keep managing everything in Google Calendar. Fine tune the display of your calendars to your liking. Add advanced features with add-ons.
15
16	= SIMPLE CALENDAR FEATURES =
17

27	* Fully extensible to support add-ons with advanced features for more specific needs.
28	* Open source with code hosted on GitHub. [Contributions welcome!](https://github.com/moonstonemedia/Simple-Calendar)
29
30	+ >[Love the plugin? Please consider purchasing our Google Calendar Pro add-on](https://simplecalendar.io/addons/google-calendar-pro/?utm_source=wordpress.org&utm_medium=link&utm_campaign=simple-cal-readme&utm_content=description)
31
32	= GOOGLE CALENDAR PRO ADD-ON FEATURES =
33

77
78	== Changelog ==
79
80	+ = 3.0.2 - November 12, 2015 =
81	+ * Fix: Fixed bug where calendar days were off by one day.
82	+
83	= 3.0.1 - November 9, 2015 =
84	+ * Fix: Fixed bug with update script being skipped via attachment to activation hook.
85
86	= 3.0.0 - November 8, 2015 =
87	* Announcement: Plugin renamed to Simple Calendar.

vendor/autoload_52.php CHANGED Viewed

	@@ -4,4 +4,4 @@
4
5	require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
7	- return ~~ComposerAutoloaderInite3de7405dc7a77d715f3874acd46d15e~~::getLoader();


4
5	require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
7	+ return ComposerAutoloaderInit25abd738463851d8f966d13db6739277::getLoader();

vendor/composer/autoload_namespaces.php CHANGED Viewed

	@@ -8,6 +8,5 @@ $baseDir = dirname($vendorDir);
8	return array(
9	'xrstf\\Composer52' => array($vendorDir . '/xrstf/composer-php52/lib'),
10	'Parsedown' => array($vendorDir . '/erusev/parsedown'),
11	- 'Carbon' => array($vendorDir . '/nesbot/carbon/src'),
12	'' => array($vendorDir . '/nekojira/wp-requirements/src'),
13	);


8	return array(
9	'xrstf\\Composer52' => array($vendorDir . '/xrstf/composer-php52/lib'),
10	'Parsedown' => array($vendorDir . '/erusev/parsedown'),

11	'' => array($vendorDir . '/nekojira/wp-requirements/src'),
12	);

vendor/composer/autoload_psr4.php CHANGED Viewed

	@@ -7,4 +7,5 @@ $baseDir = dirname($vendorDir);
7
8	return array(
9	'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),

10	);


7
8	return array(
9	'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
10	+ 'Carbon\\' => array($vendorDir . '/nesbot/carbon/src/Carbon'),
11	);

vendor/composer/autoload_real_52.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2
3	// autoload_real_52.php generated by xrstf/composer-php52
4
5	- class ~~ComposerAutoloaderInite3de7405dc7a77d715f3874acd46d15e~~ {
6	private static $loader;
7
8	public static function loadClassLoader($class) {
	@@ -19,9 +19,9 @@ class ComposerAutoloaderInite3de7405dc7a77d715f3874acd46d15e {
19	return self::$loader;
20	}
21
22	- spl_autoload_register(array('~~ComposerAutoloaderInite3de7405dc7a77d715f3874acd46d15e~~', 'loadClassLoader'), true /, true /);
23	self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24	- spl_autoload_unregister(array('~~ComposerAutoloaderInite3de7405dc7a77d715f3874acd46d15e~~', 'loadClassLoader'));
25
26	$vendorDir = dirname(dirname(__FILE__));
27	$baseDir = dirname($vendorDir);


2
3	// autoload_real_52.php generated by xrstf/composer-php52
4
5	+ class ComposerAutoloaderInit25abd738463851d8f966d13db6739277 {
6	private static $loader;
7
8	public static function loadClassLoader($class) {

19	return self::$loader;
20	}
21
22	+ spl_autoload_register(array('ComposerAutoloaderInit25abd738463851d8f966d13db6739277', 'loadClassLoader'), true /, true /);
23	self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24	+ spl_autoload_unregister(array('ComposerAutoloaderInit25abd738463851d8f966d13db6739277', 'loadClassLoader'));
25
26	$vendorDir = dirname(dirname(__FILE__));
27	$baseDir = dirname($vendorDir);

vendor/composer/installed.json CHANGED Viewed

	@@ -253,17 +253,17 @@
253	},
254	{
255	"name": "symfony/translation",
256	- "version": "v2.7.5",
257	- "version_normalized": "2.7.5.0",
258	"source": {
259	"type": "git",
260	"url": "https://github.com/symfony/translation.git",
261	- "reference": "~~485877661835e188cd78345c6d4eef1290d17571~~"
262	},
263	"dist": {
264	"type": "zip",
265	- "url": "https://api.github.com/repos/symfony/translation/zipball/~~485877661835e188cd78345c6d4eef1290d17571~~",
266	- "reference": "~~485877661835e188cd78345c6d4eef1290d17571~~",
267	"shasum": ""
268	},
269	"require": {
	@@ -276,7 +276,6 @@
276	"psr/log": "~1.0",
277	"symfony/config": "~2.7",
278	"symfony/intl": "~2.4",
279	- "symfony/phpunit-bridge": "~2.7",
280	"symfony/yaml": "~2.2"
281	},
282	"suggest": {
	@@ -284,7 +283,7 @@
284	"symfony/config": "",
285	"symfony/yaml": ""
286	},
287	- "time": "2015-09-06 08:36:38",
288	"type": "library",
289	"extra": {
290	"branch-alias": {
	@@ -316,17 +315,17 @@
316	},
317	{
318	"name": "nesbot/carbon",
319	- "version": "1.20.0",
320	- "version_normalized": "1.20.0.0",
321	"source": {
322	"type": "git",
323	"url": "https://github.com/briannesbitt/Carbon.git",
324	- "reference": "~~bfd3eaba109c9a2405c92174c8e17f20c2b9caf3~~"
325	},
326	"dist": {
327	"type": "zip",
328	- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/~~bfd3eaba109c9a2405c92174c8e17f20c2b9caf3~~",
329	- "reference": "~~bfd3eaba109c9a2405c92174c8e17f20c2b9caf3~~",
330	"shasum": ""
331	},
332	"require": {
	@@ -334,14 +333,14 @@
334	"symfony/translation": "~2.6\|~3.0"
335	},
336	"require-dev": {
337	- "phpunit/phpunit": "~4.0"
338	},
339	- "time": "2015-06-25 04:19:39",
340	"type": "library",
341	"installation-source": "dist",
342	"autoload": {
343	- "psr-0": {
344	- "Carbon": "src"
345	}
346	},
347	"notification-url": "https://packagist.org/downloads/",


253	},
254	{
255	"name": "symfony/translation",
256	+ "version": "v2.7.6",
257	+ "version_normalized": "2.7.6.0",
258	"source": {
259	"type": "git",
260	"url": "https://github.com/symfony/translation.git",
261	+ "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8"
262	},
263	"dist": {
264	"type": "zip",
265	+ "url": "https://api.github.com/repos/symfony/translation/zipball/6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
266	+ "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
267	"shasum": ""
268	},
269	"require": {

276	"psr/log": "~1.0",
277	"symfony/config": "~2.7",
278	"symfony/intl": "~2.4",

279	"symfony/yaml": "~2.2"
280	},
281	"suggest": {

283	"symfony/config": "",
284	"symfony/yaml": ""
285	},
286	+ "time": "2015-10-27 15:38:06",
287	"type": "library",
288	"extra": {
289	"branch-alias": {

315	},
316	{
317	"name": "nesbot/carbon",
318	+ "version": "1.21.0",
319	+ "version_normalized": "1.21.0.0",
320	"source": {
321	"type": "git",
322	"url": "https://github.com/briannesbitt/Carbon.git",
323	+ "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
324	},
325	"dist": {
326	"type": "zip",
327	+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
328	+ "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
329	"shasum": ""
330	},
331	"require": {

333	"symfony/translation": "~2.6\|~3.0"
334	},
335	"require-dev": {
336	+ "phpunit/phpunit": "~4.0\|~5.0"
337	},
338	+ "time": "2015-11-04 20:07:17",
339	"type": "library",
340	"installation-source": "dist",
341	"autoload": {
342	+ "psr-4": {
343	+ "Carbon\\": "src/Carbon/"
344	}
345	},
346	"notification-url": "https://packagist.org/downloads/",

vendor/nesbot/carbon/composer.json CHANGED Viewed

	@@ -8,6 +8,10 @@
8	"DateTime"
9	],
10	"homepage": "http://carbon.nesbot.com",




11	"license": "MIT",
12	"authors": [
13	{
	@@ -21,11 +25,16 @@
21	"symfony/translation": "~2.6\|~3.0"
22	},
23	"require-dev": {
24	- "phpunit/phpunit": "~4.0"
25	},
26	"autoload": {
27	- "psr-0": {
28	- "Carbon": "src"





29	}
30	}
31	}


8	"DateTime"
9	],
10	"homepage": "http://carbon.nesbot.com",
11	+ "support": {
12	+ "issues": "https://github.com/briannesbitt/Carbon/issues",
13	+ "source": "https://github.com/briannesbitt/Carbon"
14	+ },
15	"license": "MIT",
16	"authors": [
17	{

25	"symfony/translation": "~2.6\|~3.0"
26	},
27	"require-dev": {
28	+ "phpunit/phpunit": "~4.0\|~5.0"
29	},
30	"autoload": {
31	+ "psr-4": {
32	+ "Carbon\\": "src/Carbon/"
33	+ }
34	+ },
35	+ "autoload-dev": {
36	+ "psr-4": {
37	+ "Tests\\": "tests/"
38	}
39	}
40	}

vendor/nesbot/carbon/readme.md CHANGED Viewed

	@@ -1,6 +1,9 @@
1	# Carbon
2
3	- [![Latest Stable Version](https://poser.pugx.org/nesbot/carbon/v/stable.png)](https://packagist.org/packages/nesbot/carbon) [![Total Downloads](https://poser.pugx.org/nesbot/carbon/downloads.png)](https://packagist.org/packages/nesbot/carbon) [![Build Status](https://travis-ci.org/briannesbitt/Carbon.svg?branch=master)](https://travis-ci.org/briannesbitt/Carbon)



4
5	A simple PHP API extension for DateTime. [http://carbon.nesbot.com](http://carbon.nesbot.com)
6
	@@ -24,21 +27,21 @@ Carbon::setTestNow(Carbon::createFromDate(2000, 1, 1));
24
25	// comparisons are always done in UTC
26	if (Carbon::now()->gte($worldWillEnd)) {
27	- die();
28	}
29
30	// Phew! Return to normal behaviour
31	Carbon::setTestNow();
32
33	if (Carbon::now()->isWeekend()) {
34	- echo 'Party!';
35	}
36	echo Carbon::now()->subMinutes(2)->diffForHumans(); // '2 minutes ago'
37
38	// ... but also does 'from now', 'after' and 'before'
39	// rolling up to seconds, minutes, hours, days, months, years
40
41	- $daysSinceEpoch = Carbon::~~createFromTimeStamp~~(0)->diffInDays();
42	```
43
44	## Installation


1	# Carbon
2
3	+ [![Latest Stable Version](https://poser.pugx.org/nesbot/carbon/v/stable.png)](https://packagist.org/packages/nesbot/carbon)
4	+ [![Total Downloads](https://poser.pugx.org/nesbot/carbon/downloads.png)](https://packagist.org/packages/nesbot/carbon)
5	+ [![Build Status](https://travis-ci.org/briannesbitt/Carbon.svg?branch=master)](https://travis-ci.org/briannesbitt/Carbon)
6	+ [![StyleCI](https://styleci.io/repos/5724990/shield?style=flat)](https://styleci.io/repos/5724990)
7
8	A simple PHP API extension for DateTime. [http://carbon.nesbot.com](http://carbon.nesbot.com)
9

27
28	// comparisons are always done in UTC
29	if (Carbon::now()->gte($worldWillEnd)) {
30	+ die();
31	}
32
33	// Phew! Return to normal behaviour
34	Carbon::setTestNow();
35
36	if (Carbon::now()->isWeekend()) {
37	+ echo 'Party!';
38	}
39	echo Carbon::now()->subMinutes(2)->diffForHumans(); // '2 minutes ago'
40
41	// ... but also does 'from now', 'after' and 'before'
42	// rolling up to seconds, minutes, hours, days, months, years
43
44	+ $daysSinceEpoch = Carbon::createFromTimestamp(0)->diffInDays();
45	```
46
47	## Installation

vendor/nesbot/carbon/src/Carbon/Carbon.php CHANGED Viewed

	@@ -23,14 +23,14 @@ use Symfony\Component\Translation\Loader\ArrayLoader;
23	/**
24	* A simple API extension for DateTime
25	*
26	- * @property ~~integer~~ $year
27	- * @property ~~integer~~ $yearIso
28	- * @property ~~integer~~ $month
29	- * @property ~~integer~~ $day
30	- * @property ~~integer~~ $hour
31	- * @property ~~integer~~ $minute
32	- * @property ~~integer~~ $second
33	- * @property ~~integer~~ $timestamp seconds since the Unix Epoch
34	* @property DateTimeZone $timezone the current timezone
35	* @property DateTimeZone $tz alias of timezone
36	* @property-read integer $micro
	@@ -121,7 +121,6 @@ class Carbon extends DateTime
121	*/
122	protected static $toStringFormat = self::DEFAULT_TO_STRING_FORMAT;
123
124	-
125	/**
126	* First day of week
127	*
	@@ -162,9 +161,9 @@ class Carbon extends DateTime
162	*
163	* @param DateTimeZone\|string\|null $object
164	*
165	- * @return DateTimeZone
166	- *
167	* @throws InvalidArgumentException


168	*/
169	protected static function safeCreateDateTimeZone($object)
170	{
	@@ -196,8 +195,8 @@ class Carbon extends DateTime
196	* Please see the testing aids section (specifically static::setTestNow())
197	* for more on the possibility of this constructor returning a test instance.
198	*
199	- * @param string $time
200	- * @param DateTimeZone\|string $tz
201	*/
202	public function __construct($time = null, $tz = null)
203	{
	@@ -210,7 +209,7 @@ class Carbon extends DateTime
210	}
211
212	//shift the time according to the given time zone
213	- if ($tz !== ~~NULL~~ && $tz != static::getTestNow()->tz) {
214	$testInstance->setTimezone($tz);
215	} else {
216	$tz = $testInstance->tz;
	@@ -240,8 +239,8 @@ class Carbon extends DateTime
240	* Carbon::parse('Monday next week')->fn() rather than
241	* (new Carbon('Monday next week'))->fn()
242	*
243	- * @param string $time
244	- * @param DateTimeZone\|string $tz
245	*
246	* @return static
247	*/
	@@ -253,7 +252,7 @@ class Carbon extends DateTime
253	/**
254	* Get a Carbon instance for the current date and time
255	*
256	- * @param DateTimeZone\|string $tz
257	*
258	* @return static
259	*/
	@@ -265,7 +264,7 @@ class Carbon extends DateTime
265	/**
266	* Create a Carbon instance for today
267	*
268	- * @param DateTimeZone\|string $tz
269	*
270	* @return static
271	*/
	@@ -277,7 +276,7 @@ class Carbon extends DateTime
277	/**
278	* Create a Carbon instance for tomorrow
279	*
280	- * @param DateTimeZone\|string $tz
281	*
282	* @return static
283	*/
	@@ -289,7 +288,7 @@ class Carbon extends DateTime
289	/**
290	* Create a Carbon instance for yesterday
291	*
292	- * @param DateTimeZone\|string $tz
293	*
294	* @return static
295	*/
	@@ -305,7 +304,13 @@ class Carbon extends DateTime
305	*/
306	public static function maxValue()
307	{
308	- ~~return~~ ~~static::createFromTimestamp~~(~~PHP_INT_MAX~~);






309	}
310
311	/**
	@@ -315,7 +320,13 @@ class Carbon extends DateTime
315	*/
316	public static function minValue()
317	{
318	- ~~return~~ ~~static::createFromTimestamp~~(~~~PHP_INT_MAX~~);






319	}
320
321	/**
	@@ -329,29 +340,29 @@ class Carbon extends DateTime
329	* If $hour is not null then the default values for $minute and $second
330	* will be 0.
331	*
332	- * @param ~~integer~~ $year
333	- * @param ~~integer~~ $month
334	- * @param ~~integer~~ $day
335	- * @param ~~integer~~ $hour
336	- * @param ~~integer~~ $minute
337	- * @param ~~integer~~ $second
338	- * @param DateTimeZone\|string $tz
339	*
340	* @return static
341	*/
342	public static function create($year = null, $month = null, $day = null, $hour = null, $minute = null, $second = null, $tz = null)
343	{
344	- $year = ($year === null) ? date('Y') : $year;
345	- $month = ($month === null) ? date('n') : $month;
346	- $day = ($day === null) ? date('j') : $day;
347
348	if ($hour === null) {
349	$hour = date('G');
350	- $minute = ($minute === null) ? date('i') : $minute;
351	- $second = ($second === null) ? date('s') : $second;
352	} else {
353	- $minute = ($minute === null) ? 0 : $minute;
354	- $second = ($second === null) ? 0 : $second;
355	}
356
357	return static::createFromFormat('Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
	@@ -360,10 +371,10 @@ class Carbon extends DateTime
360	/**
361	* Create a Carbon instance from just a date. The time portion is set to now.
362	*
363	- * @param ~~integer~~ $year
364	- * @param ~~integer~~ $month
365	- * @param ~~integer~~ $day
366	- * @param DateTimeZone\|string $tz
367	*
368	* @return static
369	*/
	@@ -375,10 +386,10 @@ class Carbon extends DateTime
375	/**
376	* Create a Carbon instance from just a time. The date portion is set to today.
377	*
378	- * @param ~~integer~~ $hour
379	- * @param ~~integer~~ $minute
380	- * @param ~~integer~~ $second
381	- * @param DateTimeZone\|string $tz
382	*
383	* @return static
384	*/
	@@ -390,13 +401,13 @@ class Carbon extends DateTime
390	/**
391	* Create a Carbon instance from a specific format
392	*
393	- * @param string $format
394	- * @param string $time
395	- * @param DateTimeZone\|string $tz
396	- *
397	- * @return static
398	*
399	* @throws InvalidArgumentException


400	*/
401	public static function createFromFormat($format, $time, $tz = null)
402	{
	@@ -417,8 +428,8 @@ class Carbon extends DateTime
417	/**
418	* Create a Carbon instance from a timestamp
419	*
420	- * @param ~~integer~~ $timestamp
421	- * @param DateTimeZone\|string $tz
422	*
423	* @return static
424	*/
	@@ -430,7 +441,7 @@ class Carbon extends DateTime
430	/**
431	* Create a Carbon instance from an UTC timestamp
432	*
433	- * @param ~~integer~~ $timestamp
434	*
435	* @return static
436	*/
	@@ -460,7 +471,7 @@ class Carbon extends DateTime
460	*
461	* @throws InvalidArgumentException
462	*
463	- * @return string\|~~integer~~\|DateTimeZone
464	*/
465	public function __get($name)
466	{
	@@ -498,13 +509,13 @@ class Carbon extends DateTime
498	return $this->getOffset() / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR;
499
500	case $name === 'dst':
501	- return $this->format('I') == '1';
502
503	case $name === 'local':
504	- return $this->offset == $this->copy()->setTimezone(date_default_timezone_get())->offset;
505
506	case $name === 'utc':
507	- return $this->offset == 0;
508
509	case $name === 'timezone' \|\| $name === 'tz':
510	return $this->getTimezone();
	@@ -522,7 +533,7 @@ class Carbon extends DateTime
522	*
523	* @param string $name
524	*
525	- * @return ~~boolean~~
526	*/
527	public function __isset($name)
528	{
	@@ -538,8 +549,8 @@ class Carbon extends DateTime
538	/**
539	* Set a part of the Carbon object
540	*
541	- * @param string $name
542	- * @param string\|~~integer~~\|DateTimeZone $value
543	*
544	* @throws InvalidArgumentException
545	*/
	@@ -587,7 +598,7 @@ class Carbon extends DateTime
587	/**
588	* Set the instance's year
589	*
590	- * @param ~~integer~~ $value
591	*
592	* @return static
593	*/
	@@ -601,7 +612,7 @@ class Carbon extends DateTime
601	/**
602	* Set the instance's month
603	*
604	- * @param ~~integer~~ $value
605	*
606	* @return static
607	*/
	@@ -615,7 +626,7 @@ class Carbon extends DateTime
615	/**
616	* Set the instance's day
617	*
618	- * @param ~~integer~~ $value
619	*
620	* @return static
621	*/
	@@ -629,7 +640,7 @@ class Carbon extends DateTime
629	/**
630	* Set the instance's hour
631	*
632	- * @param ~~integer~~ $value
633	*
634	* @return static
635	*/
	@@ -643,7 +654,7 @@ class Carbon extends DateTime
643	/**
644	* Set the instance's minute
645	*
646	- * @param ~~integer~~ $value
647	*
648	* @return static
649	*/
	@@ -657,7 +668,7 @@ class Carbon extends DateTime
657	/**
658	* Set the instance's second
659	*
660	- * @param ~~integer~~ $value
661	*
662	* @return static
663	*/
	@@ -671,12 +682,12 @@ class Carbon extends DateTime
671	/**
672	* Set the date and time all together
673	*
674	- * @param ~~integer~~ $year
675	- * @param ~~integer~~ $month
676	- * @param ~~integer~~ $day
677	- * @param ~~integer~~ $hour
678	- * @param ~~integer~~ $minute
679	- * @param ~~integer~~ $second
680	*
681	* @return static
682	*/
	@@ -685,10 +696,28 @@ class Carbon extends DateTime
685	return $this->setDate($year, $month, $day)->setTime($hour, $minute, $second);
686	}
687


















688	/**
689	* Set the instance's timestamp
690	*
691	- * @param ~~integer~~ $value
692	*
693	* @return static
694	*/
	@@ -737,8 +766,6 @@ class Carbon extends DateTime
737	return $this;
738	}
739
740	-
741	-
742	///////////////////////////////////////////////////////////////////
743	/////////////////////// WEEK SPECIAL DAYS /////////////////////////
744	///////////////////////////////////////////////////////////////////
	@@ -803,7 +830,6 @@ class Carbon extends DateTime
803	static::$weekendDays = $days;
804	}
805
806	-
807	///////////////////////////////////////////////////////////////////
808	///////////////////////// TESTING AIDS ////////////////////////////
809	///////////////////////////////////////////////////////////////////
	@@ -822,7 +848,7 @@ class Carbon extends DateTime
822	* To clear the test instance call this method using the default
823	* parameter of null.
824	*
825	- * @param Carbon $testNow
826	*/
827	public static function setTestNow(Carbon $testNow = null)
828	{
	@@ -844,7 +870,7 @@ class Carbon extends DateTime
844	* Determine if there is a valid test instance set. A valid test instance
845	* is anything that is not null.
846	*
847	- * @return ~~boolean~~ true if there is a test instance, otherwise false
848	*/
849	public static function hasTestNow()
850	{
	@@ -857,7 +883,7 @@ class Carbon extends DateTime
857	*
858	* @param string $time
859	*
860	- * @return ~~boolean~~ true if there is a keyword, otherwise false
861	*/
862	public static function hasRelativeKeywords($time)
863	{
	@@ -884,7 +910,7 @@ class Carbon extends DateTime
884	*/
885	protected static function translator()
886	{
887	- if (static::$translator == null) {
888	static::$translator = new Translator('en');
889	static::$translator->addLoader('array', new ArrayLoader());
890	static::setLocale('en');
	@@ -952,7 +978,7 @@ class Carbon extends DateTime
952	{
953	// Check for Windows to find and replace the %e
954	// modifier correctly
955	- if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
956	$format = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $format);
957	}
958
	@@ -961,7 +987,6 @@ class Carbon extends DateTime
961
962	/**
963	* Reset the format used to the default when type juggling a Carbon instance to a string
964	- *
965	*/
966	public static function resetToStringFormat()
967	{
	@@ -1157,7 +1182,7 @@ class Carbon extends DateTime
1157	*
1158	* @param Carbon $dt
1159	*
1160	- * @return ~~boolean~~
1161	*/
1162	public function eq(Carbon $dt)
1163	{
	@@ -1169,7 +1194,7 @@ class Carbon extends DateTime
1169	*
1170	* @param Carbon $dt
1171	*
1172	- * @return ~~boolean~~
1173	*/
1174	public function ne(Carbon $dt)
1175	{
	@@ -1181,7 +1206,7 @@ class Carbon extends DateTime
1181	*
1182	* @param Carbon $dt
1183	*
1184	- * @return ~~boolean~~
1185	*/
1186	public function gt(Carbon $dt)
1187	{
	@@ -1193,7 +1218,7 @@ class Carbon extends DateTime
1193	*
1194	* @param Carbon $dt
1195	*
1196	- * @return ~~boolean~~
1197	*/
1198	public function gte(Carbon $dt)
1199	{
	@@ -1205,7 +1230,7 @@ class Carbon extends DateTime
1205	*
1206	* @param Carbon $dt
1207	*
1208	- * @return ~~boolean~~
1209	*/
1210	public function lt(Carbon $dt)
1211	{
	@@ -1217,7 +1242,7 @@ class Carbon extends DateTime
1217	*
1218	* @param Carbon $dt
1219	*
1220	- * @return ~~boolean~~
1221	*/
1222	public function lte(Carbon $dt)
1223	{
	@@ -1227,11 +1252,11 @@ class Carbon extends DateTime
1227	/**
1228	* Determines if the instance is between two others
1229	*
1230	- * @param Carbon $dt1
1231	- * @param Carbon $dt2
1232	- * @param ~~boolean~~ $equal Indicates if a > and < comparison should be used or <= or >=
1233	*
1234	- * @return ~~boolean~~
1235	*/
1236	public function between(Carbon $dt1, Carbon $dt2, $equal = true)
1237	{
	@@ -1243,21 +1268,47 @@ class Carbon extends DateTime
1243
1244	if ($equal) {
1245	return $this->gte($dt1) && $this->lte($dt2);
1246	- } else {
1247	- return $this->gt($dt1) && $this->lt($dt2);
1248	}




























1249	}
1250
1251	/**
1252	* Get the minimum instance between a given instance (default now) and the current instance.
1253	*
1254	- * @param Carbon $dt
1255	*
1256	* @return static
1257	*/
1258	public function min(Carbon $dt = null)
1259	{
1260	- $dt = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
1261
1262	return $this->lt($dt) ? $this : $dt;
1263	}
	@@ -1265,13 +1316,13 @@ class Carbon extends DateTime
1265	/**
1266	* Get the maximum instance between a given instance (default now) and the current instance.
1267	*
1268	- * @param Carbon $dt
1269	*
1270	* @return static
1271	*/
1272	public function max(Carbon $dt = null)
1273	{
1274	- $dt = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
1275
1276	return $this->gt($dt) ? $this : $dt;
1277	}
	@@ -1279,7 +1330,7 @@ class Carbon extends DateTime
1279	/**
1280	* Determines if the instance is a weekday
1281	*
1282	- * @return ~~boolean~~
1283	*/
1284	public function isWeekday()
1285	{
	@@ -1289,7 +1340,7 @@ class Carbon extends DateTime
1289	/**
1290	* Determines if the instance is a weekend day
1291	*
1292	- * @return ~~boolean~~
1293	*/
1294	public function isWeekend()
1295	{
	@@ -1299,7 +1350,7 @@ class Carbon extends DateTime
1299	/**
1300	* Determines if the instance is yesterday
1301	*
1302	- * @return ~~boolean~~
1303	*/
1304	public function isYesterday()
1305	{
	@@ -1309,7 +1360,7 @@ class Carbon extends DateTime
1309	/**
1310	* Determines if the instance is today
1311	*
1312	- * @return ~~boolean~~
1313	*/
1314	public function isToday()
1315	{
	@@ -1319,7 +1370,7 @@ class Carbon extends DateTime
1319	/**
1320	* Determines if the instance is tomorrow
1321	*
1322	- * @return ~~boolean~~
1323	*/
1324	public function isTomorrow()
1325	{
	@@ -1329,7 +1380,7 @@ class Carbon extends DateTime
1329	/**
1330	* Determines if the instance is in the future, ie. greater (after) than now
1331	*
1332	- * @return ~~boolean~~
1333	*/
1334	public function isFuture()
1335	{
	@@ -1339,7 +1390,7 @@ class Carbon extends DateTime
1339	/**
1340	* Determines if the instance is in the past, ie. less (before) than now
1341	*
1342	- * @return ~~boolean~~
1343	*/
1344	public function isPast()
1345	{
	@@ -1349,18 +1400,19 @@ class Carbon extends DateTime
1349	/**
1350	* Determines if the instance is a leap year
1351	*
1352	- * @return ~~boolean~~
1353	*/
1354	public function isLeapYear()
1355	{
1356	- return $this->format('L') == '1';
1357	}
1358
1359	/**
1360	* Checks if the passed in date is the same day as the instance current day.
1361	*
1362	- * @param Carbon $dt
1363	- * ~~@return boolean~~

1364	*/
1365	public function isSameDay(Carbon $dt)
1366	{
	@@ -1369,8 +1421,8 @@ class Carbon extends DateTime
1369
1370	/**
1371	* Checks if this day is a Sunday.
1372	- *
1373	- * @return ~~boolean~~
1374	*/
1375	public function isSunday()
1376	{
	@@ -1379,8 +1431,8 @@ class Carbon extends DateTime
1379
1380	/**
1381	* Checks if this day is a Monday.
1382	- *
1383	- * @return ~~boolean~~
1384	*/
1385	public function isMonday()
1386	{
	@@ -1389,8 +1441,8 @@ class Carbon extends DateTime
1389
1390	/**
1391	* Checks if this day is a Tuesday.
1392	- *
1393	- * @return ~~boolean~~
1394	*/
1395	public function isTuesday()
1396	{
	@@ -1399,8 +1451,8 @@ class Carbon extends DateTime
1399
1400	/**
1401	* Checks if this day is a Wednesday.
1402	- *
1403	- * @return ~~boolean~~
1404	*/
1405	public function isWednesday()
1406	{
	@@ -1409,8 +1461,8 @@ class Carbon extends DateTime
1409
1410	/**
1411	* Checks if this day is a Thursday.
1412	- *
1413	- * @return ~~boolean~~
1414	*/
1415	public function isThursday()
1416	{
	@@ -1419,8 +1471,8 @@ class Carbon extends DateTime
1419
1420	/**
1421	* Checks if this day is a Friday.
1422	- *
1423	- * @return ~~boolean~~
1424	*/
1425	public function isFriday()
1426	{
	@@ -1429,14 +1481,14 @@ class Carbon extends DateTime
1429
1430	/**
1431	* Checks if this day is a Saturday.
1432	- *
1433	- * @return ~~boolean~~
1434	*/
1435	public function isSaturday()
1436	{
1437	return $this->dayOfWeek === static::SATURDAY;
1438	}
1439	-
1440	///////////////////////////////////////////////////////////////////
1441	/////////////////// ADDITIONS AND SUBTRACTIONS ////////////////////
1442	///////////////////////////////////////////////////////////////////
	@@ -1445,7 +1497,7 @@ class Carbon extends DateTime
1445	* Add years to the instance. Positive $value travel forward while
1446	* negative $value travel into the past.
1447	*
1448	- * @param ~~integer~~ $value
1449	*
1450	* @return static
1451	*/
	@@ -1457,7 +1509,7 @@ class Carbon extends DateTime
1457	/**
1458	* Add a year to the instance
1459	*
1460	- * @param ~~integer~~ $value
1461	*
1462	* @return static
1463	*/
	@@ -1469,7 +1521,7 @@ class Carbon extends DateTime
1469	/**
1470	* Remove a year from the instance
1471	*
1472	- * @param ~~integer~~ $value
1473	*
1474	* @return static
1475	*/
	@@ -1481,7 +1533,7 @@ class Carbon extends DateTime
1481	/**
1482	* Remove years from the instance.
1483	*
1484	- * @param ~~integer~~ $value
1485	*
1486	* @return static
1487	*/
	@@ -1494,7 +1546,7 @@ class Carbon extends DateTime
1494	* Add months to the instance. Positive $value travels forward while
1495	* negative $value travels into the past.
1496	*
1497	- * @param ~~integer~~ $value
1498	*
1499	* @return static
1500	*/
	@@ -1506,7 +1558,7 @@ class Carbon extends DateTime
1506	/**
1507	* Add a month to the instance
1508	*
1509	- * @param ~~integer~~ $value
1510	*
1511	* @return static
1512	*/
	@@ -1518,7 +1570,7 @@ class Carbon extends DateTime
1518	/**
1519	* Remove a month from the instance
1520	*
1521	- * @param ~~integer~~ $value
1522	*
1523	* @return static
1524	*/
	@@ -1530,7 +1582,7 @@ class Carbon extends DateTime
1530	/**
1531	* Remove months from the instance
1532	*
1533	- * @param ~~integer~~ $value
1534	*
1535	* @return static
1536	*/
	@@ -1543,7 +1595,7 @@ class Carbon extends DateTime
1543	* Add months without overflowing to the instance. Positive $value
1544	* travels forward while negative $value travels into the past.
1545	*
1546	- * @param ~~integer~~ $value
1547	*
1548	* @return static
1549	*/
	@@ -1551,7 +1603,7 @@ class Carbon extends DateTime
1551	{
1552	$date = $this->copy()->addMonths($value);
1553
1554	- if ($date->day != $this->day) {
1555	$date->day(1)->subMonth()->day($date->daysInMonth);
1556	}
1557
	@@ -1561,7 +1613,7 @@ class Carbon extends DateTime
1561	/**
1562	* Add a month with no overflow to the instance
1563	*
1564	- * @param ~~integer~~ $value
1565	*
1566	* @return static
1567	*/
	@@ -1573,7 +1625,7 @@ class Carbon extends DateTime
1573	/**
1574	* Remove a month with no overflow from the instance
1575	*
1576	- * @param ~~integer~~ $value
1577	*
1578	* @return static
1579	*/
	@@ -1585,7 +1637,7 @@ class Carbon extends DateTime
1585	/**
1586	* Remove months with no overflow from the instance
1587	*
1588	- * @param ~~integer~~ $value
1589	*
1590	* @return static
1591	*/
	@@ -1598,7 +1650,7 @@ class Carbon extends DateTime
1598	* Add days to the instance. Positive $value travels forward while
1599	* negative $value travels into the past.
1600	*
1601	- * @param ~~integer~~ $value
1602	*
1603	* @return static
1604	*/
	@@ -1610,7 +1662,7 @@ class Carbon extends DateTime
1610	/**
1611	* Add a day to the instance
1612	*
1613	- * @param ~~integer~~ $value
1614	*
1615	* @return static
1616	*/
	@@ -1622,7 +1674,7 @@ class Carbon extends DateTime
1622	/**
1623	* Remove a day from the instance
1624	*
1625	- * @param ~~integer~~ $value
1626	*
1627	* @return static
1628	*/
	@@ -1634,7 +1686,7 @@ class Carbon extends DateTime
1634	/**
1635	* Remove days from the instance
1636	*
1637	- * @param ~~integer~~ $value
1638	*
1639	* @return static
1640	*/
	@@ -1647,7 +1699,7 @@ class Carbon extends DateTime
1647	* Add weekdays to the instance. Positive $value travels forward while
1648	* negative $value travels into the past.
1649	*
1650	- * @param ~~integer~~ $value
1651	*
1652	* @return static
1653	*/
	@@ -1659,7 +1711,7 @@ class Carbon extends DateTime
1659	/**
1660	* Add a weekday to the instance
1661	*
1662	- * @param ~~integer~~ $value
1663	*
1664	* @return static
1665	*/
	@@ -1671,7 +1723,7 @@ class Carbon extends DateTime
1671	/**
1672	* Remove a weekday from the instance
1673	*
1674	- * @param ~~integer~~ $value
1675	*
1676	* @return static
1677	*/
	@@ -1683,7 +1735,7 @@ class Carbon extends DateTime
1683	/**
1684	* Remove weekdays from the instance
1685	*
1686	- * @param ~~integer~~ $value
1687	*
1688	* @return static
1689	*/
	@@ -1696,7 +1748,7 @@ class Carbon extends DateTime
1696	* Add weeks to the instance. Positive $value travels forward while
1697	* negative $value travels into the past.
1698	*
1699	- * @param ~~integer~~ $value
1700	*
1701	* @return static
1702	*/
	@@ -1708,7 +1760,7 @@ class Carbon extends DateTime
1708	/**
1709	* Add a week to the instance
1710	*
1711	- * @param ~~integer~~ $value
1712	*
1713	* @return static
1714	*/
	@@ -1720,7 +1772,7 @@ class Carbon extends DateTime
1720	/**
1721	* Remove a week from the instance
1722	*
1723	- * @param ~~integer~~ $value
1724	*
1725	* @return static
1726	*/
	@@ -1732,7 +1784,7 @@ class Carbon extends DateTime
1732	/**
1733	* Remove weeks to the instance
1734	*
1735	- * @param ~~integer~~ $value
1736	*
1737	* @return static
1738	*/
	@@ -1745,7 +1797,7 @@ class Carbon extends DateTime
1745	* Add hours to the instance. Positive $value travels forward while
1746	* negative $value travels into the past.
1747	*
1748	- * @param ~~integer~~ $value
1749	*
1750	* @return static
1751	*/
	@@ -1757,7 +1809,7 @@ class Carbon extends DateTime
1757	/**
1758	* Add an hour to the instance
1759	*
1760	- * @param ~~integer~~ $value
1761	*
1762	* @return static
1763	*/
	@@ -1769,7 +1821,7 @@ class Carbon extends DateTime
1769	/**
1770	* Remove an hour from the instance
1771	*
1772	- * @param ~~integer~~ $value
1773	*
1774	* @return static
1775	*/
	@@ -1781,7 +1833,7 @@ class Carbon extends DateTime
1781	/**
1782	* Remove hours from the instance
1783	*
1784	- * @param ~~integer~~ $value
1785	*
1786	* @return static
1787	*/
	@@ -1794,7 +1846,7 @@ class Carbon extends DateTime
1794	* Add minutes to the instance. Positive $value travels forward while
1795	* negative $value travels into the past.
1796	*
1797	- * @param ~~integer~~ $value
1798	*
1799	* @return static
1800	*/
	@@ -1806,7 +1858,7 @@ class Carbon extends DateTime
1806	/**
1807	* Add a minute to the instance
1808	*
1809	- * @param ~~integer~~ $value
1810	*
1811	* @return static
1812	*/
	@@ -1818,7 +1870,7 @@ class Carbon extends DateTime
1818	/**
1819	* Remove a minute from the instance
1820	*
1821	- * @param ~~integer~~ $value
1822	*
1823	* @return static
1824	*/
	@@ -1830,7 +1882,7 @@ class Carbon extends DateTime
1830	/**
1831	* Remove minutes from the instance
1832	*
1833	- * @param ~~integer~~ $value
1834	*
1835	* @return static
1836	*/
	@@ -1843,7 +1895,7 @@ class Carbon extends DateTime
1843	* Add seconds to the instance. Positive $value travels forward while
1844	* negative $value travels into the past.
1845	*
1846	- * @param ~~integer~~ $value
1847	*
1848	* @return static
1849	*/
	@@ -1855,7 +1907,7 @@ class Carbon extends DateTime
1855	/**
1856	* Add a second to the instance
1857	*
1858	- * @param ~~integer~~ $value
1859	*
1860	* @return static
1861	*/
	@@ -1867,7 +1919,7 @@ class Carbon extends DateTime
1867	/**
1868	* Remove a second from the instance
1869	*
1870	- * @param ~~integer~~ $value
1871	*
1872	* @return static
1873	*/
	@@ -1879,7 +1931,7 @@ class Carbon extends DateTime
1879	/**
1880	* Remove seconds from the instance
1881	*
1882	- * @param ~~integer~~ $value
1883	*
1884	* @return static
1885	*/
	@@ -1895,14 +1947,14 @@ class Carbon extends DateTime
1895	/**
1896	* Get the difference in years
1897	*
1898	- * @param Carbon $dt
1899	- * @param ~~boolean~~ $abs Get the absolute of the difference
1900	*
1901	- * @return ~~integer~~
1902	*/
1903	public function diffInYears(Carbon $dt = null, $abs = true)
1904	{
1905	- $dt = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
1906
1907	return (int) $this->diff($dt, $abs)->format('%r%y');
1908	}
	@@ -1910,14 +1962,14 @@ class Carbon extends DateTime
1910	/**
1911	* Get the difference in months
1912	*
1913	- * @param Carbon $dt
1914	- * @param ~~boolean~~ $abs Get the absolute of the difference
1915	*
1916	- * @return ~~integer~~
1917	*/
1918	public function diffInMonths(Carbon $dt = null, $abs = true)
1919	{
1920	- $dt = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
1921
1922	return $this->diffInYears($dt, $abs) * static::MONTHS_PER_YEAR + (int) $this->diff($dt, $abs)->format('%r%m');
1923	}
	@@ -1925,10 +1977,10 @@ class Carbon extends DateTime
1925	/**
1926	* Get the difference in weeks
1927	*
1928	- * @param Carbon $dt
1929	- * @param ~~boolean~~ $abs Get the absolute of the difference
1930	*
1931	- * @return ~~integer~~
1932	*/
1933	public function diffInWeeks(Carbon $dt = null, $abs = true)
1934	{
	@@ -1938,14 +1990,14 @@ class Carbon extends DateTime
1938	/**
1939	* Get the difference in days
1940	*
1941	- * @param Carbon $dt
1942	- * @param ~~boolean~~ $abs Get the absolute of the difference
1943	*
1944	- * @return ~~integer~~
1945	*/
1946	public function diffInDays(Carbon $dt = null, $abs = true)
1947	{
1948	- $dt = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
1949
1950	return (int) $this->diff($dt, $abs)->format('%r%a');
1951	}
	@@ -1953,9 +2005,9 @@ class Carbon extends DateTime
1953	/**
1954	* Get the difference in days using a filter closure
1955	*
1956	- * @param Closure $callback
1957	- * @param Carbon $dt
1958	- * @param ~~boolean~~ $abs Get the absolute of the difference
1959	*
1960	* @return int
1961	*/
	@@ -1967,9 +2019,9 @@ class Carbon extends DateTime
1967	/**
1968	* Get the difference in hours using a filter closure
1969	*
1970	- * @param Closure $callback
1971	- * @param Carbon $dt
1972	- * @param ~~boolean~~ $abs Get the absolute of the difference
1973	*
1974	* @return int
1975	*/
	@@ -1981,17 +2033,17 @@ class Carbon extends DateTime
1981	/**
1982	* Get the difference by the given interval using a filter closure
1983	*
1984	- * @param CarbonInterval $ci An interval to traverse by
1985	- * @param Closure $callback
1986	- * @param Carbon $dt
1987	- * @param ~~boolean~~ $abs Get the absolute of the difference
1988	*
1989	* @return int
1990	*/
1991	public function diffFiltered(CarbonInterval $ci, Closure $callback, Carbon $dt = null, $abs = true)
1992	{
1993	$start = $this;
1994	- $end = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
1995	$inverse = false;
1996
1997	if ($end < $start) {
	@@ -2013,8 +2065,8 @@ class Carbon extends DateTime
2013	/**
2014	* Get the difference in weekdays
2015	*
2016	- * @param Carbon $dt
2017	- * @param ~~boolean~~ $abs Get the absolute of the difference
2018	*
2019	* @return int
2020	*/
	@@ -2028,8 +2080,8 @@ class Carbon extends DateTime
2028	/**
2029	* Get the difference in weekend days using a filter
2030	*
2031	- * @param Carbon $dt
2032	- * @param ~~boolean~~ $abs Get the absolute of the difference
2033	*
2034	* @return int
2035	*/
	@@ -2043,10 +2095,10 @@ class Carbon extends DateTime
2043	/**
2044	* Get the difference in hours
2045	*
2046	- * @param Carbon $dt
2047	- * @param ~~boolean~~ $abs Get the absolute of the difference
2048	*
2049	- * @return ~~integer~~
2050	*/
2051	public function diffInHours(Carbon $dt = null, $abs = true)
2052	{
	@@ -2056,10 +2108,10 @@ class Carbon extends DateTime
2056	/**
2057	* Get the difference in minutes
2058	*
2059	- * @param Carbon $dt
2060	- * @param ~~boolean~~ $abs Get the absolute of the difference
2061	*
2062	- * @return ~~integer~~
2063	*/
2064	public function diffInMinutes(Carbon $dt = null, $abs = true)
2065	{
	@@ -2069,14 +2121,14 @@ class Carbon extends DateTime
2069	/**
2070	* Get the difference in seconds
2071	*
2072	- * @param Carbon $dt
2073	- * @param ~~boolean~~ $abs Get the absolute of the difference
2074	*
2075	- * @return ~~integer~~
2076	*/
2077	public function diffInSeconds(Carbon $dt = null, $abs = true)
2078	{
2079	- $dt = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
2080	$value = $dt->getTimestamp() - $this->getTimestamp();
2081
2082	return $abs ? abs($value) : $value;
	@@ -2085,7 +2137,7 @@ class Carbon extends DateTime
2085	/**
2086	* The number of seconds since midnight.
2087	*
2088	- * @return ~~integer~~
2089	*/
2090	public function secondsSinceMidnight()
2091	{
	@@ -2095,7 +2147,7 @@ class Carbon extends DateTime
2095	/**
2096	* The number of seconds until 23:23:59.
2097	*
2098	- * @return ~~integer~~
2099	*/
2100	public function secondsUntilEndOfDay()
2101	{
	@@ -2121,8 +2173,8 @@ class Carbon extends DateTime
2121	* 1 hour after
2122	* 5 months after
2123	*
2124	- * @param Carbon $other
2125	- * @param bool $absolute removes time difference modifiers ago, after, etc
2126	*
2127	* @return string
2128	*/
	@@ -2172,7 +2224,7 @@ class Carbon extends DateTime
2172	break;
2173	}
2174
2175	- if ($count == 0) {
2176	$count = 1;
2177	}
2178
	@@ -2306,7 +2358,7 @@ class Carbon extends DateTime
2306	*/
2307	public function startOfWeek()
2308	{
2309	- if ($this->dayOfWeek != static::$weekStartsAt) {
2310	$this->previous(static::$weekStartsAt);
2311	}
2312
	@@ -2320,7 +2372,7 @@ class Carbon extends DateTime
2320	*/
2321	public function endOfWeek()
2322	{
2323	- if ($this->dayOfWeek != static::$weekEndsAt) {
2324	$this->next(static::$weekEndsAt);
2325	}
2326
	@@ -2328,14 +2380,14 @@ class Carbon extends DateTime
2328	}
2329
2330	/**
2331	- * Modify to the next ~~occurence~~ of a given day of the week.
2332	- * If no dayOfWeek is provided, modify to the next ~~occurence~~
2333	* of the current day of the week. Use the supplied consts
2334	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2335	*
2336	- * @param int $dayOfWeek
2337	*
2338	- * @return ~~mixed~~
2339	*/
2340	public function next($dayOfWeek = null)
2341	{
	@@ -2347,14 +2399,14 @@ class Carbon extends DateTime
2347	}
2348
2349	/**
2350	- * Modify to the previous ~~occurence~~ of a given day of the week.
2351	- * If no dayOfWeek is provided, modify to the previous ~~occurence~~
2352	* of the current day of the week. Use the supplied consts
2353	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2354	*
2355	- * @param int $dayOfWeek
2356	*
2357	- * @return ~~mixed~~
2358	*/
2359	public function previous($dayOfWeek = null)
2360	{
	@@ -2366,14 +2418,14 @@ class Carbon extends DateTime
2366	}
2367
2368	/**
2369	- * Modify to the first ~~occurence~~ of a given day of the week
2370	* in the current month. If no dayOfWeek is provided, modify to the
2371	* first day of the current month. Use the supplied consts
2372	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2373	*
2374	- * @param int $dayOfWeek
2375	*
2376	- * @return ~~mixed~~
2377	*/
2378	public function firstOfMonth($dayOfWeek = null)
2379	{
	@@ -2387,14 +2439,14 @@ class Carbon extends DateTime
2387	}
2388
2389	/**
2390	- * Modify to the last ~~occurence~~ of a given day of the week
2391	* in the current month. If no dayOfWeek is provided, modify to the
2392	* last day of the current month. Use the supplied consts
2393	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2394	*
2395	- * @param int $dayOfWeek
2396	*
2397	- * @return ~~mixed~~
2398	*/
2399	public function lastOfMonth($dayOfWeek = null)
2400	{
	@@ -2408,8 +2460,8 @@ class Carbon extends DateTime
2408	}
2409
2410	/**
2411	- * Modify to the given ~~occurence~~ of a given day of the week
2412	- * in the current month. If the calculated ~~occurence~~ is outside the scope
2413	* of the current month, then return false and no modifications are made.
2414	* Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
2415	*
	@@ -2424,18 +2476,18 @@ class Carbon extends DateTime
2424	$check = $dt->format('Y-m');
2425	$dt->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
2426
2427	- return ($dt->format('Y-m') === $check) ? $this->modify($dt) : false;
2428	}
2429
2430	/**
2431	- * Modify to the first ~~occurence~~ of a given day of the week
2432	* in the current quarter. If no dayOfWeek is provided, modify to the
2433	* first day of the current quarter. Use the supplied consts
2434	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2435	*
2436	- * @param int $dayOfWeek
2437	*
2438	- * @return ~~mixed~~
2439	*/
2440	public function firstOfQuarter($dayOfWeek = null)
2441	{
	@@ -2443,14 +2495,14 @@ class Carbon extends DateTime
2443	}
2444
2445	/**
2446	- * Modify to the last ~~occurence~~ of a given day of the week
2447	* in the current quarter. If no dayOfWeek is provided, modify to the
2448	* last day of the current quarter. Use the supplied consts
2449	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2450	*
2451	- * @param int $dayOfWeek
2452	*
2453	- * @return ~~mixed~~
2454	*/
2455	public function lastOfQuarter($dayOfWeek = null)
2456	{
	@@ -2458,8 +2510,8 @@ class Carbon extends DateTime
2458	}
2459
2460	/**
2461	- * Modify to the given ~~occurence~~ of a given day of the week
2462	- * in the current quarter. If the calculated ~~occurence~~ is outside the scope
2463	* of the current quarter, then return false and no modifications are made.
2464	* Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
2465	*
	@@ -2471,22 +2523,22 @@ class Carbon extends DateTime
2471	public function nthOfQuarter($nth, $dayOfWeek)
2472	{
2473	$dt = $this->copy()->day(1)->month($this->quarter * 3);
2474	- $~~last_month~~ = $dt->month;
2475	$year = $dt->year;
2476	$dt->firstOfQuarter()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
2477
2478	- return ($~~last_month~~ < $dt->month \|\| $year !== $dt->year) ? false : $this->modify($dt);
2479	}
2480
2481	/**
2482	- * Modify to the first ~~occurence~~ of a given day of the week
2483	* in the current year. If no dayOfWeek is provided, modify to the
2484	* first day of the current year. Use the supplied consts
2485	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2486	*
2487	- * @param int $dayOfWeek
2488	*
2489	- * @return ~~mixed~~
2490	*/
2491	public function firstOfYear($dayOfWeek = null)
2492	{
	@@ -2494,14 +2546,14 @@ class Carbon extends DateTime
2494	}
2495
2496	/**
2497	- * Modify to the last ~~occurence~~ of a given day of the week
2498	* in the current year. If no dayOfWeek is provided, modify to the
2499	* last day of the current year. Use the supplied consts
2500	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2501	*
2502	- * @param int $dayOfWeek
2503	*
2504	- * @return ~~mixed~~
2505	*/
2506	public function lastOfYear($dayOfWeek = null)
2507	{
	@@ -2509,8 +2561,8 @@ class Carbon extends DateTime
2509	}
2510
2511	/**
2512	- * Modify to the given ~~occurence~~ of a given day of the week
2513	- * in the current year. If the calculated ~~occurence~~ is outside the scope
2514	* of the current year, then return false and no modifications are made.
2515	* Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
2516	*
	@@ -2523,19 +2575,19 @@ class Carbon extends DateTime
2523	{
2524	$dt = $this->copy()->firstOfYear()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
2525
2526	- return $this->year == $dt->year ? $this->modify($dt) : false;
2527	}
2528
2529	/**
2530	* Modify the current instance to the average of a given instance (default now) and the current instance.
2531	*
2532	- * @param Carbon $dt
2533	*
2534	* @return static
2535	*/
2536	public function average(Carbon $dt = null)
2537	{
2538	- $dt = ($dt ~~===~~ ~~null) ?~~ static::now($this->tz) ~~: $dt~~;
2539
2540	return $this->addSeconds((int) ($this->diffInSeconds($dt, false) / 2));
2541	}
	@@ -2543,12 +2595,14 @@ class Carbon extends DateTime
2543	/**
2544	* Check if its the birthday. Compares the date/month values of the two dates.
2545	*
2546	- * @param Carbon $dt
2547	*
2548	- * @return ~~boolean~~
2549	*/
2550	- public function isBirthday(Carbon $dt)
2551	{


2552	return $this->format('md') === $dt->format('md');
2553	}
2554	}


23	/**
24	* A simple API extension for DateTime
25	*
26	+ * @property int $year
27	+ * @property int $yearIso
28	+ * @property int $month
29	+ * @property int $day
30	+ * @property int $hour
31	+ * @property int $minute
32	+ * @property int $second
33	+ * @property int $timestamp seconds since the Unix Epoch
34	* @property DateTimeZone $timezone the current timezone
35	* @property DateTimeZone $tz alias of timezone
36	* @property-read integer $micro

121	*/
122	protected static $toStringFormat = self::DEFAULT_TO_STRING_FORMAT;
123

124	/**
125	* First day of week
126	*

161	*
162	* @param DateTimeZone\|string\|null $object
163	*


164	* @throws InvalidArgumentException
165	+ *
166	+ * @return DateTimeZone
167	*/
168	protected static function safeCreateDateTimeZone($object)
169	{

195	* Please see the testing aids section (specifically static::setTestNow())
196	* for more on the possibility of this constructor returning a test instance.
197	*
198	+ * @param string\|null $time
199	+ * @param DateTimeZone\|string\|null $tz
200	*/
201	public function __construct($time = null, $tz = null)
202	{

209	}
210
211	//shift the time according to the given time zone
212	+ if ($tz !== null && $tz !== static::getTestNow()->tz) {
213	$testInstance->setTimezone($tz);
214	} else {
215	$tz = $testInstance->tz;

239	* Carbon::parse('Monday next week')->fn() rather than
240	* (new Carbon('Monday next week'))->fn()
241	*
242	+ * @param string\|null $time
243	+ * @param DateTimeZone\|string\|null $tz
244	*
245	* @return static
246	*/

252	/**
253	* Get a Carbon instance for the current date and time
254	*
255	+ * @param DateTimeZone\|string\|null $tz
256	*
257	* @return static
258	*/

264	/**
265	* Create a Carbon instance for today
266	*
267	+ * @param DateTimeZone\|string\|null $tz
268	*
269	* @return static
270	*/

276	/**
277	* Create a Carbon instance for tomorrow
278	*
279	+ * @param DateTimeZone\|string\|null $tz
280	*
281	* @return static
282	*/

288	/**
289	* Create a Carbon instance for yesterday
290	*
291	+ * @param DateTimeZone\|string\|null $tz
292	*
293	* @return static
294	*/

304	*/
305	public static function maxValue()
306	{
307	+ if (PHP_INT_SIZE === 4) {
308	+ // 32 bit (and additionally Windows 64 bit)
309	+ return static::createFromTimestamp(PHP_INT_MAX);
310	+ }
311	+
312	+ // 64 bit
313	+ return static::create(9999, 12, 31, 23, 59, 59);
314	}
315
316	/**

320	*/
321	public static function minValue()
322	{
323	+ if (PHP_INT_SIZE === 4) {
324	+ // 32 bit (and additionally Windows 64 bit)
325	+ return static::createFromTimestamp(~PHP_INT_MAX);
326	+ }
327	+
328	+ // 64 bit
329	+ return static::create(1, 1, 1, 0, 0, 0);
330	}
331
332	/**

340	* If $hour is not null then the default values for $minute and $second
341	* will be 0.
342	*
343	+ * @param int\|null $year
344	+ * @param int\|null $month
345	+ * @param int\|null $day
346	+ * @param int\|null $hour
347	+ * @param int\|null $minute
348	+ * @param int\|null $second
349	+ * @param DateTimeZone\|string\|null $tz
350	*
351	* @return static
352	*/
353	public static function create($year = null, $month = null, $day = null, $hour = null, $minute = null, $second = null, $tz = null)
354	{
355	+ $year = $year === null ? date('Y') : $year;
356	+ $month = $month === null ? date('n') : $month;
357	+ $day = $day === null ? date('j') : $day;
358
359	if ($hour === null) {
360	$hour = date('G');
361	+ $minute = $minute === null ? date('i') : $minute;
362	+ $second = $second === null ? date('s') : $second;
363	} else {
364	+ $minute = $minute === null ? 0 : $minute;
365	+ $second = $second === null ? 0 : $second;
366	}
367
368	return static::createFromFormat('Y-n-j G:i:s', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);

371	/**
372	* Create a Carbon instance from just a date. The time portion is set to now.
373	*
374	+ * @param int\|null $year
375	+ * @param int\|null $month
376	+ * @param int\|null $day
377	+ * @param DateTimeZone\|string\|null $tz
378	*
379	* @return static
380	*/

386	/**
387	* Create a Carbon instance from just a time. The date portion is set to today.
388	*
389	+ * @param int\|null $hour
390	+ * @param int\|null $minute
391	+ * @param int\|null $second
392	+ * @param DateTimeZone\|string\|null $tz
393	*
394	* @return static
395	*/

401	/**
402	* Create a Carbon instance from a specific format
403	*
404	+ * @param string $format
405	+ * @param string $time
406	+ * @param DateTimeZone\|string\|null $tz


407	*
408	* @throws InvalidArgumentException
409	+ *
410	+ * @return static
411	*/
412	public static function createFromFormat($format, $time, $tz = null)
413	{

428	/**
429	* Create a Carbon instance from a timestamp
430	*
431	+ * @param int $timestamp
432	+ * @param DateTimeZone\|string\|null $tz
433	*
434	* @return static
435	*/

441	/**
442	* Create a Carbon instance from an UTC timestamp
443	*
444	+ * @param int $timestamp
445	*
446	* @return static
447	*/

471	*
472	* @throws InvalidArgumentException
473	*
474	+ * @return string\|int\|DateTimeZone
475	*/
476	public function __get($name)
477	{

509	return $this->getOffset() / static::SECONDS_PER_MINUTE / static::MINUTES_PER_HOUR;
510
511	case $name === 'dst':
512	+ return $this->format('I') === '1';
513
514	case $name === 'local':
515	+ return $this->offset === $this->copy()->setTimezone(date_default_timezone_get())->offset;
516
517	case $name === 'utc':
518	+ return $this->offset === 0;
519
520	case $name === 'timezone' \|\| $name === 'tz':
521	return $this->getTimezone();

533	*
534	* @param string $name
535	*
536	+ * @return bool
537	*/
538	public function __isset($name)
539	{

549	/**
550	* Set a part of the Carbon object
551	*
552	+ * @param string $name
553	+ * @param string\|int\|DateTimeZone $value
554	*
555	* @throws InvalidArgumentException
556	*/

598	/**
599	* Set the instance's year
600	*
601	+ * @param int $value
602	*
603	* @return static
604	*/

612	/**
613	* Set the instance's month
614	*
615	+ * @param int $value
616	*
617	* @return static
618	*/

626	/**
627	* Set the instance's day
628	*
629	+ * @param int $value
630	*
631	* @return static
632	*/

640	/**
641	* Set the instance's hour
642	*
643	+ * @param int $value
644	*
645	* @return static
646	*/

654	/**
655	* Set the instance's minute
656	*
657	+ * @param int $value
658	*
659	* @return static
660	*/

668	/**
669	* Set the instance's second
670	*
671	+ * @param int $value
672	*
673	* @return static
674	*/

682	/**
683	* Set the date and time all together
684	*
685	+ * @param int $year
686	+ * @param int $month
687	+ * @param int $day
688	+ * @param int $hour
689	+ * @param int $minute
690	+ * @param int $second
691	*
692	* @return static
693	*/

696	return $this->setDate($year, $month, $day)->setTime($hour, $minute, $second);
697	}
698
699	+ /**
700	+ * Set the time by time string
701	+ *
702	+ * @param string $time
703	+ *
704	+ * @return static
705	+ */
706	+ public function setTimeFromTimeString($time)
707	+ {
708	+ $time = explode(":", $time);
709	+
710	+ $hour = $time[0];
711	+ $minute = isset($time[1]) ? $time[1] : 0;
712	+ $second = isset($time[2]) ? $time[2] : 0;
713	+
714	+ return $this->setTime($hour, $minute, $second);
715	+ }
716	+
717	/**
718	* Set the instance's timestamp
719	*
720	+ * @param int $value
721	*
722	* @return static
723	*/

766	return $this;
767	}
768


769	///////////////////////////////////////////////////////////////////
770	/////////////////////// WEEK SPECIAL DAYS /////////////////////////
771	///////////////////////////////////////////////////////////////////

830	static::$weekendDays = $days;
831	}
832

833	///////////////////////////////////////////////////////////////////
834	///////////////////////// TESTING AIDS ////////////////////////////
835	///////////////////////////////////////////////////////////////////

848	* To clear the test instance call this method using the default
849	* parameter of null.
850	*
851	+ * @param Carbon\|null $testNow
852	*/
853	public static function setTestNow(Carbon $testNow = null)
854	{

870	* Determine if there is a valid test instance set. A valid test instance
871	* is anything that is not null.
872	*
873	+ * @return bool true if there is a test instance, otherwise false
874	*/
875	public static function hasTestNow()
876	{

883	*
884	* @param string $time
885	*
886	+ * @return bool true if there is a keyword, otherwise false
887	*/
888	public static function hasRelativeKeywords($time)
889	{

910	*/
911	protected static function translator()
912	{
913	+ if (static::$translator === null) {
914	static::$translator = new Translator('en');
915	static::$translator->addLoader('array', new ArrayLoader());
916	static::setLocale('en');

978	{
979	// Check for Windows to find and replace the %e
980	// modifier correctly
981	+ if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
982	$format = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $format);
983	}
984

987
988	/**
989	* Reset the format used to the default when type juggling a Carbon instance to a string

990	*/
991	public static function resetToStringFormat()
992	{

1182	*
1183	* @param Carbon $dt
1184	*
1185	+ * @return bool
1186	*/
1187	public function eq(Carbon $dt)
1188	{

1194	*
1195	* @param Carbon $dt
1196	*
1197	+ * @return bool
1198	*/
1199	public function ne(Carbon $dt)
1200	{

1206	*
1207	* @param Carbon $dt
1208	*
1209	+ * @return bool
1210	*/
1211	public function gt(Carbon $dt)
1212	{

1218	*
1219	* @param Carbon $dt
1220	*
1221	+ * @return bool
1222	*/
1223	public function gte(Carbon $dt)
1224	{

1230	*
1231	* @param Carbon $dt
1232	*
1233	+ * @return bool
1234	*/
1235	public function lt(Carbon $dt)
1236	{

1242	*
1243	* @param Carbon $dt
1244	*
1245	+ * @return bool
1246	*/
1247	public function lte(Carbon $dt)
1248	{

1252	/**
1253	* Determines if the instance is between two others
1254	*
1255	+ * @param Carbon $dt1
1256	+ * @param Carbon $dt2
1257	+ * @param bool $equal Indicates if a > and < comparison should be used or <= or >=
1258	*
1259	+ * @return bool
1260	*/
1261	public function between(Carbon $dt1, Carbon $dt2, $equal = true)
1262	{

1268
1269	if ($equal) {
1270	return $this->gte($dt1) && $this->lte($dt2);


1271	}
1272	+
1273	+ return $this->gt($dt1) && $this->lt($dt2);
1274	+ }
1275	+
1276	+ /**
1277	+ * Get the closest date from the instance.
1278	+ *
1279	+ * @param Carbon $dt1
1280	+ * @param Carbon $dt2
1281	+ *
1282	+ * @return static
1283	+ */
1284	+ public function closest(Carbon $dt1, Carbon $dt2)
1285	+ {
1286	+ return $this->diffInSeconds($dt1) < $this->diffInSeconds($dt2) ? $dt1 : $dt2;
1287	+ }
1288	+
1289	+ /**
1290	+ * Get the farthest date from the instance.
1291	+ *
1292	+ * @param Carbon $dt1
1293	+ * @param Carbon $dt2
1294	+ *
1295	+ * @return static
1296	+ */
1297	+ public function farthest(Carbon $dt1, Carbon $dt2)
1298	+ {
1299	+ return $this->diffInSeconds($dt1) > $this->diffInSeconds($dt2) ? $dt1 : $dt2;
1300	}
1301
1302	/**
1303	* Get the minimum instance between a given instance (default now) and the current instance.
1304	*
1305	+ * @param Carbon\|null $dt
1306	*
1307	* @return static
1308	*/
1309	public function min(Carbon $dt = null)
1310	{
1311	+ $dt = $dt ?: static::now($this->tz);
1312
1313	return $this->lt($dt) ? $this : $dt;
1314	}

1316	/**
1317	* Get the maximum instance between a given instance (default now) and the current instance.
1318	*
1319	+ * @param Carbon\|null $dt
1320	*
1321	* @return static
1322	*/
1323	public function max(Carbon $dt = null)
1324	{
1325	+ $dt = $dt ?: static::now($this->tz);
1326
1327	return $this->gt($dt) ? $this : $dt;
1328	}

1330	/**
1331	* Determines if the instance is a weekday
1332	*
1333	+ * @return bool
1334	*/
1335	public function isWeekday()
1336	{

1340	/**
1341	* Determines if the instance is a weekend day
1342	*
1343	+ * @return bool
1344	*/
1345	public function isWeekend()
1346	{

1350	/**
1351	* Determines if the instance is yesterday
1352	*
1353	+ * @return bool
1354	*/
1355	public function isYesterday()
1356	{

1360	/**
1361	* Determines if the instance is today
1362	*
1363	+ * @return bool
1364	*/
1365	public function isToday()
1366	{

1370	/**
1371	* Determines if the instance is tomorrow
1372	*
1373	+ * @return bool
1374	*/
1375	public function isTomorrow()
1376	{

1380	/**
1381	* Determines if the instance is in the future, ie. greater (after) than now
1382	*
1383	+ * @return bool
1384	*/
1385	public function isFuture()
1386	{

1390	/**
1391	* Determines if the instance is in the past, ie. less (before) than now
1392	*
1393	+ * @return bool
1394	*/
1395	public function isPast()
1396	{

1400	/**
1401	* Determines if the instance is a leap year
1402	*
1403	+ * @return bool
1404	*/
1405	public function isLeapYear()
1406	{
1407	+ return $this->format('L') === '1';
1408	}
1409
1410	/**
1411	* Checks if the passed in date is the same day as the instance current day.
1412	*
1413	+ * @param Carbon $dt
1414	+ *
1415	+ * @return bool
1416	*/
1417	public function isSameDay(Carbon $dt)
1418	{

1421
1422	/**
1423	* Checks if this day is a Sunday.
1424	+ *
1425	+ * @return bool
1426	*/
1427	public function isSunday()
1428	{

1431
1432	/**
1433	* Checks if this day is a Monday.
1434	+ *
1435	+ * @return bool
1436	*/
1437	public function isMonday()
1438	{

1441
1442	/**
1443	* Checks if this day is a Tuesday.
1444	+ *
1445	+ * @return bool
1446	*/
1447	public function isTuesday()
1448	{

1451
1452	/**
1453	* Checks if this day is a Wednesday.
1454	+ *
1455	+ * @return bool
1456	*/
1457	public function isWednesday()
1458	{

1461
1462	/**
1463	* Checks if this day is a Thursday.
1464	+ *
1465	+ * @return bool
1466	*/
1467	public function isThursday()
1468	{

1471
1472	/**
1473	* Checks if this day is a Friday.
1474	+ *
1475	+ * @return bool
1476	*/
1477	public function isFriday()
1478	{

1481
1482	/**
1483	* Checks if this day is a Saturday.
1484	+ *
1485	+ * @return bool
1486	*/
1487	public function isSaturday()
1488	{
1489	return $this->dayOfWeek === static::SATURDAY;
1490	}
1491	+
1492	///////////////////////////////////////////////////////////////////
1493	/////////////////// ADDITIONS AND SUBTRACTIONS ////////////////////
1494	///////////////////////////////////////////////////////////////////

1497	* Add years to the instance. Positive $value travel forward while
1498	* negative $value travel into the past.
1499	*
1500	+ * @param int $value
1501	*
1502	* @return static
1503	*/

1509	/**
1510	* Add a year to the instance
1511	*
1512	+ * @param int $value
1513	*
1514	* @return static
1515	*/

1521	/**
1522	* Remove a year from the instance
1523	*
1524	+ * @param int $value
1525	*
1526	* @return static
1527	*/

1533	/**
1534	* Remove years from the instance.
1535	*
1536	+ * @param int $value
1537	*
1538	* @return static
1539	*/

1546	* Add months to the instance. Positive $value travels forward while
1547	* negative $value travels into the past.
1548	*
1549	+ * @param int $value
1550	*
1551	* @return static
1552	*/

1558	/**
1559	* Add a month to the instance
1560	*
1561	+ * @param int $value
1562	*
1563	* @return static
1564	*/

1570	/**
1571	* Remove a month from the instance
1572	*
1573	+ * @param int $value
1574	*
1575	* @return static
1576	*/

1582	/**
1583	* Remove months from the instance
1584	*
1585	+ * @param int $value
1586	*
1587	* @return static
1588	*/

1595	* Add months without overflowing to the instance. Positive $value
1596	* travels forward while negative $value travels into the past.
1597	*
1598	+ * @param int $value
1599	*
1600	* @return static
1601	*/

1603	{
1604	$date = $this->copy()->addMonths($value);
1605
1606	+ if ($date->day !== $this->day) {
1607	$date->day(1)->subMonth()->day($date->daysInMonth);
1608	}
1609

1613	/**
1614	* Add a month with no overflow to the instance
1615	*
1616	+ * @param int $value
1617	*
1618	* @return static
1619	*/

1625	/**
1626	* Remove a month with no overflow from the instance
1627	*
1628	+ * @param int $value
1629	*
1630	* @return static
1631	*/

1637	/**
1638	* Remove months with no overflow from the instance
1639	*
1640	+ * @param int $value
1641	*
1642	* @return static
1643	*/

1650	* Add days to the instance. Positive $value travels forward while
1651	* negative $value travels into the past.
1652	*
1653	+ * @param int $value
1654	*
1655	* @return static
1656	*/

1662	/**
1663	* Add a day to the instance
1664	*
1665	+ * @param int $value
1666	*
1667	* @return static
1668	*/

1674	/**
1675	* Remove a day from the instance
1676	*
1677	+ * @param int $value
1678	*
1679	* @return static
1680	*/

1686	/**
1687	* Remove days from the instance
1688	*
1689	+ * @param int $value
1690	*
1691	* @return static
1692	*/

1699	* Add weekdays to the instance. Positive $value travels forward while
1700	* negative $value travels into the past.
1701	*
1702	+ * @param int $value
1703	*
1704	* @return static
1705	*/

1711	/**
1712	* Add a weekday to the instance
1713	*
1714	+ * @param int $value
1715	*
1716	* @return static
1717	*/

1723	/**
1724	* Remove a weekday from the instance
1725	*
1726	+ * @param int $value
1727	*
1728	* @return static
1729	*/

1735	/**
1736	* Remove weekdays from the instance
1737	*
1738	+ * @param int $value
1739	*
1740	* @return static
1741	*/

1748	* Add weeks to the instance. Positive $value travels forward while
1749	* negative $value travels into the past.
1750	*
1751	+ * @param int $value
1752	*
1753	* @return static
1754	*/

1760	/**
1761	* Add a week to the instance
1762	*
1763	+ * @param int $value
1764	*
1765	* @return static
1766	*/

1772	/**
1773	* Remove a week from the instance
1774	*
1775	+ * @param int $value
1776	*
1777	* @return static
1778	*/

1784	/**
1785	* Remove weeks to the instance
1786	*
1787	+ * @param int $value
1788	*
1789	* @return static
1790	*/

1797	* Add hours to the instance. Positive $value travels forward while
1798	* negative $value travels into the past.
1799	*
1800	+ * @param int $value
1801	*
1802	* @return static
1803	*/

1809	/**
1810	* Add an hour to the instance
1811	*
1812	+ * @param int $value
1813	*
1814	* @return static
1815	*/

1821	/**
1822	* Remove an hour from the instance
1823	*
1824	+ * @param int $value
1825	*
1826	* @return static
1827	*/

1833	/**
1834	* Remove hours from the instance
1835	*
1836	+ * @param int $value
1837	*
1838	* @return static
1839	*/

1846	* Add minutes to the instance. Positive $value travels forward while
1847	* negative $value travels into the past.
1848	*
1849	+ * @param int $value
1850	*
1851	* @return static
1852	*/

1858	/**
1859	* Add a minute to the instance
1860	*
1861	+ * @param int $value
1862	*
1863	* @return static
1864	*/

1870	/**
1871	* Remove a minute from the instance
1872	*
1873	+ * @param int $value
1874	*
1875	* @return static
1876	*/

1882	/**
1883	* Remove minutes from the instance
1884	*
1885	+ * @param int $value
1886	*
1887	* @return static
1888	*/

1895	* Add seconds to the instance. Positive $value travels forward while
1896	* negative $value travels into the past.
1897	*
1898	+ * @param int $value
1899	*
1900	* @return static
1901	*/

1907	/**
1908	* Add a second to the instance
1909	*
1910	+ * @param int $value
1911	*
1912	* @return static
1913	*/

1919	/**
1920	* Remove a second from the instance
1921	*
1922	+ * @param int $value
1923	*
1924	* @return static
1925	*/

1931	/**
1932	* Remove seconds from the instance
1933	*
1934	+ * @param int $value
1935	*
1936	* @return static
1937	*/

1947	/**
1948	* Get the difference in years
1949	*
1950	+ * @param Carbon\|null $dt
1951	+ * @param bool $abs Get the absolute of the difference
1952	*
1953	+ * @return int
1954	*/
1955	public function diffInYears(Carbon $dt = null, $abs = true)
1956	{
1957	+ $dt = $dt ?: static::now($this->tz);
1958
1959	return (int) $this->diff($dt, $abs)->format('%r%y');
1960	}

1962	/**
1963	* Get the difference in months
1964	*
1965	+ * @param Carbon\|null $dt
1966	+ * @param bool $abs Get the absolute of the difference
1967	*
1968	+ * @return int
1969	*/
1970	public function diffInMonths(Carbon $dt = null, $abs = true)
1971	{
1972	+ $dt = $dt ?: static::now($this->tz);
1973
1974	return $this->diffInYears($dt, $abs) * static::MONTHS_PER_YEAR + (int) $this->diff($dt, $abs)->format('%r%m');
1975	}

1977	/**
1978	* Get the difference in weeks
1979	*
1980	+ * @param Carbon\|null $dt
1981	+ * @param bool $abs Get the absolute of the difference
1982	*
1983	+ * @return int
1984	*/
1985	public function diffInWeeks(Carbon $dt = null, $abs = true)
1986	{

1990	/**
1991	* Get the difference in days
1992	*
1993	+ * @param Carbon\|null $dt
1994	+ * @param bool $abs Get the absolute of the difference
1995	*
1996	+ * @return int
1997	*/
1998	public function diffInDays(Carbon $dt = null, $abs = true)
1999	{
2000	+ $dt = $dt ?: static::now($this->tz);
2001
2002	return (int) $this->diff($dt, $abs)->format('%r%a');
2003	}

2005	/**
2006	* Get the difference in days using a filter closure
2007	*
2008	+ * @param Closure $callback
2009	+ * @param Carbon\|null $dt
2010	+ * @param bool $abs Get the absolute of the difference
2011	*
2012	* @return int
2013	*/

2019	/**
2020	* Get the difference in hours using a filter closure
2021	*
2022	+ * @param Closure $callback
2023	+ * @param Carbon\|null $dt
2024	+ * @param bool $abs Get the absolute of the difference
2025	*
2026	* @return int
2027	*/

2033	/**
2034	* Get the difference by the given interval using a filter closure
2035	*
2036	+ * @param CarbonInterval $ci An interval to traverse by
2037	+ * @param Closure $callback
2038	+ * @param Carbon\|null $dt
2039	+ * @param bool $abs Get the absolute of the difference
2040	*
2041	* @return int
2042	*/
2043	public function diffFiltered(CarbonInterval $ci, Closure $callback, Carbon $dt = null, $abs = true)
2044	{
2045	$start = $this;
2046	+ $end = $dt ?: static::now($this->tz);
2047	$inverse = false;
2048
2049	if ($end < $start) {

2065	/**
2066	* Get the difference in weekdays
2067	*
2068	+ * @param Carbon\|null $dt
2069	+ * @param bool $abs Get the absolute of the difference
2070	*
2071	* @return int
2072	*/

2080	/**
2081	* Get the difference in weekend days using a filter
2082	*
2083	+ * @param Carbon\|null $dt
2084	+ * @param bool $abs Get the absolute of the difference
2085	*
2086	* @return int
2087	*/

2095	/**
2096	* Get the difference in hours
2097	*
2098	+ * @param Carbon\|null $dt
2099	+ * @param bool $abs Get the absolute of the difference
2100	*
2101	+ * @return int
2102	*/
2103	public function diffInHours(Carbon $dt = null, $abs = true)
2104	{

2108	/**
2109	* Get the difference in minutes
2110	*
2111	+ * @param Carbon\|null $dt
2112	+ * @param bool $abs Get the absolute of the difference
2113	*
2114	+ * @return int
2115	*/
2116	public function diffInMinutes(Carbon $dt = null, $abs = true)
2117	{

2121	/**
2122	* Get the difference in seconds
2123	*
2124	+ * @param Carbon\|null $dt
2125	+ * @param bool $abs Get the absolute of the difference
2126	*
2127	+ * @return int
2128	*/
2129	public function diffInSeconds(Carbon $dt = null, $abs = true)
2130	{
2131	+ $dt = $dt ?: static::now($this->tz);
2132	$value = $dt->getTimestamp() - $this->getTimestamp();
2133
2134	return $abs ? abs($value) : $value;

2137	/**
2138	* The number of seconds since midnight.
2139	*
2140	+ * @return int
2141	*/
2142	public function secondsSinceMidnight()
2143	{

2147	/**
2148	* The number of seconds until 23:23:59.
2149	*
2150	+ * @return int
2151	*/
2152	public function secondsUntilEndOfDay()
2153	{

2173	* 1 hour after
2174	* 5 months after
2175	*
2176	+ * @param Carbon\|null $other
2177	+ * @param bool $absolute removes time difference modifiers ago, after, etc
2178	*
2179	* @return string
2180	*/

2224	break;
2225	}
2226
2227	+ if ($count === 0) {
2228	$count = 1;
2229	}
2230

2358	*/
2359	public function startOfWeek()
2360	{
2361	+ if ($this->dayOfWeek !== static::$weekStartsAt) {
2362	$this->previous(static::$weekStartsAt);
2363	}
2364

2372	*/
2373	public function endOfWeek()
2374	{
2375	+ if ($this->dayOfWeek !== static::$weekEndsAt) {
2376	$this->next(static::$weekEndsAt);
2377	}
2378

2380	}
2381
2382	/**
2383	+ * Modify to the next occurrence of a given day of the week.
2384	+ * If no dayOfWeek is provided, modify to the next occurrence
2385	* of the current day of the week. Use the supplied consts
2386	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2387	*
2388	+ * @param int\|null $dayOfWeek
2389	*
2390	+ * @return static
2391	*/
2392	public function next($dayOfWeek = null)
2393	{

2399	}
2400
2401	/**
2402	+ * Modify to the previous occurrence of a given day of the week.
2403	+ * If no dayOfWeek is provided, modify to the previous occurrence
2404	* of the current day of the week. Use the supplied consts
2405	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2406	*
2407	+ * @param int\|null $dayOfWeek
2408	*
2409	+ * @return static
2410	*/
2411	public function previous($dayOfWeek = null)
2412	{

2418	}
2419
2420	/**
2421	+ * Modify to the first occurrence of a given day of the week
2422	* in the current month. If no dayOfWeek is provided, modify to the
2423	* first day of the current month. Use the supplied consts
2424	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2425	*
2426	+ * @param int\|null $dayOfWeek
2427	*
2428	+ * @return static
2429	*/
2430	public function firstOfMonth($dayOfWeek = null)
2431	{

2439	}
2440
2441	/**
2442	+ * Modify to the last occurrence of a given day of the week
2443	* in the current month. If no dayOfWeek is provided, modify to the
2444	* last day of the current month. Use the supplied consts
2445	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2446	*
2447	+ * @param int\|null $dayOfWeek
2448	*
2449	+ * @return static
2450	*/
2451	public function lastOfMonth($dayOfWeek = null)
2452	{

2460	}
2461
2462	/**
2463	+ * Modify to the given occurrence of a given day of the week
2464	+ * in the current month. If the calculated occurrence is outside the scope
2465	* of the current month, then return false and no modifications are made.
2466	* Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
2467	*

2476	$check = $dt->format('Y-m');
2477	$dt->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
2478
2479	+ return $dt->format('Y-m') === $check ? $this->modify($dt) : false;
2480	}
2481
2482	/**
2483	+ * Modify to the first occurrence of a given day of the week
2484	* in the current quarter. If no dayOfWeek is provided, modify to the
2485	* first day of the current quarter. Use the supplied consts
2486	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2487	*
2488	+ * @param int\|null $dayOfWeek
2489	*
2490	+ * @return static
2491	*/
2492	public function firstOfQuarter($dayOfWeek = null)
2493	{

2495	}
2496
2497	/**
2498	+ * Modify to the last occurrence of a given day of the week
2499	* in the current quarter. If no dayOfWeek is provided, modify to the
2500	* last day of the current quarter. Use the supplied consts
2501	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2502	*
2503	+ * @param int\|null $dayOfWeek
2504	*
2505	+ * @return static
2506	*/
2507	public function lastOfQuarter($dayOfWeek = null)
2508	{

2510	}
2511
2512	/**
2513	+ * Modify to the given occurrence of a given day of the week
2514	+ * in the current quarter. If the calculated occurrence is outside the scope
2515	* of the current quarter, then return false and no modifications are made.
2516	* Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
2517	*

2523	public function nthOfQuarter($nth, $dayOfWeek)
2524	{
2525	$dt = $this->copy()->day(1)->month($this->quarter * 3);
2526	+ $lastMonth = $dt->month;
2527	$year = $dt->year;
2528	$dt->firstOfQuarter()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
2529
2530	+ return ($lastMonth < $dt->month \|\| $year !== $dt->year) ? false : $this->modify($dt);
2531	}
2532
2533	/**
2534	+ * Modify to the first occurrence of a given day of the week
2535	* in the current year. If no dayOfWeek is provided, modify to the
2536	* first day of the current year. Use the supplied consts
2537	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2538	*
2539	+ * @param int\|null $dayOfWeek
2540	*
2541	+ * @return static
2542	*/
2543	public function firstOfYear($dayOfWeek = null)
2544	{

2546	}
2547
2548	/**
2549	+ * Modify to the last occurrence of a given day of the week
2550	* in the current year. If no dayOfWeek is provided, modify to the
2551	* last day of the current year. Use the supplied consts
2552	* to indicate the desired dayOfWeek, ex. static::MONDAY.
2553	*
2554	+ * @param int\|null $dayOfWeek
2555	*
2556	+ * @return static
2557	*/
2558	public function lastOfYear($dayOfWeek = null)
2559	{

2561	}
2562
2563	/**
2564	+ * Modify to the given occurrence of a given day of the week
2565	+ * in the current year. If the calculated occurrence is outside the scope
2566	* of the current year, then return false and no modifications are made.
2567	* Use the supplied consts to indicate the desired dayOfWeek, ex. static::MONDAY.
2568	*

2575	{
2576	$dt = $this->copy()->firstOfYear()->modify('+'.$nth.' '.static::$days[$dayOfWeek]);
2577
2578	+ return $this->year === $dt->year ? $this->modify($dt) : false;
2579	}
2580
2581	/**
2582	* Modify the current instance to the average of a given instance (default now) and the current instance.
2583	*
2584	+ * @param Carbon\|null $dt
2585	*
2586	* @return static
2587	*/
2588	public function average(Carbon $dt = null)
2589	{
2590	+ $dt = $dt ?: static::now($this->tz);
2591
2592	return $this->addSeconds((int) ($this->diffInSeconds($dt, false) / 2));
2593	}

2595	/**
2596	* Check if its the birthday. Compares the date/month values of the two dates.
2597	*
2598	+ * @param Carbon\|null $dt The instance to compare with or null to use current day.
2599	*
2600	+ * @return bool
2601	*/
2602	+ public function isBirthday(Carbon $dt = null)
2603	{
2604	+ $dt = $dt ?: static::now($this->tz);
2605	+
2606	return $this->format('md') === $dt->format('md');
2607	}
2608	}

vendor/nesbot/carbon/src/Carbon/CarbonInterval.php CHANGED Viewed

	@@ -22,13 +22,13 @@ use Symfony\Component\Translation\Loader\ArrayLoader;
22	* The implemenation provides helpers to handle weeks but only days are saved.
23	* Weeks are calculated based on the total days of the current instance.
24	*
25	- * @property ~~integer~~ $years Total years of the current interval.
26	- * @property ~~integer~~ $months Total months of the current interval.
27	- * @property ~~integer~~ $weeks Total weeks of the current interval calculated from the days.
28	- * @property ~~integer~~ $dayz Total days of the current interval (weeks * 7 + days).
29	- * @property ~~integer~~ $hours Total hours of the current interval.
30	- * @property ~~integer~~ $minutes Total minutes of the current interval.
31	- * @property ~~integer~~ $seconds Total seconds of the current interval.
32	*
33	* @property-read integer $dayzExcludeWeeks Total days remaining in the final week of the current instance (days % 7).
34	* @property-read integer $daysExcludeWeeks alias of dayzExcludeWeeks
	@@ -48,7 +48,6 @@ use Symfony\Component\Translation\Loader\ArrayLoader;
48	* @method static CarbonInterval minute($minutes = 1) Alias for minutes()
49	* @method static CarbonInterval seconds($seconds = 1) Create instance specifying a number of seconds.
50	* @method static CarbonInterval second($seconds = 1) Alias for seconds()
51	- *
52	* @method CarbonInterval years() years($years = 1) Set the years portion of the current interval.
53	* @method CarbonInterval year() year($years = 1) Alias for years().
54	* @method CarbonInterval months() months($months = 1) Set the months portion of the current interval.
	@@ -97,11 +96,11 @@ class CarbonInterval extends DateInterval
97	*
98	* @param DateInterval $interval
99	*
100	- * @return ~~boolean~~
101	*/
102	private static function wasCreatedFromDiff(DateInterval $interval)
103	{
104	- return ($interval->days !== false && $interval->days !== static::PHP_DAYS_FALSE);
105	}
106
107	///////////////////////////////////////////////////////////////////
	@@ -111,13 +110,13 @@ class CarbonInterval extends DateInterval
111	/**
112	* Create a new CarbonInterval instance.
113	*
114	- * @param ~~integer~~ $years
115	- * @param ~~integer~~ $months
116	- * @param ~~integer~~ $weeks
117	- * @param ~~integer~~ $days
118	- * @param ~~integer~~ $hours
119	- * @param ~~integer~~ $minutes
120	- * @param ~~integer~~ $seconds
121	*/
122	public function __construct($years = 1, $months = null, $weeks = null, $days = null, $hours = null, $minutes = null, $seconds = null)
123	{
	@@ -130,7 +129,7 @@ class CarbonInterval extends DateInterval
130	$specDays += $weeks > 0 ? $weeks * Carbon::DAYS_PER_WEEK : 0;
131	$specDays += $days > 0 ? $days : 0;
132
133	- $spec .= ($specDays > 0) ? $specDays.static::PERIOD_DAYS : '';
134
135	if ($hours > 0 \|\| $minutes > 0 \|\| $seconds > 0) {
136	$spec .= static::PERIOD_TIME_PREFIX;
	@@ -139,6 +138,11 @@ class CarbonInterval extends DateInterval
139	$spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : '';
140	}
141





142	parent::__construct($spec);
143	}
144
	@@ -148,13 +152,13 @@ class CarbonInterval extends DateInterval
148	* syntax as it allows you to do CarbonInterval::create(1)->fn() rather than
149	* (new CarbonInterval(1))->fn().
150	*
151	- * @param ~~integer~~ $years
152	- * @param ~~integer~~ $months
153	- * @param ~~integer~~ $weeks
154	- * @param ~~integer~~ $days
155	- * @param ~~integer~~ $hours
156	- * @param ~~integer~~ $minutes
157	- * @param ~~integer~~ $seconds
158	*
159	* @return static
160	*/
	@@ -170,13 +174,13 @@ class CarbonInterval extends DateInterval
170	* have the same names.
171	*
172	* @param string $name
173	- * @param array $args
174	*
175	* @return static
176	*/
177	public static function __callStatic($name, $args)
178	{
179	- $arg = count($args) == 0 ? 1 : $args[0];
180
181	switch ($name) {
182	case 'years':
	@@ -230,6 +234,7 @@ class CarbonInterval extends DateInterval
230	$instance = new static($di->y, $di->m, 0, $di->d, $di->h, $di->i, $di->s);
231	$instance->invert = $di->invert;
232	$instance->days = $di->days;

233	return $instance;
234	}
235
	@@ -244,7 +249,7 @@ class CarbonInterval extends DateInterval
244	*/
245	protected static function translator()
246	{
247	- if (static::$translator == null) {
248	static::$translator = new Translator('en');
249	static::$translator->addLoader('array', new ArrayLoader());
250	static::setLocale('en');
	@@ -307,7 +312,7 @@ class CarbonInterval extends DateInterval
307	*
308	* @throws InvalidArgumentException
309	*
310	- * @return ~~integer~~
311	*/
312	public function __get($name)
313	{
	@@ -346,7 +351,7 @@ class CarbonInterval extends DateInterval
346	* Set a part of the CarbonInterval object
347	*
348	* @param string $name
349	- * @param ~~integer~~ $val
350	*
351	* @throws InvalidArgumentException
352	*/
	@@ -387,13 +392,14 @@ class CarbonInterval extends DateInterval
387	* Allow setting of weeks and days to be cumulative.
388	*
389	* @param int $weeks Number of weeks to set
390	- * @param int $days Number of days to set
391	*
392	* @return static
393	*/
394	public function weeksAndDays($weeks, $days)
395	{
396	$this->dayz = ($weeks * Carbon::DAYS_PER_WEEK) + $days;

397	return $this;
398	}
399
	@@ -404,13 +410,13 @@ class CarbonInterval extends DateInterval
404	* have the same names.
405	*
406	* @param string $name
407	- * @param array $args
408	*
409	* @return static
410	*/
411	public function __call($name, $args)
412	{
413	- $arg = count($args) == 0 ? 1 : $args[0];
414
415	switch ($name) {
416	case 'years':
	@@ -491,25 +497,25 @@ class CarbonInterval extends DateInterval
491	}
492
493	/**
494	- * Add the passed interval to the current instance
495	- *
496	- * @param DateInterval $interval
497	- *
498	- * @return static
499	- */
500	public function add(DateInterval $interval)
501	{
502	- $sign = ($interval->invert === 1) ? -1 : 1;
503
504	if (static::wasCreatedFromDiff($interval)) {
505	- $this->dayz = $this->dayz + ($interval->days * $sign);
506	} else {
507	- $this->years = $this->years + ($interval->y * $sign);
508	- $this->months = $this->months + ($interval->m * $sign);
509	- $this->dayz = $this->dayz + ($interval->d * $sign);
510	- $this->hours = $this->hours + ($interval->h * $sign);
511	- $this->minutes = $this->minutes + ($interval->i * $sign);
512	- $this->seconds = $this->seconds + ($interval->s * $sign);
513	}
514
515	return $this;


22	* The implemenation provides helpers to handle weeks but only days are saved.
23	* Weeks are calculated based on the total days of the current instance.
24	*
25	+ * @property int $years Total years of the current interval.
26	+ * @property int $months Total months of the current interval.
27	+ * @property int $weeks Total weeks of the current interval calculated from the days.
28	+ * @property int $dayz Total days of the current interval (weeks * 7 + days).
29	+ * @property int $hours Total hours of the current interval.
30	+ * @property int $minutes Total minutes of the current interval.
31	+ * @property int $seconds Total seconds of the current interval.
32	*
33	* @property-read integer $dayzExcludeWeeks Total days remaining in the final week of the current instance (days % 7).
34	* @property-read integer $daysExcludeWeeks alias of dayzExcludeWeeks

48	* @method static CarbonInterval minute($minutes = 1) Alias for minutes()
49	* @method static CarbonInterval seconds($seconds = 1) Create instance specifying a number of seconds.
50	* @method static CarbonInterval second($seconds = 1) Alias for seconds()

51	* @method CarbonInterval years() years($years = 1) Set the years portion of the current interval.
52	* @method CarbonInterval year() year($years = 1) Alias for years().
53	* @method CarbonInterval months() months($months = 1) Set the months portion of the current interval.

96	*
97	* @param DateInterval $interval
98	*
99	+ * @return bool
100	*/
101	private static function wasCreatedFromDiff(DateInterval $interval)
102	{
103	+ return $interval->days !== false && $interval->days !== static::PHP_DAYS_FALSE;
104	}
105
106	///////////////////////////////////////////////////////////////////

110	/**
111	* Create a new CarbonInterval instance.
112	*
113	+ * @param int $years
114	+ * @param int $months
115	+ * @param int $weeks
116	+ * @param int $days
117	+ * @param int $hours
118	+ * @param int $minutes
119	+ * @param int $seconds
120	*/
121	public function __construct($years = 1, $months = null, $weeks = null, $days = null, $hours = null, $minutes = null, $seconds = null)
122	{

129	$specDays += $weeks > 0 ? $weeks * Carbon::DAYS_PER_WEEK : 0;
130	$specDays += $days > 0 ? $days : 0;
131
132	+ $spec .= $specDays > 0 ? $specDays.static::PERIOD_DAYS : '';
133
134	if ($hours > 0 \|\| $minutes > 0 \|\| $seconds > 0) {
135	$spec .= static::PERIOD_TIME_PREFIX;

138	$spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : '';
139	}
140
141	+ if ($spec === static::PERIOD_PREFIX) {
142	+ // Allow the zero interval.
143	+ $spec .= '0'.static::PERIOD_YEARS;
144	+ }
145	+
146	parent::__construct($spec);
147	}
148

152	* syntax as it allows you to do CarbonInterval::create(1)->fn() rather than
153	* (new CarbonInterval(1))->fn().
154	*
155	+ * @param int $years
156	+ * @param int $months
157	+ * @param int $weeks
158	+ * @param int $days
159	+ * @param int $hours
160	+ * @param int $minutes
161	+ * @param int $seconds
162	*
163	* @return static
164	*/

174	* have the same names.
175	*
176	* @param string $name
177	+ * @param array $args
178	*
179	* @return static
180	*/
181	public static function __callStatic($name, $args)
182	{
183	+ $arg = count($args) === 0 ? 1 : $args[0];
184
185	switch ($name) {
186	case 'years':

234	$instance = new static($di->y, $di->m, 0, $di->d, $di->h, $di->i, $di->s);
235	$instance->invert = $di->invert;
236	$instance->days = $di->days;
237	+
238	return $instance;
239	}
240

249	*/
250	protected static function translator()
251	{
252	+ if (static::$translator === null) {
253	static::$translator = new Translator('en');
254	static::$translator->addLoader('array', new ArrayLoader());
255	static::setLocale('en');

312	*
313	* @throws InvalidArgumentException
314	*
315	+ * @return int
316	*/
317	public function __get($name)
318	{

351	* Set a part of the CarbonInterval object
352	*
353	* @param string $name
354	+ * @param int $val
355	*
356	* @throws InvalidArgumentException
357	*/

392	* Allow setting of weeks and days to be cumulative.
393	*
394	* @param int $weeks Number of weeks to set
395	+ * @param int $days Number of days to set
396	*
397	* @return static
398	*/
399	public function weeksAndDays($weeks, $days)
400	{
401	$this->dayz = ($weeks * Carbon::DAYS_PER_WEEK) + $days;
402	+
403	return $this;
404	}
405

410	* have the same names.
411	*
412	* @param string $name
413	+ * @param array $args
414	*
415	* @return static
416	*/
417	public function __call($name, $args)
418	{
419	+ $arg = count($args) === 0 ? 1 : $args[0];
420
421	switch ($name) {
422	case 'years':

497	}
498
499	/**
500	+ * Add the passed interval to the current instance
501	+ *
502	+ * @param DateInterval $interval
503	+ *
504	+ * @return static
505	+ */
506	public function add(DateInterval $interval)
507	{
508	+ $sign = $interval->invert === 1 ? -1 : 1;
509
510	if (static::wasCreatedFromDiff($interval)) {
511	+ $this->dayz = $this->dayz + $interval->days * $sign;
512	} else {
513	+ $this->years = $this->years + $interval->y * $sign;
514	+ $this->months = $this->months + $interval->m * $sign;
515	+ $this->dayz = $this->dayz + $interval->d * $sign;
516	+ $this->hours = $this->hours + $interval->h * $sign;
517	+ $this->minutes = $this->minutes + $interval->i * $sign;
518	+ $this->seconds = $this->seconds + $interval->s * $sign;
519	}
520
521	return $this;

vendor/nesbot/carbon/src/Carbon/Lang/ar.php CHANGED Viewed

	@@ -11,20 +11,19 @@
11	/**
12	* Translation messages. See http://symfony.com/doc/current/book/translation.html
13	* for possible formats.
14	- *
15	*/
16	/**
17	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ar/date.php
18	*/
19
20	return array(
21	- 'year' => '{0}سنة\|{1}سنة\|{2}سنتين\|[3,10]:count سنوات\|[11,Inf] سنة',
22	- 'month' => '{0}شهر\|{1}شهر\|{2}شهرين\|[3,10]:count أشهر\|[11,Inf] شهر',
23	- 'week' => '{0}~~أسبوع\|~~{1}~~أسبوع\|~~{2}~~أسبوعين\|~~[3,10]:count أسابيع\|[11,Inf] ~~أسبوع~~',
24	'day' => '{0}يوم\|{1}يوم\|{2}يومين\|[3,10]:count أيام\|[11,Inf] يوم',
25	- 'hour' => '{0}ساعة\|{1}ساعة\|{2}ساعتين\|[3,10]:count ساعات\|[11,Inf] ساعة',
26	'minute' => '{0}دقيقة\|{1}دقيقة\|{2}دقيقتين\|[3,10]:count دقائق\|[11,Inf]:count دقيقة',
27	- 'second' => '{0}ثانية\|{1}ثانية\|{2}ثانيتين\|[3,10]:count ثوان\|[11,Inf] ثانية',
28	'ago' => 'منذ :time',
29	'from_now' => 'من الآن :time',
30	'after' => 'بعد :time',


11	/**
12	* Translation messages. See http://symfony.com/doc/current/book/translation.html
13	* for possible formats.

14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ar/date.php
17	*/
18
19	return array(
20	+ 'year' => '{0}سنة\|{1}سنة\|{2}سنتين\|[3,10]:count سنوات\|[11,Inf]:count سنة',
21	+ 'month' => '{0}شهر\|{1} شهر\|{2}شهرين\|[3,10]:count أشهر\|[11,Inf]:count شهر',
22	+ 'week' => '{0}إسبوع\|{1}إسبوع\|{2}إسبوعين\|[3,10]:count أسابيع\|[11,Inf]:count إسبوع',
23	'day' => '{0}يوم\|{1}يوم\|{2}يومين\|[3,10]:count أيام\|[11,Inf] يوم',
24	+ 'hour' => '{0}ساعة\|{1}ساعة\|{2}ساعتين\|[3,10]:count ساعات\|[11,Inf]:count ساعة',
25	'minute' => '{0}دقيقة\|{1}دقيقة\|{2}دقيقتين\|[3,10]:count دقائق\|[11,Inf]:count دقيقة',
26	+ 'second' => '{0}ثانية\|{1}ثانية\|{2}ثانيتين\|[3,10]:count ثوان\|[11,Inf]:count ثانية',
27	'ago' => 'منذ :time',
28	'from_now' => 'من الآن :time',
29	'after' => 'بعد :time',

vendor/nesbot/carbon/src/Carbon/Lang/az.php CHANGED Viewed

	@@ -10,9 +10,8 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	- /**
16	* Extracted from https://github.com/The-Hasanov/laravel-date/blob/1006f37c431178b5c7219d02c93579c9690ae546/src/Lang/az.php
17	*/
18	return array(


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	+ /**
15	* Extracted from https://github.com/The-Hasanov/laravel-date/blob/1006f37c431178b5c7219d02c93579c9690ae546/src/Lang/az.php
16	*/
17	return array(

vendor/nesbot/carbon/src/Carbon/Lang/bg.php CHANGED Viewed

	@@ -11,7 +11,6 @@
11	/**
12	* Translation messages. See http://symfony.com/doc/current/book/translation.html
13	* for possible formats.
14	- *
15	*/
16	/**
17	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/bg/date.php


11	/**
12	* Translation messages. See http://symfony.com/doc/current/book/translation.html
13	* for possible formats.

14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/bg/date.php

vendor/nesbot/carbon/src/Carbon/Lang/bn.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/eu/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/eu/date.php

vendor/nesbot/carbon/src/Carbon/Lang/ca.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ca/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ca/date.php

vendor/nesbot/carbon/src/Carbon/Lang/cs.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/cs/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/cs/date.php

vendor/nesbot/carbon/src/Carbon/Lang/da.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => '1 år\|:count år',


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => '1 år\|:count år',

vendor/nesbot/carbon/src/Carbon/Lang/de.php CHANGED Viewed

	@@ -13,7 +13,6 @@
13	/**
14	* Translation messages. See http://symfony.com/doc/current/book/translation.html
15	* for possible formats.
16	- *
17	*/
18	return array(
19	'year' => '1 Jahr\|:count Jahre',


13	/**
14	* Translation messages. See http://symfony.com/doc/current/book/translation.html
15	* for possible formats.

16	*/
17	return array(
18	'year' => '1 Jahr\|:count Jahre',

vendor/nesbot/carbon/src/Carbon/Lang/el.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/el/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/el/date.php

vendor/nesbot/carbon/src/Carbon/Lang/en.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => '1 year\|:count years',


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => '1 year\|:count years',

vendor/nesbot/carbon/src/Carbon/Lang/eo.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/eo/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/eo/date.php

vendor/nesbot/carbon/src/Carbon/Lang/es.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => '1 año\|:count años',
	@@ -24,6 +23,6 @@ return array(
24	'second' => '1 segundo\|:count segundos',
25	'ago' => 'hace :time',
26	'from_now' => 'dentro de :time',
27	- 'after' => ':time ~~antes~~',
28	- 'before' => ':time ~~después~~',
29	);


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => '1 año\|:count años',

23	'second' => '1 segundo\|:count segundos',
24	'ago' => 'hace :time',
25	'from_now' => 'dentro de :time',
26	+ 'after' => ':time después',
27	+ 'before' => ':time antes',
28	);

vendor/nesbot/carbon/src/Carbon/Lang/eu.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/eu/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/eu/date.php

vendor/nesbot/carbon/src/Carbon/Lang/fa.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17
18	return array(


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16
17	return array(

vendor/nesbot/carbon/src/Carbon/Lang/fi.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/fi/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/fi/date.php

vendor/nesbot/carbon/src/Carbon/Lang/fo.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => '1 ár\|:count ár',


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => '1 ár\|:count ár',

vendor/nesbot/carbon/src/Carbon/Lang/fr.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => '1 an\|:count ans',


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => '1 an\|:count ans',

vendor/nesbot/carbon/src/Carbon/Lang/he.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => 'שנה\|{2}שנתיים\|:count שנים',


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => 'שנה\|{2}שנתיים\|:count שנים',

vendor/nesbot/carbon/src/Carbon/Lang/hr.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/hr/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/hr/date.php

vendor/nesbot/carbon/src/Carbon/Lang/hu.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/hu/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/hu/date.php

vendor/nesbot/carbon/src/Carbon/Lang/id.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/id/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/id/date.php

vendor/nesbot/carbon/src/Carbon/Lang/it.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => '1 anno\|:count anni',


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => '1 anno\|:count anni',

vendor/nesbot/carbon/src/Carbon/Lang/ja.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ja/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ja/date.php

vendor/nesbot/carbon/src/Carbon/Lang/ko.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/cs/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/cs/date.php

vendor/nesbot/carbon/src/Carbon/Lang/lt.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17
18	return array(
	@@ -27,4 +26,4 @@ return array(
27	'from_now' => 'už :time',
28	'after' => 'po :time',
29	'before' => ':time nuo dabar',
30	- );


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16
17	return array(

26	'from_now' => 'už :time',
27	'after' => 'po :time',
28	'before' => ':time nuo dabar',
29	+ );

vendor/nesbot/carbon/src/Carbon/Lang/lv.php CHANGED Viewed

	@@ -11,7 +11,6 @@
11	/**
12	* Translation messages. See http://symfony.com/doc/current/book/translation.html
13	* for possible formats.
14	- *
15	*/
16	return array(
17	'year' => '0 gadiem\|:count gada\|:count gadiem',


11	/**
12	* Translation messages. See http://symfony.com/doc/current/book/translation.html
13	* for possible formats.

14	*/
15	return array(
16	'year' => '0 gadiem\|:count gada\|:count gadiem',

vendor/nesbot/carbon/src/Carbon/Lang/ms.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	return array(
16	'year' => ':count tahun',


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	return array(
15	'year' => ':count tahun',

vendor/nesbot/carbon/src/Carbon/Lang/nl.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	return array(
16	'year' => '1 jaar\|:count jaren',


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	return array(
15	'year' => '1 jaar\|:count jaren',

vendor/nesbot/carbon/src/Carbon/Lang/no.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/no/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/no/date.php

vendor/nesbot/carbon/src/Carbon/Lang/pl.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/pl/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/pl/date.php

vendor/nesbot/carbon/src/Carbon/Lang/pt.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/pt/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/pt/date.php

vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	return array(
16	'year' => '1 ano\|:count anos',
	@@ -22,6 +21,6 @@ return array(
22	'second' => '1 segundo\|:count segundos',
23	'ago' => 'há :time',
24	'from_now' => 'dentro de :time',
25	- 'after' => ':time ~~depois~~',
26	- 'before' => ':time ~~antes~~',
27	);


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	return array(
15	'year' => '1 ano\|:count anos',

21	'second' => '1 segundo\|:count segundos',
22	'ago' => 'há :time',
23	'from_now' => 'dentro de :time',
24	+ 'after' => 'após :time',
25	+ 'before' => ':time atrás',
26	);

vendor/nesbot/carbon/src/Carbon/Lang/ro.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ro/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ro/date.php

vendor/nesbot/carbon/src/Carbon/Lang/ru.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ru/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/ru/date.php

vendor/nesbot/carbon/src/Carbon/Lang/sk.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sk/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sk/date.php

vendor/nesbot/carbon/src/Carbon/Lang/sl.php CHANGED Viewed

@@ -10,28 +10,27 @@
             /**
              * Translation messages.  See http://symfony.com/doc/current/book/translation.html
              * for possible formats.
-            -
             *
              */
             /**
              * Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sl/date.php
              */
             return array(
-            -
            	'year'      => ':count leto|:count leti|:count leta|:count let',
-            -
            	'month'     => ':count mesec|:count meseca|:count mesece|:count mesecev',
-            -
            	'week'      => ':count teden|:count tedna|:count tedne|:count tednov',
-            -
            	'day'       => ':count dan|:count dni|:count dni|:count dni',
-            -
            	'hour'      => ':count uro|:count uri|:count ure|:count ur',
-            -
            	'minute'    => ':count minuto|:count minuti|:count minute|:count minut',
-            -
            	'second'    => ':count sekundo|:count sekundi|:count sekunde|:count sekund',
-            -
            	'year_ago'  => ':count letom|:count leti|:count leti|:count leti',
-            -
            	'month_ago' => ':count mesecem|:count meseci|:count meseci|:count meseci',
-            -
            	'week_ago'  => ':count tednom|:count tednoma|:count tedni|:count tedni',
-            -
            	'day_ago'   => ':count dnem|:count dnevoma|:count dnevi|:count dnevi',
-            -
            	'hour_ago'  => ':count uro|:count urama|:count urami|:count urami',
-            -
            	'minute_ago'=> ':count minuto|:count minutama|:count minutami|:count minutami',
-            -
            	'second_ago'=> ':count sekundo|:count sekundama|:count sekundami|:count sekundami',
-            -
            	'ago'       => 'pred :time',
-            -
            	'from_now'  => 'čez :time',
-            -
            	'after'     => 'čez :time',
-            -
            	'before'    => 'pred :time'
             );


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sl/date.php
16	*/
17	return array(
18	+ 'year' => ':count leto\|:count leti\|:count leta\|:count let',
19	+ 'month' => ':count mesec\|:count meseca\|:count mesece\|:count mesecev',
20	+ 'week' => ':count teden\|:count tedna\|:count tedne\|:count tednov',
21	+ 'day' => ':count dan\|:count dni\|:count dni\|:count dni',
22	+ 'hour' => ':count uro\|:count uri\|:count ure\|:count ur',
23	+ 'minute' => ':count minuto\|:count minuti\|:count minute\|:count minut',
24	+ 'second' => ':count sekundo\|:count sekundi\|:count sekunde\|:count sekund',
25	+ 'year_ago' => ':count letom\|:count leti\|:count leti\|:count leti',
26	+ 'month_ago' => ':count mesecem\|:count meseci\|:count meseci\|:count meseci',
27	+ 'week_ago' => ':count tednom\|:count tednoma\|:count tedni\|:count tedni',
28	+ 'day_ago' => ':count dnem\|:count dnevoma\|:count dnevi\|:count dnevi',
29	+ 'hour_ago' => ':count uro\|:count urama\|:count urami\|:count urami',
30	+ 'minute_ago'=> ':count minuto\|:count minutama\|:count minutami\|:count minutami',
31	+ 'second_ago'=> ':count sekundo\|:count sekundama\|:count sekundami\|:count sekundami',
32	+ 'ago' => 'pred :time',
33	+ 'from_now' => 'čez :time',
34	+ 'after' => 'čez :time',
35	+ 'before' => 'pred :time'
36	);

vendor/nesbot/carbon/src/Carbon/Lang/sr.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sr/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sr/date.php

vendor/nesbot/carbon/src/Carbon/Lang/sv.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sv/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/sv/date.php

vendor/nesbot/carbon/src/Carbon/Lang/th.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/th/date.php
	@@ -23,7 +22,6 @@ return array(
23	'hour' => '1 ชั่วโมง\|:count ชั่วโมง',
24	'minute' => '1 นาที\|:count นาที',
25	'second' => '1 วินาที\|:count วินาที',
26	- 'ago' => ':time sitten',
27	'ago' => ':time ที่แล้ว',
28	'from_now' => ':time จากนี้',
29	'after' => 'หลัง:time',


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/th/date.php

22	'hour' => '1 ชั่วโมง\|:count ชั่วโมง',
23	'minute' => '1 นาที\|:count นาที',
24	'second' => '1 วินาที\|:count วินาที',

25	'ago' => ':time ที่แล้ว',
26	'from_now' => ':time จากนี้',
27	'after' => 'หลัง:time',

vendor/nesbot/carbon/src/Carbon/Lang/tr.php CHANGED Viewed

	@@ -12,7 +12,6 @@
12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.
15	- *
16	*/
17	return array(
18	'year' => ':count yıl',


12	/**
13	* Translation messages. See http://symfony.com/doc/current/book/translation.html
14	* for possible formats.

15	*/
16	return array(
17	'year' => ':count yıl',

vendor/nesbot/carbon/src/Carbon/Lang/uk.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/uk/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/uk/date.php

vendor/nesbot/carbon/src/Carbon/Lang/uz.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15
16	return array(


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14
15	return array(

vendor/nesbot/carbon/src/Carbon/Lang/vi.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/vi/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/vi/date.php

vendor/nesbot/carbon/src/Carbon/Lang/zh-TW.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/zh-TW/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/zh-TW/date.php

vendor/nesbot/carbon/src/Carbon/Lang/zh.php CHANGED Viewed

	@@ -10,7 +10,6 @@
10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.
13	- *
14	*/
15	/**
16	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/zh/date.php


10	/**
11	* Translation messages. See http://symfony.com/doc/current/book/translation.html
12	* for possible formats.

13	*/
14	/**
15	* Extracted from https://github.com/jenssegers/laravel-date/blob/master/src/lang/zh/date.php

vendor/symfony/translation/DataCollectorTranslator.php CHANGED Viewed

	@@ -66,8 +66,6 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
66
67	/**
68	* {@inheritdoc}
69	- *
70	- * @api
71	*/
72	public function setLocale($locale)
73	{
	@@ -76,8 +74,6 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
76
77	/**
78	* {@inheritdoc}
79	- *
80	- * @api
81	*/
82	public function getLocale()
83	{


66
67	/**
68	* {@inheritdoc}


69	*/
70	public function setLocale($locale)
71	{

74
75	/**
76	* {@inheritdoc}


77	*/
78	public function getLocale()
79	{

vendor/symfony/translation/Exception/ExceptionInterface.php CHANGED Viewed

	@@ -15,8 +15,6 @@ namespace Symfony\Component\Translation\Exception;
15	* Exception interface for all exceptions thrown by the component.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>
18	- *
19	- * @api
20	*/
21	interface ExceptionInterface
22	{


15	* Exception interface for all exceptions thrown by the component.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>


18	*/
19	interface ExceptionInterface
20	{

vendor/symfony/translation/Exception/InvalidResourceException.php CHANGED Viewed

	@@ -15,8 +15,6 @@ namespace Symfony\Component\Translation\Exception;
15	* Thrown when a resource cannot be loaded.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>
18	- *
19	- * @api
20	*/
21	class InvalidResourceException extends \InvalidArgumentException implements ExceptionInterface
22	{


15	* Thrown when a resource cannot be loaded.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>


18	*/
19	class InvalidResourceException extends \InvalidArgumentException implements ExceptionInterface
20	{

vendor/symfony/translation/Exception/NotFoundResourceException.php CHANGED Viewed

	@@ -15,8 +15,6 @@ namespace Symfony\Component\Translation\Exception;
15	* Thrown when a resource does not exist.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>
18	- *
19	- * @api
20	*/
21	class NotFoundResourceException extends \InvalidArgumentException implements ExceptionInterface
22	{


15	* Thrown when a resource does not exist.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>


18	*/
19	class NotFoundResourceException extends \InvalidArgumentException implements ExceptionInterface
20	{

vendor/symfony/translation/IdentityTranslator.php CHANGED Viewed

	@@ -15,8 +15,6 @@ namespace Symfony\Component\Translation;
15	* IdentityTranslator does not translate anything.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>
18	- *
19	- * @api
20	*/
21	class IdentityTranslator implements TranslatorInterface
22	{
	@@ -27,8 +25,6 @@ class IdentityTranslator implements TranslatorInterface
27	* Constructor.
28	*
29	* @param MessageSelector\|null $selector The message selector for pluralization
30	- *
31	- * @api
32	*/
33	public function __construct(MessageSelector $selector = null)
34	{
	@@ -37,8 +33,6 @@ class IdentityTranslator implements TranslatorInterface
37
38	/**
39	* {@inheritdoc}
40	- *
41	- * @api
42	*/
43	public function setLocale($locale)
44	{
	@@ -47,8 +41,6 @@ class IdentityTranslator implements TranslatorInterface
47
48	/**
49	* {@inheritdoc}
50	- *
51	- * @api
52	*/
53	public function getLocale()
54	{
	@@ -57,8 +49,6 @@ class IdentityTranslator implements TranslatorInterface
57
58	/**
59	* {@inheritdoc}
60	- *
61	- * @api
62	*/
63	public function trans($id, array $parameters = array(), $domain = null, $locale = null)
64	{
	@@ -67,8 +57,6 @@ class IdentityTranslator implements TranslatorInterface
67
68	/**
69	* {@inheritdoc}
70	- *
71	- * @api
72	*/
73	public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
74	{


15	* IdentityTranslator does not translate anything.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>


18	*/
19	class IdentityTranslator implements TranslatorInterface
20	{

25	* Constructor.
26	*
27	* @param MessageSelector\|null $selector The message selector for pluralization


28	*/
29	public function __construct(MessageSelector $selector = null)
30	{

33
34	/**
35	* {@inheritdoc}


36	*/
37	public function setLocale($locale)
38	{

41
42	/**
43	* {@inheritdoc}


44	*/
45	public function getLocale()
46	{

49
50	/**
51	* {@inheritdoc}


52	*/
53	public function trans($id, array $parameters = array(), $domain = null, $locale = null)
54	{

57
58	/**
59	* {@inheritdoc}


60	*/
61	public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
62	{

vendor/symfony/translation/Loader/ArrayLoader.php CHANGED Viewed

	@@ -17,15 +17,11 @@ use Symfony\Component\Translation\MessageCatalogue;
17	* ArrayLoader loads translations from a PHP array.
18	*
19	* @author Fabien Potencier <fabien@symfony.com>
20	- *
21	- * @api
22	*/
23	class ArrayLoader implements LoaderInterface
24	{
25	/**
26	* {@inheritdoc}
27	- *
28	- * @api
29	*/
30	public function load($resource, $locale, $domain = 'messages')
31	{


17	* ArrayLoader loads translations from a PHP array.
18	*
19	* @author Fabien Potencier <fabien@symfony.com>


20	*/
21	class ArrayLoader implements LoaderInterface
22	{
23	/**
24	* {@inheritdoc}


25	*/
26	public function load($resource, $locale, $domain = 'messages')
27	{

vendor/symfony/translation/Loader/CsvFileLoader.php CHANGED Viewed

	@@ -19,8 +19,6 @@ use Symfony\Component\Config\Resource\FileResource;
19	* CsvFileLoader loads translations from CSV files.
20	*
21	* @author Saša Stamenković <umpirsky@gmail.com>
22	- *
23	- * @api
24	*/
25	class CsvFileLoader extends ArrayLoader
26	{
	@@ -30,8 +28,6 @@ class CsvFileLoader extends ArrayLoader
30
31	/**
32	* {@inheritdoc}
33	- *
34	- * @api
35	*/
36	public function load($resource, $locale, $domain = 'messages')
37	{
	@@ -55,18 +51,8 @@ class CsvFileLoader extends ArrayLoader
55	$file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
56
57	foreach ($file as $data) {
58	- if (substr($data[0], 0, 1) === ~~'#'~~) {
59	- continue;
60	- }
61	-
62	- if (!isset($data[1])) {
63	- continue;
64	- }
65	-
66	- if (count($data) == 2) {
67	$messages[$data[0]] = $data[1];
68	- } else {
69	- continue;
70	}
71	}
72


19	* CsvFileLoader loads translations from CSV files.
20	*
21	* @author Saša Stamenković <umpirsky@gmail.com>


22	*/
23	class CsvFileLoader extends ArrayLoader
24	{

28
29	/**
30	* {@inheritdoc}


31	*/
32	public function load($resource, $locale, $domain = 'messages')
33	{

51	$file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
52
53	foreach ($file as $data) {
54	+ if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === count($data)) {








55	$messages[$data[0]] = $data[1];


56	}
57	}
58

vendor/symfony/translation/Loader/LoaderInterface.php CHANGED Viewed

	@@ -19,8 +19,6 @@ use Symfony\Component\Translation\Exception\NotFoundResourceException;
19	* LoaderInterface is the interface implemented by all translation loaders.
20	*
21	* @author Fabien Potencier <fabien@symfony.com>
22	- *
23	- * @api
24	*/
25	interface LoaderInterface
26	{
	@@ -33,8 +31,6 @@ interface LoaderInterface
33	*
34	* @return MessageCatalogue A MessageCatalogue instance
35	*
36	- * @api
37	- *
38	* @throws NotFoundResourceException when the resource cannot be found
39	* @throws InvalidResourceException when the resource cannot be loaded
40	*/


19	* LoaderInterface is the interface implemented by all translation loaders.
20	*
21	* @author Fabien Potencier <fabien@symfony.com>


22	*/
23	interface LoaderInterface
24	{

31	*
32	* @return MessageCatalogue A MessageCatalogue instance
33	*


34	* @throws NotFoundResourceException when the resource cannot be found
35	* @throws InvalidResourceException when the resource cannot be loaded
36	*/

vendor/symfony/translation/Loader/PhpFileLoader.php CHANGED Viewed

	@@ -19,15 +19,11 @@ use Symfony\Component\Config\Resource\FileResource;
19	* PhpFileLoader loads translations from PHP files returning an array of translations.
20	*
21	* @author Fabien Potencier <fabien@symfony.com>
22	- *
23	- * @api
24	*/
25	class PhpFileLoader extends ArrayLoader
26	{
27	/**
28	* {@inheritdoc}
29	- *
30	- * @api
31	*/
32	public function load($resource, $locale, $domain = 'messages')
33	{


19	* PhpFileLoader loads translations from PHP files returning an array of translations.
20	*
21	* @author Fabien Potencier <fabien@symfony.com>


22	*/
23	class PhpFileLoader extends ArrayLoader
24	{
25	/**
26	* {@inheritdoc}


27	*/
28	public function load($resource, $locale, $domain = 'messages')
29	{

vendor/symfony/translation/Loader/QtFileLoader.php CHANGED Viewed

	@@ -21,15 +21,11 @@ use Symfony\Component\Config\Resource\FileResource;
21	* QtFileLoader loads translations from QT Translations XML files.
22	*
23	* @author Benjamin Eberlei <kontakt@beberlei.de>
24	- *
25	- * @api
26	*/
27	class QtFileLoader implements LoaderInterface
28	{
29	/**
30	* {@inheritdoc}
31	- *
32	- * @api
33	*/
34	public function load($resource, $locale, $domain = 'messages')
35	{


21	* QtFileLoader loads translations from QT Translations XML files.
22	*
23	* @author Benjamin Eberlei <kontakt@beberlei.de>


24	*/
25	class QtFileLoader implements LoaderInterface
26	{
27	/**
28	* {@inheritdoc}


29	*/
30	public function load($resource, $locale, $domain = 'messages')
31	{

vendor/symfony/translation/Loader/XliffFileLoader.php CHANGED Viewed

	@@ -21,15 +21,11 @@ use Symfony\Component\Config\Resource\FileResource;
21	* XliffFileLoader loads translations from XLIFF files.
22	*
23	* @author Fabien Potencier <fabien@symfony.com>
24	- *
25	- * @api
26	*/
27	class XliffFileLoader implements LoaderInterface
28	{
29	/**
30	* {@inheritdoc}
31	- *
32	- * @api
33	*/
34	public function load($resource, $locale, $domain = 'messages')
35	{


21	* XliffFileLoader loads translations from XLIFF files.
22	*
23	* @author Fabien Potencier <fabien@symfony.com>


24	*/
25	class XliffFileLoader implements LoaderInterface
26	{
27	/**
28	* {@inheritdoc}


29	*/
30	public function load($resource, $locale, $domain = 'messages')
31	{

vendor/symfony/translation/Loader/YamlFileLoader.php CHANGED Viewed

	@@ -21,8 +21,6 @@ use Symfony\Component\Yaml\Exception\ParseException;
21	* YamlFileLoader loads translations from Yaml files.
22	*
23	* @author Fabien Potencier <fabien@symfony.com>
24	- *
25	- * @api
26	*/
27	class YamlFileLoader extends ArrayLoader
28	{
	@@ -30,8 +28,6 @@ class YamlFileLoader extends ArrayLoader
30
31	/**
32	* {@inheritdoc}
33	- *
34	- * @api
35	*/
36	public function load($resource, $locale, $domain = 'messages')
37	{


21	* YamlFileLoader loads translations from Yaml files.
22	*
23	* @author Fabien Potencier <fabien@symfony.com>


24	*/
25	class YamlFileLoader extends ArrayLoader
26	{

28
29	/**
30	* {@inheritdoc}


31	*/
32	public function load($resource, $locale, $domain = 'messages')
33	{

vendor/symfony/translation/LoggingTranslator.php CHANGED Viewed

	@@ -66,8 +66,6 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
66
67	/**
68	* {@inheritdoc}
69	- *
70	- * @api
71	*/
72	public function setLocale($locale)
73	{
	@@ -76,8 +74,6 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
76
77	/**
78	* {@inheritdoc}
79	- *
80	- * @api
81	*/
82	public function getLocale()
83	{


66
67	/**
68	* {@inheritdoc}


69	*/
70	public function setLocale($locale)
71	{

74
75	/**
76	* {@inheritdoc}


77	*/
78	public function getLocale()
79	{

vendor/symfony/translation/MessageCatalogue.php CHANGED Viewed

	@@ -17,8 +17,6 @@ use Symfony\Component\Config\Resource\ResourceInterface;
17	* MessageCatalogue.
18	*
19	* @author Fabien Potencier <fabien@symfony.com>
20	- *
21	- * @api
22	*/
23	class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterface
24	{
	@@ -34,8 +32,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
34	*
35	* @param string $locale The locale
36	* @param array $messages An array of messages classified by domain
37	- *
38	- * @api
39	*/
40	public function __construct($locale, array $messages = array())
41	{
	@@ -45,8 +41,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
45
46	/**
47	* {@inheritdoc}
48	- *
49	- * @api
50	*/
51	public function getLocale()
52	{
	@@ -55,8 +49,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
55
56	/**
57	* {@inheritdoc}
58	- *
59	- * @api
60	*/
61	public function getDomains()
62	{
	@@ -65,8 +57,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
65
66	/**
67	* {@inheritdoc}
68	- *
69	- * @api
70	*/
71	public function all($domain = null)
72	{
	@@ -79,8 +69,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
79
80	/**
81	* {@inheritdoc}
82	- *
83	- * @api
84	*/
85	public function set($id, $translation, $domain = 'messages')
86	{
	@@ -89,8 +77,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
89
90	/**
91	* {@inheritdoc}
92	- *
93	- * @api
94	*/
95	public function has($id, $domain = 'messages')
96	{
	@@ -115,8 +101,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
115
116	/**
117	* {@inheritdoc}
118	- *
119	- * @api
120	*/
121	public function get($id, $domain = 'messages')
122	{
	@@ -133,8 +117,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
133
134	/**
135	* {@inheritdoc}
136	- *
137	- * @api
138	*/
139	public function replace($messages, $domain = 'messages')
140	{
	@@ -145,8 +127,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
145
146	/**
147	* {@inheritdoc}
148	- *
149	- * @api
150	*/
151	public function add($messages, $domain = 'messages')
152	{
	@@ -159,8 +139,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
159
160	/**
161	* {@inheritdoc}
162	- *
163	- * @api
164	*/
165	public function addCatalogue(MessageCatalogueInterface $catalogue)
166	{
	@@ -184,8 +162,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
184
185	/**
186	* {@inheritdoc}
187	- *
188	- * @api
189	*/
190	public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
191	{
	@@ -214,8 +190,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
214
215	/**
216	* {@inheritdoc}
217	- *
218	- * @api
219	*/
220	public function getFallbackCatalogue()
221	{
	@@ -224,8 +198,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
224
225	/**
226	* {@inheritdoc}
227	- *
228	- * @api
229	*/
230	public function getResources()
231	{
	@@ -234,8 +206,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
234
235	/**
236	* {@inheritdoc}
237	- *
238	- * @api
239	*/
240	public function addResource(ResourceInterface $resource)
241	{


17	* MessageCatalogue.
18	*
19	* @author Fabien Potencier <fabien@symfony.com>


20	*/
21	class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterface
22	{

32	*
33	* @param string $locale The locale
34	* @param array $messages An array of messages classified by domain


35	*/
36	public function __construct($locale, array $messages = array())
37	{

41
42	/**
43	* {@inheritdoc}


44	*/
45	public function getLocale()
46	{

49
50	/**
51	* {@inheritdoc}


52	*/
53	public function getDomains()
54	{

57
58	/**
59	* {@inheritdoc}


60	*/
61	public function all($domain = null)
62	{

69
70	/**
71	* {@inheritdoc}


72	*/
73	public function set($id, $translation, $domain = 'messages')
74	{

77
78	/**
79	* {@inheritdoc}


80	*/
81	public function has($id, $domain = 'messages')
82	{

101
102	/**
103	* {@inheritdoc}


104	*/
105	public function get($id, $domain = 'messages')
106	{

117
118	/**
119	* {@inheritdoc}


120	*/
121	public function replace($messages, $domain = 'messages')
122	{

127
128	/**
129	* {@inheritdoc}


130	*/
131	public function add($messages, $domain = 'messages')
132	{

139
140	/**
141	* {@inheritdoc}


142	*/
143	public function addCatalogue(MessageCatalogueInterface $catalogue)
144	{

162
163	/**
164	* {@inheritdoc}


165	*/
166	public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
167	{

190
191	/**
192	* {@inheritdoc}


193	*/
194	public function getFallbackCatalogue()
195	{

198
199	/**
200	* {@inheritdoc}


201	*/
202	public function getResources()
203	{

206
207	/**
208	* {@inheritdoc}


209	*/
210	public function addResource(ResourceInterface $resource)
211	{

vendor/symfony/translation/MessageCatalogueInterface.php CHANGED Viewed

	@@ -17,8 +17,6 @@ use Symfony\Component\Config\Resource\ResourceInterface;
17	* MessageCatalogueInterface.
18	*
19	* @author Fabien Potencier <fabien@symfony.com>
20	- *
21	- * @api
22	*/
23	interface MessageCatalogueInterface
24	{
	@@ -26,8 +24,6 @@ interface MessageCatalogueInterface
26	* Gets the catalogue locale.
27	*
28	* @return string The locale
29	- *
30	- * @api
31	*/
32	public function getLocale();
33
	@@ -35,8 +31,6 @@ interface MessageCatalogueInterface
35	* Gets the domains.
36	*
37	* @return array An array of domains
38	- *
39	- * @api
40	*/
41	public function getDomains();
42
	@@ -48,8 +42,6 @@ interface MessageCatalogueInterface
48	* @param string $domain The domain name
49	*
50	* @return array An array of messages
51	- *
52	- * @api
53	*/
54	public function all($domain = null);
55
	@@ -59,8 +51,6 @@ interface MessageCatalogueInterface
59	* @param string $id The message id
60	* @param string $translation The messages translation
61	* @param string $domain The domain name
62	- *
63	- * @api
64	*/
65	public function set($id, $translation, $domain = 'messages');
66
	@@ -71,8 +61,6 @@ interface MessageCatalogueInterface
71	* @param string $domain The domain name
72	*
73	* @return bool true if the message has a translation, false otherwise
74	- *
75	- * @api
76	*/
77	public function has($id, $domain = 'messages');
78
	@@ -83,8 +71,6 @@ interface MessageCatalogueInterface
83	* @param string $domain The domain name
84	*
85	* @return bool true if the message has a translation, false otherwise
86	- *
87	- * @api
88	*/
89	public function defines($id, $domain = 'messages');
90
	@@ -95,8 +81,6 @@ interface MessageCatalogueInterface
95	* @param string $domain The domain name
96	*
97	* @return string The message translation
98	- *
99	- * @api
100	*/
101	public function get($id, $domain = 'messages');
102
	@@ -105,8 +89,6 @@ interface MessageCatalogueInterface
105	*
106	* @param array $messages An array of translations
107	* @param string $domain The domain name
108	- *
109	- * @api
110	*/
111	public function replace($messages, $domain = 'messages');
112
	@@ -115,8 +97,6 @@ interface MessageCatalogueInterface
115	*
116	* @param array $messages An array of translations
117	* @param string $domain The domain name
118	- *
119	- * @api
120	*/
121	public function add($messages, $domain = 'messages');
122
	@@ -126,8 +106,6 @@ interface MessageCatalogueInterface
126	* The two catalogues must have the same locale.
127	*
128	* @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance
129	- *
130	- * @api
131	*/
132	public function addCatalogue(MessageCatalogueInterface $catalogue);
133
	@@ -138,8 +116,6 @@ interface MessageCatalogueInterface
138	* This is used to provide default translations when they do not exist for the current locale.
139	*
140	* @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance
141	- *
142	- * @api
143	*/
144	public function addFallbackCatalogue(MessageCatalogueInterface $catalogue);
145
	@@ -147,8 +123,6 @@ interface MessageCatalogueInterface
147	* Gets the fallback catalogue.
148	*
149	* @return MessageCatalogueInterface\|null A MessageCatalogueInterface instance or null when no fallback has been set
150	- *
151	- * @api
152	*/
153	public function getFallbackCatalogue();
154
	@@ -156,8 +130,6 @@ interface MessageCatalogueInterface
156	* Returns an array of resources loaded to build this collection.
157	*
158	* @return ResourceInterface[] An array of resources
159	- *
160	- * @api
161	*/
162	public function getResources();
163
	@@ -165,8 +137,6 @@ interface MessageCatalogueInterface
165	* Adds a resource for this collection.
166	*
167	* @param ResourceInterface $resource A resource instance
168	- *
169	- * @api
170	*/
171	public function addResource(ResourceInterface $resource);
172	}


17	* MessageCatalogueInterface.
18	*
19	* @author Fabien Potencier <fabien@symfony.com>


20	*/
21	interface MessageCatalogueInterface
22	{

24	* Gets the catalogue locale.
25	*
26	* @return string The locale


27	*/
28	public function getLocale();
29

31	* Gets the domains.
32	*
33	* @return array An array of domains


34	*/
35	public function getDomains();
36

42	* @param string $domain The domain name
43	*
44	* @return array An array of messages


45	*/
46	public function all($domain = null);
47

51	* @param string $id The message id
52	* @param string $translation The messages translation
53	* @param string $domain The domain name


54	*/
55	public function set($id, $translation, $domain = 'messages');
56

61	* @param string $domain The domain name
62	*
63	* @return bool true if the message has a translation, false otherwise


64	*/
65	public function has($id, $domain = 'messages');
66

71	* @param string $domain The domain name
72	*
73	* @return bool true if the message has a translation, false otherwise


74	*/
75	public function defines($id, $domain = 'messages');
76

81	* @param string $domain The domain name
82	*
83	* @return string The message translation


84	*/
85	public function get($id, $domain = 'messages');
86

89	*
90	* @param array $messages An array of translations
91	* @param string $domain The domain name


92	*/
93	public function replace($messages, $domain = 'messages');
94

97	*
98	* @param array $messages An array of translations
99	* @param string $domain The domain name


100	*/
101	public function add($messages, $domain = 'messages');
102

106	* The two catalogues must have the same locale.
107	*
108	* @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance


109	*/
110	public function addCatalogue(MessageCatalogueInterface $catalogue);
111

116	* This is used to provide default translations when they do not exist for the current locale.
117	*
118	* @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance


119	*/
120	public function addFallbackCatalogue(MessageCatalogueInterface $catalogue);
121

123	* Gets the fallback catalogue.
124	*
125	* @return MessageCatalogueInterface\|null A MessageCatalogueInterface instance or null when no fallback has been set


126	*/
127	public function getFallbackCatalogue();
128

130	* Returns an array of resources loaded to build this collection.
131	*
132	* @return ResourceInterface[] An array of resources


133	*/
134	public function getResources();
135

137	* Adds a resource for this collection.
138	*
139	* @param ResourceInterface $resource A resource instance


140	*/
141	public function addResource(ResourceInterface $resource);
142	}

vendor/symfony/translation/MessageSelector.php CHANGED Viewed

	@@ -16,8 +16,6 @@ namespace Symfony\Component\Translation;
16	*
17	* @author Fabien Potencier <fabien@symfony.com>
18	* @author Bernhard Schussek <bschussek@gmail.com>
19	- *
20	- * @api
21	*/
22	class MessageSelector
23	{
	@@ -46,8 +44,6 @@ class MessageSelector
46	* @return string
47	*
48	* @throws \InvalidArgumentException
49	- *
50	- * @api
51	*/
52	public function choose($message, $number, $locale)
53	{


16	*
17	* @author Fabien Potencier <fabien@symfony.com>
18	* @author Bernhard Schussek <bschussek@gmail.com>


19	*/
20	class MessageSelector
21	{

44	* @return string
45	*
46	* @throws \InvalidArgumentException


47	*/
48	public function choose($message, $number, $locale)
49	{

vendor/symfony/translation/PluralizationRules.php CHANGED Viewed

	@@ -189,8 +189,8 @@ class PluralizationRules
189	/**
190	* Overrides the default plural rule for a given locale.
191	*
192	- * @param ~~string~~ $rule A PHP callable
193	- * @param string $locale The locale
194	*
195	* @throws \LogicException
196	*/


189	/**
190	* Overrides the default plural rule for a given locale.
191	*
192	+ * @param callable $rule A PHP callable
193	+ * @param string $locale The locale
194	*
195	* @throws \LogicException
196	*/

vendor/symfony/translation/Tests/DataCollectorTranslatorTest.php CHANGED Viewed

	@@ -17,12 +17,6 @@ use Symfony\Component\Translation\Loader\ArrayLoader;
17
18	class DataCollectorTranslatorTest extends \PHPUnit_Framework_TestCase
19	{
20	- protected function setUp()
21	- {
22	- if (!class_exists('Symfony\Component\HttpKernel\DataCollector\DataCollector')) {
23	- $this->markTestSkipped('The "DataCollector" is not available');
24	- }
25	- }
26	public function testCollectMessages()
27	{
28	$collector = $this->createCollector();


17
18	class DataCollectorTranslatorTest extends \PHPUnit_Framework_TestCase
19	{






20	public function testCollectMessages()
21	{
22	$collector = $this->createCollector();

vendor/symfony/translation/Tests/Dumper/IcuResFileDumperTest.php CHANGED Viewed

	@@ -16,12 +16,11 @@ use Symfony\Component\Translation\Dumper\IcuResFileDumper;
16
17	class IcuResFileDumperTest extends \PHPUnit_Framework_TestCase
18	{



19	public function testDump()
20	{
21	- if (!function_exists('mb_convert_encoding')) {
22	- $this->markTestSkipped('This test requires mbstring to work.');
23	- }
24	-
25	$catalogue = new MessageCatalogue('en');
26	$catalogue->add(array('foo' => 'bar'));
27


16
17	class IcuResFileDumperTest extends \PHPUnit_Framework_TestCase
18	{
19	+ /**
20	+ * @requires extension mbstring
21	+ */
22	public function testDump()
23	{




24	$catalogue = new MessageCatalogue('en');
25	$catalogue->add(array('foo' => 'bar'));
26

vendor/symfony/translation/Tests/Loader/IcuDatFileLoaderTest.php CHANGED Viewed

	@@ -14,15 +14,11 @@ namespace Symfony\Component\Translation\Tests\Loader;
14	use Symfony\Component\Translation\Loader\IcuDatFileLoader;
15	use Symfony\Component\Config\Resource\FileResource;
16



17	class IcuDatFileLoaderTest extends LocalizedTestCase
18	{
19	- protected function setUp()
20	- {
21	- if (!extension_loaded('intl')) {
22	- $this->markTestSkipped('This test requires intl extension to work.');
23	- }
24	- }
25	-
26	/**
27	* @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
28	*/


14	use Symfony\Component\Translation\Loader\IcuDatFileLoader;
15	use Symfony\Component\Config\Resource\FileResource;
16
17	+ /**
18	+ * @requires extension intl
19	+ */
20	class IcuDatFileLoaderTest extends LocalizedTestCase
21	{







22	/**
23	* @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
24	*/

vendor/symfony/translation/Tests/Loader/IcuResFileLoaderTest.php CHANGED Viewed

	@@ -14,15 +14,11 @@ namespace Symfony\Component\Translation\Tests\Loader;
14	use Symfony\Component\Translation\Loader\IcuResFileLoader;
15	use Symfony\Component\Config\Resource\DirectoryResource;
16



17	class IcuResFileLoaderTest extends LocalizedTestCase
18	{
19	- protected function setUp()
20	- {
21	- if (!extension_loaded('intl')) {
22	- $this->markTestSkipped('This test requires intl extension to work.');
23	- }
24	- }
25	-
26	public function testLoad()
27	{
28	// resource is build using genrb command


14	use Symfony\Component\Translation\Loader\IcuResFileLoader;
15	use Symfony\Component\Config\Resource\DirectoryResource;
16
17	+ /**
18	+ * @requires extension intl
19	+ */
20	class IcuResFileLoaderTest extends LocalizedTestCase
21	{







22	public function testLoad()
23	{
24	// resource is build using genrb command

vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php CHANGED Viewed

	@@ -16,13 +16,6 @@ use Symfony\Component\Config\Resource\FileResource;
16
17	class JsonFileLoaderTest extends \PHPUnit_Framework_TestCase
18	{
19	- protected function setUp()
20	- {
21	- if (!class_exists('Symfony\Component\Config\Loader\Loader')) {
22	- $this->markTestSkipped('The "Config" component is not available');
23	- }
24	- }
25	-
26	public function testLoad()
27	{
28	$loader = new JsonFileLoader();


16
17	class JsonFileLoaderTest extends \PHPUnit_Framework_TestCase
18	{







19	public function testLoad()
20	{
21	$loader = new JsonFileLoader();

vendor/symfony/translation/Tests/Loader/LocalizedTestCase.php CHANGED Viewed

	@@ -16,7 +16,7 @@ abstract class LocalizedTestCase extends \PHPUnit_Framework_TestCase
16	protected function setUp()
17	{
18	if (!extension_loaded('intl')) {
19	- $this->markTestSkipped('~~The~~ "intl" ~~extension~~ is ~~not available~~');
20	}
21	}
22	}


16	protected function setUp()
17	{
18	if (!extension_loaded('intl')) {
19	+ $this->markTestSkipped('Extension intl is required.');
20	}
21	}
22	}

vendor/symfony/translation/Tests/Loader/XliffFileLoaderTest.php CHANGED Viewed

	@@ -59,12 +59,11 @@ class XliffFileLoaderTest extends \PHPUnit_Framework_TestCase
59	$this->assertEquals(array('foo' => 'bar', 'extra' => 'extra', 'key' => '', 'test' => 'with'), $catalogue->all('domain1'));
60	}
61



62	public function testEncoding()
63	{
64	- if (!function_exists('iconv') && !function_exists('mb_convert_encoding')) {
65	- $this->markTestSkipped('The iconv and mbstring extensions are not available.');
66	- }
67	-
68	$loader = new XliffFileLoader();
69	$catalogue = $loader->load(__DIR__.'/../fixtures/encoding.xlf', 'en', 'domain1');
70


59	$this->assertEquals(array('foo' => 'bar', 'extra' => 'extra', 'key' => '', 'test' => 'with'), $catalogue->all('domain1'));
60	}
61
62	+ /**
63	+ * @requires extension mbstring
64	+ */
65	public function testEncoding()
66	{




67	$loader = new XliffFileLoader();
68	$catalogue = $loader->load(__DIR__.'/../fixtures/encoding.xlf', 'en', 'domain1');
69

vendor/symfony/translation/Tests/LoggingTranslatorTest.php CHANGED Viewed

	@@ -17,13 +17,6 @@ use Symfony\Component\Translation\Loader\ArrayLoader;
17
18	class LoggingTranslatorTest extends \PHPUnit_Framework_TestCase
19	{
20	- protected function setUp()
21	- {
22	- if (!interface_exists('Psr\Log\LoggerInterface')) {
23	- $this->markTestSkipped('The "LoggerInterface" is not available');
24	- }
25	- }
26	-
27	public function testTransWithNoTranslationIsLogged()
28	{
29	$logger = $this->getMock('Psr\Log\LoggerInterface');


17
18	class LoggingTranslatorTest extends \PHPUnit_Framework_TestCase
19	{







20	public function testTransWithNoTranslationIsLogged()
21	{
22	$logger = $this->getMock('Psr\Log\LoggerInterface');

vendor/symfony/translation/Translator.php CHANGED Viewed

	@@ -21,8 +21,6 @@ use Symfony\Component\Config\ConfigCacheFactory;
21	* Translator.
22	*
23	* @author Fabien Potencier <fabien@symfony.com>
24	- *
25	- * @api
26	*/
27	class Translator implements TranslatorInterface, TranslatorBagInterface
28	{
	@@ -80,8 +78,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
80	* @param bool $debug Use cache in debug mode ?
81	*
82	* @throws \InvalidArgumentException If a locale contains invalid characters
83	- *
84	- * @api
85	*/
86	public function __construct($locale, MessageSelector $selector = null, $cacheDir = null, $debug = false)
87	{
	@@ -106,8 +102,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
106	*
107	* @param string $format The name of the loader (@see addResource())
108	* @param LoaderInterface $loader A LoaderInterface instance
109	- *
110	- * @api
111	*/
112	public function addLoader($format, LoaderInterface $loader)
113	{
	@@ -123,8 +117,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
123	* @param string $domain The domain
124	*
125	* @throws \InvalidArgumentException If the locale contains invalid characters
126	- *
127	- * @api
128	*/
129	public function addResource($format, $resource, $locale, $domain = null)
130	{
	@@ -145,8 +137,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
145
146	/**
147	* {@inheritdoc}
148	- *
149	- * @api
150	*/
151	public function setLocale($locale)
152	{
	@@ -156,8 +146,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
156
157	/**
158	* {@inheritdoc}
159	- *
160	- * @api
161	*/
162	public function getLocale()
163	{
	@@ -172,8 +160,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
172	* @throws \InvalidArgumentException If a locale contains invalid characters
173	*
174	* @deprecated since version 2.3, to be removed in 3.0. Use setFallbackLocales() instead.
175	- *
176	- * @api
177	*/
178	public function setFallbackLocale($locales)
179	{
	@@ -188,8 +174,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
188	* @param array $locales The fallback locales
189	*
190	* @throws \InvalidArgumentException If a locale contains invalid characters
191	- *
192	- * @api
193	*/
194	public function setFallbackLocales(array $locales)
195	{
	@@ -207,8 +191,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
207	* Gets the fallback locales.
208	*
209	* @return array $locales The fallback locales
210	- *
211	- * @api
212	*/
213	public function getFallbackLocales()
214	{
	@@ -217,8 +199,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
217
218	/**
219	* {@inheritdoc}
220	- *
221	- * @api
222	*/
223	public function trans($id, array $parameters = array(), $domain = null, $locale = null)
224	{
	@@ -231,8 +211,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
231
232	/**
233	* {@inheritdoc}
234	- *
235	- * @api
236	*/
237	public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
238	{


21	* Translator.
22	*
23	* @author Fabien Potencier <fabien@symfony.com>


24	*/
25	class Translator implements TranslatorInterface, TranslatorBagInterface
26	{

78	* @param bool $debug Use cache in debug mode ?
79	*
80	* @throws \InvalidArgumentException If a locale contains invalid characters


81	*/
82	public function __construct($locale, MessageSelector $selector = null, $cacheDir = null, $debug = false)
83	{

102	*
103	* @param string $format The name of the loader (@see addResource())
104	* @param LoaderInterface $loader A LoaderInterface instance


105	*/
106	public function addLoader($format, LoaderInterface $loader)
107	{

117	* @param string $domain The domain
118	*
119	* @throws \InvalidArgumentException If the locale contains invalid characters


120	*/
121	public function addResource($format, $resource, $locale, $domain = null)
122	{

137
138	/**
139	* {@inheritdoc}


140	*/
141	public function setLocale($locale)
142	{

146
147	/**
148	* {@inheritdoc}


149	*/
150	public function getLocale()
151	{

160	* @throws \InvalidArgumentException If a locale contains invalid characters
161	*
162	* @deprecated since version 2.3, to be removed in 3.0. Use setFallbackLocales() instead.


163	*/
164	public function setFallbackLocale($locales)
165	{

174	* @param array $locales The fallback locales
175	*
176	* @throws \InvalidArgumentException If a locale contains invalid characters


177	*/
178	public function setFallbackLocales(array $locales)
179	{

191	* Gets the fallback locales.
192	*
193	* @return array $locales The fallback locales


194	*/
195	public function getFallbackLocales()
196	{

199
200	/**
201	* {@inheritdoc}


202	*/
203	public function trans($id, array $parameters = array(), $domain = null, $locale = null)
204	{

211
212	/**
213	* {@inheritdoc}


214	*/
215	public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
216	{

vendor/symfony/translation/TranslatorInterface.php CHANGED Viewed

	@@ -15,8 +15,6 @@ namespace Symfony\Component\Translation;
15	* TranslatorInterface.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>
18	- *
19	- * @api
20	*/
21	interface TranslatorInterface
22	{
	@@ -31,8 +29,6 @@ interface TranslatorInterface
31	* @throws \InvalidArgumentException If the locale contains invalid characters
32	*
33	* @return string The translated string
34	- *
35	- * @api
36	*/
37	public function trans($id, array $parameters = array(), $domain = null, $locale = null);
38
	@@ -48,8 +44,6 @@ interface TranslatorInterface
48	* @throws \InvalidArgumentException If the locale contains invalid characters
49	*
50	* @return string The translated string
51	- *
52	- * @api
53	*/
54	public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null);
55
	@@ -59,8 +53,6 @@ interface TranslatorInterface
59	* @param string $locale The locale
60	*
61	* @throws \InvalidArgumentException If the locale contains invalid characters
62	- *
63	- * @api
64	*/
65	public function setLocale($locale);
66
	@@ -68,8 +60,6 @@ interface TranslatorInterface
68	* Returns the current locale.
69	*
70	* @return string The locale
71	- *
72	- * @api
73	*/
74	public function getLocale();
75	}


15	* TranslatorInterface.
16	*
17	* @author Fabien Potencier <fabien@symfony.com>


18	*/
19	interface TranslatorInterface
20	{

29	* @throws \InvalidArgumentException If the locale contains invalid characters
30	*
31	* @return string The translated string


32	*/
33	public function trans($id, array $parameters = array(), $domain = null, $locale = null);
34

44	* @throws \InvalidArgumentException If the locale contains invalid characters
45	*
46	* @return string The translated string


47	*/
48	public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null);
49

53	* @param string $locale The locale
54	*
55	* @throws \InvalidArgumentException If the locale contains invalid characters


56	*/
57	public function setLocale($locale);
58

60	* Returns the current locale.
61	*
62	* @return string The locale


63	*/
64	public function getLocale();
65	}

vendor/symfony/translation/composer.json CHANGED Viewed

	@@ -19,7 +19,6 @@
19	"php": ">=5.3.9"
20	},
21	"require-dev": {
22	- "symfony/phpunit-bridge": "~2.7",
23	"symfony/config": "~2.7",
24	"symfony/intl": "~2.4",
25	"symfony/yaml": "~2.2",


19	"php": ">=5.3.9"
20	},
21	"require-dev": {

22	"symfony/config": "~2.7",
23	"symfony/intl": "~2.4",
24	"symfony/yaml": "~2.2",

Simple Calendar – Google Calendar Plugin - Version 3.0.2

Version Description

Release Info

Code changes from version 3.0.1 to 3.0.2