Skip to content

Commit

Permalink
feat: Added all Doctrine string fields explicit length and validation…
Browse files Browse the repository at this point in the history 
… assert.
  • Loading branch information
@ambroisemaupate
ambroisemaupate committed Jun 7, 2023
1 parent c5c73f2 commit 8c1d230
Show file tree
Hide file tree
Showing 37 changed files with 266 additions and 94 deletions.
3 changes: 0 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,3 @@ cache :
migrate:
docker-compose exec -u www-data app php bin/console doctrine:migrations:migrate
docker-compose exec -u www-data app php bin/console themes:migrate ./src/Resources/config.yml



10 changes: 5 additions & 5 deletions lib/Models/src/Roadiz/Core/AbstractEntities/AbstractField.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ abstract class AbstractField extends AbstractPositioned
];

#[
ORM\Column(name: "group_name", type: "string", nullable: true),
ORM\Column(name: "group_name", type: "string", length: 250, nullable: true),
Assert\Length(max: 250),
SymfonySerializer\Groups(["node_type", "setting"]),
Serializer\Groups(["node_type", "setting"]),
Expand All @@ -265,7 +265,7 @@ abstract class AbstractField extends AbstractPositioned
protected ?string $groupName = null;

#[
ORM\Column(name: "group_name_canonical", type: "string", nullable: true),
ORM\Column(name: "group_name_canonical", type: "string", length: 250, nullable: true),
Serializer\Groups(["node_type", "setting"]),
SymfonySerializer\Groups(["node_type", "setting"]),
Assert\Length(max: 250),
Expand All @@ -275,7 +275,7 @@ abstract class AbstractField extends AbstractPositioned
protected ?string $groupNameCanonical = null;

#[
ORM\Column(type: "string"),
ORM\Column(type: "string", length: 250),
Serializer\Expose,
Serializer\Groups(["node_type", "setting"]),
SymfonySerializer\Groups(["node_type", "setting"]),
Expand All @@ -287,7 +287,7 @@ abstract class AbstractField extends AbstractPositioned
protected string $name;

#[
ORM\Column(type: "string"),
ORM\Column(type: "string", length: 250),
Serializer\Expose,
Serializer\Groups(["node_type", "setting"]),
Serializer\Type("string"),
Expand All @@ -299,7 +299,7 @@ abstract class AbstractField extends AbstractPositioned
protected ?string $label;

#[
ORM\Column(type: "string", nullable: true),
ORM\Column(type: "string", length: 250, nullable: true),
Serializer\Expose,
Serializer\Groups(["node_type", "setting"]),
SymfonySerializer\Groups(["node_type", "setting"]),
Expand Down
16 changes: 8 additions & 8 deletions lib/Models/src/Roadiz/Core/AbstractEntities/AbstractHuman.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
abstract class AbstractHuman extends AbstractDateTimed
{
#[
ORM\Column(type: "string", unique: true),
ORM\Column(type: "string", length: 200, unique: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\NotNull(),
Expand All @@ -37,47 +37,47 @@ abstract class AbstractHuman extends AbstractDateTimed
* Public name (pseudonyme) that can be displayed to a public audience.
*/
#[
ORM\Column(name: "publicName", type: "string", nullable: true),
ORM\Column(name: "publicName", type: "string", length: 250, nullable: true),
Serializer\Groups(["user_public", "human"]),
SymfonySerializer\Groups(["user_public", "human"]),
Assert\Length(max: 250)
]
protected ?string $publicName = null;

#[
ORM\Column(name: "firstName", type: "string", nullable: true),
ORM\Column(name: "firstName", type: "string", length: 250, nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
]
protected ?string $firstName = null;

#[
ORM\Column(name: "lastName", type: "string", nullable: true),
ORM\Column(name: "lastName", type: "string", length: 250, nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
]
protected ?string $lastName = null;

#[
ORM\Column(type: "string", nullable: true),
ORM\Column(type: "string", length: 50, nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 20)
Assert\Length(max: 50)
]
protected ?string $phone = null;

#[
ORM\Column(type: "string", nullable: true),
ORM\Column(type: "string", length: 250, nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
]
protected ?string $company = null;

