From fa521e5cb7a392d1c96b7946f3a726d2d060f903 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Mon, 15 Jul 2019 17:00:51 +0200
Subject: [PATCH] Add Forms page class

[MAILPOET-2200]
---
 lib/AdminPages/Pages/Forms.php        | 40 +++++++++++++++++++++++++++
 lib/Config/Menu.php                   | 16 ++---------
 lib/DI/ContainerConfigurator.php      |  1 +
 tests/integration/Config/MenuTest.php |  2 --
 4 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 lib/AdminPages/Pages/Forms.php

diff --git a/lib/AdminPages/Pages/Forms.php b/lib/AdminPages/Pages/Forms.php
new file mode 100644
index 0000000000..3364d8c283
--- /dev/null
+++ b/lib/AdminPages/Pages/Forms.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace MailPoet\AdminPages\Pages;
+
+use MailPoet\AdminPages\PageRenderer;
+use MailPoet\Listing\PageLimit;
+use MailPoet\Models\Segment;
+use MailPoet\Util\Installation;
+
+if (!defined('ABSPATH')) exit;
+
+class Forms {
+  /** @var PageRenderer */
+  private $page_renderer;
+
+  /** @var PageLimit */
+  private $listing_page_limit;
+
+  /** @var Installation */
+  private $installation;
+
+  function __construct(
+    PageRenderer $page_renderer,
+    PageLimit $listing_page_limit,
+    Installation $installation
+  ) {
+    $this->page_renderer = $page_renderer;
+    $this->listing_page_limit = $listing_page_limit;
+    $this->installation = $installation;
+  }
+
+  function render() {
+    $data = [];
+    $data['items_per_page'] = $this->listing_page_limit->getLimitPerPage('forms');
+    $data['segments'] = Segment::findArray();
+    $data['is_new_user'] = $this->installation->isNewInstallation();
+
+    $this->page_renderer->displayPage('forms.html', $data);
+  }
+}
diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index b10bfee902..bfaf79ba50 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -3,6 +3,7 @@
 namespace MailPoet\Config;
 
 use MailPoet\AdminPages\PageRenderer;
+use MailPoet\AdminPages\Pages\Forms;
 use MailPoet\AdminPages\Pages\Help;
 use MailPoet\AdminPages\Pages\MP2Migration;
 use MailPoet\AdminPages\Pages\NewsletterEditor;
@@ -49,9 +50,6 @@ class Menu {
   /** @var PageRenderer */
   private $page_renderer;
 
-  /** @var Listing\PageLimit */
-  private $listing_page_limit;
-
   /** @var Installation */
   private $installation;
 
@@ -65,7 +63,6 @@ class Menu {
     WPFunctions $wp,
     ServicesChecker $servicesChecker,
     PageRenderer $page_renderer,
-    Listing\PageLimit $listing_page_limit,
     Installation $installation,
     ContainerWrapper $containerWrapper
   ) {
@@ -73,7 +70,6 @@ class Menu {
     $this->wp = $wp;
     $this->servicesChecker = $servicesChecker;
     $this->page_renderer = $page_renderer;
-    $this->listing_page_limit = $listing_page_limit;
     $this->installation = $installation;
     $this->container = $containerWrapper;
   }
@@ -454,15 +450,7 @@ class Menu {
 
   function forms() {
     if ($this->subscribers_over_limit) return $this->displaySubscriberLimitExceededTemplate();
-
-    $data = [];
-
-    $data['items_per_page'] = $this->listing_page_limit->getLimitPerPage('forms');
-    $data['segments'] = Segment::findArray();
-
-    $data['is_new_user'] = $this->installation->isNewInstallation();
-
-    $this->page_renderer->displayPage('forms.html', $data);
+    $this->container->get(Forms::class)->render();
   }
 
   function newsletters() {
diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php
index e473d8e3f6..803b7e587b 100644
--- a/lib/DI/ContainerConfigurator.php
+++ b/lib/DI/ContainerConfigurator.php
@@ -30,6 +30,7 @@ class ContainerConfigurator implements IContainerConfigurator {
       ]);
     // AdminPages
     $container->autowire(\MailPoet\AdminPages\PageRenderer::class);
+    $container->autowire(\MailPoet\AdminPages\Pages\Forms::class);
     $container->autowire(\MailPoet\AdminPages\Pages\Help::class);
     $container->autowire(\MailPoet\AdminPages\Pages\NewsletterEditor::class);
     $container->autowire(\MailPoet\AdminPages\Pages\Newsletters::class);
diff --git a/tests/integration/Config/MenuTest.php b/tests/integration/Config/MenuTest.php
index d0d5507a96..b63fce04c2 100644
--- a/tests/integration/Config/MenuTest.php
+++ b/tests/integration/Config/MenuTest.php
@@ -8,7 +8,6 @@ use MailPoet\Config\AccessControl;
 use MailPoet\Config\Menu;
 use MailPoet\Config\ServicesChecker;
 use MailPoet\DI\ContainerWrapper;
-use MailPoet\Listing\PageLimit;
 use MailPoet\Settings\SettingsController;
 use MailPoet\Util\Installation;
 use MailPoet\WP\Functions as WPFunctions;
@@ -95,7 +94,6 @@ class MenuTest extends \MailPoetTest {
       $wp,
       new ServicesChecker,
       $renderer,
-      new PageLimit($wp),
       new Installation($settings, $wp),
       ContainerWrapper::getInstance()
     );