Miroslavsckaya/copypaste
1
0
Fork 0
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

WIP: feature_paste #1

Draft
Miroslavsckaya wants to merge 24 commits from feature_paste into master
pull from: feature_paste
merge into: Miroslavsckaya:master
Conversation 0 Commits 24 Files changed 31 +30 -113
2 changed files with 30 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 21d651f377 - Show all commits

19
src/Controller/PasteController.php
View file

@ -26,18 +26,18 @@ class PasteController extends AbstractController
$pasteData = $form->getData(); $pasteData = $form->getData();
$secret = null; $secret = null;
if ($pasteData->isPrivate()) { if ($pasteData->private) {
$secret = hash('sha1', random_bytes(25)); $secret = hash('sha1', random_bytes(25));
} }
$paste = new Paste( $paste = new Paste(
$pasteData->getText(), $pasteData->text,
$pasteData->getLanguage(), $pasteData->language,
$pasteData->getDescription(), $pasteData->description,
$pasteData->getFilename(), $pasteData->filename,
$pasteData->getAuthor(), $pasteData->author,
new \DateTimeImmutable(), new \DateTimeImmutable(),
$pasteData->getExpirationDate(), $pasteData->expirationDate,
skobkin commented 2023-08-06 11:03:34 +00:00
Review
Copy link

show_paste at least.

`show_paste` at least.
$request->getClientIp(), $request->getClientIp(),
$secret $secret
); );
@ -52,10 +52,11 @@ class PasteController extends AbstractController
} }
#[Route('/{id}/{secret}')] #[Route('/{id}/{secret}')]
public function showPaste(PasteRepository $pasteRepository, Request $request, string $id, ?string $secret=NULL): Response public function showPaste(PasteRepository $pasteRepository, string $id, ?string $secret=NULL): Response
{ {
$paste = $pasteRepository->findOneBy(['id' => $id, 'secret' => $secret]); $paste = $pasteRepository->findOneBy(['id' => $id, 'secret' => $secret]);
$form = $this->createForm(PasteForm::class, $paste); $pasteData = new PasteFormData($paste);
$form = $this->createForm(PasteForm::class, $pasteData);
return $this->render('paste.html.twig', [ return $this->render('paste.html.twig', [
'form' => $form, 'form' => $form,

120
src/DTO/PasteFormData.php
View file

@ -3,120 +3,36 @@ declare(strict_types = 1);
namespace App\DTO; namespace App\DTO;
use App\Entity\Paste;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
class PasteFormData class PasteFormData
{ {
private int $id;
#[Assert\NotBlank] #[Assert\NotBlank]
private string $text; public string $text;
#[Assert\Type(\boolean::class)] #[Assert\Type(\boolean::class)]
private bool $private; public bool $private;
public ?string $language = null;
private ?string $language = null; public ?string $description = null;
public ?string $filename = null;
private ?string $description = null;
private ?string $filename = null;
#[Assert\NotBlank] #[Assert\NotBlank]
private string $author = 'anonymous'; public string $author = 'anonymous';
skobkin marked this conversation as resolved
skobkin commented 2023-07-21 22:36:37 +00:00
Review
Copy link

Why string and Assert\NotBlank?

Why `string` and `Assert\NotBlank`?
👍 1
#[Assert\Type(\DateTimeImmutable::class)] #[Assert\Type(\DateTimeImmutable::class)]
private ?\DateTimeImmutable $expirationDate; public ?\DateTimeImmutable $expirationDate;
skobkin marked this conversation as resolved
skobkin commented 2023-07-22 18:00:09 +00:00
Review
Copy link

Is this validation being processed BEFORE storing the data in the DTO?
If not, it's pointless as with bool field earlier.

Is this validation being processed BEFORE storing the data in the DTO? If not, it's pointless as with `bool` field earlier.
👍 1
private ?string $secret; public function __construct(?Paste $paste=null)
skobkin marked this conversation as resolved
skobkin commented 2023-07-21 22:33:47 +00:00
Review
Copy link

Or you can make constructor private, use property promotion and add fromPaste() method to create it from the entity.

Or you can make constructor `private`, use property promotion and add `fromPaste()` method to create it from the entity.
👍 1
public function getId(): int
{ {
return $this->id; if ($paste === null)
}
public function setId(int $id): void
{ {
$this->id = $id; return;
} }
$this->text = $paste->text;
public function getText(): string $this->private = $paste->secret !== null;
{ $this->language = $paste->language;
return $this->text; $this->description = $paste->description;
} $this->filename = $paste->filename;
$this->author = $paste->author;
public function setText(string $text): void $this->expirationDate = $paste->expirationDate;
{
$this->text = $text;
}
public function getLanguage(): ?string
{
return $this->language;
}
public function setLanguage(?string $language): void
{
$this->language = $language;
}
public function getDescription(): ?string
{
return $this->description;
}
public function setDescription(?string $description): void
{
$this->description = $description;
}
public function getFilename(): ?string
{
return $this->filename;
}
public function setFilename(?string $filename): void
{
$this->filename = $filename;
}
public function getAuthor(): string
{
return $this->author;
}
public function setAuthor(string $author): void
{
$this->author = $author;
}
public function getExpirationDate(): ?\DateTime
{
return $this->expirationDate;
}
public function setExpirationDate(?\DateTime $date): void
{
$this->expirationDate = $date;
}
public function getSecret(): ?string
{
return $this->secret;
}
public function setSecret(?string $secret): void
{
$this->secret = $secret;
}
public function isPrivate(): bool
{
return $this->private;
}
public function setPrivate(bool $private): void
{
$this->private = $private;
} }
} }