webrouse / n-asset-macro

src/Webrouse/AssetMacro/AssetMacro.php

Spacing +6 added lines, -8 removed lines

@@ -69,14 +69,13 @@ 
 		$revision = $manifest === NULL ? NULL : self::resolveRevision($manifest, $path, $need, $config);
 
 		// Is revision only version (query parameter) or full path to asset?
-		$revisionIsVersion = $revision === NULL || ! Strings::match($revision, '/[.\/]/');
+		$revisionIsVersion = $revision === NULL || !Strings::match($revision, '/[.\/]/');
 
 		// Check if asset exists
 		$ds = DIRECTORY_SEPARATOR;
 		$filePath = $revisionIsVersion ?
-			($wwwDir . $ds . $path) :
-			($wwwDir . $ds . Utils::normalizePath($revision));
-		if ( ! file_exists($filePath)) {
+			($wwwDir . $ds . $path) : ($wwwDir . $ds . Utils::normalizePath($revision));
+		if (!file_exists($filePath)) {
 			Utils::throwError(
 				new AssetNotFoundException(sprintf("Asset '%s' not found.", $filePath)),
 				$config['missingAsset'],
@@ -105,7 +104,7 @@ 
 
 		return Strings::replace($format,
 			'/%([^%]+)%/',
-			function ($matches) use ($basePath, $format, $path, $revision, $revisionIsVersion) {
+			function($matches) use ($basePath, $format, $path, $revision, $revisionIsVersion) {
 				switch ($matches[1]) {
 					case 'raw':
 						return $revision;
@@ -115,8 +114,7 @@ 
 						return $path;
 					case 'url':
 						return $revisionIsVersion ?
-							sprintf("%s/%s?v=%s", $basePath, $path, $revision) :
-							sprintf("%s/%s", $basePath, $path);
+							sprintf("%s/%s?v=%s", $basePath, $path, $revision) : sprintf("%s/%s", $basePath, $path);
 					default:
 						$msg = sprintf(
 							"Asset macro: Invalid variable '%s' in format '%s'. " .
@@ -168,7 +166,7 @@ 
 
 		// Path to JSON manifest
 		if (is_string($manifest)) {
-			if ( ! file_exists($manifest)) {
+			if (!file_exists($manifest)) {
 				Utils::throwError(
 					new ManifestNotFoundException(sprintf("Manifest file not found: '%s'.", $manifest)),
 					$config['missingManifest'],

src/Webrouse/AssetMacro/DI/Extension.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@ 
 			'rev-manifest.json',
 		],
 		// Error handling
-		'missingAsset' => 'notice',	   // exception, notice, or ignore
+		'missingAsset' => 'notice', // exception, notice, or ignore
 		'missingManifest' => 'notice', // exception, notice, or ignore
-		'missingRevision' => 'ignore',  // exception, notice, or ignore
+		'missingRevision' => 'ignore', // exception, notice, or ignore
 	];
 
 
@@ -67,7 +67,7 @@ 
 	 */
 	private function validateChoices($key, array $choices)
 	{
-		if ( ! in_array($this->config[$key], $choices)) {
+		if (!in_array($this->config[$key], $choices)) {
 			throw new UnexpectedValueException(sprintf(
 				"Unexpected value '%s' of '%s' configuration key. Allowed values: %s.",
 				$this->config[$key],