diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 8b2de156b..2165d4b2b 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1447,9 +1447,6 @@ - - null === static::$instance - new $this->containerClass($value) @@ -1472,9 +1469,6 @@ (string) $key (string) $key - - new static() - @@ -2361,10 +2355,6 @@ - - getAttribs - setAttribs - $value $value diff --git a/src/Helper/Gravatar.php b/src/Helper/Gravatar.php index 65a42ac36..984a597e0 100644 --- a/src/Helper/Gravatar.php +++ b/src/Helper/Gravatar.php @@ -12,13 +12,10 @@ use function sprintf; use function str_replace; use function strtolower; -use function trigger_error; use function trim; use function ucwords; use function urlencode; -use const E_USER_DEPRECATED; - /** * Helper for retrieving avatars from gravatar.com */ @@ -196,26 +193,6 @@ public function setAttributes(array $attributes) return $this; } - /** - * Set attribs for image tag - * - * @deprecated Please use Laminas\View\Helper\Gravatar::setAttributes - * - * @param array $attribs - * @return Gravatar - */ - public function setAttribs(array $attribs) - { - trigger_error(sprintf( - '%s is deprecated; please use %s::setAttributes', - __METHOD__, - self::class - ), E_USER_DEPRECATED); - - $this->setAttributes($attribs); - return $this; - } - /** * Get attributes of image * @@ -231,29 +208,6 @@ public function getAttributes() return $this->attributes; } - /** - * Get attribs of image - * - * Warning! - * If you set src attrib, you get it, but this value will be overwritten in - * protected method setSrcAttribForImg(). And finally your get other src - * value! - * - * @deprecated Please use Laminas\View\Helper\Gravatar::getAttributes - * - * @return array - */ - public function getAttribs() - { - trigger_error(sprintf( - '%s is deprecated; please use %s::getAttributes', - __METHOD__, - self::class - ), E_USER_DEPRECATED); - - return $this->getAttributes(); - } - /** * Set default img * diff --git a/src/Helper/Placeholder/Registry.php b/src/Helper/Placeholder/Registry.php index 5de7c967c..ae3dc4abd 100644 --- a/src/Helper/Placeholder/Registry.php +++ b/src/Helper/Placeholder/Registry.php @@ -12,9 +12,6 @@ use function class_parents; use function in_array; use function sprintf; -use function trigger_error; - -use const E_USER_DEPRECATED; /** * Registry for placeholder containers @@ -42,34 +39,6 @@ class Registry */ protected $items = []; - /** - * Retrieve or create registry instance - * - * @return Registry - */ - public static function getRegistry() - { - trigger_error('Placeholder view helpers should no longer use a singleton registry', E_USER_DEPRECATED); - if (null === static::$instance) { - static::$instance = new static(); - } - - return static::$instance; - } - - /** - * Unset the singleton - * - * Primarily useful for testing purposes; sets {@link $instance} to null. - * - * @return void - */ - public static function unsetRegistry() - { - trigger_error('Placeholder view helpers should no longer use a singleton registry', E_USER_DEPRECATED); - static::$instance = null; - } - /** * Set the container for an item in the registry * diff --git a/test/Helper/GravatarTest.php b/test/Helper/GravatarTest.php index 0f5cd8c23..d763d94e4 100644 --- a/test/Helper/GravatarTest.php +++ b/test/Helper/GravatarTest.php @@ -8,7 +8,6 @@ use Laminas\View\Helper\Gravatar; use Laminas\View\Renderer\PhpRenderer as View; use PHPUnit\Framework\TestCase; -use ReflectionMethod; use function method_exists; use function strtoupper; @@ -274,34 +273,4 @@ public function testEmailIsProperlyNormalized(): void $this->helper->__invoke('Example@Example.com ')->getEmail() ); } - - public function testSetAttribsIsDeprecated(): void - { - $this->expectDeprecation(); - - $this->helper->setAttribs([]); - } - - public function testSetAttribsDocCommentHasDeprecated(): void - { - $method = new ReflectionMethod($this->helper, 'setAttribs'); - $comment = $method->getDocComment(); - - $this->assertStringContainsString('@deprecated', $comment); - } - - public function testGetAttribsIsDeprecated(): void - { - $this->expectDeprecation(); - - $this->helper->getAttribs(); - } - - public function testGetAttribsDocCommentHasDeprecated(): void - { - $method = new ReflectionMethod($this->helper, 'getAttribs'); - $comment = $method->getDocComment(); - - $this->assertStringContainsString('@deprecated', $comment); - } }