Skip to content

Commit

Permalink
Replace Class:: by static
Browse files Browse the repository at this point in the history
  • Loading branch information
@webeweb
webeweb committed Feb 5, 2021
1 parent 50f9bf5 commit 0ab9a24
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions src/Model/EpisodeNum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class EpisodeNum extends AbstractModel {
*/
public static function enumSystem(): array {
return [
EpisodeNum::SYSTEM_ONSCREEN,
EpisodeNum::SYSTEM_XMLTV_NS,
static::SYSTEM_ONSCREEN,
static::SYSTEM_XMLTV_NS,
];
}

Expand Down
8 changes: 4 additions & 4 deletions src/Model/Length.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ class Length extends AbstractModel {
*/
public static function enumUnits(): array {
return [
Length::UNITS_HOURS,
Length::UNITS_MINUTES,
Length::UNITS_SECONDS,
static::UNITS_HOURS,
static::UNITS_MINUTES,
static::UNITS_SECONDS,
];
}

Expand Down Expand Up @@ -98,7 +98,7 @@ public function jsonSerialize(): array {
* @throws InvalidArgumentException Throws an invalid argument exception if the units is invalid.
*/
public function setUnits(?string $units): Length {
if (null !== $units && false === in_array($units, Length::enumUnits())) {
if (null !== $units && false === in_array($units, static::enumUnits())) {
throw new InvalidArgumentException(sprintf('The units "%s" is invalid', $units));
}
$this->units = $units;
Expand Down
6 changes: 3 additions & 3 deletions src/Model/Review.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class Review extends AbstractModel {
*/
public static function enumType(): array {
return [
Review::TYPE_TEXT,
Review::TYPE_URL,
static::TYPE_TEXT,
static::TYPE_URL,
];
}

Expand Down Expand Up @@ -130,7 +130,7 @@ public function setSource(?string $source): Review {
* @throws InvalidArgumentException Throws an invalid argument exception if the type is invalid.
*/
public function setType(?string $type): Review {
if (null !== $type && false === in_array($type, Review::enumType())) {
if (null !== $type && false === in_array($type, static::enumType())) {
throw new InvalidArgumentException(sprintf('The type "%s" is invalid', $type));
}
$this->type = $type;
Expand Down
10 changes: 5 additions & 5 deletions src/Model/Stereo.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ class Stereo extends AbstractModel {
*/
public static function enumContent(): array {
return [
Stereo::CONTENT_BILINGUAL,
Stereo::CONTENT_DOLBY,
Stereo::CONTENT_DOLBY_DIGITAL,
Stereo::CONTENT_MONO,
Stereo::CONTENT_STEREO,
static::CONTENT_BILINGUAL,
static::CONTENT_DOLBY,
static::CONTENT_DOLBY_DIGITAL,
static::CONTENT_MONO,
static::CONTENT_STEREO,
];
}

Expand Down
8 changes: 4 additions & 4 deletions src/Model/Subtitles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ class Subtitles extends AbstractModel {
*/
public static function enumType(): array {
return [
Subtitles::TYPE_DEAF_SIGNED,
Subtitles::TYPE_ONSCREEN,
Subtitles::TYPE_TELETEXT,
static::TYPE_DEAF_SIGNED,
static::TYPE_ONSCREEN,
static::TYPE_TELETEXT,
];
}

Expand All @@ -84,7 +84,7 @@ public function jsonSerialize(): array {
* @throws InvalidArgumentException Throws an invalid argument exception if the type is invalid.
*/
public function setType(?string $type): Subtitles {
if (null !== $type && false === in_array($type, Subtitles::enumType())) {
if (null !== $type && false === in_array($type, static::enumType())) {
throw new InvalidArgumentException(sprintf('The type "%s" is invalid', $type));
}
$this->type = $type;
Expand Down
6 changes: 3 additions & 3 deletions src/Provider/XmlProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static function getXml(string $url, string $filename, LoggerInterface $lo

$client->request("GET", $url);

return XmlProvider::readXml($filename, $logger);
return static::readXml($filename, $logger);
}

/**
Expand All @@ -84,7 +84,7 @@ public static function readXml(string $filename, LoggerInterface $logger = null)
if (false === @$document->load($filename)) {
throw new RuntimeException(libxml_get_last_error()->message, 500);
}
if (false === @$document->schemaValidate(XmlProvider::getDtd()) && null !== $logger) {
if (false === @$document->schemaValidate(static::getDtd()) && null !== $logger) {
$logger->warning("Schema validation failed", ["_filename" => $filename]);
}

Expand Down Expand Up @@ -129,7 +129,7 @@ public static function writeXml(Tv $tv, string $filename, LoggerInterface $logge

$document = new DOMDocument();
$document->loadXML(implode("", $xml));
if (false === @$document->schemaValidate(XmlProvider::getDtd()) && null !== $logger) {
if (false === @$document->schemaValidate(static::getDtd()) && null !== $logger) {
$logger->warning("Schema validation failed");
}

Expand Down
2 changes: 1 addition & 1 deletion src/Serializer/JsonDeserializer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ public static function deserializeProgramme(array $data): Programme {
SerializerHelper::jsonDeserializeArray(ArrayHelper::get($data, SerializerKeys::TITLES, []), Title::DOM_NODE_NAME, $model);
SerializerHelper::jsonDeserializeArray(ArrayHelper::get($data, SerializerKeys::SECONDARY_TITLES, []), SecondaryTitle::DOM_NODE_NAME, $model);
SerializerHelper::jsonDeserializeArray(ArrayHelper::get($data, SerializerKeys::DESCS, []), Desc::DOM_NODE_NAME, $model);
$model->setCredits(JsonDeserializer::deserializeCredits(ArrayHelper::get($data, SerializerKeys::CREDITS, [])));
$model->setCredits(static::deserializeCredits(ArrayHelper::get($data, SerializerKeys::CREDITS, [])));
SerializerHelper::jsonDeserializeModel($data, SerializerKeys::DATE, $model);
SerializerHelper::jsonDeserializeArray(ArrayHelper::get($data, SerializerKeys::CATEGORIES, []), Category::DOM_NODE_NAME, $model);
SerializerHelper::jsonDeserializeArray(ArrayHelper::get($data, SerializerKeys::KEYWORDS, []), Keyword::DOM_NODE_NAME, $model);
Expand Down
2 changes: 1 addition & 1 deletion src/Serializer/JsonSerializer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class JsonSerializer {
* @return array Returns the serialized actor.
*/
public static function serializeActor(Actor $model): array {
return array_merge(JsonSerializer::serializeCredit($model), [
return array_merge(static::serializeCredit($model), [
SerializerKeys::ROLE => $model->getRole(),
]);
}
Expand Down
40 changes: 20 additions & 20 deletions src/Serializer/SerializerHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class SerializerHelper {
*/
public static function deserializeDateTime(?string $value): ?DateTime {

$dateTime = DateTime::createFromFormat(SerializerHelper::DATE_TIME_FORMAT, $value);
$dateTime = DateTime::createFromFormat(static::DATE_TIME_FORMAT, $value);
if (false === $dateTime) {
return null;
}
Expand All @@ -69,10 +69,10 @@ public static function deserializeDateTime(?string $value): ?DateTime {
*/
public static function domNode(string $name, ?string $value, array $attributes = [], bool $shortTag = false): string {

$value = SerializerHelper::xmlSerializeValue($value);
$value = static::xmlSerializeValue($value);

foreach ($attributes as $k => $v) {
$attributes[$k] = SerializerHelper::xmlSerializeValue($v);
$attributes[$k] = static::xmlSerializeValue($v);
}

return StringHelper::domNode($name, $value, $attributes, $shortTag);
Expand Down Expand Up @@ -105,7 +105,7 @@ public static function getDOMAttributeValue(DOMNode $domNode, string $attributeN
*/
public static function getDOMNodeByName(string $nodeName, DOMNodeList $domNodeList = null): ?DOMNode {

$domNodes = SerializerHelper::getDOMNodesByName($nodeName, $domNodeList);
$domNodes = static::getDOMNodesByName($nodeName, $domNodeList);
if (1 !== count($domNodes)) {
return null;
}
Expand Down Expand Up @@ -147,7 +147,7 @@ public static function getDOMNodesByName(string $nodeName, DOMNodeList $domNodeL
* @return LoggerInterface|null Returns the logger.
*/
public static function getLogger(): ?LoggerInterface {
return SerializerHelper::$logger;
return static::$logger;
}

/**
Expand Down Expand Up @@ -181,8 +181,8 @@ public static function getMethodName(string $action, string $attribute): string
*/
public static function jsonDeserializeArray(array $array, string $nodeName, AbstractModel $model): void {

$fct = __NAMESPACE__ . "\\JsonDeserializer::" . SerializerHelper::getMethodName("deserialize", $nodeName);
$add = SerializerHelper::getMethodName("add", $nodeName);
$fct = __NAMESPACE__ . "\\JsonDeserializer::" . static::getMethodName("deserialize", $nodeName);
$add = static::getMethodName("add", $nodeName);

foreach ($array as $current) {

Expand All @@ -209,8 +209,8 @@ public static function jsonDeserializeModel(array $array, string $nodeName, Abst
return;
}

$fct = __NAMESPACE__ . "\\JsonDeserializer::" . SerializerHelper::getMethodName("deserialize", $nodeName);
$set = SerializerHelper::getMethodName("set", $nodeName);
$fct = __NAMESPACE__ . "\\JsonDeserializer::" . static::getMethodName("deserialize", $nodeName);
$set = static::getMethodName("set", $nodeName);

$model->$set(call_user_func($fct, $data));
}
Expand All @@ -226,7 +226,7 @@ public static function jsonSerializeArray(array $models): array {
$output = [];

foreach ($models as $current) {
$output[] = SerializerHelper::jsonSerializeModel($current);
$output[] = static::jsonSerializeModel($current);
}

return $output;
Expand Down Expand Up @@ -255,7 +255,7 @@ public static function jsonSerializeModel(?AbstractModel $model): array {
*/
public static function log(DOMNode $domNode): void {

if (null === SerializerHelper::getLogger()) {
if (null === static::getLogger()) {
return;
}

Expand All @@ -271,7 +271,7 @@ public static function log(DOMNode $domNode): void {
$context["_children"][] = $current->nodeName;
}

SerializerHelper::$logger->debug(sprintf('Deserialize a DOM node with name "%s"', $domNode->nodeName), $context);
static::$logger->debug(sprintf('Deserialize a DOM node with name "%s"', $domNode->nodeName), $context);
}

/**
Expand All @@ -281,7 +281,7 @@ public static function log(DOMNode $domNode): void {
* @return void
*/
public static function setLogger(?LoggerInterface $logger): void {
SerializerHelper::$logger = $logger;
static::$logger = $logger;
}

/**
Expand All @@ -294,10 +294,10 @@ public static function setLogger(?LoggerInterface $logger): void {
*/
public static function xmlDeserializeArray(DomNode $domNode, string $nodeName, AbstractModel $model): void {

$fct = __NAMESPACE__ . "\\XmlDeserializer::" . SerializerHelper::getMethodName("deserialize", $nodeName);
$add = SerializerHelper::getMethodName("add", $nodeName);
$fct = __NAMESPACE__ . "\\XmlDeserializer::" . static::getMethodName("deserialize", $nodeName);
$add = static::getMethodName("add", $nodeName);

$nodes = SerializerHelper::getDOMNodesByName($nodeName, $domNode->childNodes);
$nodes = static::getDOMNodesByName($nodeName, $domNode->childNodes);
foreach ($nodes as $current) {
$model->$add(call_user_func_array($fct, [$current]));
}
Expand All @@ -313,10 +313,10 @@ public static function xmlDeserializeArray(DomNode $domNode, string $nodeName, A
*/
public static function xmlDeserializeModel(DomNode $domNode, string $nodeName, AbstractModel $model): void {

$fct = __NAMESPACE__ . "\\XmlDeserializer::" . SerializerHelper::getMethodName("deserialize", $nodeName);
$set = SerializerHelper::getMethodName("set", $nodeName);
$fct = __NAMESPACE__ . "\\XmlDeserializer::" . static::getMethodName("deserialize", $nodeName);
$set = static::getMethodName("set", $nodeName);

$node = SerializerHelper::getDOMNodeByName($nodeName, $domNode->childNodes);
$node = static::getDOMNodeByName($nodeName, $domNode->childNodes);
if (null !== $node) {
$model->$set(call_user_func_array($fct, [$node]));
}
Expand All @@ -333,7 +333,7 @@ public static function xmlSerializeArray(array $models): string {
$output = [];

foreach ($models as $current) {
$output[] = SerializerHelper::xmlSerializeModel($current);
$output[] = static::xmlSerializeModel($current);
}

return implode("", $output);
Expand Down
2 changes: 1 addition & 1 deletion src/Statistic/Statistic.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function __toString(): string {
$this->getAvg(),
];

return vsprintf(Statistic::CONTENT_FORMAT, $args);
return vsprintf(static::CONTENT_FORMAT, $args);
}

/**
Expand Down

0 comments on commit 0ab9a24

Please sign in to comment.