From bd651d535ac60094cf27fc379943f3add7d6ea45 Mon Sep 17 00:00:00 2001 From: Marcel Date: Mon, 3 Aug 2015 22:03:49 +0200 Subject: [PATCH] Fixed rollback (old typo) --- Command/DoctrineEncryptStatusCommand.php | 2 +- Resources/doc/commands.md | 6 +++--- Subscribers/DoctrineEncryptSubscriber.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Command/DoctrineEncryptStatusCommand.php b/Command/DoctrineEncryptStatusCommand.php index 4ee3ade7..c24d515c 100644 --- a/Command/DoctrineEncryptStatusCommand.php +++ b/Command/DoctrineEncryptStatusCommand.php @@ -57,6 +57,6 @@ protected function execute(InputInterface $input, OutputInterface $output) } $output->writeln(""); - $output->writeln(count($metaDataArray) . " entity's found which are containing " . $totalCount . " encrypted properties."); + $output->writeln(count($metaDataArray) . " entities found which are containing " . $totalCount . " encrypted properties."); } } diff --git a/Resources/doc/commands.md b/Resources/doc/commands.md index 2039e3ed..6cf0ba52 100644 --- a/Resources/doc/commands.md +++ b/Resources/doc/commands.md @@ -10,14 +10,14 @@ You can use the comment `doctrine:encrypt:status` to get the current database an $ php app/console doctrine:encrypt:status ``` -This command will return the amount of entity's and the amount of properties with the @Encrypted tag for each entity. +This command will return the amount of entities and the amount of properties with the @Encrypted tag for each entity. The result will look like this: ``` DoctrineEncrypt\Entity\User has 3 properties which are encrypted. DoctrineEncrypt\Entity\UserDetail has 13 properties which are encrypted. -2 entity's found which are containing 16 encrypted properties. +2 entities found which are containing 16 encrypted properties. ``` ## 2) Encrypt current database @@ -71,7 +71,7 @@ $ php app/console doctrine:encrypt:database rijndael256 $ php app/console doctrine:encrypt:database \Ambta\DoctrineEncryptBundle\Encryptors\Rijndael256Encryptor ``` -This command will return the amount of entity's and the amount of values decrypted in the database. +This command will return the amount of entities and the amount of values decrypted in the database. ``` Decryption finished entities found: 26, decrypted 195 values. diff --git a/Subscribers/DoctrineEncryptSubscriber.php b/Subscribers/DoctrineEncryptSubscriber.php index 370cfc58..f2ad7f4c 100644 --- a/Subscribers/DoctrineEncryptSubscriber.php +++ b/Subscribers/DoctrineEncryptSubscriber.php @@ -121,7 +121,7 @@ public function restoreEncryptor() { /** * Listen a postUpdate lifecycle event. - * Decrypt entity's property's values when post updated. + * Decrypt entities property's values when post updated. * * So for example after form submit the preUpdate encrypted the entity * We have to decrypt them before showing them again. @@ -137,7 +137,7 @@ public function postUpdate(LifecycleEventArgs $args) { /** * Listen a preUpdate lifecycle event. - * Encrypt entity's property's values on preUpdate, so they will be stored encrypted + * Encrypt entities property's values on preUpdate, so they will be stored encrypted * * @param PreUpdateEventArgs $args */