Merge pull request #42 from MidnightDesign/no-generic-pages

Remove the type parameter from AbstractPage
laminas · Dec 6, 2022 · f685f8b · f685f8b
2 parents 1d855c1 + fd91983
commit f685f8b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -6,8 +6,6 @@
 
 use Laminas\Navigation\AbstractContainer;
 use Laminas\Navigation\Exception;
-use Laminas\Navigation\Page\Mvc;
-use Laminas\Navigation\Page\Uri;
 use Laminas\Permissions\Acl\Resource\ResourceInterface;
 use Laminas\Permissions\Acl\Resource\ResourceInterface as AclResource;
 use Laminas\Stdlib\ArrayUtils;
@@ -31,8 +29,7 @@
 /**
  * Base class for Laminas\Navigation\Page pages
  *
- * @template TPage of AbstractPage
- * @template-extends AbstractContainer<TPage>
+ * @template-extends AbstractContainer<AbstractPage>
  */
 abstract class AbstractPage extends AbstractContainer
 {

diff --git a/src/Page/Mvc.php b/src/Page/Mvc.php
@@ -26,9 +26,6 @@
  * The two constants defined were originally provided via the laminas-mvc class
  * ModuleRouteListener; to remove the requirement on that component, they are
  * reproduced here.
- *
- * @template TPage of AbstractPage
- * @template-extends AbstractPage<TPage>
  */
 class Mvc extends AbstractPage
 {

diff --git a/src/Page/Uri.php b/src/Page/Uri.php
@@ -14,9 +14,6 @@
 
 /**
  * Represents a page that is defined by specifying a URI
- *
- * @template TPage of AbstractPage
- * @template-extends AbstractPage<TPage>
  */
 class Uri extends AbstractPage
 {

diff --git a/test/TestAsset/Page.php b/test/TestAsset/Page.php
@@ -6,7 +6,6 @@
 
 use Laminas\Navigation\Page\AbstractPage;
 
-/** @template-extends AbstractPage<AbstractPage> */
 class Page extends AbstractPage
 {
     /**