X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/9dc1e38692373814883406792a88cc7377a111c1..275a867d7909596ff26ae7c0d64a45c63c743074:/Parser/TokenParser.php diff --git a/Parser/TokenParser.php b/Parser/TokenParser.php index 7218267..de425a7 100644 --- a/Parser/TokenParser.php +++ b/Parser/TokenParser.php @@ -26,9 +26,36 @@ use Twig\Token; use Twig\TokenParser\AbstractTokenParser; class TokenParser extends AbstractTokenParser { + ///The locator + protected $locator; + + ///The package + protected $package; + + ///The name + protected $name; + + ///The scheme + protected $scheme; + + ///The timeout + protected $timeout; + + ///The agent + protected $agent; + + ///The redirect + protected $redirect; + ///The tag name protected $tag; + ///The output + protected $output; + + ///The filters + protected $filters; + /** * Constructor * @@ -325,7 +352,7 @@ class TokenParser extends AbstractTokenParser { //Check that we have a / separator between bundle name and path if (($pos = strpos($file, '/')) === false) { - throw new Error(sprintf('Invalid path "%s"', $file), $token->getLine(), $stream->getSourceContext()); + throw new Error(sprintf('Invalid path "%s"', $file), $lineno, $source); } //Set bundle @@ -378,7 +405,7 @@ class TokenParser extends AbstractTokenParser { //Catch bundle does not exist or is not enabled exception again } catch(\InvalidArgumentException $e) { //Bail out as bundle or path is invalid and we have no way to know what was meant - throw new Error(sprintf('Invalid bundle name "%s" in path "%s". Maybe you meant "%s"', substr($file, 1, $pos - 1), $file, $bundle.'/'.$path), $token->getLine(), $stream->getSourceContext(), $e); + throw new Error(sprintf('Invalid bundle name "%s" in path "%s". Maybe you meant "%s"', substr($file, 1, $pos - 1), $file, $bundle.'/'.$path), $lineno, $source, $e); } }