Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 800fddd

Browse files
committed
Merge branch 'feature/147' into develop
Close #147 Fixes #145
2 parents eb174dd + 0ab8056 commit 800fddd

7 files changed

+3
-43
lines changed

CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
1818

1919
### Removed
2020

21-
- Nothing.
21+
- [#147](https://github.com/zendframework/zend-view/pull/147) removes the property `$regKey` from a number of helpers; these were a
22+
remnant of ZF1, and have not been used internally since the initial 2.0.0
23+
release.
2224

2325
### Fixed
2426

src/Helper/HeadLink.php

-7
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
5555
'as',
5656
];
5757

58-
/**
59-
* Registry key for placeholder
60-
*
61-
* @var string
62-
*/
63-
protected $regKey = 'Zend_View_Helper_HeadLink';
64-
6558
/**
6659
* Constructor
6760
*

src/Helper/HeadMeta.php

-7
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
5959
*/
6060
protected $modifierKeys = ['lang', 'scheme'];
6161

62-
/**
63-
* Registry key for placeholder
64-
*
65-
* @var string
66-
*/
67-
protected $regKey = 'Zend_View_Helper_HeadMeta';
68-
6962
/**
7063
* Constructor
7164
*

src/Helper/HeadScript.php

-7
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
3636
const FILE = 'FILE';
3737
const SCRIPT = 'SCRIPT';
3838

39-
/**
40-
* Registry key for placeholder
41-
*
42-
* @var string
43-
*/
44-
protected $regKey = 'Zend_View_Helper_HeadScript';
45-
4639
/**
4740
* Are arbitrary attributes allowed?
4841
*

src/Helper/HeadStyle.php

-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424
*/
2525
class HeadStyle extends Placeholder\Container\AbstractStandalone
2626
{
27-
/**
28-
* Registry key for placeholder
29-
*
30-
* @var string
31-
*/
32-
protected $regKey = 'Zend_View_Helper_HeadStyle';
33-
3427
/**
3528
* Allowed optional attributes
3629
*

src/Helper/HeadTitle.php

-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ class HeadTitle extends Placeholder\Container\AbstractStandalone
1818
{
1919
use TranslatorAwareTrait;
2020

21-
/**
22-
* Registry key for placeholder
23-
*
24-
* @var string
25-
*/
26-
protected $regKey = 'Zend_View_Helper_HeadTitle';
27-
2821
/**
2922
* Default title rendering order (i.e. order in which each title attached)
3023
*

src/Helper/InlineScript.php

-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
*/
1616
class InlineScript extends HeadScript
1717
{
18-
/**
19-
* Registry key for placeholder
20-
*
21-
* @var string
22-
*/
23-
protected $regKey = 'Zend_View_Helper_InlineScript';
24-
2518
/**
2619
* Return InlineScript object
2720
*

0 commit comments

Comments
 (0)