Commit ff24acd8 authored by Ludwig Ruderstaller's avatar Ludwig Ruderstaller
Browse files

Merge branch 'develop' into 'master'

Changed Model Fields to protected to allow for override

See merge request !3
parents 92553d1a 517baf82
Pipeline #19564 passed with stage
in 3 minutes and 58 seconds
......@@ -16,9 +16,9 @@ namespace Cwd\PowerDNSClient\Model;
class CacheFlushResult
{
/** @var int */
private $count;
protected $count;
/** @var string */
private $result;
protected $result;
/**
* @return int
......
......@@ -16,13 +16,13 @@ namespace Cwd\PowerDNSClient\Model;
class Config
{
/** @var string|null */
private $type;
protected $type;
/** @var string|null */
private $name;
protected $name;
/** @var string|null */
private $value;
protected $value;
/**
* @return null|string
......
......@@ -46,10 +46,10 @@ class Cryptokey
];
/** @var string */
private $type = 'Cryptokey';
protected $type = 'Cryptokey';
/** @var int */
private $id;
protected $id;
/**
* @var string
* @Assert\Choice(
......@@ -57,20 +57,20 @@ class Cryptokey
* groups={"CREATE"}
* )
*/
private $keytype;
protected $keytype;
/** @var bool */
private $active = false;
protected $active = false;
/** @var string */
private $dnskey;
protected $dnskey;
/** @var string[] */
private $ds = [];
protected $ds = [];
/** @var string */
private $privatekey;
protected $protectedkey;
/** @var string */
private $algorithm;
protected $algorithm;
/** @var int */
private $bits;
protected $bits;
/**
* @return string
......@@ -195,19 +195,19 @@ class Cryptokey
/**
* @return string
*/
public function getPrivatekey(): ?string
public function getprotectedkey(): ?string
{
return $this->privatekey;
return $this->protectedkey;
}
/**
* @param string $privatekey
* @param string $protectedkey
*
* @return Cryptokey
*/
public function setPrivatekey(string $privatekey): Cryptokey
public function setprotectedkey(string $protectedkey): Cryptokey
{
$this->privatekey = $privatekey;
$this->protectedkey = $protectedkey;
return $this;
}
......
......@@ -57,10 +57,10 @@ class Metadata
* @var string
* @Assert\NotBlank(groups={"CREATE", "UPDATE"})
*/
private $kind;
protected $kind;
/** @var string[] */
private $metadata = [];
protected $metadata = [];
/**
* @return string
......
......@@ -16,21 +16,21 @@ namespace Cwd\PowerDNSClient\Model;
class SearchResult
{
/** @var string */
private $content;
protected $content;
/** @var bool */
private $disabled = false;
protected $disabled = false;
/** @var string */
private $name;
protected $name;
/** @var string */
private $objectType;
protected $objectType;
/** @var string */
private $zoneId;
protected $zoneId;
/** @var string */
private $zone;
protected $zone;
/** @var string */
private $type;
protected $type;
/** @var int */
private $ttl;
protected $ttl;
/**
* @return string
......
......@@ -16,19 +16,19 @@ namespace Cwd\PowerDNSClient\Model;
class Server
{
/** @var string */
private $type = 'Server';
protected $type = 'Server';
/** @var string */
private $id;
protected $id;
/** @var string */
private $daemonType;
protected $daemonType;
/** @var string */
private $version;
protected $version;
/** @var string */
private $url;
protected $url;
/** @var string */
private $configUrl;
protected $configUrl;
/** @var string */
private $zonesUrl;
protected $zonesUrl;
/**
* @return string
......
......@@ -29,14 +29,14 @@ class Zone
* @var string|null
* @Groups({"CREATE", "DELETE"})
*/
private $id;
protected $id;
/**
* @var string
* @Assert\NotBlank(groups={"CREATE"})
* @DNSAssert\HasDotPostfix(groups={"CREATE"})
* @Groups({"CREATE", "DELETE"})
*/
private $name;
protected $name;
/**
* @var string
* @Assert\NotBlank()
......@@ -46,13 +46,13 @@ class Zone
* )
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $type = self::TYPE;
protected $type = self::TYPE;
/**
* @var string|null
* @Groups({"CREATE", "DELETE"})
*/
private $url;
protected $url;
/**
* @var string|null
* @Assert\Choice(
......@@ -61,81 +61,81 @@ class Zone
* )
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $kind;
protected $kind;
/**
* @var array
* @Assert\Valid(groups={"CREATE", "UPDATE"})
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $rrsets = [];
protected $rrsets = [];
/** @var int|null */
private $serial;
protected $serial;
/** @var int|null */
private $notifiedSerial;
protected $notifiedSerial;
/**
* @var string[]
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $masters = [];
protected $masters = [];
/**
* @var bool
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $dnssec = false;
protected $dnssec = false;
/**
* @var string|null
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $nsec3param;
protected $nsec3param;
/**
* @var bool
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $nsec3narrow = false;
protected $nsec3narrow = false;
/**
* @var bool
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $predisgned = false;
protected $predisgned = false;
/**
* @var string|null
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $soaEdit;
protected $soaEdit;
/**
* @var string|null
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $soaEditApi;
protected $soaEditApi;
/**
* @var bool
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $apiRectify = false;
protected $apiRectify = false;
/**
* @var string|null
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $zone;
protected $zone;
/**
* @var string|null
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $account;
protected $account;
/**
* @var string[]
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $nameservers = [];
protected $nameservers = [];
/**
* @return null|string
......
......@@ -23,17 +23,17 @@ class Comment
* @Assert\NotBlank(groups={"CREATE", "UPDATE"})
* @Groups({"REPLACE", "CREATE"})
*/
private $content;
protected $content;
/**
* @var string
* @Groups({"REPLACE", "CREATE"})
* @Assert\NotBlank(groups={"CREATE", "UPDATE"})
*/
private $account;
protected $account;
/** @var int */
private $modifiedAt;
protected $modifiedAt;
/**
* @return string
......
......@@ -30,7 +30,7 @@ class RRSet
*
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $name;
protected $name;
/**
* @var string
......@@ -45,12 +45,12 @@ class RRSet
* )
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $type;
protected $type;
/**
* @var int
* @Groups({"REPLACE", "CREATE"})
*/
private $ttl;
protected $ttl;
/**
* @var string
......@@ -60,21 +60,21 @@ class RRSet
* )
* @Groups({"REPLACE", "DELETE"})
*/
private $changetype;
protected $changetype;
/**
* @var Record[]
* @Assert\Valid(groups={"CREATE", "UPDATE"})
* @Groups({"REPLACE", "CREATE"})
*/
private $records = [];
protected $records = [];
/**
* @var Comment[]
* @Assert\Valid(groups={"CREATE", "UPDATE"})
* @Groups({"REPLACE", "CREATE"})
*/
private $comments = [];
protected $comments = [];
/**
* @return string
......
......@@ -23,19 +23,19 @@ class Record
* @Assert\NotBlank(groups={"CREATE", "UPDATE"})
* @Groups({"REPLACE", "CREATE"})
*/
private $content;
protected $content;
/**
* @var bool
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $disabled = false;
protected $disabled = false;
/**
* @var bool
* @Groups({"REPLACE", "CREATE", "DELETE"})
*/
private $setPtr = false;
protected $setPtr = false;
/**
* @return string
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment