locomotivemtl / charcoal-attachment

src/Charcoal/Attachment/Traits/AttachmentRelationTrait.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         $pivot = $this->modelFactory()->create(Join::class);
 
         if (is_string($data) && strpos($data, '_') > 1) {
-            $data = array_combine([ 'obj_type', 'obj_id' ], explode('_', $data, 1));
+            $data = array_combine(['obj_type', 'obj_id'], explode('_', $data, 1));
         }
 
         if (is_scalar($data)) {

src/Charcoal/Attachment/Object/Join.php

Spacing +1 added lines, -1 removed lines

@@ -402,7 +402,7 @@
             );
         }
 
-        $this->position = (int)$position;
+        $this->position = (int) $position;
 
         return $this;
     }

src/Charcoal/Attachment/Script/CleanupScript.php

Spacing +6 added lines, -6 removed lines

@@ -256,7 +256,7 @@ 
                     ]);
                     $rows = $source->dbQuery(
                         strtr($sql, $binds),
-                        [ 'objType' => $row['object_type'] ]
+                        ['objType' => $row['object_type']]
                     );
 
                     /** @todo Show found rows, confirm deletion of dead relationships */
@@ -276,7 +276,7 @@ 
                     $sql  = 'SELECT p.* FROM `%pivotTable` AS p WHERE p.`%sourceType` = :objType;';
                     $rows = $source->dbQuery(
                         strtr($sql, $defaultBinds),
-                        [ 'objType' => $model ]
+                        ['objType' => $model]
                     );
 
                     /** @todo Explain missing model, confirm deletion of dead relationships */
@@ -394,7 +394,7 @@ 
                 ];
 
                 if ($ask && $verb) {
-                    $dead = array_merge([ 'Deleted' => null, 'Failed' => null ], $dead);
+                    $dead = array_merge(['Deleted' => null, 'Failed' => null], $dead);
                 }
             }
 