#[
ORM\Column(type: "string", nullable: true),
ORM\Column(type: "string", length: 250, nullable: true),
Serializer\Groups(["user_personal", "human"]),
SymfonySerializer\Groups(["user_personal", "human"]),
Assert\Length(max: 250)
Expand Down
80 changes: 80 additions & 0 deletions lib/RoadizCoreBundle/migrations/Version20230607134403.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?php

declare(strict_types=1);

namespace RZ\Roadiz\Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20230607134403 extends AbstractMigration
{
public function getDescription(): string
{
return 'Set all string fields length explicitly.';
}

public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE attribute_translations CHANGE label label VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE custom_form_answers CHANGE ip ip VARCHAR(46) NOT NULL');
$this->addSql('ALTER TABLE custom_form_fields CHANGE name name VARCHAR(250) NOT NULL, CHANGE label label VARCHAR(250) NOT NULL, CHANGE placeholder placeholder VARCHAR(250) DEFAULT NULL, CHANGE group_name group_name VARCHAR(250) DEFAULT NULL, CHANGE group_name_canonical group_name_canonical VARCHAR(250) DEFAULT NULL');
$this->addSql('ALTER TABLE custom_forms CHANGE color color VARCHAR(7) DEFAULT NULL, CHANGE name name VARCHAR(250) NOT NULL, CHANGE display_name display_name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE documents CHANGE embedId embedId VARCHAR(250) DEFAULT NULL, CHANGE embedPlatform embedPlatform VARCHAR(100) DEFAULT NULL, CHANGE filename filename VARCHAR(250) DEFAULT NULL, CHANGE folder folder VARCHAR(100) NOT NULL');
$this->addSql('ALTER TABLE documents_translations CHANGE name name VARCHAR(250) DEFAULT NULL');
$this->addSql('ALTER TABLE folders CHANGE folder_name folder_name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE folders_translations CHANGE name name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE log CHANGE client_ip client_ip VARCHAR(46) DEFAULT NULL, CHANGE channel channel VARCHAR(64) DEFAULT NULL');
$this->addSql('ALTER TABLE login_attempts CHANGE ip_address ip_address VARCHAR(46) DEFAULT NULL');
$this->addSql('ALTER TABLE node_type_fields CHANGE name name VARCHAR(250) NOT NULL, CHANGE label label VARCHAR(250) NOT NULL, CHANGE placeholder placeholder VARCHAR(250) DEFAULT NULL, CHANGE group_name group_name VARCHAR(250) DEFAULT NULL, CHANGE group_name_canonical group_name_canonical VARCHAR(250) DEFAULT NULL');
$this->addSql('ALTER TABLE node_types CHANGE name name VARCHAR(30) NOT NULL, CHANGE display_name display_name VARCHAR(250) NOT NULL, CHANGE color color VARCHAR(7) DEFAULT NULL');
$this->addSql('ALTER TABLE nodes CHANGE children_order children_order VARCHAR(50) NOT NULL');
$this->addSql('ALTER TABLE nodes_sources CHANGE title title VARCHAR(250) DEFAULT NULL, CHANGE meta_title meta_title VARCHAR(150) NOT NULL');
$this->addSql('ALTER TABLE roles CHANGE name name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE settings CHANGE name name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE settings_groups CHANGE name name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE tags CHANGE tag_name tag_name VARCHAR(250) NOT NULL, CHANGE children_order children_order VARCHAR(60) DEFAULT \'position\' NOT NULL');
$this->addSql('ALTER TABLE tags_translations CHANGE name name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE translations CHANGE name name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE url_aliases CHANGE alias alias VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE usergroups CHANGE name name VARCHAR(250) NOT NULL');
$this->addSql('ALTER TABLE users CHANGE facebook_name facebook_name VARCHAR(128) DEFAULT NULL, CHANGE confirmation_token confirmation_token VARCHAR(128) DEFAULT NULL, CHANGE username username VARCHAR(200) NOT NULL, CHANGE salt salt VARCHAR(64) NOT NULL, CHANGE password password VARCHAR(128) NOT NULL, CHANGE email email VARCHAR(200) NOT NULL, CHANGE firstName firstName VARCHAR(250) DEFAULT NULL, CHANGE lastName lastName VARCHAR(250) DEFAULT NULL, CHANGE phone phone VARCHAR(50) DEFAULT NULL, CHANGE company company VARCHAR(250) DEFAULT NULL, CHANGE job job VARCHAR(250) DEFAULT NULL, CHANGE publicName publicName VARCHAR(250) DEFAULT NULL');
}

