locomotivemtl / charcoal-cms

src/Charcoal/Admin/Widget/GroupAttachmentWidget.php

Spacing +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
             }
 
             $attachmentWidgets = $structureMetadata->get('attachments.widgets');
-            foreach ((array)$attachmentWidgets as $ident => $metadata) {
+            foreach ((array) $attachmentWidgets as $ident => $metadata) {
                 $this->addGroup($ident, $metadata);
             }
 

Doc Comments +1 added lines, -1 removed lines

@@ -238,7 +238,7 @@
     /**
      * Retrieve the form object's template controller identifier.
      *
-     * @return mixed
+     * @return string
      */
     public function controllerIdent()
     {

src/Charcoal/Cms/Section/BlocksSection.php

Unused Use Statements -4 removed lines

@@ -2,13 +2,9 @@
 
 namespace Charcoal\Cms\Section;
 
-use RuntimeException;
-
 // From Pimple
-use Pimple\Container;
 
 // From 'charcoal-core'
-use Charcoal\Loader\CollectionLoader;
 
 // From 'charcoal-cms'
 use Charcoal\Cms\AbstractSection;

src/Charcoal/Cms/ServiceProvider/CmsServiceProvider.php

Unused Use Statements -2 removed lines

@@ -7,14 +7,12 @@
 use Pimple\ServiceProviderInterface;
 
 // From 'charcoal-core'
-use Charcoal\Model\AbstractModel;
 
 // From 'charcoal-factory'
 use Charcoal\Factory\GenericFactory as Factory;
 
 // From 'charcoal-cms'
 use Charcoal\Cms\SectionInterface;
-use Charcoal\Cms\Config;
 use Charcoal\Cms\Config\CmsConfig;
 use Charcoal\Cms\Service\Loader\EventLoader;
 use Charcoal\Cms\Service\Loader\NewsLoader;

Spacing +9 added lines, -9 removed lines

@@ -60,7 +60,7 @@ 
          * @param Container $container Pimple DI Container.
          * @return CmsConfig Website configurations (from cms.json).
          */
-        $container['cms/config'] = function (Container $container) {
+        $container['cms/config'] = function(Container $container) {
             $appConfig = $container['config'];
             $cms = $appConfig->get('cms');
 
@@ -95,7 +95,7 @@ 
          * @param Container $container Pimple DI Container.
          * @return DateHelper
          */
-        $container['cms/date/helper'] = function (Container $container) {
+        $container['cms/date/helper'] = function(Container $container) {
             return new DateHelper([
                 'date_formats' => $container['cms/config']->get('date_formats'),
                 'time_formats' => $container['cms/config']->get('time_formats'),
@@ -107,7 +107,7 @@ 
          * @param Container $container Pimple DI Container.
          * @return DateHelper
          */
-        $container['date/helper'] = function (Container $container) {
+        $container['date/helper'] = function(Container $container) {
             trigger_error(sprintf(
                 '%s is deprecated, use %s instead',
                 '$container[\'date/helper\']',
@@ -128,7 +128,7 @@ 
          * @param Container $container Pimple DI Container.
          * @return Factory
          */
-        $container['cms/section/factory'] = function (Container $container) {
+        $container['cms/section/factory'] = function(Container $container) {
             return new Factory([
                 'base_class'       => SectionInterface::class,
                 'arguments'        => $container['model/factory']->arguments(),
@@ -142,7 +142,7 @@ 
          * @param Container $container Pimple DI Container.
          * @return SectionLoader
          */
-        $container['cms/section/loader'] = function (Container $container) {
+        $container['cms/section/loader'] = function(Container $container) {
             $sectionLoader = new SectionLoader([
                 'loader'     => $container['model/collection/loader'],
                 'factory'    => $container['model/factory'],
@@ -171,7 +171,7 @@ 
          * @param Container $container Pimple DI Container.
          * @return NewsLoader
          */
-        $container['cms/news/loader'] = function (Container $container) {
+        $container['cms/news/loader'] = function(Container $container) {
             $newsLoader = new NewsLoader([
                 'loader'     => $container['model/collection/loader'],
                 'factory'    => $container['model/factory'],
@@ -192,7 +192,7 @@ 
          * @param Container $container
          * @return NewsManager
          */
-        $container['cms/news/manager'] = function (Container $container) {
+        $container['cms/news/manager'] = function(Container $container) {
 
             $newsManager = new NewsManager([
                 'loader'      => $container['model/collection/loader'],
@@ -217,7 +217,7 @@ 
          * @param Container $container Pimple DI Container.
          * @return EventLoader
          */
-        $container['cms/event/loader'] = function (Container $container) {
+        $container['cms/event/loader'] = function(Container $container) {
             $eventLoader = new EventLoader([
                 'loader'     => $container['model/collection/loader'],
                 'factory'    => $container['model/factory'],
@@ -241,7 +241,7 @@ 
          * @param Container $container
          * @return EventManager
          */
-        $container['cms/event/manager'] = function (Container $container) {
+        $container['cms/event/manager'] = function(Container $container) {
 
             $eventManager = new EventManager([
                 'loader'       => $container['model/collection/loader'],

src/Charcoal/Cms/Service/Loader/EventLoader.php

Doc Comments +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
     }
 
     /**
-     * @param mixed $date The news date to filter
+     * @param DateTime $date The news date to filter
      *                    [startDate, endDate]
      *                    DateTimeInterface
      *                    string.
@@ -103,7 +103,7 @@ 
     }
 
     /**
-     * @param mixed $date The news date to filter
+     * @param DateTime $date The news date to filter
      *                    [startDate, endDate]
      *                    DateTimeInterface
      *                    string.
@@ -119,7 +119,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function lifespan()
     {

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
     {
         $now = new DateTime();
         $loader = $this->all();
-        $loader->addFilter('publishDate', $now->format('Y-m-d H:i:s'), [ 'operator' => '<=' ])
+        $loader->addFilter('publishDate', $now->format('Y-m-d H:i:s'), ['operator' => '<='])
             ->addOrder('start_date', 'asc');
 
         return $loader;
@@ -97,7 +97,7 @@ 
     {
         $date = $this->parseAsDate($date);
         $loader = $this->published();
-        $loader->addFilter('end_date', $date->format('Y-m-d H:i:s'), [ 'operator' => '>=' ]);
+        $loader->addFilter('end_date', $date->format('Y-m-d H:i:s'), ['operator' => '>=']);
 
         return $loader;
     }
@@ -113,7 +113,7 @@ 
     {
         $date = $this->parseAsDate($date);
         $loader = $this->published();
-        $loader->addFilter('end_date', $date->format('Y-m-d H:i:s'), [ 'operator' => '<' ]);
+        $loader->addFilter('end_date', $date->format('Y-m-d H:i:s'), ['operator' => '<']);
 
         return $loader;
     }

src/Charcoal/Cms/AbstractEvent.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
     {
         parent::__construct($data);
 
-        if (is_callable([ $this, 'defaultData' ])) {
+        if (is_callable([$this, 'defaultData'])) {
             $this->setData($this->defaultData());
         }
     }
@@ -365,7 +365,7 @@ 
      */
     public function setTicketPriceMin($price)
     {
-        $this->ticketPriceMin = (float)$price;
+        $this->ticketPriceMin = (float) $price;
         return $this;
     }
 
@@ -383,7 +383,7 @@ 
      */
     public function setTicketPriceMax($price)
     {
-        $this->ticketPriceMax = (float)$price;
+        $this->ticketPriceMax = (float) $price;
         return $this;
     }
 

src/Charcoal/Cms/AbstractWebTemplate.php

Doc Comments +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
     /**
      * Retrieve the canonical URI of the object.
      *
-     * @return \Psr\Http\Message\UriInterface|string|null
+     * @return UriInterface|null
      */
     public function canonicalUrl()
     {

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Pimple\Container;
 
 // From 'charcoal-core'
-use Charcoal\Model\ModelInterface;
 
 // From 'charcoal-translator'
 use Charcoal\Translator\TranslatorAwareTrait;

Spacing +11 added lines, -11 removed lines

@@ -197,11 +197,11 @@ 
         $title   = null;
 
         if ($context instanceof MetatagInterface) {
-            $title = (string)$context['metaTitle'];
+            $title = (string) $context['metaTitle'];
         }
 
         if (!$title) {
-            $title = (string)$this->fallbackMetaTitle();
+            $title = (string) $this->fallbackMetaTitle();
         }
 
         return $title;
@@ -216,7 +216,7 @@ 
      */
     protected function fallbackMetaTitle()
     {
-        return (string)$this->title();
+        return (string) $this->title();
     }
 
     /**
@@ -230,11 +230,11 @@ 
 
         $desc = null;
         if ($context instanceof MetatagInterface) {
-            $desc = (string)$context['metaDescription'];
+            $desc = (string) $context['metaDescription'];
         }
 
         if (!$desc) {
-            $desc = (string)$this->fallbackMetaDescription();
+            $desc = (string) $this->fallbackMetaDescription();
         }
 
         return $desc;
@@ -263,11 +263,11 @@ 
 
         $img = null;
         if ($context instanceof MetatagInterface) {
-            $img = (string)$context['metaImage'];
+            $img = (string) $context['metaImage'];
         }
 
         if (!$img) {
-            $img = (string)$this->fallbackMetaImage();
+            $img = (string) $this->fallbackMetaImage();
         }
 
         return $this->resolveMetaImage($img);
@@ -342,11 +342,11 @@ 
 
         $img = null;
         if ($context instanceof MetatagInterface) {
-            $img = (string)$context['opengraphImage'];
+            $img = (string) $context['opengraphImage'];
         }
 
         if (!$img) {
-            $img = (string)$this->fallbackOpengraphImage();
+            $img = (string) $this->fallbackOpengraphImage();
         }
 
         if ($img) {
@@ -412,7 +412,7 @@ 
 
             $this->seoMetadata[] = [
                 'name'    => $key,
-                'content' => (string)$value
+                'content' => (string) $value
             ];
         }
 
@@ -507,7 +507,7 @@ 
         } else {
             $parts = parse_url($uri);
             if (!isset($parts['scheme'])) {
-                if (!in_array($uri[0], [ '/', '#', '?' ])) {
+                if (!in_array($uri[0], ['/', '#', '?'])) {
                     $path  = isset($parts['path']) ? $parts['path'] : '';
                     $query = isset($parts['query']) ? $parts['query'] : '';
                     $hash  = isset($parts['fragment']) ? $parts['fragment'] : '';

src/Charcoal/Cms/Support/ContextualTemplateTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      *
      * @param  string $className The class name of the section model.
      * @throws InvalidArgumentException If the class name is not a string.
-     * @return AbstractPropertyDisplay Chainable
+     * @return ContextualTemplateTrait Chainable
      */
     public function setGenericContextClass($className)
     {

src/Charcoal/Cms/Support/LocaleAwareTrait.php

Doc Comments +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
      * Note: The application's locale is already modified and will be reset
      * after processing all available languages.
      *
-     * @param  mixed $context      The translated {@see \Charcoal\Model\ModelInterface model}
+     * @param  \Charcoal\Model\ModelInterface|null $context      The translated {@see \Charcoal\Model\ModelInterface model}
      *     or array-accessible structure.
      * @param  array $localeStruct The currently iterated language.
      * @return array Returns a link structure.
@@ -213,7 +213,7 @@ 
     /**
      * Yield the alternate translations associated with the current route.
      *
-     * @return Generator|null
+     * @return \Generator
      */
     public function alternateTranslations()
     {

Spacing +3 added lines, -3 removed lines

@@ -176,8 +176,8 @@ 
     protected function formatAlternateTranslation($context, array $localeStruct)
     {
         return [
-            'id'       => ($context['id']) ? : $this->templateName(),
-            'title'    => ((string)$context['title']) ? : $this->title(),
+            'id'       => ($context['id']) ?: $this->templateName(),
+            'title'    => ((string) $context['title']) ?: $this->title(),
             'url'      => $this->formatAlternateTranslationUrl($context, $localeStruct),
             'hreflang' => $localeStruct['code'],
             'locale'   => $localeStruct['locale'],
@@ -201,7 +201,7 @@ 
     {
         $isRoutable = ($context instanceof RoutableInterface && $context->isActiveRoute());
         $langCode   = $localeStruct['code'];
-        $path       = ($isRoutable ? $context->url($langCode) : ($this->currentUrl() ? : $langCode));
+        $path       = ($isRoutable ? $context->url($langCode) : ($this->currentUrl() ?: $langCode));
 
         if ($path instanceof UriInterface) {
             $path = $path->getPath();

src/Charcoal/Cms/Support/DocumentTrait.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
                 continue;
             }
 
-            $segments[$key] = (string)$value;
+            $segments[$key] = (string) $value;
         }
 
         return $segments;
@@ -129,7 +129,7 @@ 
     final public function documentTitle()
     {
         $parts = $this->documentTitleParts();
-        if (array_diff_key([ 'title' => true, 'site' => true ], $parts)) {
+        if (array_diff_key(['title' => true, 'site' => true], $parts)) {
             throw new InvalidArgumentException(
                 'The document title parts requires at least a "title" and a "site"'
             );