Cherry-Pie / Jarboe

src/Commands/CreateDefinitionArtisanCommand.php

Doc Comments +3 added lines

@@ -50,6 +50,9 @@
         echo $showMethod;
     } // end doGenerateMethods
     
+    /**
+     * @param string $uri
+     */
     private function trimAdminPrefix($uri)
     {
         $segments = array_filter(explode('/', $uri));

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $methodPostfix = camel_case('show_'. preg_replace('~2~', '_to_', $this->table));
         $this->info('Routes:');
         $route = "Route::any('". $this->trimAdminPrefix($this->getRequestUri) 
-                  . "', 'TableAdminController@". $methodPostfix ."');";
+                    . "', 'TableAdminController@". $methodPostfix ."');";
         $this->line($route);
         
         $this->info('Methods:');

Braces +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 
 
-class CreateDefinitionArtisanCommand extends Command 
+class CreateDefinitionArtisanCommand extends Command
 {
 
     protected $name = 'jarboe:definition';

Spacing +21 added lines, -21 removed lines

@@ -21,9 +21,9 @@ 
     public function fire()
     {
         $this->table = $this->argument('table');
-        $this->stub  = file_get_contents(__DIR__ .'/../../stubs/definition.stub');
+        $this->stub  = file_get_contents(__DIR__.'/../../stubs/definition.stub');
         
-        $fields = \DB::select(\DB::raw('SHOW FULL COLUMNS FROM '. $this->table));
+        $fields = \DB::select(\DB::raw('SHOW FULL COLUMNS FROM '.$this->table));
         $this->doFillStub($fields);
         
         $this->doSaveStub();
@@ -33,20 +33,20 @@ 
     
     private function doGenerateMethods()
     {
-        $methodPostfix = camel_case('show_'. preg_replace('~2~', '_to_', $this->table));
+        $methodPostfix = camel_case('show_'.preg_replace('~2~', '_to_', $this->table));
         $this->info('Routes:');
-        $route = "Route::any('". $this->trimAdminPrefix($this->getRequestUri) 
-                  . "', 'TableAdminController@". $methodPostfix ."');";
+        $route = "Route::any('".$this->trimAdminPrefix($this->getRequestUri) 
+                  . "', 'TableAdminController@".$methodPostfix."');";
         $this->line($route);
         
         $this->info('Methods:');
-        $showMethod = 'public function show'. $methodPostfix .'()'. PHP_EOL;
-        $showMethod .= '{' . PHP_EOL;
-        $showMethod .= '    $options = array(' . PHP_EOL;
-        $showMethod .= "        'def_name' => '". $this->definition ."'," . PHP_EOL;
-        $showMethod .= '    );' . PHP_EOL;
-        $showMethod .= '    return Jarboe::table($options);' . PHP_EOL . PHP_EOL;
-        $showMethod .= '} // end show'. $methodPostfix . PHP_EOL . PHP_EOL;
+        $showMethod = 'public function show'.$methodPostfix.'()'.PHP_EOL;
+        $showMethod .= '{'.PHP_EOL;
+        $showMethod .= '    $options = array('.PHP_EOL;
+        $showMethod .= "        'def_name' => '".$this->definition."',".PHP_EOL;
+        $showMethod .= '    );'.PHP_EOL;
+        $showMethod .= '    return Jarboe::table($options);'.PHP_EOL.PHP_EOL;
+        $showMethod .= '} // end show'.$methodPostfix.PHP_EOL.PHP_EOL;
         echo $showMethod;
     } // end doGenerateMethods
     
@@ -99,7 +99,7 @@ 
                 continue;
             }
             
-            $this->comment($field['Field'] .':');
+            $this->comment($field['Field'].':');
             if (!$this->confirm('Add field to definition? [y|n]')) {
                 continue;
             }
@@ -124,7 +124,7 @@ 
             return $template;
         }
         
-        $template .= sprintf("        '%s' => array(\n", 'many2many_'. str_random(6));
+        $template .= sprintf("        '%s' => array(\n", 'many2many_'.str_random(6));
         $template .= sprintf("            'caption' => '%s',\n", 'Связи');
         $template .= "            'type' => 'many_to_many',\n";
         $template .= $this->getManyToManyFieldType($field);
@@ -167,7 +167,7 @@ 
     
     private function getFieldCaption($field)
     {
-        $caption = $field['Comment'] ? : $field['Field'];
+        $caption = $field['Comment'] ?: $field['Field'];
         return sprintf("            'caption' => '%s',\n", $caption);
     } // end getFieldCaption
     
@@ -202,7 +202,7 @@ 
             
             $references = \DB::select(
                 \DB::raw("select concat(table_name, '.', column_name) as 'fk', concat(referenced_table_name, '.', referenced_column_name) as 'ref' from information_schema.key_column_usage where referenced_table_name is not null HAVING fk = ?"), 
-                array($this->table .'.'. $field['Field'])
+                array($this->table.'.'.$field['Field'])
             );
             
             // cuz one2many
@@ -215,7 +215,7 @@ 
             $additional .= sprintf("            'foreign_table' => '%s',\n", $foreignTable);
             $additional .= sprintf("            'foreign_key_field' => '%s',\n", $foreignKey);
             $additional .= sprintf("            'foreign_value_field' => '%s', //change me\n", $foreignKey);
-            $additional .= sprintf("            'alias' => '%s',\n", $this->table . $foreignTable);
+            $additional .= sprintf("            'alias' => '%s',\n", $this->table.$foreignTable);
         } elseif ($field['Field'] == 'datetime') {
             $type = 'datetime';
         } elseif ($field['Field'] == 'timestamp') {
@@ -246,13 +246,13 @@ 
     private function doSaveStub()
     {
         $postfix = '';
-        if (file_exists(base_path() .'/resources/definitions/'. $this->table .'.php')) {
-            $postfix = '_'. time();
+        if (file_exists(base_path().'/resources/definitions/'.$this->table.'.php')) {
+            $postfix = '_'.time();
         }
         
-        $this->definition = $this->table . $postfix;
+        $this->definition = $this->table.$postfix;
         
-        $path = base_path() .'/resources/definitions/'. $this->definition .'.php';
+        $path = base_path().'/resources/definitions/'.$this->definition.'.php';
         file_put_contents($path, $this->stub);
     } // end doSaveStub
     

src/Fields/AbstractField.php

Doc Comments +15 added lines

@@ -33,6 +33,9 @@ 
     
     protected function onAssets() {} // end onAssets
     
+    /**
+     * @param string $ident
+     */
     public function getDefinitionOption($ident, $default = null)
     {
         $value = array_get($this->definition, $ident);
@@ -74,16 +77,25 @@ 
         return $attributes;
     } // end _prepareAttributes
 
+    /**
+     * @param string $ident
+     */
     protected function getOption($ident)
     {
         return $this->options[$ident];
     } // end getOption
 
+    /**
+     * @param string $ident
+     */
     public function getAttribute($ident, $default = false)
     {
         return array_key_exists($ident, $this->attributes) ? $this->attributes[$ident] : $default;
     } // end getAttribute
     
+    /**
+     * @param string $ident
+     */
     public function getRequiredAttribute($ident)
     {
         if (!array_key_exists($ident, $this->attributes)) {
@@ -238,6 +250,9 @@ 
         return $input->render();
     } // end getFilterInput
 
+    /**
+     * @param string $methodName
+     */
     protected function hasCustomHandlerMethod($methodName)
     {
         return $this->handler && is_callable(array($this->handler, $methodName));

Braces +10 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 use Illuminate\Support\Facades\Validator;
 
 
-abstract class AbstractField 
+abstract class AbstractField
 {
 
     protected $fieldName;
@@ -31,7 +31,9 @@ 
         $this->onAssets();
     } // end __construct
     
-    protected function onAssets() {} // end onAssets
+    protected function onAssets()
+    {
+} // end onAssets
     
     public function getDefinitionOption($ident, $default = null)
     {
@@ -358,9 +360,13 @@ 
         return '';
     } // end getRowColor
     
-    public function afterInsert($id, $values) {} // end afterInsert
+    public function afterInsert($id, $values)
+    {
+} // end afterInsert
     
-    public function afterUpdate($id, $values) {} // end afterUpdate
+    public function afterUpdate($id, $values)
+    {
+} // end afterUpdate
 
     abstract public function onSearchFilter(&$db, $value);
     

Spacing +8 added lines, -8 removed lines

@@ -87,7 +87,7 @@ 
     public function getRequiredAttribute($ident)
     {
         if (!array_key_exists($ident, $this->attributes)) {
-            throw new \RuntimeException('Field ['. $this->getFieldName() .'] requires ['. $ident .'] attribute');
+            throw new \RuntimeException('Field ['.$this->getFieldName().'] requires ['.$ident.'] attribute');
         }
         
         return $this->attributes[$ident];
@@ -107,12 +107,12 @@ 
             }
         }
         
-        $fieldName = $this->getFieldName() . $postfix;
+        $fieldName = $this->getFieldName().$postfix;
         // postfix used for getting values for form - tabs loop
         // so there is no need to force appending postfix
         if ($this->getAttribute('tabs') && !$postfix) {
             $tabs = $this->getAttribute('tabs');
-            $fieldName = $fieldName . $tabs[0]['postfix'];
+            $fieldName = $fieldName.$tabs[0]['postfix'];
         }
         $value = isset($row[$fieldName]) ? $row[$fieldName] : '';
         
@@ -158,7 +158,7 @@ 
 
         $type = $this->getAttribute('type');
 
-        $input = View::make('admin::tb.input.'. $type);
+        $input = View::make('admin::tb.input.'.$type);
         $input->value = $this->getValue($row);
         $input->name  = $this->getFieldName();
         $input->rows  = $this->getAttribute('rows');
@@ -184,7 +184,7 @@ 
         
         $type = $this->getAttribute('type');
         
-        $input = View::make('admin::tb.input.tab.'. $type);
+        $input = View::make('admin::tb.input.tab.'.$type);
         $input->value = $this->getValue($row);
         $input->name  = $this->getFieldName();
         $input->rows  = $this->getAttribute('rows');
@@ -231,7 +231,7 @@ 
 
         $type = $this->getAttribute('filter');
 
-        $input = View::make('admin::tb.filter.'. $type);
+        $input = View::make('admin::tb.filter.'.$type);
         $input->name = $this->getFieldName();
         $input->value = $filter;
 
@@ -266,11 +266,11 @@ 
         $tabs = $this->getAttribute('tabs');
         if ($tabs) {
             foreach ($tabs as $tab) {
-                $name = $this->definition['db']['table'] .'.'. $this->getFieldName() . $tab['postfix'];
+                $name = $this->definition['db']['table'].'.'.$this->getFieldName().$tab['postfix'];
                 $db->addSelect($name);
             }
         } else {
-            $db->addSelect($this->definition['db']['table'] .'.'. $this->getFieldName());
+            $db->addSelect($this->definition['db']['table'].'.'.$this->getFieldName());
         }
     } // end onSelectValue
     

src/Fields/ManyToManyField.php

Doc Comments +3 added lines

@@ -177,6 +177,9 @@
         return $input->render();
     } // end getEditInputWithExtra
     
+    /**
+     * @param boolean $segmentCount
+     */
     private function doDivideOnParts($array, $segmentCount)
     {
         $dataCount = count($array);

Indentation +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
         $values = is_array($values) ? $values : explode(',', $values);
         
         DB::table($this->getAttribute('mtm_table'))
-          ->where($this->getAttribute('mtm_key_field'), $id)
-          ->delete();
+            ->where($this->getAttribute('mtm_key_field'), $id)
+            ->delete();
         
         $data = array();
         if ($this->getAttribute('show_type') == 'extra') {

Braces +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use Jarboe;
 
 
-class ManyToManyField extends AbstractField 
+class ManyToManyField extends AbstractField
 {
 
     protected function onAssets()

Spacing +11 added lines, -11 removed lines

@@ -119,7 +119,7 @@ 
             return $this->getEditInputSelectWithAjaxSearch($row);
         }
 
-        $input = View::make('admin::tb.input.many2many_'. $showType);
+        $input = View::make('admin::tb.input.many2many_'.$showType);
         $input->selected = array();
         if ($row) {
             $input->selected = $this->getRelatedExternalFieldOptions($row);
@@ -193,15 +193,15 @@ 
 
     protected function getRelatedExternalFieldOptions($row, $isGetAll = false)
     {
-        $keyField = $this->getAttribute('mtm_table') .'.'. $this->getAttribute('mtm_external_key_field');
-        $valueField = $this->getAttribute('mtm_external_table') .'.'. $this->getAttribute('mtm_external_value_field');
+        $keyField = $this->getAttribute('mtm_table').'.'.$this->getAttribute('mtm_external_key_field');
+        $valueField = $this->getAttribute('mtm_external_table').'.'.$this->getAttribute('mtm_external_value_field');
         $externalTable = $this->getAttribute('mtm_external_table');
-        $externalForeignKey = $externalTable .'.'. $this->getAttribute('mtm_external_foreign_key_field');
+        $externalForeignKey = $externalTable.'.'.$this->getAttribute('mtm_external_foreign_key_field');
         
-        $options = DB::table($this->getAttribute('mtm_table'))->orderBy($externalTable .'.id', 'desc');
+        $options = DB::table($this->getAttribute('mtm_table'))->orderBy($externalTable.'.id', 'desc');
         $options->select($keyField, $valueField);
         if ($isGetAll) {
-            $options->addSelect($this->getAttribute('mtm_table') .'.*');
+            $options->addSelect($this->getAttribute('mtm_table').'.*');
         }
 
         $options->join($externalTable, $keyField, '=', $externalForeignKey);
@@ -236,9 +236,9 @@ 
     
     protected function getAllExternalFieldOptions($isGetAll = false)
     {
-        $valueField = $this->getAttribute('mtm_external_table') .'.'. $this->getAttribute('mtm_external_value_field');
+        $valueField = $this->getAttribute('mtm_external_table').'.'.$this->getAttribute('mtm_external_value_field');
         $externalTable = $this->getAttribute('mtm_external_table');
-        $externalForeignKey = $externalTable .'.'. $this->getAttribute('mtm_external_foreign_key_field');
+        $externalForeignKey = $externalTable.'.'.$this->getAttribute('mtm_external_foreign_key_field');
         
         $options = DB::table($externalTable);
         if (!$isGetAll) {
@@ -274,13 +274,13 @@ 
     public function getAjaxSearchResult($query, $limit, $page)
     {
         // TODO: create handler callback & lambda callback
-        $results = DB::table($this->getAttribute('mtm_external_table'))->orderBy($this->getAttribute('mtm_external_table') .'.id', 'desc')
+        $results = DB::table($this->getAttribute('mtm_external_table'))->orderBy($this->getAttribute('mtm_external_table').'.id', 'desc')
                     ->select('id', $this->getAttribute('mtm_external_value_field'))
-                    ->where($this->getAttribute('mtm_external_value_field'), 'LIKE', '%'. $query .'%')
+                    ->where($this->getAttribute('mtm_external_value_field'), 'LIKE', '%'.$query.'%')
                     ->take($limit)
                     ->skip(($limit * $page) - $limit)
                     ->get();
-        $results = $results ? : array();
+        $results = $results ?: array();
         
         $res = array();
         foreach ($results as $result) {

src/Handlers/ActionsHandler.php

Doc Comments +6 added lines

@@ -8,6 +8,9 @@ 
     protected $def;
     protected $controller;
 
+    /**
+     * @param \Yaro\Jarboe\JarboeController $controller
+     */
     public function __construct(array $actionsDefinition, &$controller)
     {
         $this->def = $actionsDefinition;
@@ -134,6 +137,9 @@ 
         return $action;
     } // end onRestoreButton
     
+    /**
+     * @param string $type
+     */
     public function isAllowed($type, $buttonDefinition = array())
     {
         $def = isset($this->def[$type]) ? $this->def[$type] : false;

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace Yaro\Jarboe\Handlers;
 
-class ActionsHandler 
+class ActionsHandler
 {
     
     protected $def;

src/Handlers/ExportHandler.php

Doc Comments +15 added lines

@@ -12,6 +12,9 @@ 
     protected $def;
     protected $controller;
 
+    /**
+     * @param \Yaro\Jarboe\JarboeController $controller
+     */
     public function __construct(array $exportDefinition, &$controller)
     {
         $this->def = $exportDefinition;
@@ -184,6 +187,9 @@ 
         $xls .= "        </Row>\n";
     } // end addXlsRow
     
+    /**
+     * @param string $xls
+     */
     private function addXlsCell($value, &$xls)
     {
         $style = '';
@@ -218,6 +224,9 @@ 
         $xls .= "</Cell>\n";
     } // end addXlsCell
     
+    /**
+     * @param string $xls
+     */
     private function addXlsHeader(&$xls)
     {
         $xls .= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:html=\"http://www.w3.org/TR/REC-html40\">";
@@ -237,6 +246,9 @@ 
         $xls .= "</Workbook>";
     } // end addXlsFooter
     
+    /**
+     * @param string $filename
+     */
     private function doSendHeaders($filename)
     {
         // disable caching
@@ -255,6 +267,9 @@ 
         header('Content-Transfer-Encoding: binary');
     } // end doSendHeaders
     
+    /**
+     * @param string $ident
+     */
     private function getAttribute($ident, $default = false)
     {
         return isset($this->def[$ident]) ? $this->def[$ident] : $default;

Braces +2 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 use Illuminate\Support\Facades\Input;
 
 
-class ExportHandler 
+class ExportHandler
 {
     
     protected $def;
@@ -206,8 +206,7 @@ 
             $type = 'DateTime';
             $value = strftime("%Y-%m-%dT%H:%M:%S", $timestamp);
             $style = 'sDT'; // defined in header; tells excel to format date for display
-        }
-        else {
+        } else {
             $type = 'String';
         }
                 

Spacing +11 added lines, -11 removed lines

@@ -76,10 +76,10 @@ 
         $csvRow = '';
         foreach ($idents as $ident) {
             $field = $this->controller->getField($ident);
-            $csvRow .= '"'. $field->getAttribute('caption') .'"'. $delimiter;
+            $csvRow .= '"'.$field->getAttribute('caption').'"'.$delimiter;
         }
         foreach ($additional as $ident => $identCaption) {
-            $csvRow .= '"'. $identCaption .'"'. $delimiter;
+            $csvRow .= '"'.$identCaption.'"'.$delimiter;
         }
         $csvRow = rtrim($csvRow, $delimiter);
         $csv = $csvRow;
@@ -100,21 +100,21 @@ 
                 if ($rowsHandler) {
                     $rowsHandler($row['id'], $row, $ident, $value);
                 }
-                $csvRow .= '"'. $value .'"'. $delimiter;
+                $csvRow .= '"'.$value.'"'.$delimiter;
             }
             foreach ($additional as $ident => $identCaption) {
                 $value = '';
                 if ($rowsHandler) {
                     $rowsHandler($row['id'], $row, $ident, $value);
                 }
-                $csvRow .= '"'. $value .'"'. $delimiter;
+                $csvRow .= '"'.$value.'"'.$delimiter;
             }
             $csvRow = rtrim($csvRow, $delimiter);
             $csv .= $csvRow;
         }
         
         $name = $this->getAttribute('filename', 'export');
-        $this->doSendHeaders($name .'_'. date("Y-m-d") .'.csv');
+        $this->doSendHeaders($name.'_'.date("Y-m-d").'.csv');
         
         die($csv);
     } // end doExportCsv
@@ -128,11 +128,11 @@ 
             // XXX:
             $from = Input::get('d.from', '01/01/1900');
             $from = strtotime(str_replace('/', '-', $from));
-            $from = date('Y-m-d', $from) .' 00:00:00';
+            $from = date('Y-m-d', $from).' 00:00:00';
             // XXX:
             $to = Input::get('d.$to', '01/01/2199');
             $to = strtotime(str_replace('/', '-', $to));
-            $to = date('Y-m-d', $to) .' 23:59:59';
+            $to = date('Y-m-d', $to).' 23:59:59';
             
             $between['field'] = $this->getAttribute('date_range_field');
             $between['values'] = array(
@@ -168,7 +168,7 @@ 
         }
         
         $name = $this->getAttribute('filename', 'export');
-        $this->doSendHeaders($name .'_'. date("Y-m-d") .'.xls');
+        $this->doSendHeaders($name.'_'.date("Y-m-d").'.xls');
         
         $this->addXlsFooter($xls);
         
@@ -199,7 +199,7 @@ 
         // Note we want to be very strict in what we consider a date. There is the possibility
         // of really screwing up the data if we try to reformat a string that was not actually 
         // intended to represent a date.
-        else if(preg_match("/^(\d{1,2}|\d{4})[\/\-]\d{1,2}[\/\-](\d{1,2}|\d{4})([^\d].+)?$/", $value) &&
+        else if (preg_match("/^(\d{1,2}|\d{4})[\/\-]\d{1,2}[\/\-](\d{1,2}|\d{4})([^\d].+)?$/", $value) &&
                     ($timestamp = strtotime($value)) &&
                     ($timestamp > 0) &&
                     ($timestamp < strtotime('+500 years'))) {
@@ -243,7 +243,7 @@ 
         $now = gmdate('D, d M Y H:i:s');
         header('Expires: Tue, 03 Jul 2001 06:00:00 GMT');
         header('Cache-Control: max-age=0, no-cache, must-revalidate, proxy-revalidate');
-        header('Last-Modified: '. $now .' GMT');
+        header('Last-Modified: '.$now.' GMT');
     
         // force download  
         header('Content-Type: application/force-download');
@@ -251,7 +251,7 @@ 
         header('Content-Type: application/download');
     
         // disposition / encoding on response body
-        header('Content-Disposition: attachment;filename='. $filename);
+        header('Content-Disposition: attachment;filename='.$filename);
         header('Content-Transfer-Encoding: binary');
     } // end doSendHeaders
     

src/Handlers/ImportHandler.php

Doc Comments +9 added lines

@@ -13,6 +13,9 @@ 
     protected $def;
     protected $controller;
 
+    /**
+     * @param \Yaro\Jarboe\JarboeController $controller
+     */
     public function __construct(array $importDefinition, &$controller)
     {
         $this->def = $importDefinition;
@@ -114,6 +117,9 @@ 
         die($csv);
     } // end doCsvTemplateDownload
     
+    /**
+     * @param string $filename
+     */
     private function doSendHeaders($filename)
     {
         // disable caching
@@ -132,6 +138,9 @@ 
         header('Content-Transfer-Encoding: binary');
     } // end doSendHeaders
     
+    /**
+     * @param string $ident
+     */
     private function getAttribute($ident, $default = false)
     {
         return isset($this->def[$ident]) ? $this->def[$ident] : $default;

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
                     $message = 'Пустые строки недопустимы для csv формата. Строка #'. $n;
                 } else {
                     $message = 'Не верное количество полей. Строка #'. $n .': '
-                             . count($row) .' из '. count($fields);
+                                . count($row) .' из '. count($fields);
                 }
                 throw new JarboeValidationException($message);
             }

Braces +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use DB;
 
 
-class ImportHandler 
+class ImportHandler
 {
     
     protected $def;

Spacing +7 added lines, -7 removed lines

@@ -63,10 +63,10 @@ 
             
             if (count($row) != count($fields)) {
                 if (is_null($row[0])) {
-                    $message = 'Пустые строки недопустимы для csv формата. Строка #'. $n;
+                    $message = 'Пустые строки недопустимы для csv формата. Строка #'.$n;
                 } else {
-                    $message = 'Не верное количество полей. Строка #'. $n .': '
-                             . count($row) .' из '. count($fields);
+                    $message = 'Не верное количество полей. Строка #'.$n.': '
+                             . count($row).' из '.count($fields);
                 }
                 throw new JarboeValidationException($message);
             }
@@ -103,13 +103,13 @@ 
         
         $csv = '';
         foreach ($this->def['fields'] as $field => $caption) {
-            $csv .= '"'. $caption .'"'. $delimiter;
+            $csv .= '"'.$caption.'"'.$delimiter;
         }
         // remove extra tailing delimiter
         $csv = rtrim($csv, $delimiter);
         
         $name = $this->getAttribute('filename', 'import_template');
-        $this->doSendHeaders($name .'_'. date("Y-m-d") .'.csv');
+        $this->doSendHeaders($name.'_'.date("Y-m-d").'.csv');
         
         die($csv);
     } // end doCsvTemplateDownload
@@ -120,7 +120,7 @@ 
         $now = gmdate('D, d M Y H:i:s');
         header('Expires: Tue, 03 Jul 2001 06:00:00 GMT');
         header('Cache-Control: max-age=0, no-cache, must-revalidate, proxy-revalidate');
-        header('Last-Modified: '. $now .' GMT');
+        header('Last-Modified: '.$now.' GMT');
     
         // force download  
         header('Content-Type: application/force-download');
@@ -128,7 +128,7 @@ 
         header('Content-Type: application/download');
     
         // disposition / encoding on response body
-        header('Content-Disposition: attachment;filename='. $filename);
+        header('Content-Disposition: attachment;filename='.$filename);
         header('Content-Transfer-Encoding: binary');
     } // end doSendHeaders
     

src/Handlers/QueryHandler.php

Doc Comments +6 added lines

@@ -26,11 +26,17 @@
         $this->dbOptions = $definition['db'];
     } // end __construct
 
+    /**
+     * @param string $ident
+     */
     protected function getOptionDB($ident)
     {
         return $this->dbOptions[$ident];
     } // end getOptionDB
 
+    /**
+     * @param string $ident
+     */
     protected function hasOptionDB($ident)
     {
         return isset($this->dbOptions[$ident]);

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 use Session;
 
 
-class QueryHandler 
+class QueryHandler
 {
 
     protected $controller;

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
 
         $this->prepareSelectValues();
         if ($isSelectAll) {
-            $this->db->addSelect($this->getOptionDB('table') .'.*');
+            $this->db->addSelect($this->getOptionDB('table').'.*');
         }
         
         $this->prepareFilterValues();
@@ -64,11 +64,11 @@ 
         $sessionPath = 'table_builder.'.$definitionName.'.order';
         $order = Session::get($sessionPath, array());
         if ($order && $isUserFilters) {
-            $this->db->orderBy($this->getOptionDB('table') .'.'. $order['field'], $order['direction']);
+            $this->db->orderBy($this->getOptionDB('table').'.'.$order['field'], $order['direction']);
         } else if ($this->hasOptionDB('order')) {
             $order = $this->getOptionDB('order');
             foreach ($order as $field => $direction) {
-                $this->db->orderBy($this->getOptionDB('table') .'.'. $field, $direction);
+                $this->db->orderBy($this->getOptionDB('table').'.'.$field, $direction);
             }
         }
 
@@ -136,15 +136,15 @@ 
 
     protected function prepareSelectValues()
     {
-        $this->db->select($this->getOptionDB('table') .'.id');
+        $this->db->select($this->getOptionDB('table').'.id');
         $def = $this->controller->getDefinition();
         if (isset($def['options']['is_sortable']) && $def['options']['is_sortable']) {
             // FIXME: changeable field name
-            $this->db->addSelect($this->getOptionDB('table') .'.priority');
+            $this->db->addSelect($this->getOptionDB('table').'.priority');
         }
         
         if (isset($def['options']['select_all']) && $def['options']['select_all']) {
-            $this->db->addSelect($this->getOptionDB('table') .'.*');
+            $this->db->addSelect($this->getOptionDB('table').'.*');
         }
 
         $fields = $this->controller->getFields();
@@ -399,7 +399,7 @@ 
                 $tabs = $field->getAttribute('tabs');
                 if ($tabs) {
                     foreach ($tabs as $tab) {
-                        $fieldName = $ident . $tab['postfix'];
+                        $fieldName = $ident.$tab['postfix'];
                         $field->doValidate($values[$fieldName]);
                     }
                 } else {
@@ -433,7 +433,7 @@ 
             $tabs = $field->getAttribute('tabs');
             if ($tabs) {
                 foreach ($tabs as $tab) {
-                    $fieldName = $ident . $tab['postfix'];
+                    $fieldName = $ident.$tab['postfix'];
                     $values[$fieldName] = $field->prepareQueryValue($values[$fieldName]);
                 }
             } else {

src/helpers.php

Doc Comments +4 added lines

@@ -76,6 +76,10 @@
 
 if (!function_exists('cartesianRecurseIt'))
 {
+    /**
+     * @param integer $level
+     * @param boolean $isElementsDuplicated
+     */
     function cartesianRecurseIt($arr, $variant, $level, $result, $arrayCount, $isElementsDuplicated)
     {
         $level++;

Braces +22 added lines, -23 removed lines

@@ -1,15 +1,13 @@ 
 <?php
 
-if (!function_exists('urlify'))
-{
+if (!function_exists('urlify')) {
     function urlify($string)
     {
         return Jarboe::urlify($string);
     } // end urlify
 }
 
-if (!function_exists('__'))
-{
+if (!function_exists('__')) {
     function __()
     {
         /*
@@ -52,8 +50,7 @@ 
     } // end __
 }
 
-if (!function_exists('dr'))
-{
+if (!function_exists('dr')) {
     function dr($array)
     {
         echo '<pre>';
@@ -62,8 +59,7 @@ 
     } // end dr
 }
 
-if (!function_exists('cartesian'))
-{
+if (!function_exists('cartesian')) {
     function cartesian($arr, $isElementsDuplicated = false)
     {
         $variant = array();
@@ -74,8 +70,7 @@ 
     } // end cartesian
 }
 
-if (!function_exists('cartesianRecurseIt'))
-{
+if (!function_exists('cartesianRecurseIt')) {
     function cartesianRecurseIt($arr, $variant, $level, $result, $arrayCount, $isElementsDuplicated)
     {
         $level++;
@@ -97,8 +92,7 @@ 
     } // end cartesianRecurseIt
 }
 
-if (!function_exists('remove_bom'))
-{
+if (!function_exists('remove_bom')) {
     function remove_bom($val)
     {
         if (substr($val, 0, 3) == pack('CCC', 0xef, 0xbb, 0xbf)) {
@@ -108,8 +102,7 @@ 
     } // end remove_bom
 }
 
-if (!function_exists('xml2array'))
-{
+if (!function_exists('xml2array')) {
     function xml2array(SimpleXMLElement $xml, $options = array())
     {
         $defaults = array(
@@ -131,8 +124,10 @@ 
         foreach ($namespaces as $prefix => $namespace) {
             foreach ($xml->attributes($namespace) as $attributeName => $attribute) {
                 //replace characters in attribute name
-                if ($options['keySearch']) $attributeName =
+                if ($options['keySearch']) {
+                    $attributeName =
                         str_replace($options['keySearch'], $options['keyReplace'], $attributeName);
+                }
                 $attributeKey = $options['attributePrefix']
                         . ($prefix ? $prefix . $options['namespaceSeparator'] : '')
                         . $attributeName;
@@ -149,10 +144,14 @@ 
                 list($childTagName, $childProperties) = each($childArray);
      
                 //replace characters in tag name
-                if ($options['keySearch']) $childTagName =
+                if ($options['keySearch']) {
+                    $childTagName =
                         str_replace($options['keySearch'], $options['keyReplace'], $childTagName);
+                }
                 //add namespace prefix, if any
-                if ($prefix) $childTagName = $prefix . $options['namespaceSeparator'] . $childTagName;
+                if ($prefix) {
+                    $childTagName = $prefix . $options['namespaceSeparator'] . $childTagName;
+                }
      
                 if (!isset($tagsArray[$childTagName])) {
                     //only entry with this key
@@ -176,7 +175,9 @@ 
         //get text content of node
         $textContentArray = array();
         $plainText = trim((string)$xml);
-        if ($plainText !== '') $textContentArray[$options['textContent']] = $plainText;
+        if ($plainText !== '') {
+            $textContentArray[$options['textContent']] = $plainText;
+        }
      
         //stick it all together
         $propertiesArray = !$options['autoText'] || $attributesArray || $tagsArray || ($plainText === '')
@@ -189,9 +190,8 @@ 
     } // end xml2array    
 }
 
-if (!function_exists('filesize_format'))
-{
-    function filesize_format($bytes) 
+if (!function_exists('filesize_format')) {
+    function filesize_format($bytes)
     {
         if ($bytes >= 1073741824) {
             $bytes = number_format($bytes / 1073741824, 1, '.', '') . ' Gb';
@@ -212,8 +212,7 @@ 
 }
 
 
-if (!function_exists('get_path_by_id'))
-{
+if (!function_exists('get_path_by_id')) {
     function get_path_by_id($id, $pad = 6)
     {
         $id = str_pad($id, $pad, '0', STR_PAD_LEFT);

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
         }
  
         $namespace = 'messages';
-        if (Request::is(ltrim(config('jarboe.admin.uri') .'/*', '/')) || Request::is(ltrim(config('jarboe.admin.uri'), '/'))) {
+        if (Request::is(ltrim(config('jarboe.admin.uri').'/*', '/')) || Request::is(ltrim(config('jarboe.admin.uri'), '/'))) {
             $namespace = 'admin';
         }
         
@@ -115,11 +115,11 @@ 
         $defaults = array(
             'namespaceSeparator' => ':', // you may want this to be something other than a colon
             'attributePrefix'    => '@', // to distinguish between attributes and nodes with the same name
-            'alwaysArray' => array(),    // array of xml tag names which should always become arrays
-            'autoArray'   => true,       // only create arrays for tags which appear more than once
-            'textContent' => '$',        // key used for the text content of elements
-            'autoText'    => true,       // skip textContent key if node has no attributes or child nodes
-            'keySearch'   => false,      // optional search and replace on tag and attribute names
+            'alwaysArray' => array(), // array of xml tag names which should always become arrays
+            'autoArray'   => true, // only create arrays for tags which appear more than once
+            'textContent' => '$', // key used for the text content of elements
+            'autoText'    => true, // skip textContent key if node has no attributes or child nodes
+            'keySearch'   => false, // optional search and replace on tag and attribute names
             'keyReplace'  => false       // replace values for above search values (as passed to str_replace())
         );
         $options = array_merge($defaults, $options);
@@ -134,7 +134,7 @@ 
                 if ($options['keySearch']) $attributeName =
                         str_replace($options['keySearch'], $options['keyReplace'], $attributeName);
                 $attributeKey = $options['attributePrefix']
-                        . ($prefix ? $prefix . $options['namespaceSeparator'] : '')
+                        . ($prefix ? $prefix.$options['namespaceSeparator'] : '')
                         . $attributeName;
                 $attributesArray[$attributeKey] = (string)$attribute;
             }
@@ -152,7 +152,7 @@ 
                 if ($options['keySearch']) $childTagName =
                         str_replace($options['keySearch'], $options['keyReplace'], $childTagName);
                 //add namespace prefix, if any
-                if ($prefix) $childTagName = $prefix . $options['namespaceSeparator'] . $childTagName;
+                if ($prefix) $childTagName = $prefix.$options['namespaceSeparator'].$childTagName;
      
                 if (!isset($tagsArray[$childTagName])) {
                     //only entry with this key
@@ -194,15 +194,15 @@ 
     function filesize_format($bytes) 
     {
         if ($bytes >= 1073741824) {
-            $bytes = number_format($bytes / 1073741824, 1, '.', '') . ' Gb';
+            $bytes = number_format($bytes / 1073741824, 1, '.', '').' Gb';
         } elseif ($bytes >= 1048576) {
-            $bytes = number_format($bytes / 1048576, 1, '.', '') . ' Mb';
+            $bytes = number_format($bytes / 1048576, 1, '.', '').' Mb';
         } elseif ($bytes >= 1024) {
-            $bytes = number_format($bytes / 1024, 1, '.', '') . ' Kb';
+            $bytes = number_format($bytes / 1024, 1, '.', '').' Kb';
         } elseif ($bytes > 1) {
-            $bytes = $bytes . ' bytes';
+            $bytes = $bytes.' bytes';
         } elseif ($bytes == 1) {
-            $bytes = $bytes . ' byte';
+            $bytes = $bytes.' byte';
         } else {
             $bytes = '0 bytes';
         }
@@ -219,7 +219,7 @@ 
         $id = str_pad($id, $pad, '0', STR_PAD_LEFT);
         $chunks = str_split($id, 2);
     
-        return implode('/', $chunks) .'/';
+        return implode('/', $chunks).'/';
     } // end get_path_by_id
 }
 

src/JarboeController.php

Doc Comments +6 added lines

@@ -115,6 +115,9 @@ 
         return false;
     } // end createCustomHandlerInstance
 
+    /**
+     * @param string $methodName
+     */
     public function hasCustomHandlerMethod($methodName)
     {
         return $this->getCustomHandler() && is_callable(array($this->getCustomHandler(), $methodName));
@@ -170,6 +173,9 @@ 
         return $this->definition;
     } // end getDefinition
     
+    /**
+     * @param string $ident
+     */
     public function getDefinitionOption($ident, $default = null)
     {
         $value = array_get($this->getDefinition(), $ident);

Unused Use Statements +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 use Yaro\Jarboe\Handlers\ImportHandler;
 use Yaro\Jarboe\Handlers\CustomClosureHandler;
 use Yaro\Jarboe\Storage\Image as ImageStorage;
-use Yaro\Jarboe\Storage\File  as FileStorage;
+use Yaro\Jarboe\Storage\File as FileStorage;
 
 
 class JarboeController 

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 use Yaro\Jarboe\Storage\File  as FileStorage;
 
 
-class JarboeController 
+class JarboeController
 {
 
 

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
         if (isset($this->definition['callbacks'])) {
             $this->callbacks = new CustomClosureHandler($this->definition['callbacks'], $this);
         }
-        $this->fields  = $this->loadFields();
+        $this->fields = $this->loadFields();
 
         $this->actions      = new ActionsHandler($this->definition['actions'], $this);
         $this->export       = new ExportHandler($this->definition['export'], $this);
@@ -79,11 +79,11 @@ 
         
         //
         if (!isset($this->definition['options']['action_url'])) {
-            $this->definition['options']['action_url'] = '/'. Request::path();
+            $this->definition['options']['action_url'] = '/'.Request::path();
             // for structure current node resolver
             $requestValues = Request::only('node');
             if ($requestValues['node']) {
-                $this->definition['options']['action_url'] .'?node='. $requestValues['node'];
+                $this->definition['options']['action_url'].'?node='.$requestValues['node'];
             }
         }
     } // end doPrepareDefinition
@@ -108,7 +108,7 @@ 
     protected function createCustomHandlerInstance()
     {
         if (isset($this->definition['options']['handler'])) {
-            $handler = '\\'. $this->definition['options']['handler'];
+            $handler = '\\'.$this->definition['options']['handler'];
             return new $handler($this);
         }
 
@@ -127,7 +127,7 @@ 
 
     public function getCustomHandler()
     {
-        return $this->handler ? : $this->callbacks;
+        return $this->handler ?: $this->callbacks;
     } // end getCustomHandler
 
     public function getField($ident)
@@ -219,7 +219,7 @@ 
     
     protected function createFieldInstance($name, $info)
     {
-        $className = 'Yaro\\Jarboe\\Fields\\'. ucfirst(camel_case($info['type'])) ."Field";
+        $className = 'Yaro\\Jarboe\\Fields\\'.ucfirst(camel_case($info['type']))."Field";
 
         return new $className(
             $name, 
@@ -233,7 +233,7 @@ 
     protected function getTableDefinition($table)
     {
         $table = preg_replace('~\.~', '/', $table);
-        $path = base_path('resources/definitions/'. $table .'.php');
+        $path = base_path('resources/definitions/'.$table.'.php');
 
         if (!file_exists($path)) {
             throw new \RuntimeException("Definition \n[{$path}]\n does not exist.");