Import contact form

[packbundle] / Command / RangeCommand.php

diff --git a/Command/RangeCommand.php b/Command/RangeCommand.php
index 6ca60908b3952a44ce6605c29f15bb4a485183ae..059713825f9dee11b696d853a88b269017e4f908 100644 (file)
--- a/Command/RangeCommand.php
+++ b/Command/RangeCommand.php
@@ -12,7 +12,6 @@
 namespace Rapsys\PackBundle\Command;
 
 use Rapsys\PackBundle\Command;
-use Rapsys\PackBundle\RapsysPackBundle;
 
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -29,19 +28,19 @@ class RangeCommand extends Command {
         *
         * 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
         */
-       protected string $help = 'This command outputs a shuffled printable characters range';
+       protected string $help = 'This command generates a shuffled printable characters range';
 
        /**
         * {@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);
 
@@ -78,6 +77,9 @@ class RangeCommand extends Command {
                        $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
@@ -89,9 +91,6 @@ class RangeCommand extends Command {
                                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
@@ -99,7 +98,7 @@ class RangeCommand extends Command {
                        //Without match
                        } else {
                                //Append string
-                               $content .= (strlen($content)?"\n\n":'').'###> '.RapsysPackBundle::getBundleAlias().' ###'."\n".$string."\n".'###< '.RapsysPackBundle::getBundleAlias().' ###';
+                               $content .= (strlen($content)?"\n\n":'').'###> '.$this->bundle.' ###'."\n".$string."\n".'###< '.$this->bundle.' ###';
                        }
 
                        //Write file content
@@ -116,13 +115,10 @@ class RangeCommand extends Command {
                //Without writeable file
                } else {
                        //Print instruction
-                       echo '# Set in '.$file."\n";
+                       echo '# Add to '.$file."\n";
 
                        //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";