Rewrote some code to be less complex

rollerworks-graveyard · Sep 22, 2016 · c7a7dae · c7a7dae
1 parent 13e60ce
commit c7a7dae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/Column/ColumnTypeRegistry.php b/src/Column/ColumnTypeRegistry.php
@@ -78,11 +78,11 @@ public function getType($name): ResolvedColumnTypeInterface
 
             if (!$type) {
                 // Support fully-qualified class names.
-                if (class_exists($name) && in_array(ColumnTypeInterface::class, class_implements($name), true)) {
-                    $type = new $name();
-                } else {
+                if (!class_exists($name) || !in_array(ColumnTypeInterface::class, class_implements($name), true)) {
                     throw new InvalidArgumentException(sprintf('Could not load type "%s"', $name));
                 }
+
+                $type = new $name();
             }
 
             $this->types[$name] = $this->resolveType($type);

diff --git a/src/Column/ResolvedColumnType.php b/src/Column/ResolvedColumnType.php
@@ -137,29 +137,24 @@ public function buildType(ColumnInterface $config, array $options)
     public function createColumn(string $name, array $options = []): ColumnInterface
     {
         $options = $this->getOptionsResolver()->resolve($options);
-        $builder = $this->newColumn($name, $options);
 
-        return $builder;
+        return $this->newColumn($name, $options);
     }
 
     /**
      * {inheritdoc}.
      */
     public function createHeaderView(ColumnInterface $column, DatagridView $datagrid): HeaderView
     {
-        $view = new HeaderView($column, $datagrid, $column->getOption('label'));
-
-        return $view;
+        return new HeaderView($column, $datagrid, $column->getOption('label'));
     }
 
     /**
      * {inheritdoc}.
      */
     public function createCellView(ColumnInterface $column, DatagridView $datagrid): CellView
     {
-        $view = new CellView($column, $datagrid);
-
-        return $view;
+        return new CellView($column, $datagrid);
     }
 
     /**