@@ -69,14 +69,13 @@ discard block |
||
| 69 | 69 | $revision = $manifest === NULL ? NULL : self::resolveRevision($manifest, $path, $need, $config); |
| 70 | 70 | |
| 71 | 71 | // Is revision only version (query parameter) or full path to asset? |
| 72 | - $revisionIsVersion = $revision === NULL || ! Strings::match($revision, '/[.\/]/'); |
|
| 72 | + $revisionIsVersion = $revision === NULL || !Strings::match($revision, '/[.\/]/'); |
|
| 73 | 73 | |
| 74 | 74 | // Check if asset exists |
| 75 | 75 | $ds = DIRECTORY_SEPARATOR; |
| 76 | 76 | $filePath = $revisionIsVersion ? |
| 77 | - ($wwwDir . $ds . $path) : |
|
| 78 | - ($wwwDir . $ds . Utils::normalizePath($revision)); |
|
| 79 | - if ( ! file_exists($filePath)) { |
|
| 77 | + ($wwwDir . $ds . $path) : ($wwwDir . $ds . Utils::normalizePath($revision)); |
|
| 78 | + if (!file_exists($filePath)) { |
|
| 80 | 79 | Utils::throwError( |
| 81 | 80 | new AssetNotFoundException(sprintf("Asset '%s' not found.", $filePath)), |
| 82 | 81 | $config['missingAsset'], |
@@ -105,7 +104,7 @@ discard block |
||
| 105 | 104 | |
| 106 | 105 | return Strings::replace($format, |
| 107 | 106 | '/%([^%]+)%/', |
| 108 | - function ($matches) use ($basePath, $format, $path, $revision, $revisionIsVersion) { |
|
| 107 | + function($matches) use ($basePath, $format, $path, $revision, $revisionIsVersion) { |
|
| 109 | 108 | switch ($matches[1]) { |
| 110 | 109 | case 'raw': |
| 111 | 110 | return $revision; |
@@ -115,8 +114,7 @@ discard block |
||
| 115 | 114 | return $path; |
| 116 | 115 | case 'url': |
| 117 | 116 | return $revisionIsVersion ? |
| 118 | - sprintf("%s/%s?v=%s", $basePath, $path, $revision) : |
|
| 119 | - sprintf("%s/%s", $basePath, $path); |
|
| 117 | + sprintf("%s/%s?v=%s", $basePath, $path, $revision) : sprintf("%s/%s", $basePath, $path); |
|
| 120 | 118 | default: |
| 121 | 119 | $msg = sprintf( |
| 122 | 120 | "Asset macro: Invalid variable '%s' in format '%s'. " . |
@@ -168,7 +166,7 @@ discard block |
||
| 168 | 166 | |
| 169 | 167 | // Path to JSON manifest |
| 170 | 168 | if (is_string($manifest)) { |
| 171 | - if ( ! file_exists($manifest)) { |
|
| 169 | + if (!file_exists($manifest)) { |
|
| 172 | 170 | Utils::throwError( |
| 173 | 171 | new ManifestNotFoundException(sprintf("Manifest file not found: '%s'.", $manifest)), |
| 174 | 172 | $config['missingManifest'], |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | */ |
| 68 | 68 | private function validateChoices($key, array $choices) |
| 69 | 69 | { |
| 70 | - if ( ! in_array($this->config[$key], $choices)) { |
|
| 70 | + if (!in_array($this->config[$key], $choices)) { |
|
| 71 | 71 | throw new UnexpectedValueException(sprintf( |
| 72 | 72 | "Unexpected value '%s' of '%s' configuration key. Allowed values: %s.", |
| 73 | 73 | $this->config[$key], |