Skip to content

Commit

Permalink
Merge pull request vmelnik-ukraine#15 from jasondt/master
Browse files Browse the repository at this point in the history
properly escape all @Encrypt annotations in PHPdocs.
  • Loading branch information
westinpigott committed Aug 16, 2014
2 parents 10af92c + 6c43074 commit 6b5cb5c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Subscribers/AbstractDoctrineEncryptSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,22 @@ public function __construct(Reader $annReader, ContainerInterface $container, $e

/**
* Listen a prePersist lifecycle event. Checking and encrypt entities
* which have @Encrypted annotation
* which have <code>@Encrypted</code> annotation
* @param LifecycleEventArgs $args
*/
abstract public function prePersist($args);

/**
* Listen a preUpdate lifecycle event. Checking and encrypt entities fields
* which have @Encrypted annotation. Using changesets to avoid preUpdate event
* which have <code>@Encrypted</code> annotation. Using changesets to avoid preUpdate event
* restrictions
* @param LifecycleEventArgs $args
*/
abstract public function preUpdate($args);

/**
* Listen a postLoad lifecycle event. Checking and decrypt entities
* which have @Encrypted annotations
* which have <code>@Encrypted</code> annotations
* @param LifecycleEventArgs $args
*/
abstract public function postLoad($args);
Expand Down
6 changes: 3 additions & 3 deletions Subscribers/AbstractODMDoctrineEncryptSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ abstract class AbstractODMDoctrineEncryptSubscriber extends AbstractDoctrineEncr

/**
* Listen a prePersist lifecycle event. Checking and encrypt entities
* which have @Encrypted annotation
* which have <code>@Encrypted</code> annotation
* @param LifecycleEventArgs $args
*/
public function prePersist($args) {
Expand All @@ -30,7 +30,7 @@ public function prePersist($args) {

/**
* Listen a preUpdate lifecycle event. Checking and encrypt entities fields
* which have @Encrypted annotation. Using changesets to avoid preUpdate event
* which have <code>@Encrypted</code> annotation. Using changesets to avoid preUpdate event
* restrictions
* @param LifecycleEventArgs $args
*/
Expand All @@ -48,7 +48,7 @@ public function preUpdate($args) {

/**
* Listen a postLoad lifecycle event. Checking and decrypt entities
* which have @Encrypted annotations
* which have <code>@Encrypted</code> annotations
* @param LifecycleEventArgs $args
*/
public function postLoad($args) {
Expand Down
6 changes: 3 additions & 3 deletions Subscribers/AbstractORMDoctrineEncryptSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function getSubscribedEvents() {

/**
* Listen a prePersist lifecycle event. Checking and encrypt entities
* which have @Encrypted annotation
* which have <code>@Encrypted</code> annotation
* @param LifecycleEventArgs $args
*/
public function prePersist($args) {
Expand All @@ -41,7 +41,7 @@ public function prePersist($args) {

/**
* Listen a preUpdate lifecycle event. Checking and encrypt entities fields
* which have @Encrypted annotation. Using changesets to avoid preUpdate event
* which have <code>@Encrypted</code> annotation. Using changesets to avoid preUpdate event
* restrictions
* @param LifecycleEventArgs $args
*/
Expand All @@ -60,7 +60,7 @@ public function preUpdate($args) {

/**
* Listen a postLoad lifecycle event. Checking and decrypt entities
* which have @Encrypted annotations
* which have <code>@Encrypted</code> annotations
* @param LifecycleEventArgs $args
*/
public function postLoad($args) {
Expand Down

0 comments on commit 6b5cb5c

Please sign in to comment.