@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | { |
| 69 | 69 | self::$stack[] = 1; |
| 70 | 70 | |
| 71 | - if(ob_start() === true) { |
|
| 71 | + if (ob_start() === true) { |
|
| 72 | 72 | return; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | { |
| 91 | 91 | self::_stop(); |
| 92 | 92 | |
| 93 | - if(ob_end_clean() !== false) |
|
| 93 | + if (ob_end_clean() !== false) |
|
| 94 | 94 | { |
| 95 | 95 | return; |
| 96 | 96 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | private static function _stop() : void |
| 109 | 109 | { |
| 110 | - if(empty(self::$stack)) |
|
| 110 | + if (empty(self::$stack)) |
|
| 111 | 111 | { |
| 112 | 112 | throw new OutputBuffering_Exception( |
| 113 | 113 | 'Output buffering is not active', |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | { |
| 131 | 131 | self::_stop(); |
| 132 | 132 | |
| 133 | - if(ob_end_flush() !== false) |
|
| 133 | + if (ob_end_flush() !== false) |
|
| 134 | 134 | { |
| 135 | 135 | return; |
| 136 | 136 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | $content = ob_get_clean(); |
| 160 | 160 | |
| 161 | - if($content !== false) |
|
| 161 | + if ($content !== false) |
|
| 162 | 162 | { |
| 163 | 163 | return $content; |
| 164 | 164 | } |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | * @throws ImageHelper_Exception |
| 135 | 135 | * @see ImageHelper::ERROR_GD_LIBRARY_NOT_INSTALLED |
| 136 | 136 | */ |
| 137 | - public function __construct(?string $sourceFile=null, $resource=null, ?string $type=null) |
|
| 137 | + public function __construct(?string $sourceFile = null, $resource = null, ?string $type = null) |
|
| 138 | 138 | { |
| 139 | 139 | // ensure that the GD library is installed |
| 140 | - if(!function_exists('imagecreate')) |
|
| 140 | + if (!function_exists('imagecreate')) |
|
| 141 | 141 | { |
| 142 | 142 | throw new ImageHelper_Exception( |
| 143 | 143 | 'The PHP GD extension is not installed or not enabled.', |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | ); |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - if(is_resource($resource)) |
|
| 149 | + if (is_resource($resource)) |
|
| 150 | 150 | { |
| 151 | 151 | $this->sourceImage = $resource; |
| 152 | 152 | $this->type = $type; |
@@ -170,21 +170,21 @@ discard block |
||
| 170 | 170 | if (is_null($this->type)) { |
| 171 | 171 | throw new ImageHelper_Exception( |
| 172 | 172 | 'Error opening image', |
| 173 | - 'Not a valid supported image type for image ' . $this->file, |
|
| 173 | + 'Not a valid supported image type for image '.$this->file, |
|
| 174 | 174 | self::ERROR_UNSUPPORTED_IMAGE_TYPE |
| 175 | 175 | ); |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | $this->info = self::getImageSize($this->file); |
| 179 | 179 | |
| 180 | - if(!$this->isVector()) |
|
| 180 | + if (!$this->isVector()) |
|
| 181 | 181 | { |
| 182 | - $method = 'imagecreatefrom' . $this->type; |
|
| 182 | + $method = 'imagecreatefrom'.$this->type; |
|
| 183 | 183 | $this->sourceImage = $method($this->file); |
| 184 | 184 | if (!$this->sourceImage) { |
| 185 | 185 | throw new ImageHelper_Exception( |
| 186 | 186 | 'Error creating new image', |
| 187 | - $method . ' failed', |
|
| 187 | + $method.' failed', |
|
| 188 | 188 | self::ERROR_FAILED_TO_CREATE_NEW_IMAGE |
| 189 | 189 | ); |
| 190 | 190 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $this->width = $this->info->getWidth(); |
| 197 | 197 | $this->height = $this->info->getHeight(); |
| 198 | 198 | |
| 199 | - if(!$this->isVector()) { |
|
| 199 | + if (!$this->isVector()) { |
|
| 200 | 200 | $this->setNewImage($this->duplicateImage($this->sourceImage)); |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -212,10 +212,10 @@ discard block |
||
| 212 | 212 | * |
| 213 | 213 | * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_OBJECT |
| 214 | 214 | */ |
| 215 | - public static function createNew($width, $height, $type='png') |
|
| 215 | + public static function createNew($width, $height, $type = 'png') |
|
| 216 | 216 | { |
| 217 | 217 | $img = imagecreatetruecolor($width, $height); |
| 218 | - if($img !== false) { |
|
| 218 | + if ($img !== false) { |
|
| 219 | 219 | return self::createFromResource($img, 'png'); |
| 220 | 220 | } |
| 221 | 221 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | * @param string $type The target image type, e.g. "jpeg", "png", etc. |
| 239 | 239 | * @return ImageHelper |
| 240 | 240 | */ |
| 241 | - public static function createFromResource($resource, ?string $type=null) |
|
| 241 | + public static function createFromResource($resource, ?string $type = null) |
|
| 242 | 242 | { |
| 243 | 243 | self::requireResource($resource); |
| 244 | 244 | |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | */ |
| 271 | 271 | public static function setConfig($name, $value) |
| 272 | 272 | { |
| 273 | - if(isset(self::$config[$name])) { |
|
| 273 | + if (isset(self::$config[$name])) { |
|
| 274 | 274 | self::$config[$name] = $value; |
| 275 | 275 | } |
| 276 | 276 | } |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | * |
| 282 | 282 | * @param bool $enabled |
| 283 | 283 | */ |
| 284 | - public static function setAutoMemoryAdjustment($enabled=true) |
|
| 284 | + public static function setAutoMemoryAdjustment($enabled = true) |
|
| 285 | 285 | { |
| 286 | 286 | self::setConfig('auto-memory-adjustment', $enabled); |
| 287 | 287 | } |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | public function enableAlpha() |
| 317 | 317 | { |
| 318 | - if(!$this->alpha) |
|
| 318 | + if (!$this->alpha) |
|
| 319 | 319 | { |
| 320 | 320 | self::addAlphaSupport($this->newImage, false); |
| 321 | 321 | $this->alpha = true; |
@@ -346,9 +346,9 @@ discard block |
||
| 346 | 346 | * @param number $percent |
| 347 | 347 | * @return ImageHelper |
| 348 | 348 | */ |
| 349 | - public function sharpen($percent=0) |
|
| 349 | + public function sharpen($percent = 0) |
|
| 350 | 350 | { |
| 351 | - if($percent <= 0) { |
|
| 351 | + if ($percent <= 0) { |
|
| 352 | 352 | return $this; |
| 353 | 353 | } |
| 354 | 354 | |
@@ -357,9 +357,9 @@ discard block |
||
| 357 | 357 | return $this->convolute($factor); |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | - public function blur($percent=0) |
|
| 360 | + public function blur($percent = 0) |
|
| 361 | 361 | { |
| 362 | - if($percent <= 0) { |
|
| 362 | + if ($percent <= 0) { |
|
| 363 | 363 | return $this; |
| 364 | 364 | } |
| 365 | 365 | |
@@ -372,12 +372,12 @@ discard block |
||
| 372 | 372 | { |
| 373 | 373 | // get a value thats equal to 64 - abs( factor ) |
| 374 | 374 | // ( using min/max to limited the factor to 0 - 64 to not get out of range values ) |
| 375 | - $val1Adjustment = 64 - min( 64, max( 0, abs( $factor ) ) ); |
|
| 375 | + $val1Adjustment = 64 - min(64, max(0, abs($factor))); |
|
| 376 | 376 | |
| 377 | 377 | // the base factor for the "current" pixel depends on if we are blurring or sharpening. |
| 378 | 378 | // If we are blurring use 1, if sharpening use 9. |
| 379 | 379 | $val1Base = 9; |
| 380 | - if( abs( $factor ) != $factor ) { |
|
| 380 | + if (abs($factor) != $factor) { |
|
| 381 | 381 | $val1Base = 1; |
| 382 | 382 | } |
| 383 | 383 | |
@@ -390,24 +390,24 @@ discard block |
||
| 390 | 390 | |
| 391 | 391 | // the value for the surrounding pixels is either positive or negative depending on if we are blurring or sharpening. |
| 392 | 392 | $val2 = -1; |
| 393 | - if( abs( $factor ) != $factor ) { |
|
| 393 | + if (abs($factor) != $factor) { |
|
| 394 | 394 | $val2 = 1; |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | 397 | // setup matrix .. |
| 398 | 398 | $matrix = array( |
| 399 | - array( $val2, $val2, $val2 ), |
|
| 400 | - array( $val2, $val1, $val2 ), |
|
| 401 | - array( $val2, $val2, $val2 ) |
|
| 399 | + array($val2, $val2, $val2), |
|
| 400 | + array($val2, $val1, $val2), |
|
| 401 | + array($val2, $val2, $val2) |
|
| 402 | 402 | ); |
| 403 | 403 | |
| 404 | 404 | // calculate the correct divisor |
| 405 | 405 | // actual divisor is equal to "$divisor = $val1 + $val2 * 8;" |
| 406 | 406 | // but the following line is more generic |
| 407 | - $divisor = array_sum( array_map( 'array_sum', $matrix ) ); |
|
| 407 | + $divisor = array_sum(array_map('array_sum', $matrix)); |
|
| 408 | 408 | |
| 409 | 409 | // apply the matrix |
| 410 | - imageconvolution( $this->newImage, $matrix, $divisor, 0 ); |
|
| 410 | + imageconvolution($this->newImage, $matrix, $divisor, 0); |
|
| 411 | 411 | |
| 412 | 412 | return $this; |
| 413 | 413 | } |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | */ |
| 534 | 534 | public function resample(?int $width = null, ?int $height = null) : ImageHelper |
| 535 | 535 | { |
| 536 | - if($this->isVector()) { |
|
| 536 | + if ($this->isVector()) { |
|
| 537 | 537 | return $this; |
| 538 | 538 | } |
| 539 | 539 | |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | |
| 555 | 555 | public function resampleAndCrop($width, $height) : ImageHelper |
| 556 | 556 | { |
| 557 | - if($this->isVector()) { |
|
| 557 | + if ($this->isVector()) { |
|
| 558 | 558 | return $this; |
| 559 | 559 | } |
| 560 | 560 | |
@@ -601,14 +601,14 @@ discard block |
||
| 601 | 601 | * @param resource $canvas |
| 602 | 602 | * @param bool $fill Whether to fill the whole canvas with the transparency |
| 603 | 603 | */ |
| 604 | - public static function addAlphaSupport($canvas, $fill=true) |
|
| 604 | + public static function addAlphaSupport($canvas, $fill = true) |
|
| 605 | 605 | { |
| 606 | 606 | self::requireResource($canvas); |
| 607 | 607 | |
| 608 | - imagealphablending($canvas,true); |
|
| 608 | + imagealphablending($canvas, true); |
|
| 609 | 609 | imagesavealpha($canvas, true); |
| 610 | 610 | |
| 611 | - if($fill) { |
|
| 611 | + if ($fill) { |
|
| 612 | 612 | self::fillImageTransparent($canvas); |
| 613 | 613 | } |
| 614 | 614 | } |
@@ -618,13 +618,13 @@ discard block |
||
| 618 | 618 | return $this->alpha; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | - public function save(string $targetFile, $dispose=true) |
|
| 621 | + public function save(string $targetFile, $dispose = true) |
|
| 622 | 622 | { |
| 623 | - if($this->isVector()) { |
|
| 623 | + if ($this->isVector()) { |
|
| 624 | 624 | return true; |
| 625 | 625 | } |
| 626 | 626 | |
| 627 | - if(!is_resource($this->newImage)) { |
|
| 627 | + if (!is_resource($this->newImage)) { |
|
| 628 | 628 | throw new ImageHelper_Exception( |
| 629 | 629 | 'Error creating new image', |
| 630 | 630 | 'Cannot save an image, no valid image resource was created. You have to call one of the resample methods to create a new image.', |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | unlink($targetFile); |
| 637 | 637 | } |
| 638 | 638 | |
| 639 | - $method = 'image' . $this->type; |
|
| 639 | + $method = 'image'.$this->type; |
|
| 640 | 640 | if (!$method($this->newImage, $targetFile, $this->resolveQuality())) { |
| 641 | 641 | throw new ImageHelper_Exception( |
| 642 | 642 | 'Error creating new image', |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | ); |
| 658 | 658 | } |
| 659 | 659 | |
| 660 | - if($dispose) { |
|
| 660 | + if ($dispose) { |
|
| 661 | 661 | $this->dispose(); |
| 662 | 662 | } |
| 663 | 663 | |
@@ -666,11 +666,11 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | public function dispose() |
| 668 | 668 | { |
| 669 | - if(is_resource($this->sourceImage)) { |
|
| 669 | + if (is_resource($this->sourceImage)) { |
|
| 670 | 670 | imagedestroy($this->sourceImage); |
| 671 | 671 | } |
| 672 | 672 | |
| 673 | - if(is_resource($this->newImage)) { |
|
| 673 | + if (is_resource($this->newImage)) { |
|
| 674 | 674 | imagedestroy($this->newImage); |
| 675 | 675 | } |
| 676 | 676 | } |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | */ |
| 724 | 724 | protected function adjustMemory() : bool |
| 725 | 725 | { |
| 726 | - if(!self::$config['auto-memory-adjustment']) { |
|
| 726 | + if (!self::$config['auto-memory-adjustment']) { |
|
| 727 | 727 | return true; |
| 728 | 728 | } |
| 729 | 729 | |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | if (function_exists('memory_get_usage') && memory_get_usage() + $memoryNeeded > $memoryLimit) { |
| 753 | 753 | $newLimit = ($memoryLimit + (memory_get_usage() + $memoryNeeded)) / $MB; |
| 754 | 754 | $newLimit = ceil($newLimit); |
| 755 | - ini_set('memory_limit', $newLimit . 'M'); |
|
| 755 | + ini_set('memory_limit', $newLimit.'M'); |
|
| 756 | 756 | |
| 757 | 757 | return true; |
| 758 | 758 | } |
@@ -783,16 +783,16 @@ discard block |
||
| 783 | 783 | */ |
| 784 | 784 | protected function resampleImage(int $newWidth, int $newHeight) : ImageHelper |
| 785 | 785 | { |
| 786 | - if($this->isVector()) { |
|
| 786 | + if ($this->isVector()) { |
|
| 787 | 787 | return $this; |
| 788 | 788 | } |
| 789 | 789 | |
| 790 | - if($this->newWidth==$newWidth && $this->newHeight==$newHeight) { |
|
| 790 | + if ($this->newWidth == $newWidth && $this->newHeight == $newHeight) { |
|
| 791 | 791 | return $this; |
| 792 | 792 | } |
| 793 | 793 | |
| 794 | - if($newWidth < 1) { $newWidth = 1; } |
|
| 795 | - if($newHeight < 1) { $newHeight = 1; } |
|
| 794 | + if ($newWidth < 1) { $newWidth = 1; } |
|
| 795 | + if ($newHeight < 1) { $newHeight = 1; } |
|
| 796 | 796 | |
| 797 | 797 | $this->adjustMemory(); |
| 798 | 798 | |
@@ -860,15 +860,15 @@ discard block |
||
| 860 | 860 | * @see ImageHelper::ERROR_NOT_A_RESOURCE |
| 861 | 861 | * @see ImageHelper::ERROR_INVALID_STREAM_IMAGE_TYPE |
| 862 | 862 | */ |
| 863 | - public static function displayImageStream($resource, string $imageType, int $quality=-1) : void |
|
| 863 | + public static function displayImageStream($resource, string $imageType, int $quality = -1) : void |
|
| 864 | 864 | { |
| 865 | 865 | self::requireResource($resource); |
| 866 | 866 | |
| 867 | 867 | $imageType = self::requireValidStreamType($imageType); |
| 868 | 868 | |
| 869 | - header('Content-type:image/' . $imageType); |
|
| 869 | + header('Content-type:image/'.$imageType); |
|
| 870 | 870 | |
| 871 | - $function = 'image' . $imageType; |
|
| 871 | + $function = 'image'.$imageType; |
|
| 872 | 872 | |
| 873 | 873 | $function($resource, null, $quality); |
| 874 | 874 | } |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | { |
| 886 | 886 | $imageType = strtolower($imageType); |
| 887 | 887 | |
| 888 | - if(in_array($imageType, self::$streamTypes)) |
|
| 888 | + if (in_array($imageType, self::$streamTypes)) |
|
| 889 | 889 | { |
| 890 | 890 | return $imageType; |
| 891 | 891 | } |
@@ -911,7 +911,7 @@ discard block |
||
| 911 | 911 | if (headers_sent($file, $line)) { |
| 912 | 912 | throw new ImageHelper_Exception( |
| 913 | 913 | 'Error displaying image', |
| 914 | - 'Headers have already been sent: in file ' . $file . ':' . $line, |
|
| 914 | + 'Headers have already been sent: in file '.$file.':'.$line, |
|
| 915 | 915 | self::ERROR_HEADERS_ALREADY_SENT |
| 916 | 916 | ); |
| 917 | 917 | } |
@@ -928,16 +928,16 @@ discard block |
||
| 928 | 928 | } |
| 929 | 929 | |
| 930 | 930 | $format = self::getFileImageType($imageFile); |
| 931 | - if($format == 'svg') { |
|
| 931 | + if ($format == 'svg') { |
|
| 932 | 932 | $format = 'svg+xml'; |
| 933 | 933 | } |
| 934 | 934 | |
| 935 | - $contentType = 'image/' . $format; |
|
| 935 | + $contentType = 'image/'.$format; |
|
| 936 | 936 | |
| 937 | 937 | header('Content-Type: '.$contentType); |
| 938 | - header("Last-Modified: " . gmdate("D, d M Y H:i:s", filemtime($imageFile)) . " GMT"); |
|
| 938 | + header("Last-Modified: ".gmdate("D, d M Y H:i:s", filemtime($imageFile))." GMT"); |
|
| 939 | 939 | header('Cache-Control: public'); |
| 940 | - header('Content-Length: ' . filesize($imageFile)); |
|
| 940 | + header('Content-Length: '.filesize($imageFile)); |
|
| 941 | 941 | |
| 942 | 942 | readfile($imageFile); |
| 943 | 943 | } |
@@ -965,7 +965,7 @@ discard block |
||
| 965 | 965 | * @see ImageHelper::ERROR_NOT_A_RESOURCE |
| 966 | 966 | * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_CANVAS |
| 967 | 967 | */ |
| 968 | - public function trim(?array $color=null) : ImageHelper |
|
| 968 | + public function trim(?array $color = null) : ImageHelper |
|
| 969 | 969 | { |
| 970 | 970 | return $this->trimImage($this->newImage, $color); |
| 971 | 971 | } |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | $color = imagecolorsforindex($img, $colorIndex); |
| 988 | 988 | |
| 989 | 989 | // it seems imagecolorsforindex may return false (undocumented, unproven) |
| 990 | - if(is_array($color)) { |
|
| 990 | + if (is_array($color)) { |
|
| 991 | 991 | return $color; |
| 992 | 992 | } |
| 993 | 993 | |
@@ -1011,15 +1011,15 @@ discard block |
||
| 1011 | 1011 | * @see ImageHelper::ERROR_NOT_A_RESOURCE |
| 1012 | 1012 | * @see ImageHelper::ERROR_CANNOT_CREATE_IMAGE_CANVAS |
| 1013 | 1013 | */ |
| 1014 | - protected function trimImage($img, ?array $color=null) : ImageHelper |
|
| 1014 | + protected function trimImage($img, ?array $color = null) : ImageHelper |
|
| 1015 | 1015 | { |
| 1016 | - if($this->isVector()) { |
|
| 1016 | + if ($this->isVector()) { |
|
| 1017 | 1017 | return $this; |
| 1018 | 1018 | } |
| 1019 | 1019 | |
| 1020 | 1020 | self::requireResource($img); |
| 1021 | 1021 | |
| 1022 | - if(empty($color)) |
|
| 1022 | + if (empty($color)) |
|
| 1023 | 1023 | { |
| 1024 | 1024 | $color = imagecolorat($img, 0, 0); |
| 1025 | 1025 | $color = $this->getIndexedColors($img, $color); |
@@ -1036,16 +1036,16 @@ discard block |
||
| 1036 | 1036 | $ymax = null; |
| 1037 | 1037 | |
| 1038 | 1038 | // Start scanning for the edges. |
| 1039 | - for ($iy=0; $iy<$imh; $iy++) |
|
| 1039 | + for ($iy = 0; $iy < $imh; $iy++) |
|
| 1040 | 1040 | { |
| 1041 | 1041 | $first = true; |
| 1042 | 1042 | |
| 1043 | - for ($ix=0; $ix<$imw; $ix++) |
|
| 1043 | + for ($ix = 0; $ix < $imw; $ix++) |
|
| 1044 | 1044 | { |
| 1045 | 1045 | $ndx = imagecolorat($img, $ix, $iy); |
| 1046 | 1046 | $colors = $this->getIndexedColors($img, $ndx); |
| 1047 | 1047 | |
| 1048 | - if(!$this->colorsMatch($colors, $color)) |
|
| 1048 | + if (!$this->colorsMatch($colors, $color)) |
|
| 1049 | 1049 | { |
| 1050 | 1050 | if ($xmin > $ix) { $xmin = $ix; } |
| 1051 | 1051 | if ($xmax < $ix) { $xmax = $ix; } |
@@ -1053,7 +1053,7 @@ discard block |
||
| 1053 | 1053 | |
| 1054 | 1054 | $ymax = $iy; |
| 1055 | 1055 | |
| 1056 | - if($first) |
|
| 1056 | + if ($first) |
|
| 1057 | 1057 | { |
| 1058 | 1058 | $ix = $xmax; |
| 1059 | 1059 | $first = false; |
@@ -1063,18 +1063,18 @@ discard block |
||
| 1063 | 1063 | } |
| 1064 | 1064 | |
| 1065 | 1065 | // no trimming border found |
| 1066 | - if($ymax === null) { |
|
| 1066 | + if ($ymax === null) { |
|
| 1067 | 1067 | return $this; |
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | 1070 | // The new width and height of the image. |
| 1071 | - $imw = 1+$xmax-$xmin; // Image width in pixels |
|
| 1072 | - $imh = 1+$ymax-$ymin; // Image height in pixels |
|
| 1071 | + $imw = 1 + $xmax - $xmin; // Image width in pixels |
|
| 1072 | + $imh = 1 + $ymax - $ymin; // Image height in pixels |
|
| 1073 | 1073 | |
| 1074 | 1074 | // Make another image to place the trimmed version in. |
| 1075 | 1075 | $im2 = $this->createNewImage($imw, $imh); |
| 1076 | 1076 | |
| 1077 | - if($color['alpha'] > 0) |
|
| 1077 | + if ($color['alpha'] > 0) |
|
| 1078 | 1078 | { |
| 1079 | 1079 | $bg2 = imagecolorallocatealpha($im2, $color['red'], $color['green'], $color['blue'], $color['alpha']); |
| 1080 | 1080 | imagecolortransparent($im2, $bg2); |
@@ -1113,7 +1113,7 @@ discard block |
||
| 1113 | 1113 | |
| 1114 | 1114 | $this->newImage = $image; |
| 1115 | 1115 | $this->newWidth = imagesx($image); |
| 1116 | - $this->newHeight= imagesy($image); |
|
| 1116 | + $this->newHeight = imagesy($image); |
|
| 1117 | 1117 | |
| 1118 | 1118 | return $this; |
| 1119 | 1119 | } |
@@ -1128,7 +1128,7 @@ discard block |
||
| 1128 | 1128 | */ |
| 1129 | 1129 | protected static function requireResource($subject) : void |
| 1130 | 1130 | { |
| 1131 | - if(is_resource($subject)) { |
|
| 1131 | + if (is_resource($subject)) { |
|
| 1132 | 1132 | return; |
| 1133 | 1133 | } |
| 1134 | 1134 | |
@@ -1154,7 +1154,7 @@ discard block |
||
| 1154 | 1154 | { |
| 1155 | 1155 | $img = imagecreatetruecolor($width, $height); |
| 1156 | 1156 | |
| 1157 | - if($img === false) |
|
| 1157 | + if ($img === false) |
|
| 1158 | 1158 | { |
| 1159 | 1159 | throw new ImageHelper_Exception( |
| 1160 | 1160 | 'Error creating new image', |
@@ -1178,8 +1178,8 @@ discard block |
||
| 1178 | 1178 | protected function colorsMatch(array $a, array $b) : bool |
| 1179 | 1179 | { |
| 1180 | 1180 | $parts = array('red', 'green', 'blue'); |
| 1181 | - foreach($parts as $part) { |
|
| 1182 | - if($a[$part] != $b[$part]) { |
|
| 1181 | + foreach ($parts as $part) { |
|
| 1182 | + if ($a[$part] != $b[$part]) { |
|
| 1183 | 1183 | return false; |
| 1184 | 1184 | } |
| 1185 | 1185 | } |
@@ -1187,7 +1187,7 @@ discard block |
||
| 1187 | 1187 | return true; |
| 1188 | 1188 | } |
| 1189 | 1189 | |
| 1190 | - public function fillWhite($x=0, $y=0) |
|
| 1190 | + public function fillWhite($x = 0, $y = 0) |
|
| 1191 | 1191 | { |
| 1192 | 1192 | $this->addRGBColor('white', 255, 255, 255); |
| 1193 | 1193 | return $this->fill('white', $x, $y); |
@@ -1207,11 +1207,11 @@ discard block |
||
| 1207 | 1207 | self::requireResource($resource); |
| 1208 | 1208 | |
| 1209 | 1209 | $transparent = imagecolorallocatealpha($resource, 89, 14, 207, 127); |
| 1210 | - imagecolortransparent ($resource, $transparent); |
|
| 1210 | + imagecolortransparent($resource, $transparent); |
|
| 1211 | 1211 | imagefill($resource, 0, 0, $transparent); |
| 1212 | 1212 | } |
| 1213 | 1213 | |
| 1214 | - public function fill($colorName, $x=0, $y=0) |
|
| 1214 | + public function fill($colorName, $x = 0, $y = 0) |
|
| 1215 | 1215 | { |
| 1216 | 1216 | imagefill($this->newImage, $x, $y, $this->colors[$colorName]); |
| 1217 | 1217 | return $this; |
@@ -1225,7 +1225,7 @@ discard block |
||
| 1225 | 1225 | return $this; |
| 1226 | 1226 | } |
| 1227 | 1227 | |
| 1228 | - public function textTTF($text, $size, $colorName, $x=0, $y=0, $angle=0) |
|
| 1228 | + public function textTTF($text, $size, $colorName, $x = 0, $y = 0, $angle = 0) |
|
| 1229 | 1229 | { |
| 1230 | 1230 | imagealphablending($this->newImage, true); |
| 1231 | 1231 | |
@@ -1244,11 +1244,11 @@ discard block |
||
| 1244 | 1244 | return $this->newImage; |
| 1245 | 1245 | } |
| 1246 | 1246 | |
| 1247 | - public function paste(ImageHelper $target, $xpos=0, $ypos=0, $sourceX=0, $sourceY=0) |
|
| 1247 | + public function paste(ImageHelper $target, $xpos = 0, $ypos = 0, $sourceX = 0, $sourceY = 0) |
|
| 1248 | 1248 | { |
| 1249 | 1249 | $img = $target->getImage(); |
| 1250 | 1250 | |
| 1251 | - if($target->isAlpha()) { |
|
| 1251 | + if ($target->isAlpha()) { |
|
| 1252 | 1252 | $this->enableAlpha(); |
| 1253 | 1253 | } |
| 1254 | 1254 | |
@@ -1293,10 +1293,10 @@ discard block |
||
| 1293 | 1293 | public function fitText($text, $matchWidth) |
| 1294 | 1294 | { |
| 1295 | 1295 | $sizes = array(); |
| 1296 | - for($i=1; $i<=1000; $i=$i+0.1) { |
|
| 1296 | + for ($i = 1; $i <= 1000; $i = $i + 0.1) { |
|
| 1297 | 1297 | $size = $this->calcTextSize($text, $i); |
| 1298 | 1298 | $sizes[] = $size; |
| 1299 | - if($size['width'] >= $matchWidth) { |
|
| 1299 | + if ($size['width'] >= $matchWidth) { |
|
| 1300 | 1300 | break; |
| 1301 | 1301 | } |
| 1302 | 1302 | } |
@@ -1308,7 +1308,7 @@ discard block |
||
| 1308 | 1308 | $diffLast = $last['width'] - $matchWidth; |
| 1309 | 1309 | $diffPrev = $matchWidth - $prev['width']; |
| 1310 | 1310 | |
| 1311 | - if($diffLast <= $diffPrev) { |
|
| 1311 | + if ($diffLast <= $diffPrev) { |
|
| 1312 | 1312 | return $last; |
| 1313 | 1313 | } |
| 1314 | 1314 | |
@@ -1336,14 +1336,14 @@ discard block |
||
| 1336 | 1336 | 'bottom_left_y' => $box[1], |
| 1337 | 1337 | 'bottom_right_x' => $box[2], |
| 1338 | 1338 | 'bottom_right_y' => $box[3], |
| 1339 | - 'width' => $right-$left, |
|
| 1340 | - 'height' => $bottom-$top |
|
| 1339 | + 'width' => $right - $left, |
|
| 1340 | + 'height' => $bottom - $top |
|
| 1341 | 1341 | ); |
| 1342 | 1342 | } |
| 1343 | 1343 | |
| 1344 | 1344 | protected function requireTTFFont() |
| 1345 | 1345 | { |
| 1346 | - if(isset($this->TTFFile)) { |
|
| 1346 | + if (isset($this->TTFFile)) { |
|
| 1347 | 1347 | return; |
| 1348 | 1348 | } |
| 1349 | 1349 | |
@@ -1378,7 +1378,7 @@ discard block |
||
| 1378 | 1378 | */ |
| 1379 | 1379 | public static function getImageSize($pathOrResource) : ImageHelper_Size |
| 1380 | 1380 | { |
| 1381 | - if(is_resource($pathOrResource)) |
|
| 1381 | + if (is_resource($pathOrResource)) |
|
| 1382 | 1382 | { |
| 1383 | 1383 | return new ImageHelper_Size(array( |
| 1384 | 1384 | 'width' => imagesx($pathOrResource), |
@@ -1392,7 +1392,7 @@ discard block |
||
| 1392 | 1392 | |
| 1393 | 1393 | $info = false; |
| 1394 | 1394 | $method = 'getImageSize_'.$type; |
| 1395 | - if(method_exists(__CLASS__, $method)) |
|
| 1395 | + if (method_exists(__CLASS__, $method)) |
|
| 1396 | 1396 | { |
| 1397 | 1397 | $info = call_user_func(array(__CLASS__, $method), $pathOrResource); |
| 1398 | 1398 | } |
@@ -1401,7 +1401,7 @@ discard block |
||
| 1401 | 1401 | $info = getimagesize($pathOrResource); |
| 1402 | 1402 | } |
| 1403 | 1403 | |
| 1404 | - if($info !== false) { |
|
| 1404 | + if ($info !== false) { |
|
| 1405 | 1405 | return new ImageHelper_Size($info); |
| 1406 | 1406 | } |
| 1407 | 1407 | |
@@ -1427,7 +1427,7 @@ discard block |
||
| 1427 | 1427 | $xml = XMLHelper::createSimplexml(); |
| 1428 | 1428 | $xml->loadFile($imagePath); |
| 1429 | 1429 | |
| 1430 | - if($xml->hasErrors()) { |
|
| 1430 | + if ($xml->hasErrors()) { |
|
| 1431 | 1431 | throw new ImageHelper_Exception( |
| 1432 | 1432 | 'Error opening SVG image', |
| 1433 | 1433 | sprintf( |
@@ -1442,7 +1442,7 @@ discard block |
||
| 1442 | 1442 | $xml->dispose(); |
| 1443 | 1443 | unset($xml); |
| 1444 | 1444 | |
| 1445 | - if(!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) { |
|
| 1445 | + if (!isset($data['@attributes']) || !isset($data['@attributes']['viewBox'])) { |
|
| 1446 | 1446 | throw new ImageHelper_Exception( |
| 1447 | 1447 | 'SVG Image is corrupted', |
| 1448 | 1448 | sprintf( |
@@ -1459,7 +1459,7 @@ discard block |
||
| 1459 | 1459 | $viewBox = str_replace(' ', ',', $data['@attributes']['viewBox']); |
| 1460 | 1460 | $size = explode(',', $viewBox); |
| 1461 | 1461 | |
| 1462 | - if(count($size) != 4) |
|
| 1462 | + if (count($size) != 4) |
|
| 1463 | 1463 | { |
| 1464 | 1464 | throw new ImageHelper_Exception( |
| 1465 | 1465 | 'SVG image has an invalid viewBox attribute', |
@@ -1505,7 +1505,7 @@ discard block |
||
| 1505 | 1505 | * @param integer $y |
| 1506 | 1506 | * @return ImageHelper |
| 1507 | 1507 | */ |
| 1508 | - public function crop(int $width, int $height, int $x=0, int $y=0) : ImageHelper |
|
| 1508 | + public function crop(int $width, int $height, int $x = 0, int $y = 0) : ImageHelper |
|
| 1509 | 1509 | { |
| 1510 | 1510 | $new = $this->createNewImage($width, $height); |
| 1511 | 1511 | |
@@ -1542,7 +1542,7 @@ discard block |
||
| 1542 | 1542 | * @see ImageHelper::calcAverageColorRGB() |
| 1543 | 1543 | * @see ImageHelper::calcAverageColorHEX() |
| 1544 | 1544 | */ |
| 1545 | - public function calcAverageColor(int $format=self::COLORFORMAT_RGB) |
|
| 1545 | + public function calcAverageColor(int $format = self::COLORFORMAT_RGB) |
|
| 1546 | 1546 | { |
| 1547 | 1547 | $image = $this->duplicate(); |
| 1548 | 1548 | $image->resample(1, 1); |
@@ -1561,7 +1561,7 @@ discard block |
||
| 1561 | 1561 | public function calcAverageColorRGB() : array |
| 1562 | 1562 | { |
| 1563 | 1563 | $result = $this->calcAverageColor(self::COLORFORMAT_RGB); |
| 1564 | - if(is_array($result)) { |
|
| 1564 | + if (is_array($result)) { |
|
| 1565 | 1565 | return $result; |
| 1566 | 1566 | } |
| 1567 | 1567 | |
@@ -1582,7 +1582,7 @@ discard block |
||
| 1582 | 1582 | public function calcAverageColorHex() : string |
| 1583 | 1583 | { |
| 1584 | 1584 | $result = $this->calcAverageColor(self::COLORFORMAT_HEX); |
| 1585 | - if(is_string($result)) { |
|
| 1585 | + if (is_string($result)) { |
|
| 1586 | 1586 | return $result; |
| 1587 | 1587 | } |
| 1588 | 1588 | |
@@ -1618,9 +1618,9 @@ discard block |
||
| 1618 | 1618 | * @throws ImageHelper_Exception |
| 1619 | 1619 | * @see ImageHelper::ERROR_POSITION_OUT_OF_BOUNDS |
| 1620 | 1620 | */ |
| 1621 | - public function getColorAt(int $x, int $y, int $format=self::COLORFORMAT_RGB) |
|
| 1621 | + public function getColorAt(int $x, int $y, int $format = self::COLORFORMAT_RGB) |
|
| 1622 | 1622 | { |
| 1623 | - if($x > $this->getWidth() || $y > $this->getHeight()) |
|
| 1623 | + if ($x > $this->getWidth() || $y > $this->getHeight()) |
|
| 1624 | 1624 | { |
| 1625 | 1625 | throw new ImageHelper_Exception( |
| 1626 | 1626 | 'Position out of bounds', |
@@ -1638,7 +1638,7 @@ discard block |
||
| 1638 | 1638 | $idx = imagecolorat($this->newImage, $x, $y); |
| 1639 | 1639 | $rgb = $this->getIndexedColors($this->newImage, $idx); |
| 1640 | 1640 | |
| 1641 | - if($format == self::COLORFORMAT_HEX) { |
|
| 1641 | + if ($format == self::COLORFORMAT_HEX) { |
|
| 1642 | 1642 | return self::rgb2hex($rgb); |
| 1643 | 1643 | } |
| 1644 | 1644 | |
@@ -1653,7 +1653,7 @@ discard block |
||
| 1653 | 1653 | */ |
| 1654 | 1654 | public static function rgb2luma(array $rgb) : int |
| 1655 | 1655 | { |
| 1656 | - return (int)floor((($rgb['red']*2)+$rgb['blue']+($rgb['green']*3))/6); |
|
| 1656 | + return (int)floor((($rgb['red'] * 2) + $rgb['blue'] + ($rgb['green'] * 3)) / 6); |
|
| 1657 | 1657 | } |
| 1658 | 1658 | |
| 1659 | 1659 | /** |
@@ -1681,7 +1681,7 @@ discard block |
||
| 1681 | 1681 | */ |
| 1682 | 1682 | public function getHash() : string |
| 1683 | 1683 | { |
| 1684 | - if($this->newImage === null) |
|
| 1684 | + if ($this->newImage === null) |
|
| 1685 | 1685 | { |
| 1686 | 1686 | throw new ImageHelper_Exception( |
| 1687 | 1687 | 'No image loaded to create a hash for.', |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * @param int $tabSize The amount of spaces per tab. |
| 56 | 56 | * @return string |
| 57 | 57 | */ |
| 58 | - public static function tabs2spaces(string $string, int $tabSize=4) : string |
|
| 58 | + public static function tabs2spaces(string $string, int $tabSize = 4) : string |
|
| 59 | 59 | { |
| 60 | 60 | return ConvertHelper_String::tabs2spaces($string, $tabSize); |
| 61 | 61 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @param int $tabSize The amount of spaces per tab in the source string. |
| 68 | 68 | * @return string |
| 69 | 69 | */ |
| 70 | - public static function spaces2tabs(string $string, int $tabSize=4) : string |
|
| 70 | + public static function spaces2tabs(string $string, int $tabSize = 4) : string |
|
| 71 | 71 | { |
| 72 | 72 | return ConvertHelper_String::spaces2tabs($string, $tabSize); |
| 73 | 73 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * @deprecated Use the Highlighter class directly instead. |
| 141 | 141 | * @see Highlighter::xml() |
| 142 | 142 | */ |
| 143 | - public static function highlight_xml(string $xml, bool $formatSource=false) : string |
|
| 143 | + public static function highlight_xml(string $xml, bool $formatSource = false) : string |
|
| 144 | 144 | { |
| 145 | 145 | return Highlighter::xml($xml, $formatSource); |
| 146 | 146 | } |
@@ -206,11 +206,11 @@ discard block |
||
| 206 | 206 | * @param bool $html |
| 207 | 207 | * @return string |
| 208 | 208 | */ |
| 209 | - public static function var_dump($var, bool $html=true) : string |
|
| 209 | + public static function var_dump($var, bool $html = true) : string |
|
| 210 | 210 | { |
| 211 | 211 | $info = parseVariable($var); |
| 212 | 212 | |
| 213 | - if($html) { |
|
| 213 | + if ($html) { |
|
| 214 | 214 | return $info->toHTML(); |
| 215 | 215 | } |
| 216 | 216 | |
@@ -225,11 +225,11 @@ discard block |
||
| 225 | 225 | * @param bool $html Whether to style the dump as HTML. |
| 226 | 226 | * @return string |
| 227 | 227 | */ |
| 228 | - public static function print_r($var, bool $return=false, bool $html=true) : string |
|
| 228 | + public static function print_r($var, bool $return = false, bool $html = true) : string |
|
| 229 | 229 | { |
| 230 | 230 | $result = parseVariable($var)->enableType()->toString(); |
| 231 | 231 | |
| 232 | - if($html) |
|
| 232 | + if ($html) |
|
| 233 | 233 | { |
| 234 | 234 | $result = |
| 235 | 235 | '<pre style="background:#fff;color:#333;padding:16px;border:solid 1px #bbb;border-radius:4px">'. |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | '</pre>'; |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | - if(!$return) |
|
| 240 | + if (!$return) |
|
| 241 | 241 | { |
| 242 | 242 | echo $result; |
| 243 | 243 | } |
@@ -419,12 +419,12 @@ discard block |
||
| 419 | 419 | $output = ''; |
| 420 | 420 | $split = str_split($unicodeChar); |
| 421 | 421 | |
| 422 | - foreach($split as $octet) |
|
| 422 | + foreach ($split as $octet) |
|
| 423 | 423 | { |
| 424 | 424 | $ordInt = ord($octet); |
| 425 | 425 | // Convert from int (base 10) to hex (base 16), for PHP \x syntax |
| 426 | 426 | $ordHex = base_convert((string)$ordInt, 10, 16); |
| 427 | - $output .= '\x' . $ordHex; |
|
| 427 | + $output .= '\x'.$ordHex; |
|
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | return $output; |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | * |
| 639 | 639 | * @see JSHelper::buildRegexStatement() |
| 640 | 640 | */ |
| 641 | - public static function regex2js(string $regex, string $statementType=JSHelper::JS_REGEX_OBJECT) : string |
|
| 641 | + public static function regex2js(string $regex, string $statementType = JSHelper::JS_REGEX_OBJECT) : string |
|
| 642 | 642 | { |
| 643 | 643 | return JSHelper::buildRegexStatement($regex, $statementType); |
| 644 | 644 | } |
@@ -657,11 +657,11 @@ discard block |
||
| 657 | 657 | * @throws ConvertHelper_Exception |
| 658 | 658 | * @see ConvertHelper::ERROR_JSON_ENCODE_FAILED |
| 659 | 659 | */ |
| 660 | - public static function var2json($variable, int $options=0, int $depth=512) : string |
|
| 660 | + public static function var2json($variable, int $options = 0, int $depth = 512) : string |
|
| 661 | 661 | { |
| 662 | 662 | $result = json_encode($variable, $options, $depth); |
| 663 | 663 | |
| 664 | - if($result !== false) { |
|
| 664 | + if ($result !== false) { |
|
| 665 | 665 | return $result; |
| 666 | 666 | } |
| 667 | 667 | |
@@ -701,12 +701,12 @@ discard block |
||
| 701 | 701 | { |
| 702 | 702 | $boms = FileHelper::getUTFBOMs(); |
| 703 | 703 | |
| 704 | - foreach($boms as $bomChars) |
|
| 704 | + foreach ($boms as $bomChars) |
|
| 705 | 705 | { |
| 706 | 706 | $length = mb_strlen($bomChars); |
| 707 | 707 | $text = mb_substr($string, 0, $length); |
| 708 | 708 | |
| 709 | - if($text===$bomChars) |
|
| 709 | + if ($text === $bomChars) |
|
| 710 | 710 | { |
| 711 | 711 | return mb_substr($string, $length); |
| 712 | 712 | } |
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | * @see ConvertHelper_TextComparer::OPTION_MAX_LEVENSHTEIN_DISTANCE |
| 779 | 779 | * @see ConvertHelper_TextComparer::OPTION_PRECISION |
| 780 | 780 | */ |
| 781 | - public static function matchString(string $source, string $target, array $options=array()) : float |
|
| 781 | + public static function matchString(string $source, string $target, array $options = array()) : float |
|
| 782 | 782 | { |
| 783 | 783 | return (new ConvertHelper_TextComparer()) |
| 784 | 784 | ->setOptions($options) |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | * @see ConvertHelper::INTERVAL_HOURS |
| 857 | 857 | * @see ConvertHelper::INTERVAL_DAYS |
| 858 | 858 | */ |
| 859 | - public static function interval2total(DateInterval $interval, string $unit=self::INTERVAL_SECONDS) : int |
|
| 859 | + public static function interval2total(DateInterval $interval, string $unit = self::INTERVAL_SECONDS) : int |
|
| 860 | 860 | { |
| 861 | 861 | return ConvertHelper_DateInterval::toTotal($interval, $unit); |
| 862 | 862 | } |
@@ -868,7 +868,7 @@ discard block |
||
| 868 | 868 | * @param bool $short |
| 869 | 869 | * @return string|NULL |
| 870 | 870 | */ |
| 871 | - public static function date2dayName(DateTime $date, bool $short=false) : ?string |
|
| 871 | + public static function date2dayName(DateTime $date, bool $short = false) : ?string |
|
| 872 | 872 | { |
| 873 | 873 | return ConvertHelper_Date::toDayName($date, $short); |
| 874 | 874 | } |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | * @param bool $short |
| 889 | 889 | * @return string[] |
| 890 | 890 | */ |
| 891 | - public static function getDayNames(bool $short=false) : array |
|
| 891 | + public static function getDayNames(bool $short = false) : array |
|
| 892 | 892 | { |
| 893 | 893 | return ConvertHelper_Date::getDayNames($short); |
| 894 | 894 | } |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | * @param bool $caseInsensitive |
| 1048 | 1048 | * @return ConvertHelper_StringMatch[] |
| 1049 | 1049 | */ |
| 1050 | - public static function findString(string $needle, string $haystack, bool $caseInsensitive=false): array |
|
| 1050 | + public static function findString(string $needle, string $haystack, bool $caseInsensitive = false): array |
|
| 1051 | 1051 | { |
| 1052 | 1052 | return ConvertHelper_String::findString($needle, $haystack, $caseInsensitive); |
| 1053 | 1053 | } |
@@ -1097,17 +1097,17 @@ discard block |
||
| 1097 | 1097 | */ |
| 1098 | 1098 | public static function isInteger($value) : bool |
| 1099 | 1099 | { |
| 1100 | - if(is_int($value)) { |
|
| 1100 | + if (is_int($value)) { |
|
| 1101 | 1101 | return true; |
| 1102 | 1102 | } |
| 1103 | 1103 | |
| 1104 | 1104 | // booleans get converted to numbers, so they would |
| 1105 | 1105 | // actually match the regex. |
| 1106 | - if(is_bool($value)) { |
|
| 1106 | + if (is_bool($value)) { |
|
| 1107 | 1107 | return false; |
| 1108 | 1108 | } |
| 1109 | 1109 | |
| 1110 | - if(is_string($value) && $value !== '') { |
|
| 1110 | + if (is_string($value) && $value !== '') { |
|
| 1111 | 1111 | return preg_match('/\A-?\d+\z/', $value) === 1; |
| 1112 | 1112 | } |
| 1113 | 1113 | |
@@ -1173,7 +1173,7 @@ discard block |
||
| 1173 | 1173 | * @param bool $keepKeys |
| 1174 | 1174 | * @return array<number|string,mixed> |
| 1175 | 1175 | */ |
| 1176 | - public static function arrayRemoveValues(array $sourceArray, array $values, bool $keepKeys=false) : array |
|
| 1176 | + public static function arrayRemoveValues(array $sourceArray, array $values, bool $keepKeys = false) : array |
|
| 1177 | 1177 | { |
| 1178 | 1178 | return ConvertHelper_Array::removeValues($sourceArray, $values, $keepKeys); |
| 1179 | 1179 | } |
@@ -87,14 +87,14 @@ |
||
| 87 | 87 | public function match(string $source, string $target) : float |
| 88 | 88 | { |
| 89 | 89 | // avoid doing this via levenshtein |
| 90 | - if($source === $target) { |
|
| 90 | + if ($source === $target) { |
|
| 91 | 91 | return 100; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | $maxL = $this->getMaxDistance(); |
| 95 | 95 | |
| 96 | 96 | $diff = levenshtein($source, $target); |
| 97 | - if($diff > $maxL) { |
|
| 97 | + if ($diff > $maxL) { |
|
| 98 | 98 | return 0; |
| 99 | 99 | } |
| 100 | 100 | |
@@ -49,19 +49,19 @@ |
||
| 49 | 49 | */ |
| 50 | 50 | protected static function convertScalarForComparison($scalar) : ?string |
| 51 | 51 | { |
| 52 | - if($scalar === '' || is_null($scalar)) { |
|
| 52 | + if ($scalar === '' || is_null($scalar)) { |
|
| 53 | 53 | return null; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - if(is_bool($scalar)) { |
|
| 56 | + if (is_bool($scalar)) { |
|
| 57 | 57 | return ConvertHelper_Bool::toStringStrict($scalar); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - if(is_array($scalar)) { |
|
| 60 | + if (is_array($scalar)) { |
|
| 61 | 61 | $scalar = md5(serialize($scalar)); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if($scalar !== null && !is_scalar($scalar)) { |
|
| 64 | + if ($scalar !== null && !is_scalar($scalar)) { |
|
| 65 | 65 | throw new ConvertHelper_Exception( |
| 66 | 66 | 'Not a scalar value in comparison', |
| 67 | 67 | null, |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | * @param bool $caseInsensitive |
| 34 | 34 | * @return ConvertHelper_StringMatch[] |
| 35 | 35 | */ |
| 36 | - public static function findString(string $needle, string $haystack, bool $caseInsensitive=false): array |
|
| 36 | + public static function findString(string $needle, string $haystack, bool $caseInsensitive = false): array |
|
| 37 | 37 | { |
| 38 | - if($needle === '') { |
|
| 38 | + if ($needle === '') { |
|
| 39 | 39 | return array(); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | $function = 'mb_strpos'; |
| 43 | - if($caseInsensitive) { |
|
| 43 | + if ($caseInsensitive) { |
|
| 44 | 44 | $function = 'mb_stripos'; |
| 45 | 45 | } |
| 46 | 46 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $positions = array(); |
| 49 | 49 | $length = mb_strlen($needle); |
| 50 | 50 | |
| 51 | - while( ($pos = $function($haystack, $needle, $pos)) !== false) |
|
| 51 | + while (($pos = $function($haystack, $needle, $pos)) !== false) |
|
| 52 | 52 | { |
| 53 | 53 | $match = mb_substr($haystack, $pos, $length); |
| 54 | 54 | $positions[] = new ConvertHelper_StringMatch($pos, $match); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | public static function toArray(string $string) : array |
| 72 | 72 | { |
| 73 | 73 | $result = preg_split('//u', $string, 0, PREG_SPLIT_NO_EMPTY); |
| 74 | - if($result !== false) { |
|
| 74 | + if ($result !== false) { |
|
| 75 | 75 | return $result; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | public static function toUtf8(string $string) : string |
| 126 | 126 | { |
| 127 | - if(!self::isASCII($string)) { |
|
| 127 | + if (!self::isASCII($string)) { |
|
| 128 | 128 | return Encoding::toUTF8($string); |
| 129 | 129 | } |
| 130 | 130 | |
@@ -142,11 +142,11 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | public static function isASCII($string) : bool |
| 144 | 144 | { |
| 145 | - if($string === '' || $string === NULL) { |
|
| 145 | + if ($string === '' || $string === NULL) { |
|
| 146 | 146 | return true; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - if(!is_string($string)) { |
|
| 149 | + if (!is_string($string)) { |
|
| 150 | 150 | return false; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -161,12 +161,12 @@ discard block |
||
| 161 | 161 | */ |
| 162 | 162 | public static function isHTML(string $string) : bool |
| 163 | 163 | { |
| 164 | - if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) { |
|
| 164 | + if (preg_match('%<[a-z/][\s\S]*>%siU', $string)) { |
|
| 165 | 165 | return true; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | $decoded = html_entity_decode($string); |
| 169 | - if($decoded !== $string) { |
|
| 169 | + if ($decoded !== $string) { |
|
| 170 | 170 | return true; |
| 171 | 171 | } |
| 172 | 172 | |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | * @param int $tabSize The amount of spaces per tab. |
| 199 | 199 | * @return string |
| 200 | 200 | */ |
| 201 | - public static function tabs2spaces(string $string, int $tabSize=4) : string |
|
| 201 | + public static function tabs2spaces(string $string, int $tabSize = 4) : string |
|
| 202 | 202 | { |
| 203 | 203 | return str_replace("\t", str_repeat(' ', $tabSize), $string); |
| 204 | 204 | } |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | * @param int $tabSize The amount of spaces per tab in the source string. |
| 211 | 211 | * @return string |
| 212 | 212 | */ |
| 213 | - public static function spaces2tabs(string $string, int $tabSize=4) : string |
|
| 213 | + public static function spaces2tabs(string $string, int $tabSize = 4) : string |
|
| 214 | 214 | { |
| 215 | 215 | return str_replace(str_repeat(' ', $tabSize), "\t", $string); |
| 216 | 216 | } |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | return $text; |
| 290 | 290 | } |
| 291 | 291 | |
| 292 | - return trim(mb_substr($text, 0, $targetLength)) . $append; |
|
| 292 | + return trim(mb_substr($text, 0, $targetLength)).$append; |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | /** |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | public static function explodeTrim(string $delimiter, string $string) : array |
| 304 | 304 | { |
| 305 | - if(empty($string) || empty($delimiter)) { |
|
| 305 | + if (empty($string) || empty($delimiter)) { |
|
| 306 | 306 | return array(); |
| 307 | 307 | } |
| 308 | 308 | |
@@ -310,8 +310,8 @@ discard block |
||
| 310 | 310 | $tokens = array_map('trim', $tokens); |
| 311 | 311 | |
| 312 | 312 | $keep = array(); |
| 313 | - foreach($tokens as $token) { |
|
| 314 | - if($token !== '') { |
|
| 313 | + foreach ($tokens as $token) { |
|
| 314 | + if ($token !== '') { |
|
| 315 | 315 | $keep[] = $token; |
| 316 | 316 | } |
| 317 | 317 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | public function __construct() |
| 73 | 73 | { |
| 74 | - if(class_exists('\AppLocalize\Localization')) { |
|
| 74 | + if (class_exists('\AppLocalize\Localization')) { |
|
| 75 | 75 | \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged')); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -133,11 +133,11 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | $epoch = 'past'; |
| 135 | 135 | $key = 'singular'; |
| 136 | - if($this->dateDiff > 1) { |
|
| 136 | + if ($this->dateDiff > 1) { |
|
| 137 | 137 | $key = 'plural'; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - if($this->future) { |
|
| 140 | + if ($this->future) { |
|
| 141 | 141 | $epoch = 'future'; |
| 142 | 142 | } |
| 143 | 143 | |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | protected function initTexts() : void |
| 152 | 152 | { |
| 153 | - if(isset(self::$texts)) { |
|
| 153 | + if (isset(self::$texts)) { |
|
| 154 | 154 | return; |
| 155 | 155 | } |
| 156 | 156 | |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | $day = (int)date("j", $this->dateTo); |
| 237 | 237 | $year = (int)date("Y", $this->dateFrom); |
| 238 | 238 | |
| 239 | - while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
| 239 | + while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo) |
|
| 240 | 240 | { |
| 241 | 241 | $months_difference++; |
| 242 | 242 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | protected function resolveCalculations() : void |
| 258 | 258 | { |
| 259 | - if(!isset($this->dateFrom)) |
|
| 259 | + if (!isset($this->dateFrom)) |
|
| 260 | 260 | { |
| 261 | 261 | throw new ConvertHelper_Exception( |
| 262 | 262 | 'No date from has been specified.', |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | // no date to set? Assume we want to use today. |
| 269 | - if(!isset($this->dateTo)) |
|
| 269 | + if (!isset($this->dateTo)) |
|
| 270 | 270 | { |
| 271 | 271 | $this->dateTo = time(); |
| 272 | 272 | } |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | $difference = $this->dateTo - $this->dateFrom; |
| 335 | 335 | |
| 336 | - if($difference < 0) |
|
| 336 | + if ($difference < 0) |
|
| 337 | 337 | { |
| 338 | 338 | $difference = $difference * -1; |
| 339 | 339 | $this->future = true; |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | { |
| 396 | 396 | $converter = new ConvertHelper_DurationConverter(); |
| 397 | 397 | |
| 398 | - if($datefrom instanceof DateTime) |
|
| 398 | + if ($datefrom instanceof DateTime) |
|
| 399 | 399 | { |
| 400 | 400 | $converter->setDateFrom($datefrom); |
| 401 | 401 | } |
@@ -404,11 +404,11 @@ discard block |
||
| 404 | 404 | $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom)); |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | - if($dateto instanceof DateTime) |
|
| 407 | + if ($dateto instanceof DateTime) |
|
| 408 | 408 | { |
| 409 | 409 | $converter->setDateTo($dateto); |
| 410 | 410 | } |
| 411 | - else if($dateto > 0) |
|
| 411 | + else if ($dateto > 0) |
|
| 412 | 412 | { |
| 413 | 413 | $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto)); |
| 414 | 414 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | $this->info = $info; |
| 61 | 61 | |
| 62 | - if(isset($data['serialized'])) |
|
| 62 | + if (isset($data['serialized'])) |
|
| 63 | 63 | { |
| 64 | 64 | $this->parseSerialized($data['serialized']); |
| 65 | 65 | } |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | $this->position = $data['position']; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - if($this->hasClass()) |
|
| 72 | + if ($this->hasClass()) |
|
| 73 | 73 | { |
| 74 | 74 | $this->type = self::TYPE_METHOD_CALL; |
| 75 | 75 | } |
| 76 | - else if($this->hasFunction()) |
|
| 76 | + else if ($this->hasFunction()) |
|
| 77 | 77 | { |
| 78 | 78 | $this->type = self::TYPE_FUNCTION_CALL; |
| 79 | 79 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | public function getFileName() : string |
| 134 | 134 | { |
| 135 | - if($this->hasFile()) { |
|
| 135 | + if ($this->hasFile()) { |
|
| 136 | 136 | return basename($this->file); |
| 137 | 137 | } |
| 138 | 138 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | public function getFileRelative() : string |
| 143 | 143 | { |
| 144 | - if($this->hasFile()) { |
|
| 144 | + if ($this->hasFile()) { |
|
| 145 | 145 | return FileHelper::relativizePathByDepth($this->file, $this->info->getFolderDepth()); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $this->class = $data['class']; |
| 172 | 172 | $this->position = $data['position']; |
| 173 | 173 | |
| 174 | - foreach($data['arguments'] as $arg) |
|
| 174 | + foreach ($data['arguments'] as $arg) |
|
| 175 | 175 | { |
| 176 | 176 | $this->args[] = VariableInfo::fromSerialized($arg); |
| 177 | 177 | } |
@@ -182,29 +182,29 @@ discard block |
||
| 182 | 182 | */ |
| 183 | 183 | protected function parseTrace(array $trace) : void |
| 184 | 184 | { |
| 185 | - if(isset($trace['line'])) |
|
| 185 | + if (isset($trace['line'])) |
|
| 186 | 186 | { |
| 187 | 187 | $this->line = intval($trace['line']); |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - if(isset($trace['function'])) |
|
| 190 | + if (isset($trace['function'])) |
|
| 191 | 191 | { |
| 192 | 192 | $this->function = $trace['function']; |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - if(isset($trace['file'])) |
|
| 195 | + if (isset($trace['file'])) |
|
| 196 | 196 | { |
| 197 | 197 | $this->file = FileHelper::normalizePath($trace['file']); |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | - if(isset($trace['class'])) |
|
| 200 | + if (isset($trace['class'])) |
|
| 201 | 201 | { |
| 202 | 202 | $this->class = $trace['class']; |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - if(isset($trace['args']) && !empty($trace['args'])) |
|
| 205 | + if (isset($trace['args']) && !empty($trace['args'])) |
|
| 206 | 206 | { |
| 207 | - foreach($trace['args'] as $arg) |
|
| 207 | + foreach ($trace['args'] as $arg) |
|
| 208 | 208 | { |
| 209 | 209 | $this->args[] = parseVariable($arg); |
| 210 | 210 | } |
@@ -219,13 +219,13 @@ discard block |
||
| 219 | 219 | |
| 220 | 220 | $tokens[] = '#'.sprintf('%0'.$padLength.'d', $this->getPosition()).' '; |
| 221 | 221 | |
| 222 | - if($this->hasFile()) { |
|
| 222 | + if ($this->hasFile()) { |
|
| 223 | 223 | $tokens[] = $this->getFileRelative().':'.$this->getLine(); |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - if($this->hasClass()) { |
|
| 226 | + if ($this->hasClass()) { |
|
| 227 | 227 | $tokens[] = $this->getClass().'::'.$this->getFunction().'('.$this->argumentsToString().')'; |
| 228 | - } else if($this->hasFunction()) { |
|
| 228 | + } else if ($this->hasFunction()) { |
|
| 229 | 229 | $tokens[] = $this->getFunction().'('.$this->argumentsToString().')'; |
| 230 | 230 | } |
| 231 | 231 | |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | { |
| 237 | 237 | $tokens = array(); |
| 238 | 238 | |
| 239 | - foreach($this->args as $arg) |
|
| 239 | + foreach ($this->args as $arg) |
|
| 240 | 240 | { |
| 241 | 241 | $tokens[] = $arg->toString(); |
| 242 | 242 | } |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | 'arguments' => array() |
| 282 | 282 | ); |
| 283 | 283 | |
| 284 | - foreach($this->args as $argument) |
|
| 284 | + foreach ($this->args as $argument) |
|
| 285 | 285 | { |
| 286 | 286 | $result['arguments'][] = $argument->serialize(); |
| 287 | 287 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | $contents = file_get_contents($file); |
| 93 | 93 | |
| 94 | - if($contents === false) |
|
| 94 | + if ($contents === false) |
|
| 95 | 95 | { |
| 96 | 96 | throw new FileHelper_Exception( |
| 97 | 97 | 'Cannot load serialized content from file.', |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | $result = @unserialize($contents); |
| 107 | 107 | |
| 108 | - if($result !== false) { |
|
| 108 | + if ($result !== false) { |
|
| 109 | 109 | return $result; |
| 110 | 110 | } |
| 111 | 111 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | public static function deleteTree(string $rootFolder) : bool |
| 130 | 130 | { |
| 131 | - if(!file_exists($rootFolder)) { |
|
| 131 | + if (!file_exists($rootFolder)) { |
|
| 132 | 132 | return true; |
| 133 | 133 | } |
| 134 | 134 | |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | public static function createFolder(string $path) : void |
| 171 | 171 | { |
| 172 | - if(is_dir($path) || mkdir($path, 0777, true)) { |
|
| 172 | + if (is_dir($path) || mkdir($path, 0777, true)) { |
|
| 173 | 173 | return; |
| 174 | 174 | } |
| 175 | 175 | |
@@ -204,11 +204,11 @@ discard block |
||
| 204 | 204 | |
| 205 | 205 | if ($item->isDir()) |
| 206 | 206 | { |
| 207 | - FileHelper::copyTree($itemPath, $target . '/' . $baseName); |
|
| 207 | + FileHelper::copyTree($itemPath, $target.'/'.$baseName); |
|
| 208 | 208 | } |
| 209 | - else if($item->isFile()) |
|
| 209 | + else if ($item->isFile()) |
|
| 210 | 210 | { |
| 211 | - self::copyFile($itemPath, $target . '/' . $baseName); |
|
| 211 | + self::copyFile($itemPath, $target.'/'.$baseName); |
|
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | 214 | } |
@@ -236,11 +236,11 @@ discard block |
||
| 236 | 236 | |
| 237 | 237 | $targetFolder = dirname($targetPath); |
| 238 | 238 | |
| 239 | - if(!file_exists($targetFolder)) |
|
| 239 | + if (!file_exists($targetFolder)) |
|
| 240 | 240 | { |
| 241 | 241 | self::createFolder($targetFolder); |
| 242 | 242 | } |
| 243 | - else if(!is_writable($targetFolder)) |
|
| 243 | + else if (!is_writable($targetFolder)) |
|
| 244 | 244 | { |
| 245 | 245 | throw new FileHelper_Exception( |
| 246 | 246 | sprintf('Target folder [%s] is not writable.', basename($targetFolder)), |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | ); |
| 253 | 253 | } |
| 254 | 254 | |
| 255 | - if(copy($sourcePath, $targetPath)) { |
|
| 255 | + if (copy($sourcePath, $targetPath)) { |
|
| 256 | 256 | return; |
| 257 | 257 | } |
| 258 | 258 | |
@@ -279,11 +279,11 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | public static function deleteFile(string $filePath) : void |
| 281 | 281 | { |
| 282 | - if(!file_exists($filePath)) { |
|
| 282 | + if (!file_exists($filePath)) { |
|
| 283 | 283 | return; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - if(unlink($filePath)) { |
|
| 286 | + if (unlink($filePath)) { |
|
| 287 | 287 | return; |
| 288 | 288 | } |
| 289 | 289 | |
@@ -307,10 +307,10 @@ discard block |
||
| 307 | 307 | * @return Csv |
| 308 | 308 | * @see CSVHelper::createParser() |
| 309 | 309 | */ |
| 310 | - public static function createCSVParser(string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : Csv |
|
| 310 | + public static function createCSVParser(string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading = false) : Csv |
|
| 311 | 311 | { |
| 312 | - if($delimiter==='') { $delimiter = ';'; } |
|
| 313 | - if($enclosure==='') { $enclosure = '"'; } |
|
| 312 | + if ($delimiter === '') { $delimiter = ';'; } |
|
| 313 | + if ($enclosure === '') { $enclosure = '"'; } |
|
| 314 | 314 | |
| 315 | 315 | $parser = CSVHelper::createParser($delimiter); |
| 316 | 316 | $parser->enclosure = $enclosure; |
@@ -334,11 +334,11 @@ discard block |
||
| 334 | 334 | * @see parseCSVFile() |
| 335 | 335 | * @see FileHelper::ERROR_PARSING_CSV |
| 336 | 336 | */ |
| 337 | - public static function parseCSVString(string $csv, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : array |
|
| 337 | + public static function parseCSVString(string $csv, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading = false) : array |
|
| 338 | 338 | { |
| 339 | 339 | $parser = self::createCSVParser($delimiter, $enclosure, '\\', $heading); |
| 340 | 340 | |
| 341 | - if($parser->parse($csv)) |
|
| 341 | + if ($parser->parse($csv)) |
|
| 342 | 342 | { |
| 343 | 343 | return $parser->data; |
| 344 | 344 | } |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST |
| 367 | 367 | * @see FileHelper::ERROR_CANNOT_READ_FILE_CONTENTS |
| 368 | 368 | */ |
| 369 | - public static function parseCSVFile(string $filePath, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading=false) : array |
|
| 369 | + public static function parseCSVFile(string $filePath, string $delimiter = ';', string $enclosure = '"', string $escape = '\\', bool $heading = false) : array |
|
| 370 | 370 | { |
| 371 | 371 | $content = self::readContents($filePath); |
| 372 | 372 | |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | public static function detectMimeType(string $fileName) : ?string |
| 384 | 384 | { |
| 385 | 385 | $ext = self::getExtension($fileName); |
| 386 | - if(empty($ext)) { |
|
| 386 | + if (empty($ext)) { |
|
| 387 | 387 | return null; |
| 388 | 388 | } |
| 389 | 389 | |
@@ -423,11 +423,11 @@ discard block |
||
| 423 | 423 | * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST |
| 424 | 424 | * @see FileHelper::ERROR_UNKNOWN_FILE_MIME_TYPE |
| 425 | 425 | */ |
| 426 | - public static function sendFile(string $filePath, ?string $fileName = null, bool $asAttachment=true) : void |
|
| 426 | + public static function sendFile(string $filePath, ?string $fileName = null, bool $asAttachment = true) : void |
|
| 427 | 427 | { |
| 428 | 428 | self::requireFileExists($filePath); |
| 429 | 429 | |
| 430 | - if(empty($fileName)) { |
|
| 430 | + if (empty($fileName)) { |
|
| 431 | 431 | $fileName = basename($filePath); |
| 432 | 432 | } |
| 433 | 433 | |
@@ -445,10 +445,10 @@ discard block |
||
| 445 | 445 | |
| 446 | 446 | header("Cache-Control: public", true); |
| 447 | 447 | header("Content-Description: File Transfer", true); |
| 448 | - header("Content-Type: " . $mime, true); |
|
| 448 | + header("Content-Type: ".$mime, true); |
|
| 449 | 449 | |
| 450 | 450 | $disposition = 'inline'; |
| 451 | - if($asAttachment) { |
|
| 451 | + if ($asAttachment) { |
|
| 452 | 452 | $disposition = 'attachment'; |
| 453 | 453 | } |
| 454 | 454 | |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | public static function downloadFile(string $url) : string |
| 475 | 475 | { |
| 476 | 476 | $ch = curl_init(); |
| 477 | - if(!is_resource($ch)) |
|
| 477 | + if (!is_resource($ch)) |
|
| 478 | 478 | { |
| 479 | 479 | throw new FileHelper_Exception( |
| 480 | 480 | 'Could not initialize a new cURL instance.', |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | $output = curl_exec($ch); |
| 497 | 497 | |
| 498 | - if($output === false) { |
|
| 498 | + if ($output === false) { |
|
| 499 | 499 | throw new FileHelper_Exception( |
| 500 | 500 | 'Unable to open URL', |
| 501 | 501 | sprintf( |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | |
| 510 | 510 | curl_close($ch); |
| 511 | 511 | |
| 512 | - if(is_string($output)) |
|
| 512 | + if (is_string($output)) |
|
| 513 | 513 | { |
| 514 | 514 | return $output; |
| 515 | 515 | } |
@@ -544,14 +544,14 @@ discard block |
||
| 544 | 544 | */ |
| 545 | 545 | public static function getExtension($pathOrDirIterator, bool $lowercase = true) : string |
| 546 | 546 | { |
| 547 | - if($pathOrDirIterator instanceof DirectoryIterator) { |
|
| 547 | + if ($pathOrDirIterator instanceof DirectoryIterator) { |
|
| 548 | 548 | $filename = $pathOrDirIterator->getFilename(); |
| 549 | 549 | } else { |
| 550 | 550 | $filename = basename(strval($pathOrDirIterator)); |
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | $ext = pathinfo($filename, PATHINFO_EXTENSION); |
| 554 | - if($lowercase) { |
|
| 554 | + if ($lowercase) { |
|
| 555 | 555 | $ext = mb_strtolower($ext); |
| 556 | 556 | } |
| 557 | 557 | |
@@ -573,13 +573,13 @@ discard block |
||
| 573 | 573 | public static function getFilename($pathOrDirIterator, $extension = true) : string |
| 574 | 574 | { |
| 575 | 575 | $path = strval($pathOrDirIterator); |
| 576 | - if($pathOrDirIterator instanceof DirectoryIterator) { |
|
| 576 | + if ($pathOrDirIterator instanceof DirectoryIterator) { |
|
| 577 | 577 | $path = $pathOrDirIterator->getFilename(); |
| 578 | 578 | } |
| 579 | 579 | |
| 580 | 580 | $path = self::normalizePath($path); |
| 581 | 581 | |
| 582 | - if(!$extension) { |
|
| 582 | + if (!$extension) { |
|
| 583 | 583 | return pathinfo($path, PATHINFO_FILENAME); |
| 584 | 584 | } |
| 585 | 585 | |
@@ -599,18 +599,18 @@ discard block |
||
| 599 | 599 | * @see FileHelper::ERROR_CANNOT_FIND_JSON_FILE |
| 600 | 600 | * @see FileHelper::ERROR_CANNOT_DECODE_JSON_FILE |
| 601 | 601 | */ |
| 602 | - public static function parseJSONFile(string $file, string $targetEncoding='', $sourceEncoding=null) : array |
|
| 602 | + public static function parseJSONFile(string $file, string $targetEncoding = '', $sourceEncoding = null) : array |
|
| 603 | 603 | { |
| 604 | 604 | self::requireFileExists($file, self::ERROR_CANNOT_FIND_JSON_FILE); |
| 605 | 605 | |
| 606 | 606 | $content = self::readContents($file); |
| 607 | 607 | |
| 608 | - if(!empty($targetEncoding)) { |
|
| 608 | + if (!empty($targetEncoding)) { |
|
| 609 | 609 | $content = mb_convert_encoding($content, $targetEncoding, $sourceEncoding); |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | 612 | $json = json_decode($content, true); |
| 613 | - if($json === false || $json === NULL) { |
|
| 613 | + if ($json === false || $json === NULL) { |
|
| 614 | 614 | throw new FileHelper_Exception( |
| 615 | 615 | 'Cannot decode json data', |
| 616 | 616 | sprintf( |
@@ -650,13 +650,13 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | $name = str_replace(array_keys($replaces), array_values($replaces), $name); |
| 652 | 652 | |
| 653 | - while(strstr($name, ' ')) { |
|
| 653 | + while (strstr($name, ' ')) { |
|
| 654 | 654 | $name = str_replace(' ', ' ', $name); |
| 655 | 655 | } |
| 656 | 656 | |
| 657 | 657 | $name = str_replace(array_keys($replaces), array_values($replaces), $name); |
| 658 | 658 | |
| 659 | - while(strstr($name, '..')) { |
|
| 659 | + while (strstr($name, '..')) { |
|
| 660 | 660 | $name = str_replace('..', '.', $name); |
| 661 | 661 | } |
| 662 | 662 | |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | * @throws FileHelper_Exception |
| 693 | 693 | * @see FileHelper::createFileFinder() |
| 694 | 694 | */ |
| 695 | - public static function findHTMLFiles(string $targetFolder, array $options=array()) : array |
|
| 695 | + public static function findHTMLFiles(string $targetFolder, array $options = array()) : array |
|
| 696 | 696 | { |
| 697 | 697 | return self::findFiles($targetFolder, array('html'), $options); |
| 698 | 698 | } |
@@ -710,7 +710,7 @@ discard block |
||
| 710 | 710 | * @throws FileHelper_Exception |
| 711 | 711 | * @see FileHelper::createFileFinder() |
| 712 | 712 | */ |
| 713 | - public static function findPHPFiles(string $targetFolder, array $options=array()) : array |
|
| 713 | + public static function findPHPFiles(string $targetFolder, array $options = array()) : array |
|
| 714 | 714 | { |
| 715 | 715 | return self::findFiles($targetFolder, array('php'), $options); |
| 716 | 716 | } |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | * @return string[] |
| 730 | 730 | * @see FileHelper::createFileFinder() |
| 731 | 731 | */ |
| 732 | - public static function findFiles(string $targetFolder, array $extensions=array(), array $options=array()) : array |
|
| 732 | + public static function findFiles(string $targetFolder, array $extensions = array(), array $options = array()) : array |
|
| 733 | 733 | { |
| 734 | 734 | $finder = self::createFileFinder($targetFolder); |
| 735 | 735 | |
@@ -739,16 +739,16 @@ discard block |
||
| 739 | 739 | |
| 740 | 740 | $finder->setPathmodeStrip(); |
| 741 | 741 | |
| 742 | - if(isset($options['relative-path']) && $options['relative-path'] === true) |
|
| 742 | + if (isset($options['relative-path']) && $options['relative-path'] === true) |
|
| 743 | 743 | { |
| 744 | 744 | $finder->setPathmodeRelative(); |
| 745 | 745 | } |
| 746 | - else if(isset($options['absolute-path']) && $options['absolute-path'] === true) |
|
| 746 | + else if (isset($options['absolute-path']) && $options['absolute-path'] === true) |
|
| 747 | 747 | { |
| 748 | 748 | $finder->setPathmodeAbsolute(); |
| 749 | 749 | } |
| 750 | 750 | |
| 751 | - if(isset($options['strip-extension'])) |
|
| 751 | + if (isset($options['strip-extension'])) |
|
| 752 | 752 | { |
| 753 | 753 | $finder->stripExtensions(); |
| 754 | 754 | } |
@@ -766,12 +766,12 @@ discard block |
||
| 766 | 766 | * @param bool $keepPath Whether to keep the path component, if any. Default PHP pathinfo behavior is not to. |
| 767 | 767 | * @return string |
| 768 | 768 | */ |
| 769 | - public static function removeExtension(string $filename, bool $keepPath=false) : string |
|
| 769 | + public static function removeExtension(string $filename, bool $keepPath = false) : string |
|
| 770 | 770 | { |
| 771 | 771 | // normalize paths to allow windows style slashes even on nix servers |
| 772 | 772 | $filename = self::normalizePath($filename); |
| 773 | 773 | |
| 774 | - if(!$keepPath) |
|
| 774 | + if (!$keepPath) |
|
| 775 | 775 | { |
| 776 | 776 | return pathinfo($filename, PATHINFO_FILENAME); |
| 777 | 777 | } |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | public static function detectUTFBom(string $filename) : ?string |
| 808 | 808 | { |
| 809 | 809 | $fp = fopen($filename, 'r'); |
| 810 | - if($fp === false) |
|
| 810 | + if ($fp === false) |
|
| 811 | 811 | { |
| 812 | 812 | throw new FileHelper_Exception( |
| 813 | 813 | 'Cannot open file for reading', |
@@ -822,10 +822,10 @@ discard block |
||
| 822 | 822 | |
| 823 | 823 | $boms = self::getUTFBOMs(); |
| 824 | 824 | |
| 825 | - foreach($boms as $bom => $value) |
|
| 825 | + foreach ($boms as $bom => $value) |
|
| 826 | 826 | { |
| 827 | 827 | $length = mb_strlen($value); |
| 828 | - if(mb_substr($text, 0, $length) == $value) { |
|
| 828 | + if (mb_substr($text, 0, $length) == $value) { |
|
| 829 | 829 | return $bom; |
| 830 | 830 | } |
| 831 | 831 | } |
@@ -842,13 +842,13 @@ discard block |
||
| 842 | 842 | */ |
| 843 | 843 | public static function getUTFBOMs() : array |
| 844 | 844 | { |
| 845 | - if(!isset(self::$utfBoms)) { |
|
| 845 | + if (!isset(self::$utfBoms)) { |
|
| 846 | 846 | self::$utfBoms = array( |
| 847 | - 'UTF32-BE' => chr(0x00) . chr(0x00) . chr(0xFE) . chr(0xFF), |
|
| 848 | - 'UTF32-LE' => chr(0xFF) . chr(0xFE) . chr(0x00) . chr(0x00), |
|
| 849 | - 'UTF16-BE' => chr(0xFE) . chr(0xFF), |
|
| 850 | - 'UTF16-LE' => chr(0xFF) . chr(0xFE), |
|
| 851 | - 'UTF8' => chr(0xEF) . chr(0xBB) . chr(0xBF) |
|
| 847 | + 'UTF32-BE' => chr(0x00).chr(0x00).chr(0xFE).chr(0xFF), |
|
| 848 | + 'UTF32-LE' => chr(0xFF).chr(0xFE).chr(0x00).chr(0x00), |
|
| 849 | + 'UTF16-BE' => chr(0xFE).chr(0xFF), |
|
| 850 | + 'UTF16-LE' => chr(0xFF).chr(0xFE), |
|
| 851 | + 'UTF8' => chr(0xEF).chr(0xBB).chr(0xBF) |
|
| 852 | 852 | ); |
| 853 | 853 | } |
| 854 | 854 | |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | $encodings = self::getKnownUnicodeEncodings(); |
| 870 | 870 | |
| 871 | 871 | $keep = array(); |
| 872 | - foreach($encodings as $string) |
|
| 872 | + foreach ($encodings as $string) |
|
| 873 | 873 | { |
| 874 | 874 | $withHyphen = str_replace('UTF', 'UTF-', $string); |
| 875 | 875 | |
@@ -916,16 +916,16 @@ discard block |
||
| 916 | 916 | * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE |
| 917 | 917 | * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED |
| 918 | 918 | */ |
| 919 | - public static function saveAsJSON($data, string $file, bool $pretty=false) : void |
|
| 919 | + public static function saveAsJSON($data, string $file, bool $pretty = false) : void |
|
| 920 | 920 | { |
| 921 | 921 | $options = null; |
| 922 | - if($pretty) { |
|
| 922 | + if ($pretty) { |
|
| 923 | 923 | $options = JSON_PRETTY_PRINT; |
| 924 | 924 | } |
| 925 | 925 | |
| 926 | 926 | $json = json_encode($data, $options); |
| 927 | 927 | |
| 928 | - if($json===false) |
|
| 928 | + if ($json === false) |
|
| 929 | 929 | { |
| 930 | 930 | $errorCode = json_last_error(); |
| 931 | 931 | |
@@ -951,14 +951,14 @@ discard block |
||
| 951 | 951 | * @see FileHelper::ERROR_SAVE_FILE_NOT_WRITABLE |
| 952 | 952 | * @see FileHelper::ERROR_SAVE_FILE_WRITE_FAILED |
| 953 | 953 | */ |
| 954 | - public static function saveFile(string $filePath, string $content='') : void |
|
| 954 | + public static function saveFile(string $filePath, string $content = '') : void |
|
| 955 | 955 | { |
| 956 | 956 | $filePath = self::normalizePath($filePath); |
| 957 | 957 | |
| 958 | 958 | // target file already exists |
| 959 | - if(file_exists($filePath)) |
|
| 959 | + if (file_exists($filePath)) |
|
| 960 | 960 | { |
| 961 | - if(!is_writable($filePath)) |
|
| 961 | + if (!is_writable($filePath)) |
|
| 962 | 962 | { |
| 963 | 963 | throw new FileHelper_Exception( |
| 964 | 964 | sprintf('Cannot save file: target file [%s] exists, but is not writable.', basename($filePath)), |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | // create the folder as needed |
| 979 | 979 | self::createFolder($targetFolder); |
| 980 | 980 | |
| 981 | - if(!is_writable($targetFolder)) |
|
| 981 | + if (!is_writable($targetFolder)) |
|
| 982 | 982 | { |
| 983 | 983 | throw new FileHelper_Exception( |
| 984 | 984 | sprintf('Cannot save file: target folder [%s] is not writable.', basename($targetFolder)), |
@@ -991,7 +991,7 @@ discard block |
||
| 991 | 991 | } |
| 992 | 992 | } |
| 993 | 993 | |
| 994 | - if(is_dir($filePath)) |
|
| 994 | + if (is_dir($filePath)) |
|
| 995 | 995 | { |
| 996 | 996 | throw new FileHelper_Exception( |
| 997 | 997 | sprintf('Cannot save file: the target [%s] is a directory.', basename($filePath)), |
@@ -1003,7 +1003,7 @@ discard block |
||
| 1003 | 1003 | ); |
| 1004 | 1004 | } |
| 1005 | 1005 | |
| 1006 | - if(file_put_contents($filePath, $content) !== false) { |
|
| 1006 | + if (file_put_contents($filePath, $content) !== false) { |
|
| 1007 | 1007 | return; |
| 1008 | 1008 | } |
| 1009 | 1009 | |
@@ -1042,7 +1042,7 @@ discard block |
||
| 1042 | 1042 | { |
| 1043 | 1043 | static $checked = array(); |
| 1044 | 1044 | |
| 1045 | - if(isset($checked[$command])) { |
|
| 1045 | + if (isset($checked[$command])) { |
|
| 1046 | 1046 | return $checked[$command]; |
| 1047 | 1047 | } |
| 1048 | 1048 | |
@@ -1055,7 +1055,7 @@ discard block |
||
| 1055 | 1055 | |
| 1056 | 1056 | $os = strtolower(PHP_OS_FAMILY); |
| 1057 | 1057 | |
| 1058 | - if(!isset($osCommands[$os])) |
|
| 1058 | + if (!isset($osCommands[$os])) |
|
| 1059 | 1059 | { |
| 1060 | 1060 | throw new FileHelper_Exception( |
| 1061 | 1061 | 'Unsupported OS for CLI commands', |
@@ -1081,7 +1081,7 @@ discard block |
||
| 1081 | 1081 | $pipes |
| 1082 | 1082 | ); |
| 1083 | 1083 | |
| 1084 | - if($process === false) { |
|
| 1084 | + if ($process === false) { |
|
| 1085 | 1085 | $checked[$command] = false; |
| 1086 | 1086 | return false; |
| 1087 | 1087 | } |
@@ -1113,7 +1113,7 @@ discard block |
||
| 1113 | 1113 | */ |
| 1114 | 1114 | public static function checkPHPFileSyntax(string $path) |
| 1115 | 1115 | { |
| 1116 | - if(!self::canMakePHPCalls()) { |
|
| 1116 | + if (!self::canMakePHPCalls()) { |
|
| 1117 | 1117 | return true; |
| 1118 | 1118 | } |
| 1119 | 1119 | |
@@ -1124,7 +1124,7 @@ discard block |
||
| 1124 | 1124 | // when the validation is successful, the first entry |
| 1125 | 1125 | // in the array contains the success message. When it |
| 1126 | 1126 | // is invalid, the first entry is always empty. |
| 1127 | - if(!empty($output[0])) { |
|
| 1127 | + if (!empty($output[0])) { |
|
| 1128 | 1128 | return true; |
| 1129 | 1129 | } |
| 1130 | 1130 | |
@@ -1145,7 +1145,7 @@ discard block |
||
| 1145 | 1145 | public static function getModifiedDate(string $path) : ?DateTime |
| 1146 | 1146 | { |
| 1147 | 1147 | $time = filemtime($path); |
| 1148 | - if($time === false) { |
|
| 1148 | + if ($time === false) { |
|
| 1149 | 1149 | return null; |
| 1150 | 1150 | } |
| 1151 | 1151 | |
@@ -1175,11 +1175,11 @@ discard block |
||
| 1175 | 1175 | */ |
| 1176 | 1176 | public static function getSubfolders($targetFolder, array $options = array()) |
| 1177 | 1177 | { |
| 1178 | - if($targetFolder instanceof DirectoryIterator) { |
|
| 1178 | + if ($targetFolder instanceof DirectoryIterator) { |
|
| 1179 | 1179 | $targetFolder = $targetFolder->getPathname(); |
| 1180 | 1180 | } |
| 1181 | 1181 | |
| 1182 | - if(!is_dir($targetFolder)) |
|
| 1182 | + if (!is_dir($targetFolder)) |
|
| 1183 | 1183 | { |
| 1184 | 1184 | throw new FileHelper_Exception( |
| 1185 | 1185 | 'Target folder does not exist', |
@@ -1203,29 +1203,29 @@ discard block |
||
| 1203 | 1203 | |
| 1204 | 1204 | $d = new DirectoryIterator($targetFolder); |
| 1205 | 1205 | |
| 1206 | - foreach($d as $item) |
|
| 1206 | + foreach ($d as $item) |
|
| 1207 | 1207 | { |
| 1208 | - if($item->isDir() && !$item->isDot()) |
|
| 1208 | + if ($item->isDir() && !$item->isDot()) |
|
| 1209 | 1209 | { |
| 1210 | 1210 | $name = $item->getFilename(); |
| 1211 | 1211 | |
| 1212 | - if(!$options['absolute-path']) { |
|
| 1212 | + if (!$options['absolute-path']) { |
|
| 1213 | 1213 | $result[] = $name; |
| 1214 | 1214 | } else { |
| 1215 | 1215 | $result[] = $targetFolder.'/'.$name; |
| 1216 | 1216 | } |
| 1217 | 1217 | |
| 1218 | - if(!$options['recursive']) |
|
| 1218 | + if (!$options['recursive']) |
|
| 1219 | 1219 | { |
| 1220 | 1220 | continue; |
| 1221 | 1221 | } |
| 1222 | 1222 | |
| 1223 | 1223 | $subs = self::getSubfolders($targetFolder.'/'.$name, $options); |
| 1224 | - foreach($subs as $sub) |
|
| 1224 | + foreach ($subs as $sub) |
|
| 1225 | 1225 | { |
| 1226 | 1226 | $relative = $name.'/'.$sub; |
| 1227 | 1227 | |
| 1228 | - if(!$options['absolute-path']) { |
|
| 1228 | + if (!$options['absolute-path']) { |
|
| 1229 | 1229 | $result[] = $relative; |
| 1230 | 1230 | } else { |
| 1231 | 1231 | $result[] = $targetFolder.'/'.$relative; |
@@ -1275,7 +1275,7 @@ discard block |
||
| 1275 | 1275 | $unit = preg_replace('/[^bkmgtpezy]/i', '', $size); // Remove the non-unit characters from the size. |
| 1276 | 1276 | $size = floatval(preg_replace('/[^0-9\.]/', '', $size)); // Remove the non-numeric characters from the size. |
| 1277 | 1277 | |
| 1278 | - if($unit) |
|
| 1278 | + if ($unit) |
|
| 1279 | 1279 | { |
| 1280 | 1280 | // Find the position of the unit in the ordered string which is the power of magnitude to multiply a kilobyte by. |
| 1281 | 1281 | return round($size * pow(1024, stripos('bkmgtpezy', $unit[0]))); |
@@ -1294,7 +1294,7 @@ discard block |
||
| 1294 | 1294 | * @param int $depth The folder depth to reduce the path to |
| 1295 | 1295 | * @return string |
| 1296 | 1296 | */ |
| 1297 | - public static function relativizePathByDepth(string $path, int $depth=2) : string |
|
| 1297 | + public static function relativizePathByDepth(string $path, int $depth = 2) : string |
|
| 1298 | 1298 | { |
| 1299 | 1299 | $path = self::normalizePath($path); |
| 1300 | 1300 | |
@@ -1302,17 +1302,17 @@ discard block |
||
| 1302 | 1302 | $tokens = array_filter($tokens); // remove empty entries (trailing slash for example) |
| 1303 | 1303 | $tokens = array_values($tokens); // re-index keys |
| 1304 | 1304 | |
| 1305 | - if(empty($tokens)) { |
|
| 1305 | + if (empty($tokens)) { |
|
| 1306 | 1306 | return ''; |
| 1307 | 1307 | } |
| 1308 | 1308 | |
| 1309 | 1309 | // remove the drive if present |
| 1310 | - if(strstr($tokens[0], ':')) { |
|
| 1310 | + if (strstr($tokens[0], ':')) { |
|
| 1311 | 1311 | array_shift($tokens); |
| 1312 | 1312 | } |
| 1313 | 1313 | |
| 1314 | 1314 | // path was only the drive |
| 1315 | - if(count($tokens) == 0) { |
|
| 1315 | + if (count($tokens) == 0) { |
|
| 1316 | 1316 | return ''; |
| 1317 | 1317 | } |
| 1318 | 1318 | |
@@ -1321,8 +1321,8 @@ discard block |
||
| 1321 | 1321 | |
| 1322 | 1322 | // reduce the path to the specified depth |
| 1323 | 1323 | $length = count($tokens); |
| 1324 | - if($length > $depth) { |
|
| 1325 | - $tokens = array_slice($tokens, $length-$depth); |
|
| 1324 | + if ($length > $depth) { |
|
| 1325 | + $tokens = array_slice($tokens, $length - $depth); |
|
| 1326 | 1326 | } |
| 1327 | 1327 | |
| 1328 | 1328 | // append the last element again |
@@ -1370,14 +1370,14 @@ discard block |
||
| 1370 | 1370 | * |
| 1371 | 1371 | * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST |
| 1372 | 1372 | */ |
| 1373 | - public static function requireFileExists(string $path, ?int $errorCode=null) : string |
|
| 1373 | + public static function requireFileExists(string $path, ?int $errorCode = null) : string |
|
| 1374 | 1374 | { |
| 1375 | 1375 | $result = realpath($path); |
| 1376 | - if($result !== false) { |
|
| 1376 | + if ($result !== false) { |
|
| 1377 | 1377 | return $result; |
| 1378 | 1378 | } |
| 1379 | 1379 | |
| 1380 | - if($errorCode === null) { |
|
| 1380 | + if ($errorCode === null) { |
|
| 1381 | 1381 | $errorCode = self::ERROR_FILE_DOES_NOT_EXIST; |
| 1382 | 1382 | } |
| 1383 | 1383 | |
@@ -1394,15 +1394,15 @@ discard block |
||
| 1394 | 1394 | * @return string |
| 1395 | 1395 | * @throws FileHelper_Exception |
| 1396 | 1396 | */ |
| 1397 | - public static function requireFileReadable(string $path, ?int $errorCode=null) : string |
|
| 1397 | + public static function requireFileReadable(string $path, ?int $errorCode = null) : string |
|
| 1398 | 1398 | { |
| 1399 | 1399 | $path = self::requireFileExists($path, $errorCode); |
| 1400 | 1400 | |
| 1401 | - if(is_readable($path)) { |
|
| 1401 | + if (is_readable($path)) { |
|
| 1402 | 1402 | return $path; |
| 1403 | 1403 | } |
| 1404 | 1404 | |
| 1405 | - if($errorCode === null) { |
|
| 1405 | + if ($errorCode === null) { |
|
| 1406 | 1406 | $errorCode = self::ERROR_FILE_NOT_READABLE; |
| 1407 | 1407 | } |
| 1408 | 1408 | |
@@ -1431,15 +1431,15 @@ discard block |
||
| 1431 | 1431 | |
| 1432 | 1432 | $file = new \SplFileObject($path); |
| 1433 | 1433 | |
| 1434 | - if($file->eof()) { |
|
| 1434 | + if ($file->eof()) { |
|
| 1435 | 1435 | return ''; |
| 1436 | 1436 | } |
| 1437 | 1437 | |
| 1438 | - $targetLine = $lineNumber-1; |
|
| 1438 | + $targetLine = $lineNumber - 1; |
|
| 1439 | 1439 | |
| 1440 | 1440 | $file->seek($targetLine); |
| 1441 | 1441 | |
| 1442 | - if($file->key() !== $targetLine) { |
|
| 1442 | + if ($file->key() !== $targetLine) { |
|
| 1443 | 1443 | return null; |
| 1444 | 1444 | } |
| 1445 | 1445 | |
@@ -1465,7 +1465,7 @@ discard block |
||
| 1465 | 1465 | $number = $spl->key(); |
| 1466 | 1466 | |
| 1467 | 1467 | // if seeking to the end the cursor is still at 0, there are no lines. |
| 1468 | - if($number === 0) |
|
| 1468 | + if ($number === 0) |
|
| 1469 | 1469 | { |
| 1470 | 1470 | // since it's a very small file, to get reliable results, |
| 1471 | 1471 | // we read its contents and use that to determine what |
@@ -1473,13 +1473,13 @@ discard block |
||
| 1473 | 1473 | // that this is not pactical to solve with the SplFileObject. |
| 1474 | 1474 | $content = file_get_contents($path); |
| 1475 | 1475 | |
| 1476 | - if(empty($content)) { |
|
| 1476 | + if (empty($content)) { |
|
| 1477 | 1477 | return 0; |
| 1478 | 1478 | } |
| 1479 | 1479 | } |
| 1480 | 1480 | |
| 1481 | 1481 | // return the line number we were able to reach + 1 (key is zero-based) |
| 1482 | - return $number+1; |
|
| 1482 | + return $number + 1; |
|
| 1483 | 1483 | } |
| 1484 | 1484 | |
| 1485 | 1485 | /** |
@@ -1527,13 +1527,13 @@ discard block |
||
| 1527 | 1527 | * @see FileHelper::ERROR_FILE_DOES_NOT_EXIST |
| 1528 | 1528 | * @see FileHelper::ERROR_CANNOT_OPEN_FILE_TO_READ_LINES |
| 1529 | 1529 | */ |
| 1530 | - public static function readLines(string $filePath, int $amount=0) : array |
|
| 1530 | + public static function readLines(string $filePath, int $amount = 0) : array |
|
| 1531 | 1531 | { |
| 1532 | 1532 | self::requireFileExists($filePath); |
| 1533 | 1533 | |
| 1534 | 1534 | $fn = fopen($filePath, "r"); |
| 1535 | 1535 | |
| 1536 | - if($fn === false) |
|
| 1536 | + if ($fn === false) |
|
| 1537 | 1537 | { |
| 1538 | 1538 | throw new FileHelper_Exception( |
| 1539 | 1539 | 'Could not open file for reading.', |
@@ -1549,19 +1549,19 @@ discard block |
||
| 1549 | 1549 | $counter = 0; |
| 1550 | 1550 | $first = true; |
| 1551 | 1551 | |
| 1552 | - while(!feof($fn)) |
|
| 1552 | + while (!feof($fn)) |
|
| 1553 | 1553 | { |
| 1554 | 1554 | $counter++; |
| 1555 | 1555 | |
| 1556 | 1556 | $line = fgets($fn); |
| 1557 | 1557 | |
| 1558 | 1558 | // can happen with zero length files |
| 1559 | - if($line === false) { |
|
| 1559 | + if ($line === false) { |
|
| 1560 | 1560 | continue; |
| 1561 | 1561 | } |
| 1562 | 1562 | |
| 1563 | 1563 | // the first line may contain a unicode BOM marker. |
| 1564 | - if($first) |
|
| 1564 | + if ($first) |
|
| 1565 | 1565 | { |
| 1566 | 1566 | $line = ConvertHelper::stripUTFBom($line); |
| 1567 | 1567 | $first = false; |
@@ -1569,7 +1569,7 @@ discard block |
||
| 1569 | 1569 | |
| 1570 | 1570 | $result[] = $line; |
| 1571 | 1571 | |
| 1572 | - if($amount > 0 && $counter == $amount) { |
|
| 1572 | + if ($amount > 0 && $counter == $amount) { |
|
| 1573 | 1573 | break; |
| 1574 | 1574 | } |
| 1575 | 1575 | } |
@@ -1595,7 +1595,7 @@ discard block |
||
| 1595 | 1595 | |
| 1596 | 1596 | $result = file_get_contents($filePath); |
| 1597 | 1597 | |
| 1598 | - if($result !== false) { |
|
| 1598 | + if ($result !== false) { |
|
| 1599 | 1599 | return $result; |
| 1600 | 1600 | } |
| 1601 | 1601 | |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | { |
| 1626 | 1626 | $actual = realpath($path); |
| 1627 | 1627 | |
| 1628 | - if($actual === false) |
|
| 1628 | + if ($actual === false) |
|
| 1629 | 1629 | { |
| 1630 | 1630 | throw new FileHelper_Exception( |
| 1631 | 1631 | 'Folder does not exist', |
@@ -1637,7 +1637,7 @@ discard block |
||
| 1637 | 1637 | ); |
| 1638 | 1638 | } |
| 1639 | 1639 | |
| 1640 | - if(is_dir($path)) |
|
| 1640 | + if (is_dir($path)) |
|
| 1641 | 1641 | { |
| 1642 | 1642 | return self::normalizePath($actual); |
| 1643 | 1643 | } |
@@ -1659,7 +1659,7 @@ discard block |
||
| 1659 | 1659 | * @param string[] $paths |
| 1660 | 1660 | * @return FileHelper_PathsReducer |
| 1661 | 1661 | */ |
| 1662 | - public static function createPathsReducer(array $paths=array()) : FileHelper_PathsReducer |
|
| 1662 | + public static function createPathsReducer(array $paths = array()) : FileHelper_PathsReducer |
|
| 1663 | 1663 | { |
| 1664 | 1664 | return new FileHelper_PathsReducer(); |
| 1665 | 1665 | } |