@@ -617,7 +617,7 @@ 
         $cli = $this->climate();
 
         if (is_string($this->action)) {
-            $opts = [ 'y', 'n', 'r', 'q', '?' ];
+            $opts = ['y', 'n', 'r', 'q', '?'];
             $help = [
                 '[y]es    — delete the attachment',
                 '[n]o     — don’t delete the attachment',
@@ -625,7 +625,7 @@ 
                 '[q]uit   — exit immediately (does not undo previous actions)',
             ];
         } else {
-            $opts = [ 'y', 'a', 'n', 's', 'q', '?' ];
+            $opts = ['y', 'a', 'n', 's', 'q', '?'];
             $help = [
                 '[y]es  — delete this attachment',
                 '[a]ll  — delete all attachments',
@@ -686,7 +686,7 @@ 
     {
         $cli = $this->climate();
 
-        $opts = [ 'y', 'n', 'v', '?' ];
+        $opts = ['y', 'n', 'v', '?'];
         $help = [
             '[y]es  — continue to deletion phase',
             '[n]o   — cancel deletion phase',

src/Charcoal/Admin/Action/JoinAction.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 
         $count = count($attachments);
         $i = 0;
-        for (; $i<$count; $i++) {
+        for (; $i < $count; $i++) {
             $attachmentId = $attachments[$i]['attachment_id'];
             $position = $attachments[$i]['position'];
 

src/Charcoal/Attachment/Object/Attachment.php

Spacing +9 added lines, -9 removed lines

@@ -180,7 +180,7 @@ 
     {
         parent::__construct($data);
 
-        if (is_callable([ $this, 'defaultData' ])) {
+        if (is_callable([$this, 'defaultData'])) {
             $defaultData = $this->defaultData();
             if ($defaultData) {
                 $this->setData($defaultData);
@@ -356,7 +356,7 @@ 
      */
     public function heading()
     {
-        $heading = $this->render((string)$this->heading);
+        $heading = $this->render((string) $this->heading);
 
         if (!$heading) {
             $heading = $this->translator()->translation('{{ objType }} #{{ id }}', [
@@ -399,7 +399,7 @@ 
     public function preview()
     {
         if ($this->preview) {
-            return $this->render((string)$this->preview);
+            return $this->render((string) $this->preview);
         }
 
         return '';
@@ -927,19 +927,19 @@ 
         static $search;
 
         if ($search === null) {
-            $attr   = [ 'href', 'link', 'url', 'src' ];
-            $scheme = [ '../', './', '/', 'data', 'mailto', 'http' ];
+            $attr   = ['href', 'link', 'url', 'src'];
+            $scheme = ['../', './', '/', 'data', 'mailto', 'http'];
 
             $search = sprintf(
                 '(?<=%1$s=")(?!%2$s)(\S+)(?=")',
-                implode('="|', array_map('preg_quote', $attr, [ '~' ])),
-                implode('|', array_map('preg_quote', $scheme, [ '~' ]))
+                implode('="|', array_map('preg_quote', $attr, ['~'])),
+                implode('|', array_map('preg_quote', $scheme, ['~']))
             );
         }
 
         $text = preg_replace_callback(
             '~'.$search.'~i',
-            function ($matches) {
+            function($matches) {
                 return $this->createAbsoluteUrl($matches[1]);
             },
             $text
@@ -958,7 +958,7 @@ 
     protected function isRelativeUri($uri)
     {
         if ($uri && !parse_url($uri, PHP_URL_SCHEME)) {
-            if (!in_array($uri[0], [ '/', '#', '?' ])) {
+            if (!in_array($uri[0], ['/', '#', '?'])) {
                 return true;
             }
         }

src/Charcoal/Admin/Widget/AttachmentWidget.php

Spacing +3 added lines, -3 removed lines

@@ -207,7 +207,7 @@ 
         ]);
 
         foreach ($attachments as $attachment) {
-            $GLOBALS['widget_template'] = (string)$attachment->rawPreview();
+            $GLOBALS['widget_template'] = (string) $attachment->rawPreview();
 
             if (isset($attachableObjects[$attachment->objType()])) {
                 $attachment->attachmentType = $attachableObjects[$attachment->objType()];
@@ -473,7 +473,7 @@ 
             );
         }
 
-        $num = (int)$num;
+        $num = (int) $num;
 
         if ($num < 0) {
             throw new InvalidArgumentException(
@@ -501,7 +501,7 @@ 
             );
         }
 
-        $page = (int)$page;
+        $page = (int) $page;
 
         if ($page < 0) {
             throw new InvalidArgumentException(

src/Charcoal/Attachment/Traits/AttachmentAwareTrait.php

Spacing +7 added lines, -7 removed lines

@@ -80,7 +80,7 @@ 
                 $this->logger->warning(
                     'AttachmentAwareTrait::attachments() parameters are deprecated. '.
                     'An array of parameters should be used.',
-                    [ 'package' => 'locomotivemtl/charcoal-attachment' ]
+                    ['package' => 'locomotivemtl/charcoal-attachment']
                 );
             }
             $options = [
@@ -181,7 +181,7 @@ 
         $loader->setDynamicTypeField('type');
 
         if ($widget instanceof AttachmentWidget) {
-            $callable = function (&$att) use ($widget, $before) {
+            $callable = function(&$att) use ($widget, $before) {
                 if ($this instanceof AttachableInterface) {
                     $att->setContainerObj($this);
                 }
@@ -208,11 +208,11 @@ 
                 $att->isPresentable(true);
 
                 if ($before !== null) {
-                    call_user_func_array($before, [ &$att ]);
+                    call_user_func_array($before, [&$att]);
                 }
             };
         } else {
-            $callable = function (&$att) use ($before) {
+            $callable = function(&$att) use ($before) {
                 if ($this instanceof AttachableInterface) {
                     $att->setContainerObj($this);
                 }
@@ -220,7 +220,7 @@ 
                 $att->isPresentable(true);
 
                 if ($before !== null) {
-                    call_user_func_array($before, [ &$att ]);
+                    call_user_func_array($before, [&$att]);
                 }
             };
         }
@@ -294,7 +294,7 @@ 
         $this->logger->warning(
             'AttachmentAwareTrait::removeJoins() is deprecated. '.
             'Use AttachmentAwareTrait::removeAttachmentJoins() instead.',
-            [ 'package' => 'locomotivemtl/charcoal-attachment' ]
+            ['package' => 'locomotivemtl/charcoal-attachment']
         );
 
         return $this->removeAttachmentJoins();
@@ -422,7 +422,7 @@ 
         $defaults = $this->getDefaultAttachmentOptions();
 
         $options = array_intersect_key($options, $defaults);
-        $options = array_filter($options, [ $this, 'filterAttachmentOption' ], ARRAY_FILTER_USE_BOTH);
+        $options = array_filter($options, [$this, 'filterAttachmentOption'], ARRAY_FILTER_USE_BOTH);
         $options = array_replace($defaults, $options);
 
         return $options;

src/Charcoal/Attachment/Object/Container.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         callable $after = null
     ) {
         $attachables = $this->attachableObjects();
-        $attachments = call_user_func_array([ $this, 'getAttachments' ], func_get_args());
+        $attachments = call_user_func_array([$this, 'getAttachments'], func_get_args());
 
         foreach ($attachments as $attachment) {
             if (isset($attachables[$attachment->objType()])) {

tests/Charcoal/ContainerProvider.php

Spacing +34 added lines, -34 removed lines

@@ -108,7 +108,7 @@ 
      */
     public function registerBaseUrl(Container $container)
     {
-        $container['base-url'] = function (Container $container) {
+        $container['base-url'] = function(Container $container) {
             return '';
         };
     }
@@ -121,7 +121,7 @@ 
      */
     public function registerConfig(Container $container)
     {
-        $container['config'] = function (Container $container) {
+        $container['config'] = function(Container $container) {
             return new AppConfig([
                 'base_path'  => realpath(__DIR__.'/../../..'),
                 'apis'       => [
@@ -146,14 +146,14 @@ 
     {
         $this->registerConfig($container);
 
-        $container['admin/config'] = function (Container $container) {
+        $container['admin/config'] = function(Container $container) {
             return new AdminConfig();
         };
     }
 
     public function registerLayoutFactory(Container $container)
     {
-        $container['layout/factory'] = function (Container $container) {
+        $container['layout/factory'] = function(Container $container) {
 
             $layoutFactory = new LayoutFactory();
             return $layoutFactory;
@@ -164,7 +164,7 @@ 
     {
         $this->registerLayoutFactory($container);
 
-        $container['layout/builder'] = function (Container $container) {
+        $container['layout/builder'] = function(Container $container) {
             $layoutFactory = $container['layout/factory'];
             $layoutBuilder = new LayoutBuilder($layoutFactory, $container);
             return $layoutBuilder;
@@ -177,7 +177,7 @@ 
         $this->registerWidgetBuilder($container);
         $this->registerLayoutBuilder($container);
 
-        $container['dashboard/factory'] = function (Container $container) {
+        $container['dashboard/factory'] = function(Container $container) {
             return new Factory([
                 'arguments'          => [[
                     'container'      => $container,
@@ -196,7 +196,7 @@ 
     {
         $this->registerDashboardFactory($container);
 
-        $container['dashboard/builder'] = function (Container $container) {
+        $container['dashboard/builder'] = function(Container $container) {
             $dashboardFactory = $container['dashboard/factory'];
             $dashboardBuilder = new DashboardBuilder($dashboardFactory, $container);
             return $dashboardBuilder;
@@ -207,7 +207,7 @@ 
     {
         $this->registerLogger($container);
 
-        $container['widget/factory'] = function (Container $container) {
+        $container['widget/factory'] = function(Container $container) {
             return new Factory([
                 'resolver_options' => [
                     'suffix' => 'Widget'
@@ -224,13 +224,13 @@ 
     {
         $this->registerWidgetFactory($container);
 
-        $container['widget/builder'] = function (Container $container) {
+        $container['widget/builder'] = function(Container $container) {
             return new WidgetBuilder($container['widget/factory'], $container);
         };
     }
     public function registerClimate(Container $container)
     {
-        $container['climate/system'] = function (Container $container) {
+        $container['climate/system'] = function(Container $container) {
             $system = Mockery::mock(Linux::class);
             $system->shouldReceive('hasAnsiSupport')->andReturn(true);
             $system->shouldReceive('width')->andReturn(80);
@@ -238,7 +238,7 @@ 
             return $system;
         };
 
-        $container['climate/output'] = function (Container $container) {
+        $container['climate/output'] = function(Container $container) {
             $output = Mockery::mock(Output::class);
             $output->shouldReceive('persist')->andReturn($output);
             $output->shouldReceive('sameLine')->andReturn($output);
@@ -247,7 +247,7 @@ 
             return $output;
         };
 
-        $container['climate/reader'] = function (Container $container) {
+        $container['climate/reader'] = function(Container $container) {
             $reader = Mockery::mock(Stdin::class);
             $reader->shouldReceive('line')->andReturn('line');
             $reader->shouldReceive('char')->andReturn('char');
@@ -255,11 +255,11 @@ 
             return $reader;
         };
 
-        $container['climate/util'] = function (Container $container) {
+        $container['climate/util'] = function(Container $container) {
             return new UtilFactory($container['climate/system']);
         };
 
-        $container['climate'] = function (Container $container) {
+        $container['climate'] = function(Container $container) {
             $climate = new CLImate();
 
             $climate->setOutput($container['climate/output']);
@@ -278,7 +278,7 @@ 
      */
     public function registerView(Container $container)
     {
-        $container['view/loader'] = function (Container $container) {
+        $container['view/loader'] = function(Container $container) {
             return new MustacheLoader([
                 'logger'    => $container['logger'],
                 'base_path' => $container['config']['base_path'],
@@ -288,7 +288,7 @@ 
             ]);
         };
 
-        $container['view/engine'] = function (Container $container) {
+        $container['view/engine'] = function(Container $container) {
             return new MustacheEngine([
                 'logger' => $container['logger'],
                 'cache'  => MustacheEngine::DEFAULT_CACHE_PATH,
@@ -296,7 +296,7 @@ 
             ]);
         };
 
-        $container['view'] = function (Container $container) {
+        $container['view'] = function(Container $container) {
             return new GenericView([
                 'logger' => $container['logger'],
                 'engine' => $container['view/engine']
@@ -312,15 +312,15 @@ 
      */
     public function registerTranslator(Container $container)
     {
-        $container['locales/manager'] = function (Container $container) {
+        $container['locales/manager'] = function(Container $container) {
             return new LocalesManager([
                 'locales' => [
-                    'en' => [ 'locale' => 'en-US' ]
+                    'en' => ['locale' => 'en-US']
                 ]
             ]);
         };
 
-        $container['translator'] = function (Container $container) {
+        $container['translator'] = function(Container $container) {
             return new Translator([
                 'manager' => $container['locales/manager']
             ]);
@@ -335,7 +335,7 @@ 
      */
     public function registerLogger(Container $container)
     {
-        $container['logger'] = function (Container $container) {
+        $container['logger'] = function(Container $container) {
             return new NullLogger();
         };
     }
@@ -348,14 +348,14 @@ 
      */
     public function registerCache(Container $container)
     {
-        $container['cache'] = function ($container) {
+        $container['cache'] = function($container) {
             return new Pool(new Ephemeral());
         };
     }
 
     public function registerDatabase(Container $container)
     {
-        $container['database'] = function (Container $container) {
+        $container['database'] = function(Container $container) {
             $pdo = new PDO('sqlite::memory:');
             $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             return $pdo;
@@ -367,7 +367,7 @@ 
         $this->registerLogger($container);
         $this->registerCache($container);
 
-        $container['metadata/loader'] = function (Container $container) {
+        $container['metadata/loader'] = function(Container $container) {
             return new MetadataLoader([
                 'logger'    => $container['logger'],
                 'cache'     => $container['cache'],
@@ -386,7 +386,7 @@ 
         $this->registerLogger($container);
         $this->registerDatabase($container);
 
-        $container['source/factory'] = function (Container $container) {
+        $container['source/factory'] = function(Container $container) {
             return new Factory([
                 'map' => [
                     'database' => DatabaseSource::class
@@ -405,7 +405,7 @@ 
         $this->registerDatabase($container);
         $this->registerLogger($container);
 
-        $container['property/factory'] = function (Container $container) {
+        $container['property/factory'] = function(Container $container) {
             return new Factory([
                 'resolver_options' => [
                     'prefix' => '\\Charcoal\\Property\\',
@@ -426,7 +426,7 @@ 
         $this->registerDatabase($container);
         $this->registerLogger($container);
 
-        $container['property/display/factory'] = function (Container $container) {
+        $container['property/display/factory'] = function(Container $container) {
             return new Factory([
                 'resolver_options' => [
                     'suffix' => 'Display'
@@ -448,7 +448,7 @@ 
         $this->registerPropertyFactory($container);
         $this->registerSourceFactory($container);
 
-        $container['model/factory'] = function (Container $container) {
+        $container['model/factory'] = function(Container $container) {
             return new Factory([
                 'arguments' => [[
                     'container'        => $container,
@@ -463,7 +463,7 @@ 
 
     public function registerAcl(Container $container)
     {
-        $container['admin/acl'] = function (Container $container) {
+        $container['admin/acl'] = function(Container $container) {
             return new Acl();
         };
     }
@@ -473,7 +473,7 @@ 
         $this->registerLogger($container);
         $this->registerModelFactory($container);
 
-        $container['admin/authenticator'] = function (Container $container) {
+        $container['admin/authenticator'] = function(Container $container) {
             return new Authenticator([
                 'logger'        => $container['logger'],
                 'user_type'     => 'charcoal/admin/user',
@@ -489,7 +489,7 @@ 
         $this->registerLogger($container);
         $this->registerAcl($container);
 
-        $container['admin/authorizer'] = function (Container $container) {
+        $container['admin/authorizer'] = function(Container $container) {
             return new Authorizer([
                 'logger'    => $container['logger'],
                 'acl'       => $container['admin/acl'],
@@ -503,7 +503,7 @@ 
         $this->registerLogger($container);
         $this->registerModelFactory($container);
 
-        $container['model/collection/loader'] = function (Container $container) {
+        $container['model/collection/loader'] = function(Container $container) {
             return new \Charcoal\Loader\CollectionLoader([
                 'logger'  => $container['logger'],
                 'factory' => $container['model/factory']
@@ -513,7 +513,7 @@ 
 
     public function registerEmailFactory(Container $container)
     {
-        $container['email/factory'] = function (Container $container) {
+        $container['email/factory'] = function(Container $container) {
             return new Factory([
                 'map' => [
                     'email' => Email::class
@@ -524,7 +524,7 @@ 
 
     public function registerElfinderConfig(Container $container)
     {
-        $container['elfinder/config'] = function (Container $container) {
+        $container['elfinder/config'] = function(Container $container) {
             return [];
         };
     }