@@ -63,7 +63,7 @@ |
||
| 63 | 63 | return $this->getBoolOption('cut'); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - public function setCuttingEnabled(bool $enabled=true) : ConvertHelper_WordWrapper |
|
| 66 | + public function setCuttingEnabled(bool $enabled = true) : ConvertHelper_WordWrapper |
|
| 67 | 67 | { |
| 68 | 68 | $this->setOption('cut', $enabled); |
| 69 | 69 | return $this; |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | |
| 58 | 58 | $interval = $d2->diff($d1); |
| 59 | 59 | |
| 60 | - if($interval === false) |
|
| 60 | + if ($interval === false) |
|
| 61 | 61 | { |
| 62 | 62 | throw new ConvertHelper_Exception( |
| 63 | 63 | 'Cannot create interval', |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | public function __construct() |
| 65 | 65 | { |
| 66 | - if(class_exists('\AppLocalize\Localization')) { |
|
| 66 | + if (class_exists('\AppLocalize\Localization')) { |
|
| 67 | 67 | \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged')); |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -125,11 +125,11 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $epoch = 'past'; |
| 127 | 127 | $key = 'singular'; |
| 128 | - if($this->dateDiff > 1) { |
|
| 128 | + if ($this->dateDiff > 1) { |
|
| 129 | 129 | $key = 'plural'; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - if($this->future) { |
|
| 132 | + if ($this->future) { |
|
| 133 | 133 | $epoch = 'future'; |
| 134 | 134 | } |
| 135 | 135 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | protected function initTexts() |
| 144 | 144 | { |
| 145 | - if(isset(self::$texts)) { |
|
| 145 | + if (isset(self::$texts)) { |
|
| 146 | 146 | return; |
| 147 | 147 | } |
| 148 | 148 | |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | $day = (int)date("j", $this->dateTo); |
| 229 | 229 | $year = (int)date("Y", $this->dateFrom); |
| 230 | 230 | |
| 231 | - while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
| 231 | + while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
| 232 | 232 | { |
| 233 | 233 | $months_difference++; |
| 234 | 234 | } |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | |
| 249 | 249 | protected function resolveCalculations() : void |
| 250 | 250 | { |
| 251 | - if(!isset($this->dateFrom)) |
|
| 251 | + if (!isset($this->dateFrom)) |
|
| 252 | 252 | { |
| 253 | 253 | throw new ConvertHelper_Exception( |
| 254 | 254 | 'No date from has been specified.', |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | // no date to set? Assume we want to use today. |
| 261 | - if(!isset($this->dateTo)) |
|
| 261 | + if (!isset($this->dateTo)) |
|
| 262 | 262 | { |
| 263 | 263 | $this->dateTo = time(); |
| 264 | 264 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | |
| 338 | 338 | $difference = $this->dateTo - $this->dateFrom; |
| 339 | 339 | |
| 340 | - if($difference < 0) |
|
| 340 | + if ($difference < 0) |
|
| 341 | 341 | { |
| 342 | 342 | $difference = $difference * -1; |
| 343 | 343 | $this->future = true; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function __construct() |
| 38 | 38 | { |
| 39 | - if(class_exists('\AppLocalize\Localization')) { |
|
| 39 | + if (class_exists('\AppLocalize\Localization')) { |
|
| 40 | 40 | \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged')); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -69,17 +69,17 @@ discard block |
||
| 69 | 69 | $keep = $this->resolveTokens($interval); |
| 70 | 70 | |
| 71 | 71 | $parts = array(); |
| 72 | - foreach($keep as $token) |
|
| 72 | + foreach ($keep as $token) |
|
| 73 | 73 | { |
| 74 | 74 | $value = $interval->getToken($token); |
| 75 | - if($value === 0) { |
|
| 75 | + if ($value === 0) { |
|
| 76 | 76 | continue; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $parts[] = $this->translateToken($token, $interval); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - if(count($parts) == 1) { |
|
| 82 | + if (count($parts) == 1) { |
|
| 83 | 83 | return $parts[0]; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -101,10 +101,10 @@ discard block |
||
| 101 | 101 | $value = $interval->getToken($token); |
| 102 | 102 | |
| 103 | 103 | $suffix = 'p'; |
| 104 | - if($value == 1) { $suffix = 's'; } |
|
| 104 | + if ($value == 1) { $suffix = 's'; } |
|
| 105 | 105 | $token .= $suffix; |
| 106 | 106 | |
| 107 | - if(!isset(self::$texts[$token])) |
|
| 107 | + if (!isset(self::$texts[$token])) |
|
| 108 | 108 | { |
| 109 | 109 | throw new ConvertHelper_Exception( |
| 110 | 110 | 'Missing interval translation', |
@@ -134,9 +134,9 @@ discard block |
||
| 134 | 134 | { |
| 135 | 135 | $offset = 0; |
| 136 | 136 | |
| 137 | - foreach($this->tokens as $token) |
|
| 137 | + foreach ($this->tokens as $token) |
|
| 138 | 138 | { |
| 139 | - if($interval->getToken($token) > 0) |
|
| 139 | + if ($interval->getToken($token) > 0) |
|
| 140 | 140 | { |
| 141 | 141 | return array_slice($this->tokens, $offset); |
| 142 | 142 | } |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | protected function initTexts() : void |
| 154 | 154 | { |
| 155 | - if(isset(self::$texts)) { |
|
| 155 | + if (isset(self::$texts)) { |
|
| 156 | 156 | return; |
| 157 | 157 | } |
| 158 | 158 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | const ERROR_OPENING_ZIP_FILE = 338003; |
| 32 | 32 | |
| 33 | - const ERROR_CANNOT_SAVE_FILE_TO_DISK =338004; |
|
| 33 | + const ERROR_CANNOT_SAVE_FILE_TO_DISK = 338004; |
|
| 34 | 34 | |
| 35 | 35 | protected $options = array( |
| 36 | 36 | 'WriteThreshold' => 100 |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * @see FileHelper::ERROR_SOURCE_FILE_DOES_NOT_EXIST |
| 82 | 82 | */ |
| 83 | - public function addFile(string $filePath, ?string $zipPath=null) : bool |
|
| 83 | + public function addFile(string $filePath, ?string $zipPath = null) : bool |
|
| 84 | 84 | { |
| 85 | 85 | $this->open(); |
| 86 | 86 | |
@@ -126,16 +126,16 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | protected function open() |
| 128 | 128 | { |
| 129 | - if($this->open) { |
|
| 129 | + if ($this->open) { |
|
| 130 | 130 | return; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - if(!isset($this->zip)) { |
|
| 133 | + if (!isset($this->zip)) { |
|
| 134 | 134 | $this->zip = new \ZipArchive(); |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | $flag = null; |
| 138 | - if(!file_exists($this->file)) { |
|
| 138 | + if (!file_exists($this->file)) { |
|
| 139 | 139 | $flag = \ZipArchive::CREATE; |
| 140 | 140 | } |
| 141 | 141 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | { |
| 176 | 176 | $this->fileTracker++; |
| 177 | 177 | |
| 178 | - if($this->options['WriteThreshold'] < 1) { |
|
| 178 | + if ($this->options['WriteThreshold'] < 1) { |
|
| 179 | 179 | return; |
| 180 | 180 | } |
| 181 | 181 | |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | |
| 189 | 189 | protected function close() |
| 190 | 190 | { |
| 191 | - if(!$this->open) { |
|
| 191 | + if (!$this->open) { |
|
| 192 | 192 | return; |
| 193 | 193 | } |
| 194 | 194 | |
@@ -197,8 +197,8 @@ discard block |
||
| 197 | 197 | throw new ZIPHelper_Exception( |
| 198 | 198 | 'Could not save ZIP file to disk', |
| 199 | 199 | sprintf( |
| 200 | - 'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, ' . |
|
| 201 | - 'including adding files that do not exist on disk, trying to create an empty zip, ' . |
|
| 200 | + 'Tried saving the ZIP file [%1$s], but the write failed. This can have several causes, '. |
|
| 201 | + 'including adding files that do not exist on disk, trying to create an empty zip, '. |
|
| 202 | 202 | 'or trying to save to a directory that does not exist.', |
| 203 | 203 | $this->file |
| 204 | 204 | ), |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | { |
| 214 | 214 | $this->open(); |
| 215 | 215 | |
| 216 | - if($this->countFiles() < 1) |
|
| 216 | + if ($this->countFiles() < 1) |
|
| 217 | 217 | { |
| 218 | 218 | throw new ZIPHelper_Exception( |
| 219 | 219 | 'No files in the zip file', |
@@ -237,17 +237,17 @@ discard block |
||
| 237 | 237 | * @throws ZIPHelper_Exception |
| 238 | 238 | * @return string The file name that was sent (useful in case none was specified). |
| 239 | 239 | */ |
| 240 | - public function download(?string $fileName=null) : string |
|
| 240 | + public function download(?string $fileName = null) : string |
|
| 241 | 241 | { |
| 242 | 242 | $this->save(); |
| 243 | 243 | |
| 244 | - if(empty($fileName)) { |
|
| 244 | + if (empty($fileName)) { |
|
| 245 | 245 | $fileName = basename($this->file); |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | header('Content-type: application/zip'); |
| 249 | - header('Content-Disposition: attachment; filename=' . $fileName); |
|
| 250 | - header('Content-length: ' . filesize($this->file)); |
|
| 249 | + header('Content-Disposition: attachment; filename='.$fileName); |
|
| 250 | + header('Content-length: '.filesize($this->file)); |
|
| 251 | 251 | header('Pragma: no-cache'); |
| 252 | 252 | header('Expires: 0'); |
| 253 | 253 | readfile($this->file); |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | * @param string|NULL $fileName Override the ZIP's file name for the download |
| 263 | 263 | * @see ZIPHelper::download() |
| 264 | 264 | */ |
| 265 | - public function downloadAndDelete(?string $fileName=null) |
|
| 265 | + public function downloadAndDelete(?string $fileName = null) |
|
| 266 | 266 | { |
| 267 | 267 | $this->download($fileName); |
| 268 | 268 | |
@@ -277,9 +277,9 @@ discard block |
||
| 277 | 277 | * @param string|NULL $outputFolder If no folder is specified, uses the target file's folder. |
| 278 | 278 | * @return boolean |
| 279 | 279 | */ |
| 280 | - public function extractAll(?string $outputFolder=null) : bool |
|
| 280 | + public function extractAll(?string $outputFolder = null) : bool |
|
| 281 | 281 | { |
| 282 | - if(empty($outputFolder)) { |
|
| 282 | + if (empty($outputFolder)) { |
|
| 283 | 283 | $outputFolder = dirname($this->file); |
| 284 | 284 | } |
| 285 | 285 | |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | 'gif' |
| 137 | 137 | ); |
| 138 | 138 | |
| 139 | - public function __construct($sourceFile=null, $resource=null, $type=null) |
|
| 139 | + public function __construct($sourceFile = null, $resource = null, $type = null) |
|
| 140 | 140 | { |
| 141 | 141 | // ensure that the GD library is installed |
| 142 | - if(!function_exists('imagecreate')) |
|
| 142 | + if (!function_exists('imagecreate')) |
|
| 143 | 143 | { |
| 144 | 144 | throw new ImageHelper_Exception( |
| 145 | 145 | 'The PHP GD extension is not installed or not enabled.', |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | ); |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - if(is_resource($resource)) |
|
| 151 | + if (is_resource($resource)) |
|
| 152 | 152 | { |
| 153 | 153 | $this->sourceImage = $resource; |
| 154 | 154 | $this->type = $type; |
@@ -172,21 +172,21 @@ discard block |
||
| 172 | 172 | if (is_null($this->type)) { |
| 173 | 173 | throw new ImageHelper_Exception( |
| 174 | 174 | 'Error opening image', |
| 175 | - 'Not a valid supported image type for image ' . $this->file, |
|
| 175 | + 'Not a valid supported image type for image '.$this->file, |
|
| 176 | 176 | self::ERROR_UNSUPPORTED_IMAGE_TYPE |
| 177 | 177 | ); |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | $this->info = self::getImageSize($this->file); |
| 181 | 181 | |
| 182 | - if(!$this->isVector()) |
|
| 182 | + if (!$this->isVector()) |
|
| 183 | 183 | { |
| 184 | - $method = 'imagecreatefrom' . $this->type; |
|
| 184 | + $method = 'imagecreatefrom'.$this->type; |
|
| 185 | 185 | $this->sourceImage = $method($this->file); |
| 186 | 186 | if (!$this->sourceImage) { |
| 187 | 187 | throw new ImageHelper_Exception( |
| 188 | 188 | 'Error creating new image', |
| 189 | - $method . ' failed', |
|
| 189 | + $method.' failed', |
|
| 190 | 190 | self::ERROR_FAILED_TO_CREATE_NEW_IMAGE |
| 191 | 191 | ); |
| 192 | 192 | } |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | $this->width = $this->info->getWidth(); |
| 199 | 199 | $this->height = $this->info->getHeight(); |
| 200 | 200 | |
| 201 | - if(!$this->isVector()) { |
|
| 201 | + if (!$this->isVector()) { |
|
| 202 | 202 | $this->setNewImage($this->duplicateImage($this->sourceImage)); |
| 203 | 203 | } |
| 204 | 204 | } |
@@ -214,10 +214,10 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_OBJECT |
| 216 | 216 | */ |
| 217 | - public static function createNew($width, $height, $type='png') |
|
| 217 | + public static function createNew($width, $height, $type = 'png') |
|
| 218 | 218 | { |
| 219 | 219 | $img = imagecreatetruecolor($width, $height); |
| 220 | - if($img !== false) { |
|
| 220 | + if ($img !== false) { |
|
| 221 | 221 | return self::createFromResource($img, 'png'); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | * @param string $type The target image type, e.g. "jpeg", "png", etc. |
| 241 | 241 | * @return ImageHelper |
| 242 | 242 | */ |
| 243 | - public static function createFromResource($resource, ?string $type=null) |
|
| 243 | + public static function createFromResource($resource, ?string $type = null) |
|
| 244 | 244 | { |
| 245 | 245 | self::requireResource($resource); |
| 246 | 246 | |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | */ |
| 273 | 273 | public static function setConfig($name, $value) |
| 274 | 274 | { |
| 275 | - if(isset(self::$config[$name])) { |
|
| 275 | + if (isset(self::$config[$name])) { |
|
| 276 | 276 | self::$config[$name] = $value; |
| 277 | 277 | } |
| 278 | 278 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | * |
| 284 | 284 | * @param bool $enabled |
| 285 | 285 | */ |
| 286 | - public static function setAutoMemoryAdjustment($enabled=true) |
|
| 286 | + public static function setAutoMemoryAdjustment($enabled = true) |
|
| 287 | 287 | { |
| 288 | 288 | self::setConfig('auto-memory-adjustment', $enabled); |
| 289 | 289 | } |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | |
| 318 | 318 | public function enableAlpha() |
| 319 | 319 | { |
| 320 | - if(!$this->alpha) |
|
| 320 | + if (!$this->alpha) |
|
| 321 | 321 | { |
| 322 | 322 | self::addAlphaSupport($this->newImage, false); |
| 323 | 323 | $this->alpha = true; |
@@ -348,9 +348,9 @@ discard block |
||
| 348 | 348 | * @param number $percent |
| 349 | 349 | * @return ImageHelper |
| 350 | 350 | */ |
| 351 | - public function sharpen($percent=0) |
|
| 351 | + public function sharpen($percent = 0) |
|
| 352 | 352 | { |
| 353 | - if($percent <= 0) { |
|
| 353 | + if ($percent <= 0) { |
|
| 354 | 354 | return $this; |
| 355 | 355 | } |
| 356 | 356 | |
@@ -359,9 +359,9 @@ discard block |
||
| 359 | 359 | return $this->convolute($factor); |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - public function blur($percent=0) |
|
| 362 | + public function blur($percent = 0) |
|
| 363 | 363 | { |
| 364 | - if($percent <= 0) { |
|
| 364 | + if ($percent <= 0) { |
|
| 365 | 365 | return $this; |
| 366 | 366 | } |
| 367 | 367 | |
@@ -374,12 +374,12 @@ discard block |
||
| 374 | 374 | { |
| 375 | 375 | // get a value thats equal to 64 - abs( factor ) |
| 376 | 376 | // ( using min/max to limited the factor to 0 - 64 to not get out of range values ) |
| 377 | - $val1Adjustment = 64 - min( 64, max( 0, abs( $factor ) ) ); |
|
| 377 | + $val1Adjustment = 64 - min(64, max(0, abs($factor))); |
|
| 378 | 378 | |
| 379 | 379 | // the base factor for the "current" pixel depends on if we are blurring or sharpening. |
| 380 | 380 | // If we are blurring use 1, if sharpening use 9. |
| 381 | 381 | $val1Base = 9; |
| 382 | - if( abs( $factor ) != $factor ) { |
|
| 382 | + if (abs($factor) != $factor) { |
|
| 383 | 383 | $val1Base = 1; |
| 384 | 384 | } |
| 385 | 385 | |
@@ -392,24 +392,24 @@ discard block |
||
| 392 | 392 | |
| 393 | 393 | // the value for the surrounding pixels is either positive or negative depending on if we are blurring or sharpening. |
| 394 | 394 | $val2 = -1; |
| 395 | - if( abs( $factor ) != $factor ) { |
|
| 395 | + if (abs($factor) != $factor) { |
|
| 396 | 396 | $val2 = 1; |
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | // setup matrix .. |
| 400 | 400 | $matrix = array( |
| 401 | - array( $val2, $val2, $val2 ), |
|
| 402 | - array( $val2, $val1, $val2 ), |
|
| 403 | - array( $val2, $val2, $val2 ) |
|
| 401 | + array($val2, $val2, $val2), |
|
| 402 | + array($val2, $val1, $val2), |
|
| 403 | + array($val2, $val2, $val2) |
|
| 404 | 404 | ); |
| 405 | 405 | |
| 406 | 406 | // calculate the correct divisor |
| 407 | 407 | // actual divisor is equal to "$divisor = $val1 + $val2 * 8;" |
| 408 | 408 | // but the following line is more generic |
| 409 | - $divisor = array_sum( array_map( 'array_sum', $matrix ) ); |
|
| 409 | + $divisor = array_sum(array_map('array_sum', $matrix)); |
|
| 410 | 410 | |
| 411 | 411 | // apply the matrix |
| 412 | - imageconvolution( $this->newImage, $matrix, $divisor, 0 ); |
|
| 412 | + imageconvolution($this->newImage, $matrix, $divisor, 0); |
|
| 413 | 413 | |
| 414 | 414 | return $this; |
| 415 | 415 | } |
@@ -535,7 +535,7 @@ discard block |
||
| 535 | 535 | */ |
| 536 | 536 | public function resample(?int $width = null, ?int $height = null) : ImageHelper |
| 537 | 537 | { |
| 538 | - if($this->isVector()) { |
|
| 538 | + if ($this->isVector()) { |
|
| 539 | 539 | return $this; |
| 540 | 540 | } |
| 541 | 541 | |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | |
| 557 | 557 | public function resampleAndCrop($width, $height) : ImageHelper |
| 558 | 558 | { |
| 559 | - if($this->isVector()) { |
|
| 559 | + if ($this->isVector()) { |
|
| 560 | 560 | return $this; |
| 561 | 561 | } |
| 562 | 562 | |
@@ -603,14 +603,14 @@ discard block |
||
| 603 | 603 | * @param resource $canvas |
| 604 | 604 | * @param bool $fill Whether to fill the whole canvas with the transparency |
| 605 | 605 | */ |
| 606 | - public static function addAlphaSupport($canvas, $fill=true) |
|
| 606 | + public static function addAlphaSupport($canvas, $fill = true) |
|
| 607 | 607 | { |
| 608 | 608 | self::requireResource($canvas); |
| 609 | 609 | |
| 610 | - imagealphablending($canvas,true); |
|
| 610 | + imagealphablending($canvas, true); |
|
| 611 | 611 | imagesavealpha($canvas, true); |
| 612 | 612 | |
| 613 | - if($fill) { |
|
| 613 | + if ($fill) { |
|
| 614 | 614 | self::fillImageTransparent($canvas); |
| 615 | 615 | } |
| 616 | 616 | } |
@@ -620,13 +620,13 @@ discard block |
||
| 620 | 620 | return $this->alpha; |
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - public function save(string $targetFile, $dispose=true) |
|
| 623 | + public function save(string $targetFile, $dispose = true) |
|
| 624 | 624 | { |
| 625 | - if($this->isVector()) { |
|
| 625 | + if ($this->isVector()) { |
|
| 626 | 626 | return true; |
| 627 | 627 | } |
| 628 | 628 | |
| 629 | - if(!is_resource($this->newImage)) { |
|
| 629 | + if (!is_resource($this->newImage)) { |
|
| 630 | 630 | throw new ImageHelper_Exception( |
| 631 | 631 | 'Error creating new image', |
| 632 | 632 | 'Cannot save an image, no valid image resource was created. You have to call one of the resample methods to create a new image.', |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | unlink($targetFile); |
| 639 | 639 | } |
| 640 | 640 | |
| 641 | - $method = 'image' . $this->type; |
|
| 641 | + $method = 'image'.$this->type; |
|
| 642 | 642 | if (!$method($this->newImage, $targetFile, $this->resolveQuality())) { |
| 643 | 643 | throw new ImageHelper_Exception( |
| 644 | 644 | 'Error creating new image', |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | ); |
| 660 | 660 | } |
| 661 | 661 | |
| 662 | - if($dispose) { |
|
| 662 | + if ($dispose) { |
|
| 663 | 663 | $this->dispose(); |
| 664 | 664 | } |
| 665 | 665 | |
@@ -668,11 +668,11 @@ discard block |
||
| 668 | 668 | |
| 669 | 669 | public function dispose() |
| 670 | 670 | { |
| 671 | - if(is_resource($this->sourceImage)) { |
|
| 671 | + if (is_resource($this->sourceImage)) { |
|
| 672 | 672 | imagedestroy($this->sourceImage); |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | - if(is_resource($this->newImage)) { |
|
| 675 | + if (is_resource($this->newImage)) { |
|
| 676 | 676 | imagedestroy($this->newImage); |
| 677 | 677 | } |
| 678 | 678 | } |
@@ -725,7 +725,7 @@ discard block |
||
| 725 | 725 | */ |
| 726 | 726 | protected function adjustMemory() : bool |
| 727 | 727 | { |
| 728 | - if(!self::$config['auto-memory-adjustment']) { |
|
| 728 | + if (!self::$config['auto-memory-adjustment']) { |
|
| 729 | 729 | return true; |
| 730 | 730 | } |
| 731 | 731 | |
@@ -754,7 +754,7 @@ discard block |
||
| 754 | 754 | if (function_exists('memory_get_usage') && memory_get_usage() + $memoryNeeded > $memoryLimit) { |
| 755 | 755 | $newLimit = ($memoryLimit + (memory_get_usage() + $memoryNeeded)) / $MB; |
| 756 | 756 | $newLimit = ceil($newLimit); |
| 757 | - ini_set('memory_limit', $newLimit . 'M'); |
|
| 757 | + ini_set('memory_limit', $newLimit.'M'); |
|
| 758 | 758 | |
| 759 | 759 | return true; |
| 760 | 760 | } |
@@ -785,16 +785,16 @@ discard block |
||
| 785 | 785 | */ |
| 786 | 786 | protected function resampleImage(int $newWidth, int $newHeight) : ImageHelper |
| 787 | 787 | { |
| 788 | - if($this->isVector()) { |
|
| 788 | + if ($this->isVector()) { |
|
| 789 | 789 | return $this; |
| 790 | 790 | } |
| 791 | 791 | |
| 792 | - if($this->newWidth==$newWidth && $this->newHeight==$newHeight) { |
|
| 792 | + if ($this->newWidth == $newWidth && $this->newHeight == $newHeight) { |
|
| 793 | 793 | return $this; |
| 794 | 794 | } |
| 795 | 795 | |
| 796 | - if($newWidth < 1) { $newWidth = 1; } |
|
| 797 | - if($newHeight < 1) { $newHeight = 1; } |
|
| 796 | + if ($newWidth < 1) { $newWidth = 1; } |
|
| 797 | + if ($newHeight < 1) { $newHeight = 1; } |
|
| 798 | 798 | |
| 799 | 799 | $this->adjustMemory(); |
| 800 | 800 | |
@@ -858,11 +858,11 @@ discard block |
||
| 858 | 858 | * @param string $imageType The image format to send, i.e. "jpeg", "png" |
| 859 | 859 | * @param int $quality The quality to use for the image. This is 0-9 (0=no compression, 9=max) for PNG, and 0-100 (0=lowest, 100=highest quality) for JPG |
| 860 | 860 | */ |
| 861 | - public static function displayImageStream($resource, $imageType, $quality=-1) |
|
| 861 | + public static function displayImageStream($resource, $imageType, $quality = -1) |
|
| 862 | 862 | { |
| 863 | 863 | $imageType = strtolower($imageType); |
| 864 | 864 | |
| 865 | - if(!in_array($imageType, self::$streamTypes)) { |
|
| 865 | + if (!in_array($imageType, self::$streamTypes)) { |
|
| 866 | 866 | throw new ImageHelper_Exception( |
| 867 | 867 | 'Invalid image stream type', |
| 868 | 868 | sprintf( |
@@ -873,9 +873,9 @@ discard block |
||
| 873 | 873 | ); |
| 874 | 874 | } |
| 875 | 875 | |
| 876 | - header('Content-type:image/' . $imageType); |
|
| 876 | + header('Content-type:image/'.$imageType); |
|
| 877 | 877 | |
| 878 | - $function = 'image' . $imageType; |
|
| 878 | + $function = 'image'.$imageType; |
|
| 879 | 879 | |
| 880 | 880 | $function($resource, null, $quality); |
| 881 | 881 | } |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | if (headers_sent($file, $line)) { |
| 892 | 892 | throw new ImageHelper_Exception( |
| 893 | 893 | 'Error displaying image', |
| 894 | - 'Headers have already been sent: in file ' . $file . ':' . $line, |
|
| 894 | + 'Headers have already been sent: in file '.$file.':'.$line, |
|
| 895 | 895 | self::ERROR_HEADERS_ALREADY_SENT |
| 896 | 896 | ); |
| 897 | 897 | } |
@@ -908,16 +908,16 @@ discard block |
||
| 908 | 908 | } |
| 909 | 909 | |
| 910 | 910 | $format = self::getFileImageType($imageFile); |
| 911 | - if($format == 'svg') { |
|
| 911 | + if ($format == 'svg') { |
|
| 912 | 912 | $format = 'svg+xml'; |
| 913 | 913 | } |
| 914 | 914 | |
| 915 | - $contentType = 'image/' . $format; |
|
| 915 | + $contentType = 'image/'.$format; |
|
| 916 | 916 | |
| 917 | 917 | header('Content-Type: '.$contentType); |
| 918 | - header("Last-Modified: " . gmdate("D, d M Y H:i:s", filemtime($imageFile)) . " GMT"); |
|
| 918 | + header("Last-Modified: ".gmdate("D, d M Y H:i:s", filemtime($imageFile))." GMT"); |
|
| 919 | 919 | header('Cache-Control: public'); |
| 920 | - header('Content-Length: ' . filesize($imageFile)); |
|
| 920 | + header('Content-Length: '.filesize($imageFile)); |
|
| 921 | 921 | |
| 922 | 922 | readfile($imageFile); |
| 923 | 923 | } |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | * |
| 936 | 936 | * @param array $color A color definition, as an associative array with red, green, and blue keys. If not specified, the color at pixel position 0,0 will be used. |
| 937 | 937 | */ |
| 938 | - public function trim($color=null) |
|
| 938 | + public function trim($color = null) |
|
| 939 | 939 | { |
| 940 | 940 | return $this->trimImage($this->newImage, $color); |
| 941 | 941 | } |
@@ -952,7 +952,7 @@ discard block |
||
| 952 | 952 | $color = imagecolorsforindex($img, $colorIndex); |
| 953 | 953 | |
| 954 | 954 | // it seems imagecolorsforindex may return false (undocumented, unproven) |
| 955 | - if(is_array($color)) { |
|
| 955 | + if (is_array($color)) { |
|
| 956 | 956 | return $color; |
| 957 | 957 | } |
| 958 | 958 | |
@@ -972,15 +972,15 @@ discard block |
||
| 972 | 972 | * @param array $color A color definition, as an associative array with red, green, blue and alpha keys. If not specified, the color at pixel position 0,0 will be used. |
| 973 | 973 | * @return ImageHelper |
| 974 | 974 | */ |
| 975 | - protected function trimImage($img, ?array $color=null) : ImageHelper |
|
| 975 | + protected function trimImage($img, ?array $color = null) : ImageHelper |
|
| 976 | 976 | { |
| 977 | - if($this->isVector()) { |
|
| 977 | + if ($this->isVector()) { |
|
| 978 | 978 | return $this; |
| 979 | 979 | } |
| 980 | 980 | |
| 981 | 981 | self::requireResource($img); |
| 982 | 982 | |
| 983 | - if(empty($color)) |
|
| 983 | + if (empty($color)) |
|
| 984 | 984 | { |
| 985 | 985 | $color = imagecolorat($img, 0, 0); |
| 986 | 986 | $color = $this->getIndexedColors($img, $color); |
@@ -997,16 +997,16 @@ discard block |
||
| 997 | 997 | $ymax = null; |
| 998 | 998 | |
| 999 | 999 | // Start scanning for the edges. |
| 1000 | - for ($iy=0; $iy<$imh; $iy++) |
|
| 1000 | + for ($iy = 0; $iy < $imh; $iy++) |
|
| 1001 | 1001 | { |
| 1002 | 1002 | $first = true; |
| 1003 | 1003 | |
| 1004 | - for ($ix=0; $ix<$imw; $ix++) |
|
| 1004 | + for ($ix = 0; $ix < $imw; $ix++) |
|
| 1005 | 1005 | { |
| 1006 | 1006 | $ndx = imagecolorat($img, $ix, $iy); |
| 1007 | 1007 | $colors = $this->getIndexedColors($img, $ndx); |
| 1008 | 1008 | |
| 1009 | - if(!$this->colorsMatch($colors, $color)) |
|
| 1009 | + if (!$this->colorsMatch($colors, $color)) |
|
| 1010 | 1010 | { |
| 1011 | 1011 | if ($xmin > $ix) { $xmin = $ix; } |
| 1012 | 1012 | if ($xmax < $ix) { $xmax = $ix; } |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | |
| 1015 | 1015 | $ymax = $iy; |
| 1016 | 1016 | |
| 1017 | - if($first) |
|
| 1017 | + if ($first) |
|
| 1018 | 1018 | { |
| 1019 | 1019 | $ix = $xmax; |
| 1020 | 1020 | $first = false; |
@@ -1024,18 +1024,18 @@ discard block |
||
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | 1026 | // no trimming border found |
| 1027 | - if($ymax === null && $ymax === null) { |
|
| 1027 | + if ($ymax === null && $ymax === null) { |
|
| 1028 | 1028 | return $this; |
| 1029 | 1029 | } |
| 1030 | 1030 | |
| 1031 | 1031 | // The new width and height of the image. |
| 1032 | - $imw = 1+$xmax-$xmin; // Image width in pixels |
|
| 1033 | - $imh = 1+$ymax-$ymin; // Image height in pixels |
|
| 1032 | + $imw = 1 + $xmax - $xmin; // Image width in pixels |
|
| 1033 | + $imh = 1 + $ymax - $ymin; // Image height in pixels |
|
| 1034 | 1034 | |
| 1035 | 1035 | // Make another image to place the trimmed version in. |
| 1036 | 1036 | $im2 = $this->createNewImage($imw, $imh); |
| 1037 | 1037 | |
| 1038 | - if($color['alpha'] > 0) |
|
| 1038 | + if ($color['alpha'] > 0) |
|
| 1039 | 1039 | { |
| 1040 | 1040 | $bg2 = imagecolorallocatealpha($im2, $color['red'], $color['green'], $color['blue'], $color['alpha']); |
| 1041 | 1041 | imagecolortransparent($im2, $bg2); |
@@ -1071,7 +1071,7 @@ discard block |
||
| 1071 | 1071 | |
| 1072 | 1072 | $this->newImage = $image; |
| 1073 | 1073 | $this->newWidth = imagesx($image); |
| 1074 | - $this->newHeight= imagesy($image); |
|
| 1074 | + $this->newHeight = imagesy($image); |
|
| 1075 | 1075 | } |
| 1076 | 1076 | |
| 1077 | 1077 | /** |
@@ -1082,7 +1082,7 @@ discard block |
||
| 1082 | 1082 | */ |
| 1083 | 1083 | protected static function requireResource($subject) |
| 1084 | 1084 | { |
| 1085 | - if(is_resource($subject)) { |
|
| 1085 | + if (is_resource($subject)) { |
|
| 1086 | 1086 | return; |
| 1087 | 1087 | } |
| 1088 | 1088 | |
@@ -1108,7 +1108,7 @@ discard block |
||
| 1108 | 1108 | { |
| 1109 | 1109 | $img = imagecreatetruecolor($width, $height); |
| 1110 | 1110 | |
| 1111 | - if($img === false) |
|
| 1111 | + if ($img === false) |
|
| 1112 | 1112 | { |
| 1113 | 1113 | throw new ImageHelper_Exception( |
| 1114 | 1114 | 'Error creating new image', |
@@ -1132,8 +1132,8 @@ discard block |
||
| 1132 | 1132 | protected function colorsMatch($a, $b) : bool |
| 1133 | 1133 | { |
| 1134 | 1134 | $parts = array('red', 'green', 'blue'); |
| 1135 | - foreach($parts as $part) { |
|
| 1136 | - if($a[$part] != $b[$part]) { |
|
| 1135 | + foreach ($parts as $part) { |
|
| 1136 | + if ($a[$part] != $b[$part]) { |
|
| 1137 | 1137 | return false; |
| 1138 | 1138 | } |
| 1139 | 1139 | } |
@@ -1141,7 +1141,7 @@ discard block |
||
| 1141 | 1141 | return true; |
| 1142 | 1142 | } |
| 1143 | 1143 | |
| 1144 | - public function fillWhite($x=0, $y=0) |
|
| 1144 | + public function fillWhite($x = 0, $y = 0) |
|
| 1145 | 1145 | { |
| 1146 | 1146 | $this->addRGBColor('white', 255, 255, 255); |
| 1147 | 1147 | return $this->fill('white', $x, $y); |
@@ -1161,11 +1161,11 @@ discard block |
||
| 1161 | 1161 | self::requireResource($resource); |
| 1162 | 1162 | |
| 1163 | 1163 | $transparent = imagecolorallocatealpha($resource, 89, 14, 207, 127); |
| 1164 | - imagecolortransparent ($resource, $transparent); |
|
| 1164 | + imagecolortransparent($resource, $transparent); |
|
| 1165 | 1165 | imagefill($resource, 0, 0, $transparent); |
| 1166 | 1166 | } |
| 1167 | 1167 | |
| 1168 | - public function fill($colorName, $x=0, $y=0) |
|
| 1168 | + public function fill($colorName, $x = 0, $y = 0) |
|
| 1169 | 1169 | { |
| 1170 | 1170 | imagefill($this->newImage, $x, $y, $this->colors[$colorName]); |
| 1171 | 1171 | return $this; |
@@ -1179,7 +1179,7 @@ discard block |
||
| 1179 | 1179 | return $this; |
| 1180 | 1180 | } |
| 1181 | 1181 | |
| 1182 | - public function textTTF($text, $size, $colorName, $x=0, $y=0, $angle=0) |
|
| 1182 | + public function textTTF($text, $size, $colorName, $x = 0, $y = 0, $angle = 0) |
|
| 1183 | 1183 | { |
| 1184 | 1184 | imagealphablending($this->newImage, true); |
| 1185 | 1185 | |
@@ -1198,11 +1198,11 @@ discard block |
||
| 1198 | 1198 | return $this->newImage; |
| 1199 | 1199 | } |
| 1200 | 1200 | |
| 1201 | - public function paste(ImageHelper $target, $xpos=0, $ypos=0, $sourceX=0, $sourceY=0) |
|
| 1201 | + public function paste(ImageHelper $target, $xpos = 0, $ypos = 0, $sourceX = 0, $sourceY = 0) |
|
| 1202 | 1202 | { |
| 1203 | 1203 | $img = $target->getImage(); |
| 1204 | 1204 | |
| 1205 | - if($target->isAlpha()) { |
|
| 1205 | + if ($target->isAlpha()) { |
|
| 1206 | 1206 | $this->enableAlpha(); |
| 1207 | 1207 | } |
| 1208 | 1208 | |
@@ -1248,10 +1248,10 @@ discard block |
||
| 1248 | 1248 | public function fitText($text, $matchWidth) |
| 1249 | 1249 | { |
| 1250 | 1250 | $sizes = array(); |
| 1251 | - for($i=1; $i<=1000; $i=$i+0.1) { |
|
| 1251 | + for ($i = 1; $i <= 1000; $i = $i + 0.1) { |
|
| 1252 | 1252 | $size = $this->calcTextSize($text, $i); |
| 1253 | 1253 | $sizes[] = $size; |
| 1254 | - if($size['width'] >= $matchWidth) { |
|
| 1254 | + if ($size['width'] >= $matchWidth) { |
|
| 1255 | 1255 | break; |
| 1256 | 1256 | } |
| 1257 | 1257 | } |
@@ -1263,7 +1263,7 @@ discard block |
||
| 1263 | 1263 | $diffLast = $last['width'] - $matchWidth; |
| 1264 | 1264 | $diffPrev = $matchWidth - $prev['width']; |
| 1265 | 1265 | |
| 1266 | - if($diffLast <= $diffPrev) { |
|
| 1266 | + if ($diffLast <= $diffPrev) { |
|
| 1267 | 1267 | return $last; |
| 1268 | 1268 | } |
| 1269 | 1269 | |
@@ -1291,14 +1291,14 @@ discard block |
||
| 1291 | 1291 | 'bottom_left_y' => $box[1], |
| 1292 | 1292 | 'bottom_right_x' => $box[2], |
| 1293 | 1293 | 'bottom_right_y' => $box[3], |
| 1294 | - 'width' => $right-$left, |
|
| 1295 | - 'height' => $bottom-$top |
|
| 1294 | + 'width' => $right - $left, |
|
| 1295 | + 'height' => $bottom - $top |
|
| 1296 | 1296 | ); |
| 1297 | 1297 | } |
| 1298 | 1298 | |
| 1299 | 1299 | protected function requireTTFFont() |
| 1300 | 1300 | { |
| 1301 | - if(isset($this->TTFFile)) { |
|
| 1301 | + if (isset($this->TTFFile)) { |
|
| 1302 | 1302 | return; |
| 1303 | 1303 | } |
| 1304 | 1304 | |
@@ -1333,7 +1333,7 @@ discard block |
||
| 1333 | 1333 | */ |
| 1334 | 1334 | public static function getImageSize($pathOrResource) : ImageHelper_Size |
| 1335 | 1335 | { |
| 1336 | - if(is_resource($pathOrResource)) |
|
| 1336 | + if (is_resource($pathOrResource)) |
|
| 1337 | 1337 | { |
| 1338 | 1338 | return new ImageHelper_Size(array( |
| 1339 | 1339 | 'width' => imagesx($pathOrResource), |
@@ -1347,7 +1347,7 @@ discard block |
||
| 1347 | 1347 | |
| 1348 | 1348 | $info = false; |
| 1349 | 1349 | $method = 'getImageSize_'.$type; |
| 1350 | - if(method_exists(__CLASS__, $method)) |
|
| 1350 | + if (method_exists(__CLASS__, $method)) |
|
| 1351 | 1351 | { |
| 1352 | 1352 | $info = call_user_func(array(__CLASS__, $method), $pathOrResource); |
| 1353 | 1353 | } |
@@ -1356,7 +1356,7 @@ discard block |
||
| 1356 | 1356 | $info = getimagesize($pathOrResource); |
| 1357 | 1357 | } |
| 1358 | 1358 | |
| 1359 | - if($info !== false) { |
|
| 1359 | + if ($info !== false) { |
|
| 1360 | 1360 | return new ImageHelper_Size($info); |
| 1361 | 1361 | } |
| 1362 | 1362 | |
@@ -1382,7 +1382,7 @@ discard block |
||
| 1382 | 1382 | $xml = XMLHelper::createSimplexml(); |
| 1383 | 1383 | $xml->loadFile($imagePath); |
| 1384 | 1384 | |
| 1385 | - if($xml->hasErrors()) { |
|
| 1385 | + if ($xml->hasErrors()) { |
|
| 1386 | 1386 | throw new ImageHelper_Exception( |
| 1387 | 1387 | 'Error opening SVG image', |
| 1388 | 1388 | sprintf( |
@@ -1397,7 +1397,7 @@ discard block |
||
| 1397 | 1397 | $xml->dispose(); |
| 1398 | 1398 | unset($xml); |
| 1399 | 1399 | |
| 1400 | - if(!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) { |
|
| 1400 | + if (!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) { |
|
| 1401 | 1401 | throw new ImageHelper_Exception( |
| 1402 | 1402 | 'SVG Image is corrupted', |
| 1403 | 1403 | sprintf( |
@@ -1414,7 +1414,7 @@ discard block |
||
| 1414 | 1414 | $viewBox = str_replace(' ', ',', $data['@attributes']['viewBox']); |
| 1415 | 1415 | $size = explode(',', $viewBox); |
| 1416 | 1416 | |
| 1417 | - if(count($size) != 4) |
|
| 1417 | + if (count($size) != 4) |
|
| 1418 | 1418 | { |
| 1419 | 1419 | throw new ImageHelper_Exception( |
| 1420 | 1420 | 'SVG image has an invalid viewBox attribute', |
@@ -1460,7 +1460,7 @@ discard block |
||
| 1460 | 1460 | * @param integer $y |
| 1461 | 1461 | * @return ImageHelper |
| 1462 | 1462 | */ |
| 1463 | - public function crop(int $width, int $height, int $x=0, int $y=0) : ImageHelper |
|
| 1463 | + public function crop(int $width, int $height, int $x = 0, int $y = 0) : ImageHelper |
|
| 1464 | 1464 | { |
| 1465 | 1465 | $new = $this->createNewImage($width, $height); |
| 1466 | 1466 | |
@@ -1497,7 +1497,7 @@ discard block |
||
| 1497 | 1497 | * @see ImageHelper::calcAverageColorRGB() |
| 1498 | 1498 | * @see ImageHelper::calcAverageColorHEX() |
| 1499 | 1499 | */ |
| 1500 | - public function calcAverageColor(int $format=self::COLORFORMAT_RGB) |
|
| 1500 | + public function calcAverageColor(int $format = self::COLORFORMAT_RGB) |
|
| 1501 | 1501 | { |
| 1502 | 1502 | $image = $this->duplicate(); |
| 1503 | 1503 | $image->resample(1, 1); |
@@ -1516,7 +1516,7 @@ discard block |
||
| 1516 | 1516 | public function calcAverageColorRGB() : array |
| 1517 | 1517 | { |
| 1518 | 1518 | $result = $this->calcAverageColor(self::COLORFORMAT_RGB); |
| 1519 | - if(is_array($result)) { |
|
| 1519 | + if (is_array($result)) { |
|
| 1520 | 1520 | return $result; |
| 1521 | 1521 | } |
| 1522 | 1522 | |
@@ -1537,7 +1537,7 @@ discard block |
||
| 1537 | 1537 | public function calcAverageColorHex() : string |
| 1538 | 1538 | { |
| 1539 | 1539 | $result = $this->calcAverageColor(self::COLORFORMAT_HEX); |
| 1540 | - if(is_string($result)) { |
|
| 1540 | + if (is_string($result)) { |
|
| 1541 | 1541 | return $result; |
| 1542 | 1542 | } |
| 1543 | 1543 | |
@@ -1574,9 +1574,9 @@ discard block |
||
| 1574 | 1574 | * @see ImageHelper::COLORFORMAT_RGB |
| 1575 | 1575 | * @see ImageHelper::COLORFORMAT_HEX |
| 1576 | 1576 | */ |
| 1577 | - public function getColorAt(int $x, int $y, int $format=self::COLORFORMAT_RGB) |
|
| 1577 | + public function getColorAt(int $x, int $y, int $format = self::COLORFORMAT_RGB) |
|
| 1578 | 1578 | { |
| 1579 | - if($x > $this->getWidth() || $y > $this->getHeight()) |
|
| 1579 | + if ($x > $this->getWidth() || $y > $this->getHeight()) |
|
| 1580 | 1580 | { |
| 1581 | 1581 | throw new ImageHelper_Exception( |
| 1582 | 1582 | 'Position out of bounds', |
@@ -1594,7 +1594,7 @@ discard block |
||
| 1594 | 1594 | $idx = imagecolorat($this->newImage, $x, $y); |
| 1595 | 1595 | $rgb = $this->getIndexedColors($this->newImage, $idx); |
| 1596 | 1596 | |
| 1597 | - if($format == self::COLORFORMAT_HEX) { |
|
| 1597 | + if ($format == self::COLORFORMAT_HEX) { |
|
| 1598 | 1598 | return self::rgb2hex($rgb); |
| 1599 | 1599 | } |
| 1600 | 1600 | |
@@ -1609,7 +1609,7 @@ discard block |
||
| 1609 | 1609 | */ |
| 1610 | 1610 | public static function rgb2luma(array $rgb) : int |
| 1611 | 1611 | { |
| 1612 | - return (int)floor((($rgb['red']*2)+$rgb['blue']+($rgb['green']*3))/6); |
|
| 1612 | + return (int)floor((($rgb['red'] * 2) + $rgb['blue'] + ($rgb['green'] * 3)) / 6); |
|
| 1613 | 1613 | } |
| 1614 | 1614 | |
| 1615 | 1615 | /** |
@@ -41,8 +41,8 @@ discard block |
||
| 41 | 41 | $this->commandLine = $commandLine; |
| 42 | 42 | $this->output = $output; |
| 43 | 43 | |
| 44 | - foreach($errors as $error) { |
|
| 45 | - if($error->isError()) { |
|
| 44 | + foreach ($errors as $error) { |
|
| 45 | + if ($error->isError()) { |
|
| 46 | 46 | $this->errors[] = $error; |
| 47 | 47 | } else { |
| 48 | 48 | $this->warnings[] = $error; |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | public function hasErrorCode($code) |
| 64 | 64 | { |
| 65 | - foreach($this->errors as $error) { |
|
| 66 | - if($error->getCode() == $code) { |
|
| 65 | + foreach ($this->errors as $error) { |
|
| 66 | + if ($error->getCode() == $code) { |
|
| 67 | 67 | return true; |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -92,11 +92,11 @@ discard block |
||
| 92 | 92 | * @param bool $asString |
| 93 | 93 | * @return string|string[] |
| 94 | 94 | */ |
| 95 | - public function getErrorMessages(bool $asString=false) |
|
| 95 | + public function getErrorMessages(bool $asString = false) |
|
| 96 | 96 | { |
| 97 | - if($asString) { |
|
| 97 | + if ($asString) { |
|
| 98 | 98 | $lines = array(); |
| 99 | - foreach($this->errors as $error) { |
|
| 99 | + foreach ($this->errors as $error) { |
|
| 100 | 100 | $lines[] = (string)$error; |
| 101 | 101 | } |
| 102 | 102 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $messages = array(); |
| 107 | - foreach($this->errors as $error) { |
|
| 107 | + foreach ($this->errors as $error) { |
|
| 108 | 108 | $messages[] = (string)$error; |
| 109 | 109 | } |
| 110 | 110 | |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | public function getLastLine() |
| 125 | 125 | { |
| 126 | - return $this->output[count($this->output)-1]; |
|
| 126 | + return $this->output[count($this->output) - 1]; |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | public function getFirstLine() |
@@ -138,8 +138,8 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | public function isConnectionFailed() |
| 140 | 140 | { |
| 141 | - foreach($this->errors as $error) { |
|
| 142 | - if($error->isConnectionFailed()) { |
|
| 141 | + foreach ($this->errors as $error) { |
|
| 142 | + if ($error->isConnectionFailed()) { |
|
| 143 | 143 | return true; |
| 144 | 144 | } |
| 145 | 145 | } |
@@ -149,8 +149,8 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | public function hasConflicts() |
| 151 | 151 | { |
| 152 | - foreach($this->errors as $error) { |
|
| 153 | - if($error->isConflict()) { |
|
| 152 | + foreach ($this->errors as $error) { |
|
| 153 | + if ($error->isConflict()) { |
|
| 154 | 154 | return true; |
| 155 | 155 | } |
| 156 | 156 | } |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | public function hasLocks() |
| 162 | 162 | { |
| 163 | - foreach($this->errors as $error) { |
|
| 164 | - if($error->isLock()) { |
|
| 163 | + foreach ($this->errors as $error) { |
|
| 164 | + if ($error->isLock()) { |
|
| 165 | 165 | return true; |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | public function addAttribute($parent, string $name, $value) |
| 110 | 110 | { |
| 111 | - if(!$parent instanceof \DOMNode) { |
|
| 111 | + if (!$parent instanceof \DOMNode) { |
|
| 112 | 112 | throw new XMLHelper_Exception( |
| 113 | 113 | 'The specified parent node is not a node instance.', |
| 114 | 114 | sprintf('Tried adding attribute [%s].', $name), |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | |
| 231 | 231 | if (!empty($text)) { |
| 232 | 232 | $fragment = $this->dom->createDocumentFragment(); |
| 233 | - if(!@$fragment->appendXML($text)) { |
|
| 233 | + if (!@$fragment->appendXML($text)) { |
|
| 234 | 234 | throw new XMLHelper_Exception( |
| 235 | 235 | 'Cannot append XML fragment', |
| 236 | 236 | sprintf( |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | * @param array $attributes |
| 273 | 273 | * @return \DOMNode |
| 274 | 274 | */ |
| 275 | - public function createRoot($name, $attributes=array()) |
|
| 275 | + public function createRoot($name, $attributes = array()) |
|
| 276 | 276 | { |
| 277 | 277 | $root = $this->dom->appendChild($this->dom->createElement($name)); |
| 278 | 278 | $this->addAttributes($root, $attributes); |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | $string = str_replace('<', 'LT_ESCAPE', $string); |
| 294 | 294 | $string = str_replace('>', 'GT_ESCAPE', $string); |
| 295 | 295 | |
| 296 | - $string = str_replace(' ',' ', $string); |
|
| 297 | - $string = str_replace('&','&', $string); |
|
| 296 | + $string = str_replace(' ', ' ', $string); |
|
| 297 | + $string = str_replace('&', '&', $string); |
|
| 298 | 298 | |
| 299 | 299 | return $string; |
| 300 | 300 | } |
@@ -309,8 +309,8 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | public static function downloadXML($xml, $filename = 'download.xml') |
| 311 | 311 | { |
| 312 | - if(!headers_sent() && !self::$simulation) { |
|
| 313 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
| 312 | + if (!headers_sent() && !self::$simulation) { |
|
| 313 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | echo $xml; |
@@ -325,11 +325,11 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | public static function displayXML($xml) |
| 327 | 327 | { |
| 328 | - if(!headers_sent() && !self::$simulation) { |
|
| 328 | + if (!headers_sent() && !self::$simulation) { |
|
| 329 | 329 | header('Content-Type:text/xml; charset=utf-8'); |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | - if(self::$simulation) { |
|
| 332 | + if (self::$simulation) { |
|
| 333 | 333 | $xml = '<pre>'.htmlspecialchars($xml).'</pre>'; |
| 334 | 334 | } |
| 335 | 335 | |
@@ -347,10 +347,10 @@ discard block |
||
| 347 | 347 | * @param string[] $customInfo Associative array with name => value pairs for custom tags to add to the output xml |
| 348 | 348 | * @see buildErrorXML() |
| 349 | 349 | */ |
| 350 | - public static function displayErrorXML($code, $message, $title, $customInfo=array()) |
|
| 350 | + public static function displayErrorXML($code, $message, $title, $customInfo = array()) |
|
| 351 | 351 | { |
| 352 | - if(!headers_sent() && !self::$simulation) { |
|
| 353 | - header('HTTP/1.1 400 Bad Request: ' . $title, true, 400); |
|
| 352 | + if (!headers_sent() && !self::$simulation) { |
|
| 353 | + header('HTTP/1.1 400 Bad Request: '.$title, true, 400); |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | self::displayXML(self::buildErrorXML($code, $message, $title, $customInfo)); |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | |
| 359 | 359 | protected static $simulation = false; |
| 360 | 360 | |
| 361 | - public static function setSimulation($simulate=true) |
|
| 361 | + public static function setSimulation($simulate = true) |
|
| 362 | 362 | { |
| 363 | 363 | self::$simulation = $simulate; |
| 364 | 364 | } |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | * @param string $title |
| 407 | 407 | * @return string |
| 408 | 408 | */ |
| 409 | - public static function buildErrorXML($code, $message, $title, $customInfo=array()) |
|
| 409 | + public static function buildErrorXML($code, $message, $title, $customInfo = array()) |
|
| 410 | 410 | { |
| 411 | 411 | $xml = new \DOMDocument('1.0', 'UTF-8'); |
| 412 | 412 | $xml->formatOutput = true; |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | $helper->addTextTag($root, 'title', $title); |
| 421 | 421 | $helper->addTextTag($root, 'request_uri', $_SERVER['REQUEST_URI']); |
| 422 | 422 | |
| 423 | - foreach($customInfo as $name => $value) { |
|
| 423 | + foreach ($customInfo as $name => $value) { |
|
| 424 | 424 | $helper->addTextTag($root, $name, $value); |
| 425 | 425 | } |
| 426 | 426 | |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | */ |
| 466 | 466 | public static function string2xml(string $string) : string |
| 467 | 467 | { |
| 468 | - if(stristr($string, '<body')) |
|
| 468 | + if (stristr($string, '<body')) |
|
| 469 | 469 | { |
| 470 | 470 | throw new XMLHelper_Exception( |
| 471 | 471 | 'Cannot convert string with existing body element', |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | // capture all elements except the body tag itself |
| 497 | 497 | $xml = ''; |
| 498 | - foreach($root->childNodes as $child) { |
|
| 498 | + foreach ($root->childNodes as $child) { |
|
| 499 | 499 | $xml .= $dom->saveXML($child); |
| 500 | 500 | } |
| 501 | 501 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * The converted string will be all lowercase. |
| 61 | 61 | * @return Transliteration |
| 62 | 62 | */ |
| 63 | - public function setLowercase(bool $lowercase=true) : Transliteration |
|
| 63 | + public function setLowercase(bool $lowercase = true) : Transliteration |
|
| 64 | 64 | { |
| 65 | 65 | $this->setOption('lowercase', $lowercase); |
| 66 | 66 | |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | $result = implode('', $keep); |
| 99 | 99 | |
| 100 | - while (strstr($result, $space . $space)) { |
|
| 101 | - $result = str_replace($space . $space, $space, $result); |
|
| 100 | + while (strstr($result, $space.$space)) { |
|
| 101 | + $result = str_replace($space.$space, $space, $result); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | $result = trim($result, $space); |