@@ -123,6 +123,7 @@ |
||
| 123 | 123 | |
| 124 | 124 | /** |
| 125 | 125 | * Add our custom table style(s) to the table. |
| 126 | + * @param Table $table |
|
| 126 | 127 | */ |
| 127 | 128 | protected static function addCustomTableStyles($table) |
| 128 | 129 | { |
@@ -4,12 +4,10 @@ |
||
| 4 | 4 | use Symfony\Component\Console\Output\OutputInterface; |
| 5 | 5 | use Symfony\Component\Console\Helper\Table; |
| 6 | 6 | use Symfony\Component\Console\Helper\TableStyle; |
| 7 | - |
|
| 8 | 7 | use Consolidation\OutputFormatters\Validate\ValidDataTypesInterface; |
| 9 | 8 | use Consolidation\OutputFormatters\Options\FormatterOptions; |
| 10 | 9 | use Consolidation\OutputFormatters\Validate\ValidDataTypesTrait; |
| 11 | 10 | use Consolidation\OutputFormatters\StructuredData\TableDataInterface; |
| 12 | -use Consolidation\OutputFormatters\Transformations\ReorderFields; |
|
| 13 | 11 | use Consolidation\OutputFormatters\Exception\IncompatibleDataException; |
| 14 | 12 | use Consolidation\OutputFormatters\Transformations\WordWrapper; |
| 15 | 13 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | if (!empty($headers)) { |
| 90 | 90 | array_splice($headers, 1, 0, ':'); |
| 91 | 91 | } |
| 92 | - $data = array_map(function ($item) { |
|
| 92 | + $data = array_map(function($item) { |
|
| 93 | 93 | array_splice($item, 1, 0, ':'); |
| 94 | 94 | return $item; |
| 95 | 95 | }, $data); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $wrapper = new WordWrapper($options->get(FormatterOptions::TERMINAL_WIDTH)); |
| 117 | 117 | $wrapper->setPaddingFromStyle($tableStyle); |
| 118 | 118 | if (!empty($headers)) { |
| 119 | - $headerLengths = array_map(function ($item) { |
|
| 119 | + $headerLengths = array_map(function($item) { |
|
| 120 | 120 | return strlen($item); |
| 121 | 121 | }, $headers); |
| 122 | 122 | $wrapper->setMinimumWidths($headerLengths); |
@@ -34,6 +34,9 @@ discard block |
||
| 34 | 34 | $this->addXmlChildren($dom, $element, $elementName, $structuredData); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | + /** |
|
| 38 | + * @param \DOMElement $xmlParent |
|
| 39 | + */ |
|
| 37 | 40 | protected function addXmlChildren(\DOMDocument $dom, $xmlParent, $elementName, $structuredData) |
| 38 | 41 | { |
| 39 | 42 | foreach ($structuredData as $key => $value) { |
@@ -52,6 +55,9 @@ discard block |
||
| 52 | 55 | $this->addXmlData($dom, $xmlParent, $elementName, $value); |
| 53 | 56 | } |
| 54 | 57 | |
| 58 | + /** |
|
| 59 | + * @param string $childElementName |
|
| 60 | + */ |
|
| 55 | 61 | protected function determineElementName($key, $childElementName, $value) |
| 56 | 62 | { |
| 57 | 63 | if (is_numeric($key)) { |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | return $childElementName; |
| 59 | 59 | } |
| 60 | 60 | if (is_object($value)) { |
| 61 | - $value = (array)$value; |
|
| 61 | + $value = (array) $value; |
|
| 62 | 62 | } |
| 63 | 63 | if (!is_array($value)) { |
| 64 | 64 | return $key; |
@@ -111,13 +111,13 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | if (count($validFormats) > 1) { |
| 113 | 113 | // Make an input option for --format |
| 114 | - $description = 'Format the result data. Available formats: ' . implode(',', $validFormats); |
|
| 114 | + $description = 'Format the result data. Available formats: '.implode(',', $validFormats); |
|
| 115 | 115 | $automaticOptions[FormatterOptions::FORMAT] = new InputOption(FormatterOptions::FORMAT, '', InputOption::VALUE_OPTIONAL, $description, $defaultFormat); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | if ($availableFields) { |
| 119 | 119 | $defaultFields = $options->get(FormatterOptions::DEFAULT_FIELDS, [], ''); |
| 120 | - $description = 'Available fields: ' . implode(', ', $this->availableFieldsList($availableFields)); |
|
| 120 | + $description = 'Available fields: '.implode(', ', $this->availableFieldsList($availableFields)); |
|
| 121 | 121 | $automaticOptions[FormatterOptions::FIELDS] = new InputOption(FormatterOptions::FIELDS, '', InputOption::VALUE_OPTIONAL, $description, $defaultFields); |
| 122 | 122 | $automaticOptions[FormatterOptions::FIELD] = new InputOption(FormatterOptions::FIELD, '', InputOption::VALUE_OPTIONAL, "Select just one field, and force format to 'string'.", ''); |
| 123 | 123 | } |
@@ -132,8 +132,8 @@ discard block |
||
| 132 | 132 | protected function availableFieldsList($availableFields) |
| 133 | 133 | { |
| 134 | 134 | return array_map( |
| 135 | - function ($key) use ($availableFields) { |
|
| 136 | - return $availableFields[$key] . " ($key)"; |
|
| 135 | + function($key) use ($availableFields) { |
|
| 136 | + return $availableFields[$key]." ($key)"; |
|
| 137 | 137 | }, |
| 138 | 138 | array_keys($availableFields) |
| 139 | 139 | ); |
@@ -197,10 +197,10 @@ discard block |
||
| 197 | 197 | */ |
| 198 | 198 | public function write(OutputInterface $output, $format, $structuredOutput, FormatterOptions $options) |
| 199 | 199 | { |
| 200 | - $formatter = $this->getFormatter((string)$format); |
|
| 200 | + $formatter = $this->getFormatter((string) $format); |
|
| 201 | 201 | if (!is_string($structuredOutput) && !$this->isValidFormat($formatter, $structuredOutput)) { |
| 202 | 202 | $validFormats = $this->validFormats($structuredOutput); |
| 203 | - throw new InvalidFormatException((string)$format, $structuredOutput, $validFormats); |
|
| 203 | + throw new InvalidFormatException((string) $format, $structuredOutput, $validFormats); |
|
| 204 | 204 | } |
| 205 | 205 | // Give the formatter a chance to override the options |
| 206 | 206 | $options = $this->overrideOptions($formatter, $structuredOutput, $options); |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Consolidation\OutputFormatters\Transformations\Wrap; |
| 3 | 3 | |
| 4 | -use Symfony\Component\Console\Helper\TableStyle; |
|
| 5 | - |
|
| 6 | 4 | /** |
| 7 | 5 | * Calculate column widths for table cells. |
| 8 | 6 | * |
@@ -17,6 +17,7 @@ |
||
| 17 | 17 | /** |
| 18 | 18 | * Given the total amount of available space, and the width of |
| 19 | 19 | * the columns to place, calculate the optimum column widths to use. |
| 20 | + * @param double $availableWidth |
|
| 20 | 21 | */ |
| 21 | 22 | public function calculate($availableWidth, DataCellWidths $dataWidths, DataCellWidths $minimumWidths) |
| 22 | 23 | { |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | { |
| 167 | 167 | return array_reduce( |
| 168 | 168 | $widths, |
| 169 | - function ($carry, $item) { |
|
| 169 | + function($carry, $item) { |
|
| 170 | 170 | return $carry + $item; |
| 171 | 171 | } |
| 172 | 172 | ); |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | protected static function longestWordLength($str) |
| 181 | 181 | { |
| 182 | 182 | $words = preg_split('#[ /-]#', $str); |
| 183 | - $lengths = array_map(function ($s) { |
|
| 183 | + $lengths = array_map(function($s) { |
|
| 184 | 184 | return strlen($s); |
| 185 | 185 | }, $words); |
| 186 | 186 | return max($lengths); |
@@ -53,6 +53,9 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | + /** |
|
| 57 | + * @param integer $paddingInEachCell |
|
| 58 | + */ |
|
| 56 | 59 | public function paddingSpace( |
| 57 | 60 | $paddingInEachCell, |
| 58 | 61 | $extraPaddingAtEndOfLine = 0, |
@@ -103,6 +106,7 @@ discard block |
||
| 103 | 106 | /** |
| 104 | 107 | * Need to think about the name of this function a bit. |
| 105 | 108 | * Maybe second parameter is just a column count. |
| 109 | + * @param double $availableWidth |
|
| 106 | 110 | */ |
| 107 | 111 | public function adjustMinimumWidths($availableWidth, DataCellWidths $dataCellWidths) |
| 108 | 112 | { |
@@ -157,6 +161,7 @@ discard block |
||
| 157 | 161 | |
| 158 | 162 | /** |
| 159 | 163 | * Return the length of the specified column. |
| 164 | + * @return string |
|
| 160 | 165 | */ |
| 161 | 166 | public function width($key) |
| 162 | 167 | { |
@@ -203,6 +208,7 @@ discard block |
||
| 203 | 208 | /** |
| 204 | 209 | * Ensure that every item in $widths that has a corresponding entry |
| 205 | 210 | * in $minimumWidths is as least as large as the minimum value held there. |
| 211 | + * @param DataCellWidths $minimumWidths |
|
| 206 | 212 | */ |
| 207 | 213 | public function enforceMinimums($minimumWidths) |
| 208 | 214 | { |
@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Consolidation\OutputFormatters\Transformations\Wrap; |
| 3 | 3 | |
| 4 | -use Symfony\Component\Console\Helper\TableStyle; |
|
| 5 | - |
|
| 6 | 4 | /** |
| 7 | 5 | * Calculate the width of data in table cells in preparation for word wrapping. |
| 8 | 6 | */ |