webrouse / n-asset-macro

src/Webrouse/AssetMacro/DI/Extension.php

Indentation +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 			'rev-manifest.json',
 		],
 		'missingAsset' => 'notice',    // exception, notice, or ignore
-        'missingManifest' => 'notice', // exception, notice, or ignore
+		'missingManifest' => 'notice', // exception, notice, or ignore
 		'missingVersion' => 'ignore',  // exception, notice, or ignore
 	];
 
@@ -34,7 +34,7 @@ 
 
 		$choices = ['exception', 'notice', 'ignore'];
 		$this->validateChoices('missingAsset', $choices);
-        $this->validateChoices('missingManifest', $choices);
+		$this->validateChoices('missingManifest', $choices);
 		$this->validateChoices('missingVersion', $choices);
 
 		$builder = $this->getContainerBuilder();

Spacing +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@ 
 			'versions.json',
 			'rev-manifest.json',
 		],
-		'missingAsset' => 'notice',    // exception, notice, or ignore
+		'missingAsset' => 'notice', // exception, notice, or ignore
         'missingManifest' => 'notice', // exception, notice, or ignore
-		'missingVersion' => 'ignore',  // exception, notice, or ignore
+		'missingVersion' => 'ignore', // exception, notice, or ignore
 	];
 
 
@@ -53,7 +53,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],

src/Webrouse/AssetMacro/AssetMacro.php

Indentation +35 added lines, -35 removed lines

@@ -73,14 +73,14 @@ 
 		}
 
 		// Get asset version
-        try {
-            $versions = $config['revManifest'] ?:
-                self::autodetectVersions($absolutePath, $wwwDir, $config['autodetect']);
-            $version = self::getAssetVersion($versions, $absolutePath, $needed, $config);
-        } catch(ManifestNotFoundException $e) {
-		    self::throwError($e, $config['missingManifest'], $needed);
-            $version = 'unknown';
-        }
+		try {
+			$versions = $config['revManifest'] ?:
+				self::autodetectVersions($absolutePath, $wwwDir, $config['autodetect']);
+			$version = self::getAssetVersion($versions, $absolutePath, $needed, $config);
+		} catch(ManifestNotFoundException $e) {
+			self::throwError($e, $config['missingManifest'], $needed);
+			$version = 'unknown';
+		}
 
 		return self::formatOutput($format, $basePath, $relativePath, $version);
 	}
@@ -102,8 +102,8 @@ 
 				switch ($matches[1]) {
 					case 'url':
 						return sprintf("%s/%s?v=%s", $basePath, $relativePath, $version);
-                    case 'path':
-                        return sprintf("%s/%s", $basePath, $relativePath);
+					case 'path':
+						return sprintf("%s/%s", $basePath, $relativePath);
 					case 'version':
 						return $version;
 					case 'basePath':
@@ -157,8 +157,8 @@ 
 		}
 
 		if (($absolutePath = realpath($wwwDir . DIRECTORY_SEPARATOR . $relativePath)) === FALSE) {
-            $msg = sprintf("Asset '%s' not found.", $relativePath);
-            self::throwError(new AssetNotFoundException($msg), $config['missingAsset'], $needed);
+			$msg = sprintf("Asset '%s' not found.", $relativePath);
+			self::throwError(new AssetNotFoundException($msg), $config['missingAsset'], $needed);
 		}
 
 		return [$relativePath, $absolutePath, $wwwDir];
@@ -168,7 +168,7 @@ 
 	/**
 	 * @param mixed $assetsVersions
 	 * @param string $absolutePath
-     * @param bool $needed
+	 * @param bool $needed
 	 * @param array $config
 	 * @return mixed|string
 	 */
@@ -190,18 +190,18 @@ 
 		}
 
 		$msg = sprintf("Asset macro: version of asset '%s' not found.", $absolutePath);
-        self::throwError(new AssetVersionNotFound($msg), $config['missingVersion'], $needed);
+		self::throwError(new AssetVersionNotFound($msg), $config['missingVersion'], $needed);
 
-        return 'unknown';
+		return 'unknown';
 	}
 
 
-    /**
-     * @param $absolutePath
-     * @param $wwwDir
-     * @param array $paths
-     * @return mixed|string
-     */
+	/**
+	 * @param $absolutePath
+	 * @param $wwwDir
+	 * @param array $paths
+	 * @return mixed|string
+	 */
 	private static function autodetectVersions($absolutePath, $wwwDir, array $paths)
 	{
 		// Iterate over parent directories (stop in www dir)
@@ -226,20 +226,20 @@ 
 		);
 	}
 
-    /**
-     * @param \Exception $e
-     * @param string $action
-     * @param bool $needed
-     * @throws \Exception
-     */
+	/**
+	 * @param \Exception $e
+	 * @param string $action
+	 * @param bool $needed
+	 * @throws \Exception
+	 */
 	private static function throwError(\Exception $e, $action = 'exception', $needed = TRUE) {
-        if ($needed) {
-            if ($action === 'exception') {
-                throw $e;
-            } elseif ($action === 'notice') {
-                trigger_error($e->getMessage(), E_USER_NOTICE);
-            }
-        }
-    }
+		if ($needed) {
+			if ($action === 'exception') {
+				throw $e;
+			} elseif ($action === 'notice') {
+				trigger_error($e->getMessage(), E_USER_NOTICE);
+			}
+		}
+	}
 
 }

Spacing +5 added lines, -6 removed lines

@@ -74,10 +74,9 @@ 
 
 		// Get asset version
         try {
-            $versions = $config['revManifest'] ?:
-                self::autodetectVersions($absolutePath, $wwwDir, $config['autodetect']);
+            $versions = $config['revManifest'] ?: self::autodetectVersions($absolutePath, $wwwDir, $config['autodetect']);
             $version = self::getAssetVersion($versions, $absolutePath, $needed, $config);
-        } catch(ManifestNotFoundException $e) {
+        } catch (ManifestNotFoundException $e) {
 		    self::throwError($e, $config['missingManifest'], $needed);
             $version = 'unknown';
         }
@@ -98,7 +97,7 @@ 
 	{
 		return Strings::replace($format,
 			'/%([^%]+)%/',
-			function ($matches) use ($basePath, $format, $relativePath, $version) {
+			function($matches) use ($basePath, $format, $relativePath, $version) {
 				switch ($matches[1]) {
 					case 'url':
 						return sprintf("%s/%s?v=%s", $basePath, $relativePath, $version);
@@ -175,8 +174,8 @@ 
 	private static function getAssetVersion($assetsVersions, $absolutePath, $needed, array $config)
 	{
 		// Versions can be array or path to JSON file
-		if ( ! is_array($assetsVersions)) {
-			if ( ! file_exists($assetsVersions)) {
+		if (!is_array($assetsVersions)) {
+			if (!file_exists($assetsVersions)) {
 				throw new ManifestNotFoundException(sprintf("Revision manifest file not found: '%s'.", $assetsVersions));
 			}
 			$assetsVersions = Json::decode(file_get_contents($assetsVersions), Json::FORCE_ARRAY);