Merge pull request DoctrineEncryptBundle#6 from DoctrineEncryptBundle…

…/rossjcooper-patch Rossjcooper patch
core23 · Jul 17, 2023 · a8f4e20 · a8f4e20
2 parents 872b324 + a04e74a
commit a8f4e20
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/Command/DoctrineDecryptDatabaseCommand.php b/src/Command/DoctrineDecryptDatabaseCommand.php
@@ -54,7 +54,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 } else {
                     $output->writeln('Given encryptor does not exists');
 
-                    return $output->writeln('Supported encryptors: ' . implode(', ', array_keys($supportedExtensions)));
+                    $output->writeln('Supported encryptors: ' . implode(', ', array_keys($supportedExtensions)));
+
+                    return defined('AbstractCommand::INVALID') ? AbstractCommand::INVALID : 2;
                 }
             }
         }
@@ -82,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         );
 
         if (!$question->ask($input, $output, $confirmationQuestion)) {
-            return 1;
+            return defined('AbstractCommand::FAILURE') ? AbstractCommand::FAILURE : 1;
         }
 
         // Start decrypting database
@@ -147,6 +149,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $output->writeln('' . PHP_EOL . 'Decryption finished values found: <info>' . $valueCounter . '</info>, decrypted: <info>' . $this->subscriber->decryptCounter . '</info>.' . PHP_EOL . 'All values are now decrypted.');
 
-        return 0;
+        return defined('AbstractCommand::SUCCESS') ? AbstractCommand::SUCCESS : 0;
     }
 }
diff --git a/src/Command/DoctrineEncryptDatabaseCommand.php b/src/Command/DoctrineEncryptDatabaseCommand.php
@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         );
 
         if (!$question->ask($input, $output, $confirmationQuestion)) {
-            return 1;
+            return defined('AbstractCommand::FAILURE') ? AbstractCommand::FAILURE : 1;
         }
 
         // Start decrypting database
@@ -102,7 +102,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         // Say it is finished
         $output->writeln('Encryption finished. Values encrypted: <info>' . $this->subscriber->encryptCounter . ' values</info>.' . PHP_EOL . 'All values are now encrypted.');
 
-        return 0;
+        return defined('AbstractCommand::SUCCESS') ? AbstractCommand::SUCCESS : 0;
     }
 
 

diff --git a/src/Command/DoctrineEncryptStatusCommand.php b/src/Command/DoctrineEncryptStatusCommand.php
@@ -54,6 +54,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $output->writeln('');
         $output->writeln(sprintf('<info>%d</info> entities found which are containing <info>%d</info> encrypted properties.', count($metaDataArray), $totalCount));
 
-        return 0;
+        return defined('AbstractCommand::SUCCESS') ? AbstractCommand::SUCCESS : 0;
     }
 }
diff --git a/src/Resources/doc/commands.md b/src/Resources/doc/commands.md
@@ -7,7 +7,7 @@ To make your life a little easier we created some commands that you can use for
 You can use the comment `doctrine:encrypt:status` to get the current database and encryption information.
 
 ```
-$ php app/console doctrine:encrypt:status
+$ php bin/console doctrine:encrypt:status
 ```
 
 This command will return the amount of entities and the amount of properties with the @Encrypted tag for each entity.
@@ -29,17 +29,17 @@ You can use the comment `doctrine:encrypt:database [encryptor]` to encrypt the c
     * Default: Your encryptor set in the configuration file or the default encryption class when not set in the configuration file
 
 ```
-$ php app/console doctrine:encrypt:database
+$ php bin/console doctrine:encrypt:database
 ```
 
 or you can provide an encryptor (optional).
 
 ```
-$ php app/console doctrine:encrypt:database Defuse
+$ php bin/console doctrine:encrypt:database Defuse
 ```
 
 ```
-$ php app/console doctrine:encrypt:database Halite
+$ php bin/console doctrine:encrypt:database Halite
 ```
 
 This command will return the amount of values encrypted in the database.
@@ -58,17 +58,17 @@ You can use the comment `doctrine:decrypt:database [encryptor]` to decrypt the c
     * Default: Your encryptor set in the configuration file or the default encryption class when not set in the configuration file
 
 ```
-$ php app/console doctrine:decrypt:database
+$ php bin/console doctrine:decrypt:database
 ```
 
 or you can provide an encryptor (optional).
 
 ```
-$ php app/console doctrine:decrypt:database Defuse
+$ php bin/console doctrine:decrypt:database Defuse
 ```
 
 ```
-$ php app/console doctrine:decrypt:database Halite
+$ php bin/console doctrine:decrypt:database Halite
 ```
 
 This command will return the amount of entities and the amount of values decrypted in the database.
@@ -81,4 +81,4 @@ Decryption finished entities found: 26, decrypted 195 values.
 
 You may want to use your own encryption class learn how here:
 
-#### [Custom encryption class](https://github.com/DoctrineEncryptBundle/DoctrineEncryptBundle/blob/master/src/Resources/doc/custom_encryptor.md)
+#### [Custom encryption class](https://github.com/DoctrineEncryptBundle/DoctrineEncryptBundle/blob/master/src/Resources/doc/custom_encryptor.md)