@@ -449,52 +449,43 @@ discard block |
||
| 449 | 449 | { |
| 450 | 450 | $r[] = $indent . (substr($lines[$ii], 0, 1) == "*" ? " " : "") . $lines[$ii]; |
| 451 | 451 | } |
| 452 | - } |
|
| 453 | - elseif ($class === "CssAtCharsetToken") |
|
| 452 | + } elseif ($class === "CssAtCharsetToken") |
|
| 454 | 453 | { |
| 455 | 454 | $r[] = $indent . "@charset " . $token->Charset . ";"; |
| 456 | - } |
|
| 457 | - elseif ($class === "CssAtFontFaceStartToken") |
|
| 455 | + } elseif ($class === "CssAtFontFaceStartToken") |
|
| 458 | 456 | { |
| 459 | 457 | $r[] = $indent . "@font-face"; |
| 460 | 458 | $r[] = $this->indent . $indent . "{"; |
| 461 | 459 | $level++; |
| 462 | - } |
|
| 463 | - elseif ($class === "CssAtImportToken") |
|
| 460 | + } elseif ($class === "CssAtImportToken") |
|
| 464 | 461 | { |
| 465 | 462 | $r[] = $indent . "@import " . $token->Import . " " . implode(", ", $token->MediaTypes) . ";"; |
| 466 | - } |
|
| 467 | - elseif ($class === "CssAtKeyframesStartToken") |
|
| 463 | + } elseif ($class === "CssAtKeyframesStartToken") |
|
| 468 | 464 | { |
| 469 | 465 | $r[] = $indent . "@keyframes \"" . $token->Name . "\""; |
| 470 | 466 | $r[] = $this->indent . $indent . "{"; |
| 471 | 467 | $level++; |
| 472 | - } |
|
| 473 | - elseif ($class === "CssAtMediaStartToken") |
|
| 468 | + } elseif ($class === "CssAtMediaStartToken") |
|
| 474 | 469 | { |
| 475 | 470 | $r[] = $indent . "@media " . implode(", ", $token->MediaTypes); |
| 476 | 471 | $r[] = $this->indent . $indent . "{"; |
| 477 | 472 | $level++; |
| 478 | - } |
|
| 479 | - elseif ($class === "CssAtPageStartToken") |
|
| 473 | + } elseif ($class === "CssAtPageStartToken") |
|
| 480 | 474 | { |
| 481 | 475 | $r[] = $indent . "@page"; |
| 482 | 476 | $r[] = $this->indent . $indent . "{"; |
| 483 | 477 | $level++; |
| 484 | - } |
|
| 485 | - elseif ($class === "CssAtVariablesStartToken") |
|
| 478 | + } elseif ($class === "CssAtVariablesStartToken") |
|
| 486 | 479 | { |
| 487 | 480 | $r[] = $indent . "@variables " . implode(", ", $token->MediaTypes); |
| 488 | 481 | $r[] = $this->indent . $indent . "{"; |
| 489 | 482 | $level++; |
| 490 | - } |
|
| 491 | - elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken") |
|
| 483 | + } elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken") |
|
| 492 | 484 | { |
| 493 | 485 | $r[] = $indent . implode(", ", $token->Selectors); |
| 494 | 486 | $r[] = $this->indent . $indent . "{"; |
| 495 | 487 | $level++; |
| 496 | - } |
|
| 497 | - elseif ($class == "CssAtFontFaceDeclarationToken" |
|
| 488 | + } elseif ($class == "CssAtFontFaceDeclarationToken" |
|
| 498 | 489 | || $class === "CssAtKeyframesRulesetDeclarationToken" |
| 499 | 490 | || $class === "CssAtPageDeclarationToken" |
| 500 | 491 | || $class == "CssAtVariablesDeclarationToken" |
@@ -507,8 +498,7 @@ discard block |
||
| 507 | 498 | $declaration = str_pad($declaration, $this->padding, " ", STR_PAD_RIGHT); |
| 508 | 499 | } |
| 509 | 500 | $r[] = $declaration . $token->Value . ($token->IsImportant ? " !important" : "") . ";"; |
| 510 | - } |
|
| 511 | - elseif ($class === "CssAtFontFaceEndToken" |
|
| 501 | + } elseif ($class === "CssAtFontFaceEndToken" |
|
| 512 | 502 | || $class === "CssAtMediaEndToken" |
| 513 | 503 | || $class === "CssAtKeyframesEndToken" |
| 514 | 504 | || $class === "CssAtKeyframesRulesetEndToken" |
@@ -721,8 +711,7 @@ discard block |
||
| 721 | 711 | if (!($plugin = $this->minifier->getPlugin("CssVariablesMinifierPlugin"))) |
| 722 | 712 | { |
| 723 | 713 | CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin <code>CssVariablesMinifierPlugin</code> was not found but is required for <code>" . __CLASS__ . "</code>")); |
| 724 | - } |
|
| 725 | - else |
|
| 714 | + } else |
|
| 726 | 715 | { |
| 727 | 716 | $plugin->setVariables($variables); |
| 728 | 717 | } |
@@ -797,8 +786,7 @@ discard block |
||
| 797 | 786 | { |
| 798 | 787 | $this->parser->popState(); |
| 799 | 788 | $this->parser->unsetExclusive(); |
| 800 | - } |
|
| 801 | - else |
|
| 789 | + } else |
|
| 802 | 790 | { |
| 803 | 791 | return false; |
| 804 | 792 | } |
@@ -898,8 +886,7 @@ discard block |
||
| 898 | 886 | $this->parser->popState(); |
| 899 | 887 | $this->parser->unsetExclusive(); |
| 900 | 888 | $this->delimiterChar = null; |
| 901 | - } |
|
| 902 | - else |
|
| 889 | + } else |
|
| 903 | 890 | { |
| 904 | 891 | return false; |
| 905 | 892 | } |
@@ -974,8 +961,7 @@ discard block |
||
| 974 | 961 | if ($ii == $ll) |
| 975 | 962 | { |
| 976 | 963 | $declarations[$ii]->IsLast = true; |
| 977 | - } |
|
| 978 | - else |
|
| 964 | + } else |
|
| 979 | 965 | { |
| 980 | 966 | $declarations[$ii]->IsLast = false; |
| 981 | 967 | } |
@@ -1133,8 +1119,7 @@ discard block |
||
| 1133 | 1119 | { |
| 1134 | 1120 | $value = trim(substr($value, 0, -10)); |
| 1135 | 1121 | $isImportant = true; |
| 1136 | - } |
|
| 1137 | - else |
|
| 1122 | + } else |
|
| 1138 | 1123 | { |
| 1139 | 1124 | $isImportant = false; |
| 1140 | 1125 | } |
@@ -1156,8 +1141,7 @@ discard block |
||
| 1156 | 1141 | $this->parser->appendToken(new CssRulesetEndToken()); |
| 1157 | 1142 | $this->buffer = ""; |
| 1158 | 1143 | $this->selectors = array(); |
| 1159 | - } |
|
| 1160 | - else |
|
| 1144 | + } else |
|
| 1161 | 1145 | { |
| 1162 | 1146 | return false; |
| 1163 | 1147 | } |
@@ -1462,8 +1446,7 @@ discard block |
||
| 1462 | 1446 | if (class_exists($class)) |
| 1463 | 1447 | { |
| 1464 | 1448 | $this->plugins[] = new $class($this, $config); |
| 1465 | - } |
|
| 1466 | - else |
|
| 1449 | + } else |
|
| 1467 | 1450 | { |
| 1468 | 1451 | CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found")); |
| 1469 | 1452 | } |
@@ -1825,46 +1808,37 @@ discard block |
||
| 1825 | 1808 | { |
| 1826 | 1809 | $r[] = $indent . (substr($lines[$ii], 0, 1) == "*" ? " " : "") . $lines[$ii]; |
| 1827 | 1810 | } |
| 1828 | - } |
|
| 1829 | - elseif ($class === "CssAtCharsetToken") |
|
| 1811 | + } elseif ($class === "CssAtCharsetToken") |
|
| 1830 | 1812 | { |
| 1831 | 1813 | $r[] = $indent . "@charset " . $token->Charset . ";"; |
| 1832 | - } |
|
| 1833 | - elseif ($class === "CssAtFontFaceStartToken") |
|
| 1814 | + } elseif ($class === "CssAtFontFaceStartToken") |
|
| 1834 | 1815 | { |
| 1835 | 1816 | $r[] = $indent . "@font-face {"; |
| 1836 | 1817 | $level++; |
| 1837 | - } |
|
| 1838 | - elseif ($class === "CssAtImportToken") |
|
| 1818 | + } elseif ($class === "CssAtImportToken") |
|
| 1839 | 1819 | { |
| 1840 | 1820 | $r[] = $indent . "@import " . $token->Import . " " . implode(", ", $token->MediaTypes) . ";"; |
| 1841 | - } |
|
| 1842 | - elseif ($class === "CssAtKeyframesStartToken") |
|
| 1821 | + } elseif ($class === "CssAtKeyframesStartToken") |
|
| 1843 | 1822 | { |
| 1844 | 1823 | $r[] = $indent . "@keyframes \"" . $token->Name . "\" {"; |
| 1845 | 1824 | $level++; |
| 1846 | - } |
|
| 1847 | - elseif ($class === "CssAtMediaStartToken") |
|
| 1825 | + } elseif ($class === "CssAtMediaStartToken") |
|
| 1848 | 1826 | { |
| 1849 | 1827 | $r[] = $indent . "@media " . implode(", ", $token->MediaTypes) . " {"; |
| 1850 | 1828 | $level++; |
| 1851 | - } |
|
| 1852 | - elseif ($class === "CssAtPageStartToken") |
|
| 1829 | + } elseif ($class === "CssAtPageStartToken") |
|
| 1853 | 1830 | { |
| 1854 | 1831 | $r[] = $indent . "@page {"; |
| 1855 | 1832 | $level++; |
| 1856 | - } |
|
| 1857 | - elseif ($class === "CssAtVariablesStartToken") |
|
| 1833 | + } elseif ($class === "CssAtVariablesStartToken") |
|
| 1858 | 1834 | { |
| 1859 | 1835 | $r[] = $indent . "@variables " . implode(", ", $token->MediaTypes) . " {"; |
| 1860 | 1836 | $level++; |
| 1861 | - } |
|
| 1862 | - elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken") |
|
| 1837 | + } elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken") |
|
| 1863 | 1838 | { |
| 1864 | 1839 | $r[] = $indent . implode(", ", $token->Selectors) . " {"; |
| 1865 | 1840 | $level++; |
| 1866 | - } |
|
| 1867 | - elseif ($class == "CssAtFontFaceDeclarationToken" |
|
| 1841 | + } elseif ($class == "CssAtFontFaceDeclarationToken" |
|
| 1868 | 1842 | || $class === "CssAtKeyframesRulesetDeclarationToken" |
| 1869 | 1843 | || $class === "CssAtPageDeclarationToken" |
| 1870 | 1844 | || $class == "CssAtVariablesDeclarationToken" |
@@ -1877,8 +1851,7 @@ discard block |
||
| 1877 | 1851 | $declaration = str_pad($declaration, $this->padding, " ", STR_PAD_RIGHT); |
| 1878 | 1852 | } |
| 1879 | 1853 | $r[] = $declaration . $token->Value . ($token->IsImportant ? " !important" : "") . ";"; |
| 1880 | - } |
|
| 1881 | - elseif ($class === "CssAtFontFaceEndToken" |
|
| 1854 | + } elseif ($class === "CssAtFontFaceEndToken" |
|
| 1882 | 1855 | || $class === "CssAtMediaEndToken" |
| 1883 | 1856 | || $class === "CssAtKeyframesEndToken" |
| 1884 | 1857 | || $class === "CssAtKeyframesRulesetEndToken" |
@@ -1992,8 +1965,7 @@ discard block |
||
| 1992 | 1965 | if (class_exists($class)) |
| 1993 | 1966 | { |
| 1994 | 1967 | $this->filters[] = new $class($this, $config); |
| 1995 | - } |
|
| 1996 | - else |
|
| 1968 | + } else |
|
| 1997 | 1969 | { |
| 1998 | 1970 | CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The filter <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found")); |
| 1999 | 1971 | } |
@@ -2009,8 +1981,7 @@ discard block |
||
| 2009 | 1981 | if (class_exists($class)) |
| 2010 | 1982 | { |
| 2011 | 1983 | $this->plugins[] = new $class($this, $config); |
| 2012 | - } |
|
| 2013 | - else |
|
| 1984 | + } else |
|
| 2014 | 1985 | { |
| 2015 | 1986 | CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found")); |
| 2016 | 1987 | } |
@@ -2362,8 +2333,7 @@ discard block |
||
| 2362 | 2333 | { |
| 2363 | 2334 | CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file <code>" . $import. "</code> was already imported.", (string) $tokens[$i])); |
| 2364 | 2335 | $tokens[$i] = null; |
| 2365 | - } |
|
| 2366 | - else |
|
| 2336 | + } else |
|
| 2367 | 2337 | { |
| 2368 | 2338 | $this->imported[] = $import; |
| 2369 | 2339 | $parser = new CssParser(file_get_contents($import)); |
@@ -2595,8 +2565,7 @@ discard block |
||
| 2595 | 2565 | $this->leftBraces = $this->rightBraces = 0; |
| 2596 | 2566 | $this->parser->popState(); |
| 2597 | 2567 | return $index - 1; |
| 2598 | - } |
|
| 2599 | - else |
|
| 2568 | + } else |
|
| 2600 | 2569 | { |
| 2601 | 2570 | return false; |
| 2602 | 2571 | } |
@@ -3214,8 +3183,7 @@ discard block |
||
| 3214 | 3183 | { |
| 3215 | 3184 | $result = array($result); |
| 3216 | 3185 | } |
| 3217 | - } |
|
| 3218 | - else |
|
| 3186 | + } else |
|
| 3219 | 3187 | { |
| 3220 | 3188 | $tValue = $tokens[$i]->Value; |
| 3221 | 3189 | $tMediaTypes = $tokens[$i]->MediaTypes; |
@@ -3297,8 +3265,7 @@ discard block |
||
| 3297 | 3265 | new CssRulesetDeclarationToken("word-wrap", "break-word", $token->MediaTypes) |
| 3298 | 3266 | ); |
| 3299 | 3267 | return $r; |
| 3300 | - } |
|
| 3301 | - else |
|
| 3268 | + } else |
|
| 3302 | 3269 | { |
| 3303 | 3270 | return array(); |
| 3304 | 3271 | } |
@@ -3359,8 +3326,7 @@ discard block |
||
| 3359 | 3326 | if (isset($this->configuration["RemoveSource"]) && $this->configuration["RemoveSource"] === true) |
| 3360 | 3327 | { |
| 3361 | 3328 | array_splice($tokens, $i, $ii - $i + 1, $add); |
| 3362 | - } |
|
| 3363 | - else |
|
| 3329 | + } else |
|
| 3364 | 3330 | { |
| 3365 | 3331 | array_splice($tokens, $ii + 1, 0, $add); |
| 3366 | 3332 | } |
@@ -3450,14 +3416,12 @@ discard block |
||
| 3450 | 3416 | $red = $lightness * 255; |
| 3451 | 3417 | $green = $lightness * 255; |
| 3452 | 3418 | $blue = $lightness * 255; |
| 3453 | - } |
|
| 3454 | - else |
|
| 3419 | + } else |
|
| 3455 | 3420 | { |
| 3456 | 3421 | if ($lightness < 0.5 ) |
| 3457 | 3422 | { |
| 3458 | 3423 | $v2 = $lightness * (1 + $saturation); |
| 3459 | - } |
|
| 3460 | - else |
|
| 3424 | + } else |
|
| 3461 | 3425 | { |
| 3462 | 3426 | $v2 = ($lightness + $saturation) - ($saturation * $lightness); |
| 3463 | 3427 | } |
@@ -3884,15 +3848,13 @@ discard block |
||
| 3884 | 3848 | $this->parser->pushState("T_COMMENT"); |
| 3885 | 3849 | $this->parser->setExclusive(__CLASS__); |
| 3886 | 3850 | $this->restoreBuffer = substr($this->parser->getAndClearBuffer(), 0, -2); |
| 3887 | - } |
|
| 3888 | - elseif ($char === "/" && $previousChar === "*" && $state === "T_COMMENT") |
|
| 3851 | + } elseif ($char === "/" && $previousChar === "*" && $state === "T_COMMENT") |
|
| 3889 | 3852 | { |
| 3890 | 3853 | $this->parser->popState(); |
| 3891 | 3854 | $this->parser->unsetExclusive(); |
| 3892 | 3855 | $this->parser->appendToken(new CssCommentToken("/*" . $this->parser->getAndClearBuffer())); |
| 3893 | 3856 | $this->parser->setBuffer($this->restoreBuffer); |
| 3894 | - } |
|
| 3895 | - else |
|
| 3857 | + } else |
|
| 3896 | 3858 | { |
| 3897 | 3859 | return false; |
| 3898 | 3860 | } |
@@ -4020,8 +3982,7 @@ discard block |
||
| 4020 | 3982 | { |
| 4021 | 3983 | $value = trim(substr($value, 0, -10)); |
| 4022 | 3984 | $isImportant = true; |
| 4023 | - } |
|
| 4024 | - else |
|
| 3985 | + } else |
|
| 4025 | 3986 | { |
| 4026 | 3987 | $isImportant = false; |
| 4027 | 3988 | } |
@@ -4035,8 +3996,7 @@ discard block |
||
| 4035 | 3996 | $this->parser->popState(); |
| 4036 | 3997 | $this->parser->clearBuffer(); |
| 4037 | 3998 | $this->parser->appendToken(new CssAtVariablesEndToken()); |
| 4038 | - } |
|
| 4039 | - else |
|
| 3999 | + } else |
|
| 4040 | 4000 | { |
| 4041 | 4001 | return false; |
| 4042 | 4002 | } |
@@ -4211,8 +4171,7 @@ discard block |
||
| 4211 | 4171 | { |
| 4212 | 4172 | $value = trim(substr($value, 0, -10)); |
| 4213 | 4173 | $isImportant = true; |
| 4214 | - } |
|
| 4215 | - else |
|
| 4174 | + } else |
|
| 4216 | 4175 | { |
| 4217 | 4176 | $isImportant = false; |
| 4218 | 4177 | } |
@@ -4232,8 +4191,7 @@ discard block |
||
| 4232 | 4191 | $this->parser->popState(); |
| 4233 | 4192 | $this->parser->clearBuffer(); |
| 4234 | 4193 | $this->parser->appendToken(new CssAtPageEndToken()); |
| 4235 | - } |
|
| 4236 | - else |
|
| 4194 | + } else |
|
| 4237 | 4195 | { |
| 4238 | 4196 | return false; |
| 4239 | 4197 | } |
@@ -4353,22 +4311,19 @@ discard block |
||
| 4353 | 4311 | $this->parser->pushState("T_AT_MEDIA::PREPARE"); |
| 4354 | 4312 | $this->parser->clearBuffer(); |
| 4355 | 4313 | return $index + 6; |
| 4356 | - } |
|
| 4357 | - elseif ($char === "{" && $state === "T_AT_MEDIA::PREPARE") |
|
| 4314 | + } elseif ($char === "{" && $state === "T_AT_MEDIA::PREPARE") |
|
| 4358 | 4315 | { |
| 4359 | 4316 | $mediaTypes = array_filter(array_map("trim", explode(",", $this->parser->getAndClearBuffer("{")))); |
| 4360 | 4317 | $this->parser->setMediaTypes($mediaTypes); |
| 4361 | 4318 | $this->parser->setState("T_AT_MEDIA"); |
| 4362 | 4319 | $this->parser->appendToken(new CssAtMediaStartToken($mediaTypes)); |
| 4363 | - } |
|
| 4364 | - elseif ($char === "}" && $state === "T_AT_MEDIA") |
|
| 4320 | + } elseif ($char === "}" && $state === "T_AT_MEDIA") |
|
| 4365 | 4321 | { |
| 4366 | 4322 | $this->parser->appendToken(new CssAtMediaEndToken()); |
| 4367 | 4323 | $this->parser->clearBuffer(); |
| 4368 | 4324 | $this->parser->unsetMediaTypes(); |
| 4369 | 4325 | $this->parser->popState(); |
| 4370 | - } |
|
| 4371 | - else |
|
| 4326 | + } else |
|
| 4372 | 4327 | { |
| 4373 | 4328 | return false; |
| 4374 | 4329 | } |
@@ -4631,8 +4586,7 @@ discard block |
||
| 4631 | 4586 | { |
| 4632 | 4587 | $value = trim(substr($value, 0, -10)); |
| 4633 | 4588 | $isImportant = true; |
| 4634 | - } |
|
| 4635 | - else |
|
| 4589 | + } else |
|
| 4636 | 4590 | { |
| 4637 | 4591 | $isImportant = false; |
| 4638 | 4592 | } |
@@ -4660,8 +4614,7 @@ discard block |
||
| 4660 | 4614 | $this->parser->clearBuffer(); |
| 4661 | 4615 | $this->parser->popState(); |
| 4662 | 4616 | $this->parser->appendToken(new CssAtKeyframesEndToken()); |
| 4663 | - } |
|
| 4664 | - else |
|
| 4617 | + } else |
|
| 4665 | 4618 | { |
| 4666 | 4619 | return false; |
| 4667 | 4620 | } |
@@ -4778,8 +4731,7 @@ discard block |
||
| 4778 | 4731 | $this->parser->pushState("T_AT_IMPORT"); |
| 4779 | 4732 | $this->parser->clearBuffer(); |
| 4780 | 4733 | return $index + 7; |
| 4781 | - } |
|
| 4782 | - elseif (($char === ";" || $char === "\n") && $state === "T_AT_IMPORT") |
|
| 4734 | + } elseif (($char === ";" || $char === "\n") && $state === "T_AT_IMPORT") |
|
| 4783 | 4735 | { |
| 4784 | 4736 | $this->buffer = $this->parser->getAndClearBuffer(";"); |
| 4785 | 4737 | $pos = false; |
@@ -4800,14 +4752,12 @@ discard block |
||
| 4800 | 4752 | if ($pos) |
| 4801 | 4753 | { |
| 4802 | 4754 | $this->parser->appendToken(new CssAtImportToken($import, $mediaTypes)); |
| 4803 | - } |
|
| 4804 | - else |
|
| 4755 | + } else |
|
| 4805 | 4756 | { |
| 4806 | 4757 | CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Invalid @import at-rule syntax", $this->parser->buffer)); |
| 4807 | 4758 | } |
| 4808 | 4759 | $this->parser->popState(); |
| 4809 | - } |
|
| 4810 | - else |
|
| 4760 | + } else |
|
| 4811 | 4761 | { |
| 4812 | 4762 | return false; |
| 4813 | 4763 | } |
@@ -4919,8 +4869,7 @@ discard block |
||
| 4919 | 4869 | { |
| 4920 | 4870 | $value = trim(substr($value, 0, -10)); |
| 4921 | 4871 | $isImportant = true; |
| 4922 | - } |
|
| 4923 | - else |
|
| 4872 | + } else |
|
| 4924 | 4873 | { |
| 4925 | 4874 | $isImportant = false; |
| 4926 | 4875 | } |
@@ -4940,8 +4889,7 @@ discard block |
||
| 4940 | 4889 | $this->parser->appendToken(new CssAtFontFaceEndToken()); |
| 4941 | 4890 | $this->parser->clearBuffer(); |
| 4942 | 4891 | $this->parser->popState(); |
| 4943 | - } |
|
| 4944 | - else |
|
| 4892 | + } else |
|
| 4945 | 4893 | { |
| 4946 | 4894 | return false; |
| 4947 | 4895 | } |
@@ -5065,14 +5013,12 @@ discard block |
||
| 5065 | 5013 | $this->parser->pushState("T_AT_CHARSET"); |
| 5066 | 5014 | $this->parser->clearBuffer(); |
| 5067 | 5015 | return $index + 8; |
| 5068 | - } |
|
| 5069 | - elseif (($char === ";" || $char === "\n") && $state === "T_AT_CHARSET") |
|
| 5016 | + } elseif (($char === ";" || $char === "\n") && $state === "T_AT_CHARSET") |
|
| 5070 | 5017 | { |
| 5071 | 5018 | $charset = $this->parser->getAndClearBuffer(";"); |
| 5072 | 5019 | $this->parser->popState(); |
| 5073 | 5020 | $this->parser->appendToken(new CssAtCharsetToken($charset)); |
| 5074 | - } |
|
| 5075 | - else |
|
| 5021 | + } else |
|
| 5076 | 5022 | { |
| 5077 | 5023 | return false; |
| 5078 | 5024 | } |
@@ -300,7 +300,7 @@ |
||
| 300 | 300 | { |
| 301 | 301 | if ($isNameProvided) { |
| 302 | 302 | $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING); |
| 303 | - }else{ |
|
| 303 | + } else{ |
|
| 304 | 304 | $this->name = uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q'))); |
| 305 | 305 | } |
| 306 | 306 | |
@@ -15,7 +15,9 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | function cors() |
| 17 | 17 | { |
| 18 | - if (!headers_sent()) return; |
|
| 18 | + if (!headers_sent()) { |
|
| 19 | + return; |
|
| 20 | + } |
|
| 19 | 21 | |
| 20 | 22 | // Allow from any origin |
| 21 | 23 | if (isset($_SERVER['HTTP_ORIGIN'])) { |
@@ -151,7 +153,9 @@ discard block |
||
| 151 | 153 | if (!file_exists(dirname($file))) { |
| 152 | 154 | mkdir(dirname($file)); |
| 153 | 155 | } |
| 154 | - if (file_exists($file)) delete($file); |
|
| 156 | + if (file_exists($file)) { |
|
| 157 | + delete($file); |
|
| 158 | + } |
|
| 155 | 159 | file_put_contents($file, $content, ($append ? FILE_APPEND : 0)); |
| 156 | 160 | } |
| 157 | 161 | |