public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE attribute_translations CHANGE label label VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE custom_form_answers CHANGE ip ip VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE custom_form_fields CHANGE group_name group_name VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE group_name_canonical group_name_canonical VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE label label VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE placeholder placeholder VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE custom_forms CHANGE color color VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE display_name display_name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE documents CHANGE embedId embedId VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE embedPlatform embedPlatform VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE filename filename VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE folder folder VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE documents_translations CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE folders CHANGE folder_name folder_name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE folders_translations CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE log CHANGE client_ip client_ip VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE channel channel VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE login_attempts CHANGE ip_address ip_address VARCHAR(50) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE node_type_fields CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE group_name group_name VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE group_name_canonical group_name_canonical VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE label label VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE placeholder placeholder VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE node_types CHANGE color color VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE display_name display_name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE nodes CHANGE children_order children_order VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE nodes_sources CHANGE title title VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE meta_title meta_title VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE roles CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE settings CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE settings_groups CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE tags CHANGE tag_name tag_name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE children_order children_order VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT \'position\' NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE tags_translations CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE translations CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE url_aliases CHANGE alias alias VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE usergroups CHANGE name name VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`');
$this->addSql('ALTER TABLE users CHANGE email email VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE facebook_name facebook_name VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE confirmation_token confirmation_token VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE username username VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE salt salt VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE password password VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE publicName publicName VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE firstName firstName VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE lastName lastName VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE phone phone VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE company company VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, CHANGE job job VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
}

public function isTransactional(): bool
{
return false;
}
}
8 changes: 5 additions & 3 deletions lib/RoadizCoreBundle/src/Entity/CustomForm.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@
class CustomForm extends AbstractDateTimed
{
#[
ORM\Column(name: "color", type: "string", unique: false, nullable: true),
ORM\Column(name: "color", type: "string", length: 7, unique: false, nullable: true),
Serializer\Groups(["custom_form", "nodes_sources"]),
Assert\Length(max: 7),
SymfonySerializer\Ignore()
]
protected ?string $color = '#000000';

#[
ORM\Column(type: "string", unique: true),
ORM\Column(type: "string", length: 250, unique: true),
Serializer\Groups(["custom_form", "nodes_sources"]),
SymfonySerializer\Groups(["custom_form", "nodes_sources"]),
Assert\NotNull(),
Expand All @@ -49,7 +50,7 @@ class CustomForm extends AbstractDateTimed
private string $name = 'Untitled';

#[
ORM\Column(name: "display_name", type: "string"),
ORM\Column(name: "display_name", type: "string", length: 250),
Serializer\Groups(["custom_form", "nodes_sources"]),
SymfonySerializer\Groups(["custom_form", "nodes_sources"]),
Assert\NotNull(),
Expand Down Expand Up @@ -79,6 +80,7 @@ class CustomForm extends AbstractDateTimed
ORM\Column(type: "string", length: 15, nullable: true),
Serializer\Groups(["custom_form"]),
SymfonySerializer\Groups(["custom_form"]),
Assert\Length(max: 15),
SymfonySerializer\Ignore()
]
private ?string $retentionTime = null;
Expand Down
6 changes: 4 additions & 2 deletions lib/RoadizCoreBundle/src/Entity/CustomFormAnswer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use RZ\Roadiz\CoreBundle\Repository\CustomFormAnswerRepository;
use Symfony\Component\Serializer\Annotation as SymfonySerializer;
use RZ\Roadiz\Core\AbstractEntities\AbstractEntity;
use Symfony\Component\Validator\Constraints as Assert;

#[
ORM\Entity(repositoryClass: CustomFormAnswerRepository::class),
Expand All @@ -22,9 +23,10 @@
class CustomFormAnswer extends AbstractEntity
{
#[
ORM\Column(name: "ip", type: "string", nullable: false),
ORM\Column(name: "ip", type: "string", length: 46, nullable: false),
Serializer\Groups(["custom_form_answer"]),
SymfonySerializer\Groups(["custom_form_answer"])
SymfonySerializer\Groups(["custom_form_answer"]),
Assert\Length(max: 46)
]
private string $ip = '';

Expand Down
Loading

0 comments on commit 8c1d230

Please sign in to comment.