@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | // error wrappers. |
| 84 | 84 | $errors = libxml_get_errors(); |
| 85 | 85 | |
| 86 | - foreach($errors as $error) |
|
| 86 | + foreach ($errors as $error) |
|
| 87 | 87 | { |
| 88 | 88 | $this->errors[] = new XMLHelper_SimpleXML_Error($this, $error); |
| 89 | 89 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | $xml = $function($subject); |
| 99 | 99 | |
| 100 | - if($xml instanceof SimpleXMLElement) |
|
| 100 | + if ($xml instanceof SimpleXMLElement) |
|
| 101 | 101 | { |
| 102 | 102 | return $xml; |
| 103 | 103 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | public function getConverter() : XMLHelper_Converter |
| 109 | 109 | { |
| 110 | - if($this->element instanceof SimpleXMLElement) |
|
| 110 | + if ($this->element instanceof SimpleXMLElement) |
|
| 111 | 111 | { |
| 112 | 112 | return XMLHelper::convertElement($this->element); |
| 113 | 113 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public const ERROR_OPENING_ZIP_FILE = 338003; |
| 34 | 34 | |
| 35 | - public const ERROR_CANNOT_SAVE_FILE_TO_DISK =338004; |
|
| 35 | + public const ERROR_CANNOT_SAVE_FILE_TO_DISK = 338004; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @var array<string,mixed> |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * |
| 86 | 86 | * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST |
| 87 | 87 | */ |
| 88 | - public function addFile(string $filePath, ?string $zipPath=null) : bool |
|
| 88 | + public function addFile(string $filePath, ?string $zipPath = null) : bool |
|
| 89 | 89 | { |
| 90 | 90 | $this->open(); |
| 91 | 91 | |
@@ -138,16 +138,16 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | protected function open() : void |
| 140 | 140 | { |
| 141 | - if($this->open) { |
|
| 141 | + if ($this->open) { |
|
| 142 | 142 | return; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - if(!isset($this->zip)) { |
|
| 145 | + if (!isset($this->zip)) { |
|
| 146 | 146 | $this->zip = new ZipArchive(); |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | $flag = null; |
| 150 | - if(!file_exists($this->file)) { |
|
| 150 | + if (!file_exists($this->file)) { |
|
| 151 | 151 | $flag = ZipArchive::CREATE; |
| 152 | 152 | } |
| 153 | 153 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | { |
| 191 | 191 | $this->fileTracker++; |
| 192 | 192 | |
| 193 | - if($this->options['WriteThreshold'] < 1) { |
|
| 193 | + if ($this->options['WriteThreshold'] < 1) { |
|
| 194 | 194 | return; |
| 195 | 195 | } |
| 196 | 196 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | |
| 204 | 204 | protected function close() : void |
| 205 | 205 | { |
| 206 | - if(!$this->open) { |
|
| 206 | + if (!$this->open) { |
|
| 207 | 207 | return; |
| 208 | 208 | } |
| 209 | 209 | |
@@ -212,8 +212,8 @@ discard block |
||
| 212 | 212 | throw new ZIPHelper_Exception( |
| 213 | 213 | 'Could not save ZIP file to disk', |
| 214 | 214 | sprintf( |
| 215 | - 'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, ' . |
|
| 216 | - 'including adding files that do not exist on disk, trying to create an empty zip, ' . |
|
| 215 | + 'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, '. |
|
| 216 | + 'including adding files that do not exist on disk, trying to create an empty zip, '. |
|
| 217 | 217 | 'or trying to save to a directory that does not exist.', |
| 218 | 218 | $this->file |
| 219 | 219 | ), |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | { |
| 229 | 229 | $this->open(); |
| 230 | 230 | |
| 231 | - if($this->countFiles() < 1) |
|
| 231 | + if ($this->countFiles() < 1) |
|
| 232 | 232 | { |
| 233 | 233 | throw new ZIPHelper_Exception( |
| 234 | 234 | 'No files in the zip file', |
@@ -254,18 +254,18 @@ discard block |
||
| 254 | 254 | * @throws ZIPHelper_Exception |
| 255 | 255 | * @return string The file name that was sent (useful in case none was specified). |
| 256 | 256 | */ |
| 257 | - public function download(?string $fileName=null) : string |
|
| 257 | + public function download(?string $fileName = null) : string |
|
| 258 | 258 | { |
| 259 | 259 | $this->save(); |
| 260 | 260 | |
| 261 | - if(empty($fileName)) |
|
| 261 | + if (empty($fileName)) |
|
| 262 | 262 | { |
| 263 | 263 | $fileName = basename($this->file); |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | header('Content-type: application/zip'); |
| 267 | - header('Content-Disposition: attachment; filename=' . $fileName); |
|
| 268 | - header('Content-length: ' . filesize($this->file)); |
|
| 267 | + header('Content-Disposition: attachment; filename='.$fileName); |
|
| 268 | + header('Content-length: '.filesize($this->file)); |
|
| 269 | 269 | header('Pragma: no-cache'); |
| 270 | 270 | header('Expires: 0'); |
| 271 | 271 | readfile($this->file); |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | * @throws ZIPHelper_Exception |
| 284 | 284 | * @see ZIPHelper::download() |
| 285 | 285 | */ |
| 286 | - public function downloadAndDelete(?string $fileName=null) : ZIPHelper |
|
| 286 | + public function downloadAndDelete(?string $fileName = null) : ZIPHelper |
|
| 287 | 287 | { |
| 288 | 288 | $this->download($fileName); |
| 289 | 289 | |
@@ -300,9 +300,9 @@ discard block |
||
| 300 | 300 | * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder. |
| 301 | 301 | * @return boolean |
| 302 | 302 | */ |
| 303 | - public function extractAll(?string $outputFolder=null) : bool |
|
| 303 | + public function extractAll(?string $outputFolder = null) : bool |
|
| 304 | 304 | { |
| 305 | - if(empty($outputFolder)) { |
|
| 305 | + if (empty($outputFolder)) { |
|
| 306 | 306 | $outputFolder = dirname($this->file); |
| 307 | 307 | } |
| 308 | 308 | |
@@ -18,15 +18,15 @@ |
||
| 18 | 18 | * @param int $level |
| 19 | 19 | * @return array<mixed> |
| 20 | 20 | */ |
| 21 | - protected function traverseArray(array $array, int $level=0) : array |
|
| 21 | + protected function traverseArray(array $array, int $level = 0) : array |
|
| 22 | 22 | { |
| 23 | 23 | $result = array(); |
| 24 | 24 | |
| 25 | - foreach($array as $key => $val) |
|
| 25 | + foreach ($array as $key => $val) |
|
| 26 | 26 | { |
| 27 | - if(is_array($val)) |
|
| 27 | + if (is_array($val)) |
|
| 28 | 28 | { |
| 29 | - $result[$key] = $this->traverseArray($val, ($level+1)); |
|
| 29 | + $result[$key] = $this->traverseArray($val, ($level + 1)); |
|
| 30 | 30 | } |
| 31 | 31 | else |
| 32 | 32 | { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public static function getPresetsManager() : PresetsManager |
| 43 | 43 | { |
| 44 | - if(!isset(self::$presets)) |
|
| 44 | + if (!isset(self::$presets)) |
|
| 45 | 45 | { |
| 46 | 46 | self::$presets = new PresetsManager(); |
| 47 | 47 | } |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | * @param string $name |
| 58 | 58 | * @return RGBAColor |
| 59 | 59 | */ |
| 60 | - public static function create(ColorChannel $red, ColorChannel $green, ColorChannel $blue, ?ColorChannel $alpha=null, string $name='') : RGBAColor |
|
| 60 | + public static function create(ColorChannel $red, ColorChannel $green, ColorChannel $blue, ?ColorChannel $alpha = null, string $name = '') : RGBAColor |
|
| 61 | 61 | { |
| 62 | - if($alpha === null) |
|
| 62 | + if ($alpha === null) |
|
| 63 | 63 | { |
| 64 | 64 | $alpha = ColorChannel::eightBit(0); |
| 65 | 65 | } |
@@ -86,31 +86,31 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public static function createAuto($subject) : ?RGBAColor |
| 88 | 88 | { |
| 89 | - if($subject instanceof RGBAColor) |
|
| 89 | + if ($subject instanceof RGBAColor) |
|
| 90 | 90 | { |
| 91 | 91 | return $subject; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - if(is_array($subject)) |
|
| 94 | + if (is_array($subject)) |
|
| 95 | 95 | { |
| 96 | 96 | return self::createFrom8BitArray($subject); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $hexOrPreset = (string)$subject; |
| 100 | 100 | |
| 101 | - if($hexOrPreset === '') |
|
| 101 | + if ($hexOrPreset === '') |
|
| 102 | 102 | { |
| 103 | 103 | return null; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $manager = self::getPresetsManager(); |
| 107 | 107 | |
| 108 | - if($manager->hasPreset($hexOrPreset)) |
|
| 108 | + if ($manager->hasPreset($hexOrPreset)) |
|
| 109 | 109 | { |
| 110 | 110 | return $manager->getPreset($hexOrPreset); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - if(preg_match('/[a-f0-9]{3,8}/i', $hexOrPreset)) |
|
| 113 | + if (preg_match('/[a-f0-9]{3,8}/i', $hexOrPreset)) |
|
| 114 | 114 | { |
| 115 | 115 | return self::createFromHEX($hexOrPreset); |
| 116 | 116 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | { |
| 159 | 159 | $color = FormatsConverter::array2associative($color); |
| 160 | 160 | |
| 161 | - if(!isset($color[RGBAColor::CHANNEL_ALPHA])) |
|
| 161 | + if (!isset($color[RGBAColor::CHANNEL_ALPHA])) |
|
| 162 | 162 | { |
| 163 | 163 | $color[RGBAColor::CHANNEL_ALPHA] = 0; |
| 164 | 164 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | * @see RGBAColor::ERROR_INVALID_COLOR_COMPONENT |
| 184 | 184 | * @see RGBAColor::ERROR_INVALID_PERCENTAGE_VALUE |
| 185 | 185 | */ |
| 186 | - public static function createFromHEX(string $hex, string $name='') : RGBAColor |
|
| 186 | + public static function createFromHEX(string $hex, string $name = '') : RGBAColor |
|
| 187 | 187 | { |
| 188 | 188 | return FormatsConverter::hex2color($hex, $name); |
| 189 | 189 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | * @param string $name |
| 209 | 209 | * @return RGBAColor |
| 210 | 210 | */ |
| 211 | - public static function createPercent(float $red, float $green, float $blue, float $alpha=0, string $name='') : RGBAColor |
|
| 211 | + public static function createPercent(float $red, float $green, float $blue, float $alpha = 0, string $name = '') : RGBAColor |
|
| 212 | 212 | { |
| 213 | 213 | return new RGBAColor( |
| 214 | 214 | ColorChannel::percent($red), |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | * @param string $name |
| 231 | 231 | * @return RGBAColor |
| 232 | 232 | */ |
| 233 | - public static function createCSS(int $red, int $green, int $blue, float $alpha=0, string $name='') : RGBAColor |
|
| 233 | + public static function createCSS(int $red, int $green, int $blue, float $alpha = 0, string $name = '') : RGBAColor |
|
| 234 | 234 | { |
| 235 | 235 | return self::create( |
| 236 | 236 | ColorChannel::eightBit($red), |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | * @param string $name |
| 253 | 253 | * @return RGBAColor |
| 254 | 254 | */ |
| 255 | - public static function create8Bit(int $red, int $green, int $blue, int $alpha=0, string $name='') : RGBAColor |
|
| 255 | + public static function create8Bit(int $red, int $green, int $blue, int $alpha = 0, string $name = '') : RGBAColor |
|
| 256 | 256 | { |
| 257 | 257 | return self::create( |
| 258 | 258 | ColorChannel::eightBit($red), |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | * @param string $name |
| 276 | 276 | * @return RGBAColor |
| 277 | 277 | */ |
| 278 | - public static function createGD(int $red, int $green, int $blue, int $alpha=0, string $name='') : RGBAColor |
|
| 278 | + public static function createGD(int $red, int $green, int $blue, int $alpha = 0, string $name = '') : RGBAColor |
|
| 279 | 279 | { |
| 280 | 280 | return self::create( |
| 281 | 281 | ColorChannel::eightBit($red), |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | $color = imagecolorsforindex($img, $colorIndex); |
| 298 | 298 | |
| 299 | 299 | // it seems imagecolorsforindex() may return false (undocumented, unproven) |
| 300 | - if(is_array($color)) { |
|
| 300 | + if (is_array($color)) { |
|
| 301 | 301 | return self::create( |
| 302 | 302 | ColorChannel::eightBit($color['red']), |
| 303 | 303 | ColorChannel::eightBit($color['green']), |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | private function init() : void |
| 64 | 64 | { |
| 65 | - if(self::$initialized === true) |
|
| 65 | + if (self::$initialized === true) |
|
| 66 | 66 | { |
| 67 | 67 | return; |
| 68 | 68 | } |
@@ -89,16 +89,16 @@ discard block |
||
| 89 | 89 | { |
| 90 | 90 | $preset = null; |
| 91 | 91 | |
| 92 | - if(isset($this->customPresets[$name])) |
|
| 92 | + if (isset($this->customPresets[$name])) |
|
| 93 | 93 | { |
| 94 | 94 | $preset = $this->customPresets[$name]; |
| 95 | 95 | } |
| 96 | - else if(isset(self::$globalPresets[$name])) |
|
| 96 | + else if (isset(self::$globalPresets[$name])) |
|
| 97 | 97 | { |
| 98 | 98 | $preset = self::$globalPresets[$name]; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - if($preset !== null) |
|
| 101 | + if ($preset !== null) |
|
| 102 | 102 | { |
| 103 | 103 | return ColorFactory::create( |
| 104 | 104 | ColorChannel::eightBit($preset[RGBAColor::CHANNEL_RED]), |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | { |
| 133 | 133 | $this->requireNotGlobal($name); |
| 134 | 134 | |
| 135 | - if(!isset(self::$globalPresets[$name])) |
|
| 135 | + if (!isset(self::$globalPresets[$name])) |
|
| 136 | 136 | { |
| 137 | 137 | self::$globalPresets[$name] = array( |
| 138 | 138 | RGBAColor::CHANNEL_RED => $red, |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | ); |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public function registerPreset(string $name, int $red, int $green, int $blue, int $alpha=255) : PresetsManager |
|
| 157 | + public function registerPreset(string $name, int $red, int $green, int $blue, int $alpha = 255) : PresetsManager |
|
| 158 | 158 | { |
| 159 | 159 | $this->requireNotGlobal($name); |
| 160 | 160 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | private function requireNotGlobal(string $name) : void |
| 172 | 172 | { |
| 173 | - if(!isset(self::$globalPresets[$name])) |
|
| 173 | + if (!isset(self::$globalPresets[$name])) |
|
| 174 | 174 | { |
| 175 | 175 | return; |
| 176 | 176 | } |
@@ -40,11 +40,11 @@ discard block |
||
| 40 | 40 | public static function color2HEX(RGBAColor $color) : string |
| 41 | 41 | { |
| 42 | 42 | $hex = |
| 43 | - UnitsConverter::int2hex($color->getRed()->get8Bit()) . |
|
| 44 | - UnitsConverter::int2hex($color->getGreen()->get8Bit()) . |
|
| 43 | + UnitsConverter::int2hex($color->getRed()->get8Bit()). |
|
| 44 | + UnitsConverter::int2hex($color->getGreen()->get8Bit()). |
|
| 45 | 45 | UnitsConverter::int2hex($color->getBlue()->get8Bit()); |
| 46 | 46 | |
| 47 | - if($color->hasTransparency()) |
|
| 47 | + if ($color->hasTransparency()) |
|
| 48 | 48 | { |
| 49 | 49 | $hex .= UnitsConverter::int2hex($color->getAlpha()->get8Bit()); |
| 50 | 50 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public static function color2CSS(RGBAColor $color) : string |
| 62 | 62 | { |
| 63 | - if($color->hasTransparency()) |
|
| 63 | + if ($color->hasTransparency()) |
|
| 64 | 64 | { |
| 65 | 65 | return sprintf( |
| 66 | 66 | 'rgba(%s, %s, %s, %s)', |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | public static function requireValidColorArray(array $color) : void |
| 97 | 97 | { |
| 98 | - if(self::isColorArray($color)) |
|
| 98 | + if (self::isColorArray($color)) |
|
| 99 | 99 | { |
| 100 | 100 | return; |
| 101 | 101 | } |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | RGBAColor::CHANNEL_BLUE |
| 128 | 128 | ); |
| 129 | 129 | |
| 130 | - foreach($keys as $key) |
|
| 130 | + foreach ($keys as $key) |
|
| 131 | 131 | { |
| 132 | - if(!isset($color[$key])) |
|
| 132 | + if (!isset($color[$key])) |
|
| 133 | 133 | { |
| 134 | 134 | return false; |
| 135 | 135 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | */ |
| 149 | 149 | public static function color2readable(RGBAColor $color) : string |
| 150 | 150 | { |
| 151 | - if($color->hasTransparency()) |
|
| 151 | + if ($color->hasTransparency()) |
|
| 152 | 152 | { |
| 153 | 153 | return sprintf( |
| 154 | 154 | 'RGBA(%s %s %s %s)', |
@@ -191,9 +191,9 @@ discard block |
||
| 191 | 191 | * @throws ColorException |
| 192 | 192 | * @see RGBAColor::ERROR_INVALID_HEX_LENGTH |
| 193 | 193 | */ |
| 194 | - public static function hex2color(string $hex, string $name='') : RGBAColor |
|
| 194 | + public static function hex2color(string $hex, string $name = '') : RGBAColor |
|
| 195 | 195 | { |
| 196 | - if(!isset(self::$hexParser)) |
|
| 196 | + if (!isset(self::$hexParser)) |
|
| 197 | 197 | { |
| 198 | 198 | self::$hexParser = new HEXParser(); |
| 199 | 199 | } |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | { |
| 246 | 246 | // If one associative key is present, we assume |
| 247 | 247 | // that the color array is already correct. |
| 248 | - if(isset($color[RGBAColor::CHANNEL_RED])) |
|
| 248 | + if (isset($color[RGBAColor::CHANNEL_RED])) |
|
| 249 | 249 | { |
| 250 | 250 | return $color; |
| 251 | 251 | } |
@@ -253,15 +253,15 @@ discard block |
||
| 253 | 253 | $values = array_values($color); |
| 254 | 254 | $result = array(); |
| 255 | 255 | |
| 256 | - foreach(self::$keys as $idx => $def) |
|
| 256 | + foreach (self::$keys as $idx => $def) |
|
| 257 | 257 | { |
| 258 | - if(isset($values[$idx])) |
|
| 258 | + if (isset($values[$idx])) |
|
| 259 | 259 | { |
| 260 | 260 | $result[$def['key']] = $values[$idx]; |
| 261 | 261 | continue; |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | - if(!$def['mandatory']) |
|
| 264 | + if (!$def['mandatory']) |
|
| 265 | 265 | { |
| 266 | 266 | continue; |
| 267 | 267 | } |
@@ -117,11 +117,11 @@ discard block |
||
| 117 | 117 | { |
| 118 | 118 | return (int)floor( |
| 119 | 119 | ( |
| 120 | - ($this->getRed()->get8Bit()*2) |
|
| 120 | + ($this->getRed()->get8Bit() * 2) |
|
| 121 | 121 | + |
| 122 | 122 | $this->getBlue()->get8Bit() |
| 123 | 123 | + |
| 124 | - ($this->getGreen()->get8Bit()*3) |
|
| 124 | + ($this->getGreen()->get8Bit() * 3) |
|
| 125 | 125 | ) |
| 126 | 126 | /6 |
| 127 | 127 | ); |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | */ |
| 369 | 369 | private function requireValidComponent(string $name) : void |
| 370 | 370 | { |
| 371 | - if(in_array($name, self::COLOR_COMPONENTS)) |
|
| 371 | + if (in_array($name, self::COLOR_COMPONENTS)) |
|
| 372 | 372 | { |
| 373 | 373 | return; |
| 374 | 374 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | return $this->setOption('separatorChar', $char); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - public function setTrailingNewline(bool $useNewline=true) : self |
|
| 49 | + public function setTrailingNewline(bool $useNewline = true) : self |
|
| 50 | 50 | { |
| 51 | 51 | return $this->setOption('trailingNewline', $useNewline); |
| 52 | 52 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $args = $args[0]; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - $this->lines[] = '"' . implode('"'.$this->getOption('separatorChar').'"', $args) . '"'; |
|
| 67 | + $this->lines[] = '"'.implode('"'.$this->getOption('separatorChar').'"', $args).'"'; |
|
| 68 | 68 | |
| 69 | 69 | return $this; |
| 70 | 70 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | { |
| 81 | 81 | $csv = implode(PHP_EOL, $this->lines); |
| 82 | 82 | |
| 83 | - if($this->getOption('trailingNewline')) { |
|
| 83 | + if ($this->getOption('trailingNewline')) { |
|
| 84 | 84 | $csv .= PHP_EOL; |
| 85 | 85 | } |
| 86 | 86 | |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | public function setOption(string $name, $value) : self |
| 96 | 96 | { |
| 97 | - if(!isset($this->options)) { |
|
| 97 | + if (!isset($this->options)) { |
|
| 98 | 98 | $this->options = $this->getDefaultOptions(); |
| 99 | 99 | } |
| 100 | 100 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | public function setOptions(array $options) : self |
| 110 | 110 | { |
| 111 | - foreach($options as $name => $value) { |
|
| 111 | + foreach ($options as $name => $value) { |
|
| 112 | 112 | $this->setOption($name, $value); |
| 113 | 113 | } |
| 114 | 114 | |
@@ -120,9 +120,9 @@ discard block |
||
| 120 | 120 | * @param mixed|NULL $default |
| 121 | 121 | * @return mixed|NULL |
| 122 | 122 | */ |
| 123 | - public function getOption(string $name, $default=null) |
|
| 123 | + public function getOption(string $name, $default = null) |
|
| 124 | 124 | { |
| 125 | - if(!isset($this->options)) { |
|
| 125 | + if (!isset($this->options)) { |
|
| 126 | 126 | $this->options = $this->getDefaultOptions(); |
| 127 | 127 | } |
| 128 | 128 | |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | |
| 132 | 132 | public function hasOption(string $name) : bool |
| 133 | 133 | { |
| 134 | - if(!isset($this->options)) { |
|
| 134 | + if (!isset($this->options)) { |
|
| 135 | 135 | $this->options = $this->getDefaultOptions(); |
| 136 | 136 | } |
| 137 | 137 | |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | */ |
| 144 | 144 | public function getOptions() : array |
| 145 | 145 | { |
| 146 | - if(!isset($this->options)) { |
|
| 146 | + if (!isset($this->options)) { |
|
| 147 | 147 | $this->options = $this->getDefaultOptions(); |
| 148 | 148 | } |
| 149 | 149 | |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | self::HEADERS_TOP |
| 210 | 210 | ); |
| 211 | 211 | |
| 212 | - if(!in_array($position, $validPositions)) { |
|
| 212 | + if (!in_array($position, $validPositions)) { |
|
| 213 | 213 | throw new CSVHelper_Exception( |
| 214 | 214 | 'Invalid headers position', |
| 215 | 215 | sprintf( |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | { |
| 333 | 333 | $data = array(); |
| 334 | 334 | |
| 335 | - for($i=0; $i < $this->rowCount; $i++) |
|
| 335 | + for ($i = 0; $i < $this->rowCount; $i++) |
|
| 336 | 336 | { |
| 337 | 337 | $value = $this->data[$i][$index] ?? ''; |
| 338 | 338 | |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | { |
| 357 | 357 | $this->reset(); |
| 358 | 358 | |
| 359 | - if(empty(trim($this->csv))) { |
|
| 359 | + if (empty(trim($this->csv))) { |
|
| 360 | 360 | $this->addError('Tried to parse an empty CSV string.'); |
| 361 | 361 | return; |
| 362 | 362 | } |
@@ -368,14 +368,14 @@ discard block |
||
| 368 | 368 | |
| 369 | 369 | $parser = self::createParser(); |
| 370 | 370 | |
| 371 | - if(!$parser->parse($this->csv)) { |
|
| 371 | + if (!$parser->parse($this->csv)) { |
|
| 372 | 372 | $this->addError('The CSV string could not be parsed.'); |
| 373 | 373 | return; |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | $result = $parser->data; |
| 377 | 377 | |
| 378 | - switch($this->headersPosition) |
|
| 378 | + switch ($this->headersPosition) |
|
| 379 | 379 | { |
| 380 | 380 | case self::HEADERS_TOP: |
| 381 | 381 | $this->headers = array_shift($result); |
@@ -398,9 +398,9 @@ discard block |
||
| 398 | 398 | $this->data = $result; |
| 399 | 399 | $this->rowCount = count($this->data); |
| 400 | 400 | |
| 401 | - for($i=0; $i < $this->rowCount; $i++) { |
|
| 401 | + for ($i = 0; $i < $this->rowCount; $i++) { |
|
| 402 | 402 | $amount = count($this->data[$i]); |
| 403 | - if($amount > $this->columnCount) { |
|
| 403 | + if ($amount > $this->columnCount) { |
|
| 404 | 404 | $this->columnCount = $amount; |
| 405 | 405 | } |
| 406 | 406 | } |
@@ -443,8 +443,8 @@ discard block |
||
| 443 | 443 | ',,' => ',' |
| 444 | 444 | ); |
| 445 | 445 | |
| 446 | - foreach($search as $char => $separator) { |
|
| 447 | - if(strpos($this->csv, $char) !== false) { |
|
| 446 | + foreach ($search as $char => $separator) { |
|
| 447 | + if (strpos($this->csv, $char) !== false) { |
|
| 448 | 448 | return $separator; |
| 449 | 449 | } |
| 450 | 450 | } |
@@ -458,11 +458,11 @@ discard block |
||
| 458 | 458 | * @param string $delimiter |
| 459 | 459 | * @return Csv |
| 460 | 460 | */ |
| 461 | - public static function createParser(string $delimiter=self::DELIMITER_AUTO) : Csv |
|
| 461 | + public static function createParser(string $delimiter = self::DELIMITER_AUTO) : Csv |
|
| 462 | 462 | { |
| 463 | 463 | $csv = new Csv(); |
| 464 | 464 | |
| 465 | - if($delimiter !== self::DELIMITER_AUTO) { |
|
| 465 | + if ($delimiter !== self::DELIMITER_AUTO) { |
|
| 466 | 466 | $csv->delimiter = $delimiter; |
| 467 | 467 | } |
| 468 | 468 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | |
| 494 | 494 | $result = $parser->auto($path); |
| 495 | 495 | |
| 496 | - if(is_string($result)) { |
|
| 496 | + if (is_string($result)) { |
|
| 497 | 497 | return $parser->data; |
| 498 | 498 | } |
| 499 | 499 | |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | $parser = self::createParser(); |
| 527 | 527 | $result = $parser->parse($string); |
| 528 | 528 | |
| 529 | - if($result === true) { |
|
| 529 | + if ($result === true) { |
|
| 530 | 530 | return $parser->data; |
| 531 | 531 | } |
| 532 | 532 | |