@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | /** |
| 33 | 33 | * Formatted news list |
| 34 | 34 | * Returns the entries for the current page. |
| 35 | - * @return \Generator|void |
|
| 35 | + * @return \Generator |
|
| 36 | 36 | */ |
| 37 | 37 | public function newsList() |
| 38 | 38 | { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | /** |
| 46 | 46 | * Formatted news archive list |
| 47 | 47 | * Returns the entries for the current page. |
| 48 | - * @return \Generator|void |
|
| 48 | + * @return \Generator |
|
| 49 | 49 | */ |
| 50 | 50 | public function newsArchiveList() |
| 51 | 51 | { |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | /** |
| 126 | 126 | * Amount of news (total) |
| 127 | - * @return integer How many news? |
|
| 127 | + * @return boolean How many news? |
|
| 128 | 128 | */ |
| 129 | 129 | public function numNews() |
| 130 | 130 | { |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | protected function newsFormatShort(NewsInterface $news) |
| 193 | 193 | { |
| 194 | 194 | return [ |
| 195 | - 'title' => (string)$news->title(), |
|
| 196 | - 'url' => (string)$news->url(), |
|
| 195 | + 'title' => (string) $news->title(), |
|
| 196 | + 'url' => (string) $news->url(), |
|
| 197 | 197 | 'date' => $this->getNewsDateFormat($news), |
| 198 | 198 | 'dateTime' => $news->newsDate()->format('Y-m-d h:i'), |
| 199 | 199 | 'active' => ($this->currentNews() && ($this->currentNews()['id'] == $news->id())), |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | return [ |
| 213 | 213 | 'date' => $this->getNewsDateFormat($news), |
| 214 | 214 | 'dateTime' => $news->newsDate()->format('Y-m-d h:i'), |
| 215 | - 'title' => (string)$news->title(), |
|
| 215 | + 'title' => (string) $news->title(), |
|
| 216 | 216 | 'url' => $news->url(), |
| 217 | 217 | 'category' => $news->category(), |
| 218 | 218 | 'categoryName' => $this->newsCategory($news)->name() |
@@ -231,9 +231,9 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | return [ |
| 233 | 233 | 'id' => $news->id(), |
| 234 | - 'title' => (string)$news->title(), |
|
| 235 | - 'summary' => (string)$news->summary(), |
|
| 236 | - 'content' => (string)$news->content(), |
|
| 234 | + 'title' => (string) $news->title(), |
|
| 235 | + 'summary' => (string) $news->summary(), |
|
| 236 | + 'content' => (string) $news->content(), |
|
| 237 | 237 | 'image' => $news->image(), |
| 238 | 238 | 'date' => $this->getNewsDateFormat($news), |
| 239 | 239 | 'dateTime' => $news->newsDate()->format('Y-m-d h:i'), |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | 'gallery' => $gallery, |
| 245 | 245 | 'hasGallery' => !!(count($gallery)), |
| 246 | 246 | 'url' => $news->url(), |
| 247 | - 'metaTitle' => (string)$news->metaTitle(), |
|
| 247 | + 'metaTitle' => (string) $news->metaTitle(), |
|
| 248 | 248 | 'category' => $news->category(), |
| 249 | 249 | 'categoryName' => $this->newsCategory($news)->name() |
| 250 | 250 | ]; |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | { |
| 259 | 259 | return [ |
| 260 | 260 | 'id' => $category->id(), |
| 261 | - 'name' => (string)$category->name(), |
|
| 261 | + 'name' => (string) $category->name(), |
|
| 262 | 262 | ]; |
| 263 | 263 | } |
| 264 | 264 | |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | 73 | * Gets latest route for the given slug. |
| 74 | - * @return string The latest url. |
|
| 74 | + * @return \Closure The latest url. |
|
| 75 | 75 | */ |
| 76 | 76 | public function routes() |
| 77 | 77 | { |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | public function routes() |
| 77 | 77 | { |
| 78 | - return function ($arg) { |
|
| 78 | + return function($arg) { |
|
| 79 | 79 | return $this->sectionLoader()->resolveRoute($arg); |
| 80 | 80 | }; |
| 81 | 81 | } |
@@ -177,10 +177,10 @@ discard block |
||
| 177 | 177 | $documents = $section->attachments('document'); |
| 178 | 178 | |
| 179 | 179 | return [ |
| 180 | - 'title' => (string)$section->title(), |
|
| 181 | - 'summary' => (string)$section->summary(), |
|
| 182 | - 'image' => (string)$section->image(), |
|
| 183 | - 'content' => (string)$section->content(), |
|
| 180 | + 'title' => (string) $section->title(), |
|
| 181 | + 'summary' => (string) $section->summary(), |
|
| 182 | + 'image' => (string) $section->image(), |
|
| 183 | + 'content' => (string) $section->content(), |
|
| 184 | 184 | 'contentBlocks' => $contentBlocks, |
| 185 | 185 | 'gallery' => $gallery, |
| 186 | 186 | 'documents' => $documents |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | $now = new DateTime(); |
| 49 | 49 | $loader = $this->all(); |
| 50 | - $loader->addFilter('publish_date', $now->format('Y-m-d H:i:s'), [ 'operator' => '<=' ]) |
|
| 51 | - ->addFilter('expiry_date', $now->format('Y-m-d H:i:s'), [ 'operator' => '>=' ]); |
|
| 50 | + $loader->addFilter('publish_date', $now->format('Y-m-d H:i:s'), ['operator' => '<=']) |
|
| 51 | + ->addFilter('expiry_date', $now->format('Y-m-d H:i:s'), ['operator' => '>=']); |
|
| 52 | 52 | |
| 53 | 53 | return $loader; |
| 54 | 54 | } |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | { |
| 61 | 61 | $now = new DateTime(); |
| 62 | 62 | $loader = $this->all(); |
| 63 | - $loader->addFilter('publish_date', $now->format('Y-m-d H:i:s'), [ 'operator' => '<=' ]) |
|
| 64 | - ->addFilter('expiry_date', $now->format('Y-m-d H:i:s'), [ 'operator' => '<=' ]); |
|
| 63 | + $loader->addFilter('publish_date', $now->format('Y-m-d H:i:s'), ['operator' => '<=']) |
|
| 64 | + ->addFilter('expiry_date', $now->format('Y-m-d H:i:s'), ['operator' => '<=']); |
|
| 65 | 65 | |
| 66 | 66 | return $loader; |
| 67 | 67 | } |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | // ========================================================================== |
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | - * @return mixed |
|
| 101 | + * @return string |
|
| 102 | 102 | */ |
| 103 | 103 | public function median() |
| 104 | 104 | { |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | if ($this->category()) { |
| 219 | - $loader->addFilter('category', $this->category(), [ 'operator' => 'in' ]); |
|
| 219 | + $loader->addFilter('category', $this->category(), ['operator' => 'in']); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | if ($this->numPerPage()) { |
@@ -321,8 +321,8 @@ discard block |
||
| 321 | 321 | |
| 322 | 322 | $ids = explode(',', $ids); |
| 323 | 323 | |
| 324 | - $loader->addFilter('id', $ids, [ 'operator' => 'in' ]) |
|
| 325 | - ->addOrder('id', 'values', [ 'values' => $ids ]); |
|
| 324 | + $loader->addFilter('id', $ids, ['operator' => 'in']) |
|
| 325 | + ->addOrder('id', 'values', ['values' => $ids]); |
|
| 326 | 326 | |
| 327 | 327 | if (count($options) > 0) { |
| 328 | 328 | foreach ($options as $key => $option) { |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | $loader = $this->loader()->archive(); |
| 370 | 370 | |
| 371 | 371 | if ($this->category()) { |
| 372 | - $loader->addFilter('category', $this->category(), [ 'operator' => 'in' ]); |
|
| 372 | + $loader->addFilter('category', $this->category(), ['operator' => 'in']); |
|
| 373 | 373 | } |
| 374 | 374 | if ($this->numPerPage()) { |
| 375 | 375 | $loader->setPage($this->page()); |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | |
| 231 | 231 | /** |
| 232 | 232 | * @param integer|null $id The event id. |
| 233 | - * @return mixed |
|
| 233 | + * @return EventInterface |
|
| 234 | 234 | */ |
| 235 | 235 | public function entry($id = null) |
| 236 | 236 | { |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | } |
| 399 | 399 | |
| 400 | 400 | /** |
| 401 | - * @return mixed The previous event |
|
| 401 | + * @return EventInterface The previous event |
|
| 402 | 402 | */ |
| 403 | 403 | public function prev() |
| 404 | 404 | { |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | /** |
| 413 | - * @return mixed The next event |
|
| 413 | + * @return EventInterface The next event |
|
| 414 | 414 | */ |
| 415 | 415 | public function next() |
| 416 | 416 | { |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | |
| 505 | 505 | /** |
| 506 | 506 | * Amount of event (total) |
| 507 | - * @return integer How many event? |
|
| 507 | + * @return boolean How many event? |
|
| 508 | 508 | */ |
| 509 | 509 | public function numEvent() |
| 510 | 510 | { |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | } |
| 568 | 568 | |
| 569 | 569 | /** |
| 570 | - * @return mixed |
|
| 570 | + * @return string |
|
| 571 | 571 | */ |
| 572 | 572 | public function featIdent() |
| 573 | 573 | { |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $loader->addOrder('news_date', 'desc'); |
| 123 | 123 | |
| 124 | 124 | if ($this->category()) { |
| 125 | - $loader->addFilter('category', $this->category(), [ 'operator' => 'in' ]); |
|
| 125 | + $loader->addFilter('category', $this->category(), ['operator' => 'in']); |
|
| 126 | 126 | } |
| 127 | 127 | if ($this->numPerPage()) { |
| 128 | 128 | $loader->setPage($this->page()); |
@@ -223,8 +223,8 @@ discard block |
||
| 223 | 223 | |
| 224 | 224 | $ids = explode(',', $ids); |
| 225 | 225 | |
| 226 | - $loader->addFilter('id', $ids, [ 'operator' => 'in' ]) |
|
| 227 | - ->addOrder('id', 'values', [ 'values' => $ids ]); |
|
| 226 | + $loader->addFilter('id', $ids, ['operator' => 'in']) |
|
| 227 | + ->addOrder('id', 'values', ['values' => $ids]); |
|
| 228 | 228 | |
| 229 | 229 | if (count($options) > 0) { |
| 230 | 230 | foreach ($options as $key => $option) { |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | $loader->addOrder('news_date', 'desc'); |
| 273 | 273 | |
| 274 | 274 | if ($this->category()) { |
| 275 | - $loader->addFilter('category', $this->category(), [ 'operator' => 'in' ]); |
|
| 275 | + $loader->addFilter('category', $this->category(), ['operator' => 'in']); |
|
| 276 | 276 | } |
| 277 | 277 | if ($this->numPerPage()) { |
| 278 | 278 | $loader->setPage($this->page()); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | /** |
| 151 | 151 | * @param integer|null $id The news id. |
| 152 | - * @return mixed |
|
| 152 | + * @return NewsInterface |
|
| 153 | 153 | */ |
| 154 | 154 | public function entry($id = null) |
| 155 | 155 | { |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | /** |
| 319 | - * @return mixed The previous news |
|
| 319 | + * @return NewsInterface The previous news |
|
| 320 | 320 | */ |
| 321 | 321 | public function prev() |
| 322 | 322 | { |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | /** |
| 331 | - * @return mixed The next news |
|
| 331 | + * @return NewsInterface The next news |
|
| 332 | 332 | */ |
| 333 | 333 | public function next() |
| 334 | 334 | { |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | |
| 401 | 401 | /** |
| 402 | 402 | * Amount of news (total) |
| 403 | - * @return integer How many news? |
|
| 403 | + * @return boolean How many news? |
|
| 404 | 404 | */ |
| 405 | 405 | public function numNews() |
| 406 | 406 | { |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | } |
| 443 | 443 | |
| 444 | 444 | /** |
| 445 | - * @return mixed |
|
| 445 | + * @return string |
|
| 446 | 446 | */ |
| 447 | 447 | public function objType() |
| 448 | 448 | { |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | |
| 452 | 452 | /** |
| 453 | - * @return mixed |
|
| 453 | + * @return string |
|
| 454 | 454 | */ |
| 455 | 455 | public function featIdent() |
| 456 | 456 | { |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | /** |
| 233 | - * @param string|DateTimeInterface $startDate Event starting date. |
|
| 233 | + * @param string $startDate Event starting date. |
|
| 234 | 234 | * @throws InvalidArgumentException If the timestamp is invalid. |
| 235 | 235 | * @return self |
| 236 | 236 | */ |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
| 266 | - * @param string|DateTimeInterface $endDate Event end date. |
|
| 266 | + * @param null|DateTimeInterface $endDate Event end date. |
|
| 267 | 267 | * @throws InvalidArgumentException If the timestamp is invalid. |
| 268 | 268 | * @return self |
| 269 | 269 | */ |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | /** |
| 322 | - * @return Translation|string|null |
|
| 322 | + * @return null|Translation |
|
| 323 | 323 | */ |
| 324 | 324 | public function defaultMetaDescription() |
| 325 | 325 | { |
@@ -7,8 +7,6 @@ discard block |
||
| 7 | 7 | use InvalidArgumentException; |
| 8 | 8 | |
| 9 | 9 | // From PSR-7 |
| 10 | -use Psr\Http\Message\RequestInterface; |
|
| 11 | -use Psr\Http\Message\ResponseInterface; |
|
| 12 | 10 | |
| 13 | 11 | // From 'charcoal-object' |
| 14 | 12 | use Charcoal\Object\Content; |
@@ -26,7 +24,6 @@ discard block |
||
| 26 | 24 | use Charcoal\Cms\MetatagInterface; |
| 27 | 25 | use Charcoal\Cms\SearchableInterface; |
| 28 | 26 | use Charcoal\Cms\TemplateableInterface; |
| 29 | - |
|
| 30 | 27 | use Charcoal\Cms\MetatagTrait; |
| 31 | 28 | use Charcoal\Cms\SearchableTrait; |
| 32 | 29 | use Charcoal\Cms\TemplateableTrait; |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | { |
| 32 | 32 | parent::__construct($data); |
| 33 | 33 | |
| 34 | - if (is_callable([ $this, 'defaultData' ])) { |
|
| 34 | + if (is_callable([$this, 'defaultData'])) { |
|
| 35 | 35 | $this->setData($this->defaultData()); |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | - * @return boolean Entry cycle. |
|
| 62 | + * @return string Entry cycle. |
|
| 63 | 63 | */ |
| 64 | 64 | public function entryCycle() |
| 65 | 65 | { |
@@ -263,7 +263,7 @@ |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
| 266 | - * @param mixed $format DateTime to be formatted. |
|
| 266 | + * @param string $format DateTime to be formatted. |
|
| 267 | 267 | * @return mixed |
| 268 | 268 | */ |
| 269 | 269 | private function crossPlatformFormat($format) |
@@ -199,18 +199,18 @@ discard block |
||
| 199 | 199 | ? $this->translator()->translation($case['formats']['to']) |
| 200 | 200 | : null; |
| 201 | 201 | |
| 202 | - $formats['from'] = $this->crossPlatformFormat((string)$formats['from']); |
|
| 203 | - $formats['to'] = $this->crossPlatformFormat((string)$formats['to']); |
|
| 202 | + $formats['from'] = $this->crossPlatformFormat((string) $formats['from']); |
|
| 203 | + $formats['to'] = $this->crossPlatformFormat((string) $formats['to']); |
|
| 204 | 204 | |
| 205 | 205 | if (!$this->to || !$formats['to']) { |
| 206 | 206 | return sprintf( |
| 207 | - (string)$content, |
|
| 207 | + (string) $content, |
|
| 208 | 208 | strftime($formats['from'], $this->from->getTimestamp()) |
| 209 | 209 | ); |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | return sprintf( |
| 213 | - (string)$content, |
|
| 213 | + (string) $content, |
|
| 214 | 214 | strftime($formats['from'], $this->from->getTimestamp()), |
| 215 | 215 | strftime($formats['to'], $this->to->getTimestamp()) |
| 216 | 216 | ); |
@@ -235,13 +235,13 @@ discard block |
||
| 235 | 235 | |
| 236 | 236 | if (!$this->to || !$formats['to']) { |
| 237 | 237 | return sprintf( |
| 238 | - (string)$content, |
|
| 238 | + (string) $content, |
|
| 239 | 239 | strftime($formats['from'], $this->from->getTimestamp()) |
| 240 | 240 | ); |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | return sprintf( |
| 244 | - (string)$content, |
|
| 244 | + (string) $content, |
|
| 245 | 245 | strftime($formats['from'], $this->from->getTimestamp()), |
| 246 | 246 | strftime($formats['to'], $this->to->getTimestamp()) |
| 247 | 247 | ); |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace Charcoal\Property; |
| 4 | 4 | |
| 5 | 5 | use PDO; |
| 6 | - |
|
| 7 | -use RuntimeException; |
|
| 8 | 6 | use InvalidArgumentException; |
| 9 | 7 | |
| 10 | 8 | // From Pimple |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | $struct = $this->availableTemplates[$choiceIdent]; |
| 102 | - $immutable = [ 'value' => $struct['value'] ]; |
|
| 102 | + $immutable = ['value' => $struct['value']]; |
|
| 103 | 103 | |
| 104 | 104 | return array_replace($struct, $choice, $immutable); |
| 105 | 105 | } elseif (isset($choice['template']) || isset($choice['controller']) || isset($choice['class'])) { |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | return ''; |
| 140 | 140 | } |
| 141 | 141 | } elseif ($val instanceof Translation) { |
| 142 | - $propertyValue = (string)$val; |
|
| 142 | + $propertyValue = (string) $val; |
|
| 143 | 143 | } else { |
| 144 | 144 | $propertyValue = $val; |
| 145 | 145 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | $val = $this->val(); |
| 188 | 188 | if ($this->hasChoice($val)) { |
| 189 | 189 | $choice = $this->choice($val); |
| 190 | - $keys = [ 'controller', 'template', 'class' ]; |
|
| 190 | + $keys = ['controller', 'template', 'class']; |
|
| 191 | 191 | foreach ($keys as $key) { |
| 192 | 192 | if (isset($choice[$key])) { |
| 193 | 193 | return $choice[$key]; |