Fix file util arguments

[packbundle] / Command / RangeCommand.php

diff --git a/Command/RangeCommand.php b/Command/RangeCommand.php
index 6ba5dd110f3c5a974456c99627a07095d4183ff1..059713825f9dee11b696d853a88b269017e4f908 100644 (file)
--- a/Command/RangeCommand.php
+++ b/Command/RangeCommand.php
@@ -28,19 +28,19 @@ class RangeCommand extends Command {
         *
         * Shown with bin/console list
         */
         *
         * Shown with bin/console list
         */

-       protected string $description = 'Outputs a shuffled printable characters range';
+       protected string $description = 'Generates a shuffled printable characters range';

 
        /**
         * Set help
         *
         * Shown with bin/console --help rapsyspack:range
         */
 
        /**
         * Set help
         *
         * Shown with bin/console --help rapsyspack:range
         */

-       protected string $help = 'This command outputs a shuffled printable characters range';
+       protected string $help = 'This command generates a shuffled printable characters range';

 
        /**
         * {@inheritdoc}
         */
 
        /**
         * {@inheritdoc}
         */

-       public function __construct(protected string $file = '.env.local', protected ?string $name = null) {
+       public function __construct(protected string $file, protected ?string $name = null) {

                //Call parent constructor
                parent::__construct($this->name);
 
                //Call parent constructor
                parent::__construct($this->name);
 


@@ -77,6 +77,9 @@ class RangeCommand extends Command {
                        $shuffles = array_merge($shuffles, $slices);
                } while (!empty($ranges));
 
                        $shuffles = array_merge($shuffles, $slices);
                } while (!empty($ranges));
 

+               //Set string
+               $string = 'RAPSYSPACK_RANGE="'.strtr(implode($shuffles), ['\\' => '\\\\', '"' => '\\"', '$' => '\\$']).'"';
+

                //With writeable file
                if (is_file($file = $input->getArgument('file')) && is_writeable($file)) {
                        //Get file content
                //With writeable file
                if (is_file($file = $input->getArgument('file')) && is_writeable($file)) {
                        //Get file content


@@ -88,16 +91,14 @@ class RangeCommand extends Command {
                                return self::FAILURE;
                        }
 
                                return self::FAILURE;
                        }
 

-                       //Set string
-                       $string = 'RAPSYSPACK_RANGE="'.strtr(implode($shuffles), ['\\' => '\\\\', '"' => '\\"', '$' => '\\$']).'"';
-

                        //With match
                        if (preg_match('/^RAPSYSPACK_RANGE=.*$/m', $content, $matches, PREG_OFFSET_CAPTURE)) {
                                //Replace matches
                                $content = preg_replace('/^(RAPSYSPACK_RANGE=.*)$/m', '#$1'."\n".strtr($string, ['\\' => '\\\\', '\\$' => '\\\\$']), $content);
                        //Without match
                        } else {
                        //With match
                        if (preg_match('/^RAPSYSPACK_RANGE=.*$/m', $content, $matches, PREG_OFFSET_CAPTURE)) {
                                //Replace matches
                                $content = preg_replace('/^(RAPSYSPACK_RANGE=.*)$/m', '#$1'."\n".strtr($string, ['\\' => '\\\\', '\\$' => '\\\\$']), $content);
                        //Without match
                        } else {

-                               $content .= "\n".$string;
+                               //Append string
+                               $content .= (strlen($content)?"\n\n":'').'###> '.$this->bundle.' ###'."\n".$string."\n".'###< '.$this->bundle.' ###';

                        }
 
                        //Write file content
                        }
 
                        //Write file content


@@ -114,13 +115,10 @@ class RangeCommand extends Command {
                //Without writeable file
                } else {
                        //Print instruction
                //Without writeable file
                } else {
                        //Print instruction

-                       echo '# Set in '.$file."\n";
+                       echo '# Add to '.$file."\n";

 
                        //Print rapsys pack range variable
 
                        //Print rapsys pack range variable

-                       echo 'RAPSYSPACK_RANGE=';
-
-                       //Print shuffled range
-                       var_export(implode($shuffles));
+                       echo '###> '.$this->bundle.' ###'."\n".$string."\n".'###< '.$this->bundle.' ###';

 
                        //Add trailing line
                        echo "\n";
 
                        //Add trailing line
                        echo "\n";