X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/41e15ab5df817a5178b73a08bcfb2298842cc559..b29d46fa4a1cb6b6cae4274f5bd0f6aaafa27f04:/Parser/TokenParser.php?ds=inline

diff --git a/Parser/TokenParser.php b/Parser/TokenParser.php
index 1115e0c..67e87eb 100644
--- a/Parser/TokenParser.php
+++ b/Parser/TokenParser.php
@@ -11,6 +11,8 @@
 
 namespace Rapsys\PackBundle\Parser;
 
+use Rapsys\PackBundle\RapsysPackBundle;
+
 use Symfony\Component\Asset\PackageInterface;
 use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 use Symfony\Component\Filesystem\Filesystem;
@@ -25,8 +27,9 @@ use Twig\Source;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
-use Rapsys\PackBundle\RapsysPackBundle;
-
+/**
+ * {@inheritdoc}
+ */
 class TokenParser extends AbstractTokenParser {
 	/**
 	 * The stream context instance
@@ -50,7 +53,7 @@ class TokenParser extends AbstractTokenParser {
 				'http' => [
 					#'header' => ['Referer: https://www.openstreetmap.org/'],
 					'max_redirects' => $_ENV['RAPSYSPACK_REDIRECT'] ?? 20,
-					'timeout' => $_ENV['RAPSYSPACK_TIMEOUT'] ?? (int)ini_get('default_socket_timeout') ?: 60,
+					'timeout' => $_ENV['RAPSYSPACK_TIMEOUT'] ?? (($timeout = ini_get('default_socket_timeout')) !== false && $timeout !== "" ? (float)$timeout : 60),
 					'user_agent' => $_ENV['RAPSYSPACK_AGENT'] ?? (($agent = ini_get('user_agent')) !== false && $agent !== "" ? (string)$agent : RapsysPackBundle::getAlias().'/'.RapsysPackBundle::getVersion())
 				]
 			]
@@ -140,7 +143,7 @@ class TokenParser extends AbstractTokenParser {
 			//Deal with generic url
 			if (strpos($inputs[$k], '//') === 0) {
 				//Fix url
-				$inputs[$k] = ($_ENV['RAPSYSPACK_SCHEME'] ?? 'https://').substr($inputs[$k], 2);
+				$inputs[$k] = ($_ENV['RAPSYSPACK_SCHEME'] ?? 'https').'://'.substr($inputs[$k], 2);
 			//Deal with non url path
 			} elseif (strpos($inputs[$k], '://') === false) {
 				//Check if we have a bundle path
@@ -153,6 +156,7 @@ class TokenParser extends AbstractTokenParser {
 				if (strpos($inputs[$k], '*') !== false || (($a = strpos($inputs[$k], '{')) !== false && ($b = strpos($inputs[$k], ',', $a)) !== false && strpos($inputs[$k], '}', $b) !== false)) {
 					//Get replacement
 					$replacement = glob($inputs[$k], GLOB_NOSORT|GLOB_BRACE);
+
 					//Check that these are working files
 					foreach($replacement as $input) {
 						//Check that it's a file
@@ -160,8 +164,10 @@ class TokenParser extends AbstractTokenParser {
 							throw new Error(sprintf('Input path "%s" from "%s" is not a file', $input, $inputs[$k]), $token->getLine(), $stream->getSourceContext());
 						}
 					}
+
 					//Replace with glob path
 					array_splice($inputs, $k, 1, $replacement);
+
 					//Fix current key
 					$k += count($replacement) - 1;
 				//Check that it's a file
@@ -179,6 +185,7 @@ class TokenParser extends AbstractTokenParser {
 				if (($data = file_get_contents($input, false, $this->ctx)) === false) {
 					throw new Error(sprintf('Unable to retrieve input path "%s"', $input), $token->getLine(), $stream->getSourceContext());
 				}
+
 				//Append content
 				$content .= $data;
 			}
@@ -197,17 +204,22 @@ class TokenParser extends AbstractTokenParser {
 			foreach($this->filters as $filter) {
 				//Init args
 				$args = [$stream->getSourceContext(), $token->getLine()];
+
 				//Check if args is available
 				if (!empty($filter['args'])) {
 					//Append args if provided
 					$args += $filter['args'];
 				}
+
 				//Init reflection
 				$reflection = new \ReflectionClass($filter['class']);
+
 				//Set instance args
 				$tool = $reflection->newInstanceArgs($args);
+
 				//Process content
 				$content = $tool->process($content);
+
 				//Remove object
 				unset($tool, $reflection);
 			}
@@ -218,7 +230,7 @@ class TokenParser extends AbstractTokenParser {
 		}
 
 		//Retrieve asset uri
-		//XXX: this path is the merge of services.assets.path_package.arguments[0] and rapsys_pack.output.(css,img,js)
+		//XXX: this path is the merge of services.assets.path_package.arguments[0] and rapsyspack.output.(css,img,js)
 		if (($outputUrl = $this->package->getUrl($this->output)) === false) {
 			throw new Error(sprintf('Unable to get url for asset: %s', $this->output), $token->getLine(), $stream->getSourceContext());
 		}