From e05fca83842fb37dbd70c5b991739a6eb81be8ff Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 8 Jan 2020 02:12:47 +0100 Subject: [PATCH] cs --- src/Utils/ArrayHash.php | 5 +---- src/Utils/DateTime.php | 4 +--- src/Utils/IHtmlString.php | 1 - src/Utils/ITranslator.php | 1 - src/Utils/ObjectHelpers.php | 20 ++++++-------------- src/Utils/ObjectMixin.php | 8 +++----- src/Utils/Reflection.php | 4 +--- src/Utils/StaticClass.php | 5 +---- 8 files changed, 13 insertions(+), 35 deletions(-) diff --git a/src/Utils/ArrayHash.php b/src/Utils/ArrayHash.php index 273f445fc..374b7c9a2 100644 --- a/src/Utils/ArrayHash.php +++ b/src/Utils/ArrayHash.php @@ -17,10 +17,7 @@ */ class ArrayHash extends \stdClass implements \ArrayAccess, \Countable, \IteratorAggregate { - - /** - * @return static - */ + /** @return static */ public static function from(array $arr, bool $recursive = true) { $obj = new static; diff --git a/src/Utils/DateTime.php b/src/Utils/DateTime.php index 055138af0..32c095410 100644 --- a/src/Utils/DateTime.php +++ b/src/Utils/DateTime.php @@ -113,9 +113,7 @@ public function __toString(): string } - /** - * @return static - */ + /** @return static */ public function modifyClone(string $modify = '') { $dolly = clone $this; diff --git a/src/Utils/IHtmlString.php b/src/Utils/IHtmlString.php index 80f570ea2..8a63b74e8 100644 --- a/src/Utils/IHtmlString.php +++ b/src/Utils/IHtmlString.php @@ -12,7 +12,6 @@ interface IHtmlString { - /** * Returns string in HTML format */ diff --git a/src/Utils/ITranslator.php b/src/Utils/ITranslator.php index dc0cb6b50..1dacac798 100644 --- a/src/Utils/ITranslator.php +++ b/src/Utils/ITranslator.php @@ -15,7 +15,6 @@ */ interface ITranslator { - /** * Translates the given string. * @param mixed $message diff --git a/src/Utils/ObjectHelpers.php b/src/Utils/ObjectHelpers.php index f9b6b0744..5ff3de2a8 100644 --- a/src/Utils/ObjectHelpers.php +++ b/src/Utils/ObjectHelpers.php @@ -20,9 +20,7 @@ final class ObjectHelpers { use Nette\StaticClass; - /** - * @throws MemberAccessException - */ + /** @throws MemberAccessException */ public static function strictGet(string $class, string $name): void { $rc = new \ReflectionClass($class); @@ -34,9 +32,7 @@ public static function strictGet(string $class, string $name): void } - /** - * @throws MemberAccessException - */ + /** @throws MemberAccessException */ public static function strictSet(string $class, string $name): void { $rc = new \ReflectionClass($class); @@ -48,9 +44,7 @@ public static function strictSet(string $class, string $name): void } - /** - * @throws MemberAccessException - */ + /** @throws MemberAccessException */ public static function strictCall(string $class, string $method, array $additionalMethods = []): void { $hint = self::getSuggestion(array_merge( @@ -66,9 +60,7 @@ public static function strictCall(string $class, string $method, array $addition } - /** - * @throws MemberAccessException - */ + /** @throws MemberAccessException */ public static function strictStaticCall(string $class, string $method): void { $hint = self::getSuggestion( @@ -103,10 +95,10 @@ public static function getMagicProperties(string $class): array $uname = ucfirst($name); $write = $type !== '-read' && $rc->hasMethod($nm = 'set' . $uname) - && ($rm = $rc->getMethod($nm)) && $rm->getName() === $nm && !$rm->isPrivate() && !$rm->isStatic(); + && ($rm = $rc->getMethod($nm))->getName() === $nm && !$rm->isPrivate() && !$rm->isStatic(); $read = $type !== '-write' && ($rc->hasMethod($nm = 'get' . $uname) || $rc->hasMethod($nm = 'is' . $uname)) - && ($rm = $rc->getMethod($nm)) && $rm->getName() === $nm && !$rm->isPrivate() && !$rm->isStatic(); + && ($rm = $rc->getMethod($nm))->getName() === $nm && !$rm->isPrivate() && !$rm->isStatic(); if ($read || $write) { $props[$name] = $read << 0 | ($nm[0] === 'g') << 1 | $rm->returnsReference() << 2 | $write << 3; diff --git a/src/Utils/ObjectMixin.php b/src/Utils/ObjectMixin.php index 36559f2db..33249509b 100644 --- a/src/Utils/ObjectMixin.php +++ b/src/Utils/ObjectMixin.php @@ -20,9 +20,7 @@ final class ObjectMixin { use Nette\StaticClass; - /** - * @deprecated use ObjectHelpers::getSuggestion() - */ + /** @deprecated use ObjectHelpers::getSuggestion() */ public static function getSuggestion(array $possibilities, string $value): ?string { trigger_error(__METHOD__ . '() has been renamed to Nette\Utils\ObjectHelpers::getSuggestion()', E_USER_DEPRECATED); @@ -30,13 +28,13 @@ public static function getSuggestion(array $possibilities, string $value): ?stri } - public static function setExtensionMethod($class, $name, $callback) + public static function setExtensionMethod(): void { trigger_error('Class Nette\Utils\ObjectMixin is deprecated', E_USER_DEPRECATED); } - public static function getExtensionMethod($class, $name) + public static function getExtensionMethod(): void { trigger_error('Class Nette\Utils\ObjectMixin is deprecated', E_USER_DEPRECATED); } diff --git a/src/Utils/Reflection.php b/src/Utils/Reflection.php index 2ab989aa3..a394fc76c 100644 --- a/src/Utils/Reflection.php +++ b/src/Utils/Reflection.php @@ -189,9 +189,7 @@ public static function expandClassName(string $name, \ReflectionClass $rc): stri } - /** - * @return array of [alias => class] - */ + /** @return array of [alias => class] */ public static function getUseStatements(\ReflectionClass $class): array { if ($class->isAnonymous()) { diff --git a/src/Utils/StaticClass.php b/src/Utils/StaticClass.php index fb70d661c..d87793320 100644 --- a/src/Utils/StaticClass.php +++ b/src/Utils/StaticClass.php @@ -15,10 +15,7 @@ */ trait StaticClass { - - /** - * @throws \Error - */ + /** @throws \Error */ final public function __construct() { throw new \Error('Class ' . get_class($this) . ' is static and cannot be instantiated.');