Skip to content

Commit

Permalink
Merge branch '12-annotation-entity-and-property-constructors-causing-…
Browse files Browse the repository at this point in the history
…conflicts' into 'develop'

Resolve "Annotation entity and property constructors causing conflicts"

Closes #12

See merge request SQLI/sqli-eztoolbox!6
  • Loading branch information
ChakerKhachlek committed Feb 27, 2024
2 parents e966865 + 27fe0a3 commit ccfd21e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 32 deletions.
17 changes: 0 additions & 17 deletions Annotations/Annotation/Entity.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,6 @@ final class Entity implements SQLIClassAnnotation
/** @var string */
public $tabname = "default";

public function __construct(
bool $create = false,
bool $update = false,
bool $delete = false,
string $description = "",
int $max_per_page = 10,
bool $csv_exportable = false,
string $tabname = "default"
) {
$this->create = $create;
$this->update = $update;
$this->delete = $delete;
$this->description = $description;
$this->max_per_page = $max_per_page;
$this->csv_exportable = $csv_exportable;
$this->tabname = $tabname;
}

/**
* @return bool
Expand Down
15 changes: 0 additions & 15 deletions Annotations/Annotation/EntityProperty.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,6 @@ final class EntityProperty implements SQLIPropertyAnnotation
public $extra_link = null;


public function __construct(
bool $visible = true,
bool $readonly = false,
string $description = "",
?array $choices = null,
?string $extra_link = null
) {
$this->visible = $visible;
$this->readonly = $readonly;
$this->description = $description;
$this->choices = $choices;
$this->extra_link = $extra_link;
}


/**
* @return bool
*/
Expand Down

0 comments on commit ccfd21e

Please sign in to comment.