Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2

This commit is contained in:
Pantheon Automation 2016-06-02 15:56:09 -07:00 committed by Greg Anderson
parent 9eae24d844
commit 28556d630e
1322 changed files with 6699 additions and 2064 deletions

View file

@ -104,6 +104,9 @@ class DateTimePlus {
* A DateTime object.
* @param array $settings
* @see __construct()
*
* @return static
* A new DateTimePlus object.
*/
public static function createFromDateTime(\DateTime $datetime, $settings = array()) {
return new static($datetime->format(static::FORMAT), $datetime->getTimezone(), $settings);
@ -125,8 +128,10 @@ class DateTimePlus {
* __construct().
*
* @return static
* A new \Drupal\Component\DateTimePlus object based on the parameters
* passed in.
* A new DateTimePlus object.
*
* @throws \Exception
* If the array date values or value combination is not correct.
*/
public static function createFromArray(array $date_parts, $timezone = NULL, $settings = array()) {
$date_parts = static::prepareArray($date_parts, TRUE);
@ -155,6 +160,12 @@ class DateTimePlus {
* @see __construct()
* @param array $settings
* @see __construct()
*
* @return static
* A new DateTimePlus object.
*
* @throws \Exception
* If the timestamp is not numeric.
*/
public static function createFromTimestamp($timestamp, $timezone = NULL, $settings = array()) {
if (!is_numeric($timestamp)) {
@ -187,6 +198,13 @@ class DateTimePlus {
* from a format string exactly matches the input. This option
* indicates the format can be used for validation. Defaults to TRUE.
* @see __construct()
*
* @return static
* A new DateTimePlus object.
*
* @throws \Exception
* If the a date cannot be created from the given format, or if the
* created date does not match the input value.
*/
public static function createFromFormat($format, $time, $timezone = NULL, $settings = array()) {
if (!isset($settings['validate_format'])) {
@ -294,6 +312,30 @@ class DateTimePlus {
return call_user_func_array(array($this->dateTimeObject, $method), $args);
}
/**
* Returns the difference between two DateTimePlus objects.
*
* @param \Drupal\Component\Datetime\DateTimePlus|\DateTime $datetime2
* The date to compare to.
* @param bool $absolute
* Should the interval be forced to be positive?
*
* @return \DateInterval
* A DateInterval object representing the difference between the two dates.
*
* @throws \BadMethodCallException
* If the input isn't a DateTime or DateTimePlus object.
*/
public function diff($datetime2, $absolute = FALSE) {
if ($datetime2 instanceof DateTimePlus) {
$datetime2 = $datetime2->dateTimeObject;
}
if (!($datetime2 instanceof \DateTime)) {
throw new \BadMethodCallException(sprintf('Method %s expects parameter 1 to be a \DateTime or \Drupal\Component\Datetime\DateTimePlus object', __METHOD__));
}
return $this->dateTimeObject->diff($datetime2, $absolute);
}
/**
* Implements the magic __callStatic method.
*
@ -324,6 +366,9 @@ class DateTimePlus {
* @param mixed $time
* An input value, which could be a timestamp, a string,
* or an array of date parts.
*
* @return mixed
* The massaged time.
*/
protected function prepareTime($time) {
return $time;
@ -338,6 +383,9 @@ class DateTimePlus {
*
* @param mixed $timezone
* Either a timezone name or a timezone object or NULL.
*
* @return \DateTimeZone
* The massaged time zone.
*/
protected function prepareTimezone($timezone) {
// If the input timezone is a valid timezone object, use it.
@ -370,6 +418,9 @@ class DateTimePlus {
*
* @param string $format
* A PHP format string.
*
* @return string
* The massaged PHP format string.
*/
protected function prepareFormat($format) {
return $format;
@ -403,6 +454,10 @@ class DateTimePlus {
/**
* Detects if there were errors in the processing of this date.
*
* @return boolean
* TRUE if there were errors in the processing of this date, FALSE
* otherwise.
*/
public function hasErrors() {
return (boolean) count($this->errors);
@ -412,6 +467,9 @@ class DateTimePlus {
* Gets error messages.
*
* Public function to return the error messages.
*
* @return array
* An array of errors encountered when creating this date.
*/
public function getErrors() {
return $this->errors;
@ -592,4 +650,5 @@ class DateTimePlus {
return $value;
}
}