webrouse / n-asset-macro

src/Webrouse/AssetMacro/DI/Extension.php

Spacing +3 added lines, -3 removed lines

@@ -29,9 +29,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
 	];
 
 
@@ -65,7 +65,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],

Doc Comments +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 
 	/**
 	 * @param string $key
-	 * @param array $choices
+	 * @param string[] $choices
 	 */
 	private function validateChoices($key, array $choices)
 	{

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'],

examples/gulp/www/data/TemplateRouter.php

Indentation +11 added lines, -11 removed lines

@@ -10,13 +10,13 @@ 
  */
 class TemplateRouter extends Routers\RouteList
 {
-    /** @var ILatteFactory  */
-    private $latteFactory;
+	/** @var ILatteFactory  */
+	private $latteFactory;
 
 	public function __construct($path, $cachePath, ILatteFactory $latteFactory)
 	{
-	    parent::__construct();
-	    $this->latteFactory = $latteFactory;
+		parent::__construct();
+		$this->latteFactory = $latteFactory;
 
 		if (is_file($cacheFile = $cachePath . '/routes.php')) {
 			$routes = require $cacheFile;
@@ -37,8 +37,8 @@ 
 	{
 		$routes = [];
 
-        $latte = $this->createLatte();
-        $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
+		$latte = $this->createLatte();
+		$macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
 		$macroSet->addMacro('url', function ($node) use (&$routes, &$file) {
 			$routes[$node->args] = (string) $file;
 		}, null, null, $macroSet::ALLOWED_IN_HEAD);
@@ -51,9 +51,9 @@ 
 	}
 
 	public function createLatte() {
-        $latte = $this->latteFactory->create();
-        $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-        $macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
-        return $latte;
-    }
+		$latte = $this->latteFactory->create();
+		$macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
+		$macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
+		return $latte;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 use Nette\Application\Routers;
 use \Nette\Bridges\ApplicationLatte\ILatteFactory;
@@ -26,7 +26,7 @@ 
 		}
 
 		foreach ($routes as $mask => $file) {
-			$this[] = new Routers\Route($mask, function ($presenter) use ($file, $cachePath, $latteFactory) {
+			$this[] = new Routers\Route($mask, function($presenter) use ($file, $cachePath, $latteFactory) {
 				return $presenter->createTemplate(null, [$this, 'createLatte'])->setFile($file);
 			});
 		}
@@ -39,7 +39,7 @@ 
 
         $latte = $this->createLatte();
         $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-		$macroSet->addMacro('url', function ($node) use (&$routes, &$file) {
+		$macroSet->addMacro('url', function($node) use (&$routes, &$file) {
 			$routes[$node->args] = (string) $file;
 		}, null, null, $macroSet::ALLOWED_IN_HEAD);
 
@@ -53,7 +53,7 @@ 
 	public function createLatte() {
         $latte = $this->latteFactory->create();
         $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-        $macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
+        $macroSet->addMacro('url', function() {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
         return $latte;
     }
 }

examples/gulp/www/index.php

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 /** @var ILatteFactory $latteFactory */
 $latteFactory = $container->getService('latte.latteFactory');
 $container->addService(
-    'router',
-    new TemplateRouter('data/templates', __DIR__ . '/data/temp', $latteFactory)
+	'router',
+	new TemplateRouter('data/templates', __DIR__ . '/data/temp', $latteFactory)
 );
 
 // Run the application!

examples/grunt/www/data/TemplateRouter.php

Indentation +11 added lines, -11 removed lines

@@ -10,13 +10,13 @@ 
  */
 class TemplateRouter extends Routers\RouteList
 {
-    /** @var ILatteFactory  */
-    private $latteFactory;
+	/** @var ILatteFactory  */
+	private $latteFactory;
 
 	public function __construct($path, $cachePath, ILatteFactory $latteFactory)
 	{
-	    parent::__construct();
-	    $this->latteFactory = $latteFactory;
+		parent::__construct();
+		$this->latteFactory = $latteFactory;
 
 		if (is_file($cacheFile = $cachePath . '/routes.php')) {
 			$routes = require $cacheFile;
@@ -37,8 +37,8 @@ 
 	{
 		$routes = [];
 
-        $latte = $this->createLatte();
-        $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
+		$latte = $this->createLatte();
+		$macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
 		$macroSet->addMacro('url', function ($node) use (&$routes, &$file) {
 			$routes[$node->args] = (string) $file;
 		}, null, null, $macroSet::ALLOWED_IN_HEAD);
@@ -51,9 +51,9 @@ 
 	}
 
 	public function createLatte() {
-        $latte = $this->latteFactory->create();
-        $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-        $macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
-        return $latte;
-    }
+		$latte = $this->latteFactory->create();
+		$macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
+		$macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
+		return $latte;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 use Nette\Application\Routers;
 use \Nette\Bridges\ApplicationLatte\ILatteFactory;
@@ -26,7 +26,7 @@ 
 		}
 
 		foreach ($routes as $mask => $file) {
-			$this[] = new Routers\Route($mask, function ($presenter) use ($file, $cachePath, $latteFactory) {
+			$this[] = new Routers\Route($mask, function($presenter) use ($file, $cachePath, $latteFactory) {
 				return $presenter->createTemplate(null, [$this, 'createLatte'])->setFile($file);
 			});
 		}
@@ -39,7 +39,7 @@ 
 
         $latte = $this->createLatte();
         $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-		$macroSet->addMacro('url', function ($node) use (&$routes, &$file) {
+		$macroSet->addMacro('url', function($node) use (&$routes, &$file) {
 			$routes[$node->args] = (string) $file;
 		}, null, null, $macroSet::ALLOWED_IN_HEAD);
 
@@ -53,7 +53,7 @@ 
 	public function createLatte() {
         $latte = $this->latteFactory->create();
         $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-        $macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
+        $macroSet->addMacro('url', function() {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
         return $latte;
     }
 }

examples/grunt/www/index.php

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 /** @var ILatteFactory $latteFactory */
 $latteFactory = $container->getService('latte.latteFactory');
 $container->addService(
-    'router',
-    new TemplateRouter('data/templates', __DIR__ . '/data/temp', $latteFactory)
+	'router',
+	new TemplateRouter('data/templates', __DIR__ . '/data/temp', $latteFactory)
 );
 
 // Run the application!

examples/webpack/www/data/TemplateRouter.php

Indentation +11 added lines, -11 removed lines

@@ -10,13 +10,13 @@ 
  */
 class TemplateRouter extends Routers\RouteList
 {
-    /** @var ILatteFactory  */
-    private $latteFactory;
+	/** @var ILatteFactory  */
+	private $latteFactory;
 
 	public function __construct($path, $cachePath, ILatteFactory $latteFactory)
 	{
-	    parent::__construct();
-	    $this->latteFactory = $latteFactory;
+		parent::__construct();
+		$this->latteFactory = $latteFactory;
 
 		if (is_file($cacheFile = $cachePath . '/routes.php')) {
 			$routes = require $cacheFile;
@@ -37,8 +37,8 @@ 
 	{
 		$routes = [];
 
-        $latte = $this->createLatte();
-        $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
+		$latte = $this->createLatte();
+		$macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
 		$macroSet->addMacro('url', function ($node) use (&$routes, &$file) {
 			$routes[$node->args] = (string) $file;
 		}, null, null, $macroSet::ALLOWED_IN_HEAD);
@@ -51,9 +51,9 @@ 
 	}
 
 	public function createLatte() {
-        $latte = $this->latteFactory->create();
-        $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-        $macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
-        return $latte;
-    }
+		$latte = $this->latteFactory->create();
+		$macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
+		$macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
+		return $latte;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 use Nette\Application\Routers;
 use \Nette\Bridges\ApplicationLatte\ILatteFactory;
@@ -26,7 +26,7 @@ 
 		}
 
 		foreach ($routes as $mask => $file) {
-			$this[] = new Routers\Route($mask, function ($presenter) use ($file, $cachePath, $latteFactory) {
+			$this[] = new Routers\Route($mask, function($presenter) use ($file, $cachePath, $latteFactory) {
 				return $presenter->createTemplate(null, [$this, 'createLatte'])->setFile($file);
 			});
 		}
@@ -39,7 +39,7 @@ 
 
         $latte = $this->createLatte();
         $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-		$macroSet->addMacro('url', function ($node) use (&$routes, &$file) {
+		$macroSet->addMacro('url', function($node) use (&$routes, &$file) {
 			$routes[$node->args] = (string) $file;
 		}, null, null, $macroSet::ALLOWED_IN_HEAD);
 
@@ -53,7 +53,7 @@ 
 	public function createLatte() {
         $latte = $this->latteFactory->create();
         $macroSet = new Latte\Macros\MacroSet($latte->getCompiler());
-        $macroSet->addMacro('url', function () {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
+        $macroSet->addMacro('url', function() {}, null, null, $macroSet::ALLOWED_IN_HEAD); // ignore
         return $latte;
     }
 }

examples/webpack/www/index.php

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 /** @var ILatteFactory $latteFactory */
 $latteFactory = $container->getService('latte.latteFactory');
 $container->addService(
-    'router',
-    new TemplateRouter('data/templates', __DIR__ . '/data/temp', $latteFactory)
+	'router',
+	new TemplateRouter('data/templates', __DIR__ . '/data/temp', $latteFactory)
 );
 
 // Run the application!