locomotivemtl / charcoal-admin

src/Charcoal/Admin/AdminWidget.php

Spacing +8 added lines, -8 removed lines

@@ -296,7 +296,7 @@ 
         }
 
         if (!is_array($sources)) {
-            $sources = [ $sources ];
+            $sources = [$sources];
         }
 
         foreach ($sources as $ident => $filter) {
@@ -543,7 +543,7 @@ 
      */
     protected function resolveConditionalLogic($condition)
     {
-        if (is_callable([ $this, $condition ])) {
+        if (is_callable([$this, $condition])) {
             return !!$this->{$condition}();
         } elseif (is_callable($condition)) {
             return !!$condition();
@@ -567,7 +567,7 @@ 
         $validSources = $this->acceptedDataSources();
 
         if (is_numeric($sourceIdent) && is_string($sourceFilter)) {
-            $sourceIdent   = $sourceFilter;
+            $sourceIdent = $sourceFilter;
             $sourceFilter = null;
         }
 
@@ -601,7 +601,7 @@ 
      */
     protected function acceptedDataSources()
     {
-        return [ static::DATA_SOURCE_REQUEST, static::DATA_SOURCE_OBJECT ];
+        return [static::DATA_SOURCE_REQUEST, static::DATA_SOURCE_OBJECT];
     }
 
     /**
@@ -649,15 +649,15 @@ 
                 $method = $matches[2];
 
                 if ($class === 'parent') {
-                    $resolved = [ $this, $class.'::'.$method ];
+                    $resolved = [$this, $class.'::'.$method];
                 } else {
                     if (!class_exists($class)) {
                         return null;
                     }
-                    $resolved = [ $class, $method ];
+                    $resolved = [$class, $method];
                 }
             } else {
-                $resolved = [ $this, $toResolve ];
+                $resolved = [$this, $toResolve];
             }
         }
 
@@ -680,7 +680,7 @@ 
         foreach ($sources as $sourceIdent) {
             $filter = $this->dataSourceFilter($sourceIdent);
             $getter = $this->camelize('data_from_'.$sourceIdent);
-            $method = [ $this, $getter ];
+            $method = [$this, $getter];
 
             if (is_callable($method)) {
                 $data = call_user_func($method);

src/Charcoal/Admin/Action/Filesystem/LoadAction.php

Indentation -1 removed lines

@@ -35,7 +35,6 @@
  * - `name` (_string_) — The custom file name.
  * - `disposition` (_string_) ["inline"] — How the response should be treated.
  *   Available options: "inline", "attachment".
-
  * ## Response
  *
  * - {@see Psr\Http\Message\StreamInterface} - A streamed response for the given file.

Spacing +4 added lines, -4 removed lines

@@ -135,7 +135,7 @@ 
      */
     protected function validDataFromRequest()
     {
-        return [ 'disk', 'disposition', 'path', 'name' ];
+        return ['disk', 'disposition', 'path', 'name'];
     }
 
     /**
@@ -198,7 +198,7 @@ 
             $disk = $this->getParam('disk', $this->filesystemConfig['default_connection']);
             $this->assertValidDisk($disk);
 
-            $disp =  $this->getParam('disposition', self::DISPOSITION_INLINE);
+            $disp = $this->getParam('disposition', self::DISPOSITION_INLINE);
             $this->assertValidDisposition($disp);
 
             $path = $this->getParam('path');
@@ -281,7 +281,7 @@ 
      */
     public function generateHttpDisposition($disposition, $filename, $filenameFallback = '')
     {
-        if (!in_array($disposition, [ self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE ])) {
+        if (!in_array($disposition, [self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE])) {
             throw new InvalidArgumentException(sprintf(
                 'The disposition must be either "%s" or "%s".',
                 self::DISPOSITION_ATTACHMENT,
@@ -438,7 +438,7 @@ 
     {
         $translator = $this->translator();
 
-        if (!in_array($disposition, [ self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE ])) {
+        if (!in_array($disposition, [self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE])) {
             throw new InvalidArgumentException(sprintf(
                 'The disposition must be either "%s" or "%s".',
                 self::DISPOSITION_ATTACHMENT,

src/Charcoal/Admin/Template/System/StaticWebsiteTemplate.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
             return 0;
         }
         $base = log($size, 1024);
-        $suffixes = [ 'bytes', 'k', 'M', 'G', 'T' ];
+        $suffixes = ['bytes', 'k', 'M', 'G', 'T'];
 
         $floor = floor($base);
         return round(pow(1024, ($base - $floor)), 2).' '.$suffixes[$floor];
@@ -106,7 +106,7 @@ 
     private function globRecursive($dir, $pattern, $flags = 0)
     {
         $files = glob($dir.'/'.$pattern, $flags);
-        foreach (glob($dir.'/*', (GLOB_ONLYDIR|GLOB_NOSORT)) as $dir) {
+        foreach (glob($dir.'/*', (GLOB_ONLYDIR | GLOB_NOSORT)) as $dir) {
             $files = array_merge($files, $this->globRecursive($dir, $pattern, $flags));
         }
         return $files;

src/Charcoal/Admin/Action/ElfinderConnectorAction.php

Spacing +4 added lines, -4 removed lines

@@ -164,7 +164,7 @@ 
      */
     protected function validDataFromRequest()
     {
-        return [ 'obj_type', 'obj_id', 'property' ];
+        return ['obj_type', 'obj_id', 'property'];
     }
 
     /**
@@ -324,8 +324,8 @@ 
 
             'uploadDeny'      => $this->defaultUploadDeny(),
             'uploadAllow'     => $this->defaultUploadAllow(),
-            'uploadOrder'     => [ 'deny', 'allow' ],
-            'accessControl'   => [ $this, 'checkAccess' ],
+            'uploadOrder'     => ['deny', 'allow'],
+            'accessControl'   => [$this, 'checkAccess'],
             'duplicateSuffix' => '_%s_'
         ];
     }
@@ -475,7 +475,7 @@ 
                 $disk['startPath'] = $startPath;
             }
 
-            return [ $disk ];
+            return [$disk];
         }
 
         return $this->getPublicRoots();

src/Charcoal/Admin/Template/ElfinderTemplate.php

Spacing +3 added lines, -4 removed lines

@@ -285,7 +285,7 @@ 
             }
         }
 
-        return json_encode($i18n, (JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE));
+        return json_encode($i18n, (JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
     }
 
     /**
@@ -407,7 +407,7 @@ 
             $settings['rememberLastDir'] = !($property instanceof FileProperty);
         }
 
-        return json_encode($settings, (JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE));
+        return json_encode($settings, (JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
     }
 
     /**
@@ -429,8 +429,7 @@ 
     public function disableTheme()
     {
         return isset($this->elfinderConfig['disable_theme']) ?
-            !!$this->elfinderConfig['disable_theme'] :
-            false;
+            !!$this->elfinderConfig['disable_theme'] : false;
     }
 
     /**

src/Charcoal/Admin/Ui/Sidemenu/SidemenuGroupTrait.php

Spacing +2 added lines, -2 removed lines

@@ -227,7 +227,7 @@ 
                 return $this;
             }
 
-            $isSelected = $this->sidemenu()->isCurrentItem([ $linkIdent, (string)$url ]);
+            $isSelected = $this->sidemenu()->isCurrentItem([$linkIdent, (string)$url]);
 
             if ($isSelected) {
                 $this->isSelected(true);
@@ -348,7 +348,7 @@ 
      */
     public function displayAsPanel()
     {
-        return in_array($this->displayType(), [ 'panel', 'collapsible' ]);
+        return in_array($this->displayType(), ['panel', 'collapsible']);
     }
 
     /**

src/Charcoal/Admin/Ui/ActionContainerTrait.php

Spacing +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
             }
         }
 
-        usort($parsedActions, [ $this, 'sortActionsByPriority' ]);
+        usort($parsedActions, [$this, 'sortActionsByPriority']);
 
         while (($first = reset($parsedActions)) && $first['isSeparator']) {
             array_shift($parsedActions);
@@ -165,7 +165,7 @@ 
             $action = $this->defaultActionStruct();
             $action['isSeparator'] = true;
         } elseif (is_array($action)) {
-            $buttonTypes = [ 'button', 'menu', 'reset', 'submit' ];
+            $buttonTypes = ['button', 'menu', 'reset', 'submit'];
             // Normalize structure keys
             foreach ($action as $key => $val) {
                 $attr = $this->camelize($key);
@@ -193,7 +193,7 @@ 
             if (isset($action['label'])) {
                 $action['label'] = $this->translator()->translation($action['label']);
             } else {
-                $action['label'] = ucwords(str_replace([ '.', '_' ], ' ', $action['ident']));
+                $action['label'] = ucwords(str_replace(['.', '_'], ' ', $action['ident']));
 
                 $model = $this->getActionRenderer();
                 if ($model) {
@@ -370,9 +370,9 @@ 
             }
 
             $result = null;
-            if ($renderer && is_callable([ $renderer, $condition ])) {
+            if ($renderer && is_callable([$renderer, $condition])) {
                 $result = !!$renderer->{$condition}();
-            } elseif (is_callable([ $this, $condition ])) {
+            } elseif (is_callable([$this, $condition])) {
                 $result = !!$this->{$condition}();
             } elseif (is_callable($condition)) {
                 $result = !!$condition();
@@ -427,7 +427,7 @@ 
                 $url = preg_replace('~\{\{\s*(obj_)?type\s*\}\}~', $objType, $url);
             }
 
-            if ($url && strpos($url, ':') === false && !in_array($url[0], [ '/', '#', '?' ])) {
+            if ($url && strpos($url, ':') === false && !in_array($url[0], ['/', '#', '?'])) {
                 $url = $this->adminUrl().$url;
             }
 
@@ -435,7 +435,7 @@ 
         } elseif ($renderer instanceof ViewableInterface) {
             $url = $renderer->renderTemplate($url);
 
-            if ($url && strpos($url, ':') === false && !in_array($url[0], [ '/', '#', '?' ])) {
+            if ($url && strpos($url, ':') === false && !in_array($url[0], ['/', '#', '?'])) {
                 $url = $this->adminUrl().$url;
             }
         }

src/Charcoal/Admin/Widget/CollectionMapWidget.php

Spacing +3 added lines, -3 removed lines

@@ -217,7 +217,7 @@ 
                 $loader->setData($collectionConfig);
             }
 
-            $callback = function(&$obj) {
+            $callback = function (&$obj) {
                 $obj->mapInfoboxTemplate = $this->infoboxTemplate();
 
                 if ($this->latProperty() && $this->latProperty()) {
@@ -454,7 +454,7 @@ 
         if (is_string($toResolve)) {
             $model = $this->proto();
 
-            $resolved = [ $model, $toResolve ];
+            $resolved = [$model, $toResolve];
 
             // check for slim callable as "class:method"
             $callablePattern = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
@@ -463,7 +463,7 @@ 
                 $method = $matches[2];
 
                 if ($class === 'parent') {
-                    $resolved = [ $model, $class.'::'.$method ];
+                    $resolved = [$model, $class.'::'.$method];
                 }
             }
 

src/Charcoal/Admin/Widget/FormGroup/ObjectRevisionsFormGroup.php

Spacing +3 added lines, -3 removed lines

@@ -63,14 +63,14 @@ 
         $lastRevision = $target->latestRevision();
         $propLabel    = '<span title="%1$s">%2$s</code>';
 
-        $callback = function(&$obj) use ($lastRevision, $target, $propLabel) {
+        $callback = function (&$obj) use ($lastRevision, $target, $propLabel) {
             $dataDiff = $obj->dataDiff();
             $obj->revTsDisplay = $obj->revTs()->format('Y-m-d H:i:s');
             $obj->numDiff = count($dataDiff);
 
             if (isset($dataDiff[0])) {
                 $props = array_keys($dataDiff[0]);
-                $props = array_diff($props, [ 'last_modified', 'last_modified_by' ]);
+                $props = array_diff($props, ['last_modified', 'last_modified_by']);
 
                 $changedProps = [];
                 $droppedProps = [];
@@ -79,7 +79,7 @@ 
                         $label = $target->p($p)->label();
                         $changedProps[] = sprintf($propLabel, $p, $label);
                     } else {
-                        $label = ucwords(str_replace([ '.', '_' ], ' ', $p));
+                        $label = ucwords(str_replace(['.', '_'], ' ', $p));
                         $droppedProps[] = sprintf($propLabel, $p, $label);
                     }
                 }