Remove hardcoded range

[packbundle] / Parser / TokenParser.php

diff --git a/Parser/TokenParser.php b/Parser/TokenParser.php
index 72182674795198e6eb6accbc24cbbfd8479baead..02acca34a868aa12aa9c5206c52de8e80317a7df 100644 (file)
--- a/Parser/TokenParser.php
+++ b/Parser/TokenParser.php
@@ -26,8 +26,10 @@ use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
 class TokenParser extends AbstractTokenParser {
 use Twig\TokenParser\AbstractTokenParser;
 
 class TokenParser extends AbstractTokenParser {

-       ///The tag name
-       protected $tag;
+       /**
+        * The stream context instance
+        */
+       protected mixed $ctx;

 
        /**
         * Constructor
 
        /**
         * Constructor


@@ -39,36 +41,23 @@ class TokenParser extends AbstractTokenParser {
         * @param string $output The default output string
         * @param array $filters The default filters array
         */
         * @param string $output The default output string
         * @param array $filters The default filters array
         */

-       public function __construct(FileLocator $locator, PackageInterface $package, array $config, string $tag, string $output, array $filters) {
-               //Save locator
-               $this->locator = $locator;
-
-               //Save assets package
-               $this->package = $package;
-
-               //Set name
-               $this->name = $config['name'];
-
-               //Set scheme
-               $this->scheme = $config['scheme'];
-
-               //Set timeout
-               $this->timeout = $config['timeout'];
-
-               //Set agent
-               $this->agent = $config['agent'];
-
-               //Set redirect
-               $this->redirect = $config['redirect'];
-
-               //Set tag
-               $this->tag = $tag;
-
-               //Set output
-               $this->output = $output;
-
-               //Set filters
-               $this->filters = $filters;
+       //TODO: change config to name and get other values from RAPSYSPACK_REDIRECT, RAPSYSPACK_SCHEME, RAPSYSPACK_TIMEOUT, RAPSYSPACK_AGENT env variables ?
+       public function __construct(protected FileLocator $locator, protected PackageInterface $package, protected array $config, protected string $tag, protected string $output, protected array $filters) {
+               //Set ctx
+               $this->ctx = stream_context_create(
+                       [
+                               'http' => [
+                                       #'header' => ['Referer: https://www.openstreetmap.org/'],
+                                       //TODO: set as bundle env config
+                                       'max_redirects' => $config['redirect']?:5,
+                                       //TODO: set as bundle env config
+                                       'timeout' => $config['timeout']?:(int)ini_get('default_socket_timeout'),
+                                       #'user_agent' => 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36',
+                                       //TODO: set as bundle env config
+                                       'user_agent' => $config['agent']?:(string)ini_get('user_agent')?:'rapsys_pack/2.0.0',
+                               ]
+                       ]
+               );

        }
 
        /**
        }
 
        /**


@@ -95,7 +84,7 @@ class TokenParser extends AbstractTokenParser {
                $stream = $this->parser->getStream();
 
                $inputs = [];
                $stream = $this->parser->getStream();
 
                $inputs = [];

-               $name = $this->name;
+               $name = $this->config['name'];

                $output = $this->output;
                $filters = $this->filters;
 
                $output = $this->output;
                $filters = $this->filters;
 


@@ -152,7 +141,8 @@ class TokenParser extends AbstractTokenParser {
                        //Deal with generic url
                        if (strpos($inputs[$k], '//') === 0) {
                                //Fix url
                        //Deal with generic url
                        if (strpos($inputs[$k], '//') === 0) {
                                //Fix url

-                               $inputs[$k] = $this->scheme.substr($inputs[$k], 2);
+                               //TODO: set as bundle env config
+                               $inputs[$k] = $this->config['scheme'].substr($inputs[$k], 2);

                        //Deal with non url path
                        } elseif (strpos($inputs[$k], '://') === false) {
                                //Check if we have a bundle path
                        //Deal with non url path
                        } elseif (strpos($inputs[$k], '://') === false) {
                                //Check if we have a bundle path


@@ -183,23 +173,12 @@ class TokenParser extends AbstractTokenParser {
                        }
                }
 
                        }
                }
 

-               //Init context
-               $ctx = stream_context_create(
-                       [
-                               'http' => [
-                                       'timeout' => $this->timeout,
-                                       'user_agent' => $this->agent,
-                                       'redirect' => $this->redirect,
-                               ]
-                       ]
-               );
-

                //Check inputs
                if (!empty($inputs)) {
                        //Retrieve files content
                        foreach($inputs as $input) {
                                //Try to retrieve content
                //Check inputs
                if (!empty($inputs)) {
                        //Retrieve files content
                        foreach($inputs as $input) {
                                //Try to retrieve content

-                               if (($data = file_get_contents($input, false, $ctx)) === false) {
+                               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
                                        throw new Error(sprintf('Unable to retrieve input path "%s"', $input), $token->getLine(), $stream->getSourceContext());
                                }
                                //Append content


@@ -314,7 +293,7 @@ class TokenParser extends AbstractTokenParser {
         * @param Exception $prev The previous exception
         * @return string The resolved file path
         */
         * @param Exception $prev The previous exception
         * @return string The resolved file path
         */

-       public function getLocated(string $file, int $lineno = 0, Source $source = null, \Exception $prev = null): string {
+       public function getLocated(string $file, int $lineno = 0, ?Source $source = null, ?\Exception $prev = null): string {

                /*TODO: add a @jquery magic feature ?
                if ($file == '@jquery') {
                        #header('Content-Type: text/plain');
                /*TODO: add a @jquery magic feature ?
                if ($file == '@jquery') {
                        #header('Content-Type: text/plain');


@@ -325,7 +304,7 @@ class TokenParser extends AbstractTokenParser {
 
                //Check that we have a / separator between bundle name and path
                if (($pos = strpos($file, '/')) === false) {
 
                //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
                }
 
                //Set bundle


@@ -378,7 +357,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
                                //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);

                        }
                }
 
                        }
                }