@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | foreach ($node->children() as $child) { |
| 95 | 95 | if ($child->getName() === "date-part") { |
| 96 | 96 | $datePartName = (string) $child->attributes()["name"]; |
| 97 | - $this->dateParts->set($this->form . "-" . $datePartName, Util\Factory::create($child)); |
|
| 97 | + $this->dateParts->set($this->form."-".$datePartName, Util\Factory::create($child)); |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -175,15 +175,15 @@ discard block |
||
| 175 | 175 | $toRender = 0; |
| 176 | 176 | if ($interval->y > 0 && in_array('year', $dateParts)) { |
| 177 | 177 | $toRender |= self::DATE_RANGE_STATE_YEAR; |
| 178 | - $delim = $this->dateParts->get($this->form . "-year")->getRangeDelimiter(); |
|
| 178 | + $delim = $this->dateParts->get($this->form."-year")->getRangeDelimiter(); |
|
| 179 | 179 | } |
| 180 | 180 | if ($interval->m > 0 && $from->getMonth() - $to->getMonth() !== 0 && in_array('month', $dateParts)) { |
| 181 | 181 | $toRender |= self::DATE_RANGE_STATE_MONTH; |
| 182 | - $delim = $this->dateParts->get($this->form . "-month")->getRangeDelimiter(); |
|
| 182 | + $delim = $this->dateParts->get($this->form."-month")->getRangeDelimiter(); |
|
| 183 | 183 | } |
| 184 | 184 | if ($interval->d > 0 && $from->getDay() - $to->getDay() !== 0 && in_array('day', $dateParts)) { |
| 185 | 185 | $toRender |= self::DATE_RANGE_STATE_DAY; |
| 186 | - $delim = $this->dateParts->get($this->form . "-day")->getRangeDelimiter(); |
|
| 186 | + $delim = $this->dateParts->get($this->form."-day")->getRangeDelimiter(); |
|
| 187 | 187 | } |
| 188 | 188 | if ($toRender === self::DATE_RANGE_STATE_NONE) { |
| 189 | 189 | foreach ($this->dateParts as $key => $datePart) { |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | if (isset($var->raw) && preg_match("/(\p{L}+)\s?([\-\-\&,])\s?(\p{L}+)/u", $var->raw, $matches)) { |
| 203 | - return $matches[1] . $matches[2] . $matches[3]; |
|
| 203 | + return $matches[1].$matches[2].$matches[3]; |
|
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | // fallback: |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | $t = $datePart[0]->renderWithoutAffixes($to, $this); |
| 385 | 385 | $t .= $datePart[0]->renderSuffix(); |
| 386 | 386 | $t .= $datePart[1]->render($to, $this); |
| 387 | - $ret .= $f . $delim . $t; |
|
| 387 | + $ret .= $f.$delim.$t; |
|
| 388 | 388 | } else { |
| 389 | 389 | $ret .= $datePart->render($from, $this); |
| 390 | 390 | } |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | $from = $datePart->renderWithoutAffixes($from, $this); |
| 408 | 408 | $to = $datePart->renderWithoutAffixes($to, $this); |
| 409 | 409 | $suffix = !empty($to) ? $datePart->renderSuffix() : ""; |
| 410 | - return $prefix . $from . $delim . $to . $suffix; |
|
| 410 | + return $prefix.$from.$delim.$to.$suffix; |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | /** |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | } |
| 513 | 513 | } else { //otherwise create default date parts |
| 514 | 514 | foreach ($dateParts as $datePart) { |
| 515 | - $this->dateParts->add("$form-$datePart", new DatePart(new \SimpleXMLElement('<date-part name="' . $datePart . '" form="' . $form . '" />'))); |
|
| 515 | + $this->dateParts->add("$form-$datePart", new DatePart(new \SimpleXMLElement('<date-part name="'.$datePart.'" form="'.$form.'" />'))); |
|
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | 518 | } |
@@ -193,8 +193,7 @@ |
||
| 193 | 193 | $ret .= $datePart->render($data_[0], $this); |
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | - } |
|
| 197 | - else { |
|
| 196 | + } else { |
|
| 198 | 197 | $ret = $this->renderDateRange($toRender, $from, $to, $delim); |
| 199 | 198 | } |
| 200 | 199 | } |