Mark all services as private/public, as needed

ezsystems · Dec 16, 2017 · cc2f0d7 · cc2f0d7
1 parent caf32ed
commit cc2f0d7
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 18 deletions.
diff --git a/bundle/Controller/LegacySetupController.php b/bundle/Controller/LegacySetupController.php
@@ -8,20 +8,20 @@
  */
 namespace eZ\Bundle\EzPublishLegacyBundle\Controller;
 
+use eZ\Bundle\EzPublishLegacyBundle\SetupWizard\ConfigurationConverter;
+use eZ\Bundle\EzPublishLegacyBundle\SetupWizard\ConfigurationDumper;
 use eZ\Publish\Core\MVC\Legacy\Kernel\Loader;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use eZ\Publish\Core\MVC\Symfony\ConfigDumperInterface;
 use eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Configuration\LegacyConfigResolver;
 use eZ\Bundle\EzPublishLegacyBundle\Cache\PersistenceCachePurger;
 use eZINI;
 use eZCache;
+use Symfony\Component\HttpKernel\KernelInterface;
 
-class LegacySetupController implements ContainerAwareInterface
+class LegacySetupController
 {
-    use ContainerAwareTrait;
-
     /**
      * The legacy kernel instance (eZ Publish 4).
      *
@@ -42,31 +42,58 @@ class LegacySetupController implements ContainerAwareInterface
     private $persistenceCachePurger;
 
     /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     * @var \eZ\Publish\Core\MVC\Legacy\Kernel\Loader
      */
-    protected $container;
+    protected $kernelFactory;
 
     /**
-     * @var \eZ\Publish\Core\MVC\Legacy\Kernel\Loader
+     * @var \eZ\Bundle\EzPublishLegacyBundle\SetupWizard\ConfigurationDumper
      */
-    protected $kernelFactory;
+    protected $configDumper;
+
+    /**
+     * @var \eZ\Bundle\EzPublishLegacyBundle\SetupWizard\ConfigurationConverter
+     */
+    protected $configConverter;
+
+    /**
+     * @var \Symfony\Component\HttpFoundation\RequestStack
+     */
+    protected $requestStack;
+
+    /**
+     * @var \Symfony\Component\HttpKernel\KernelInterface
+     */
+    protected $kernel;
 
     /**
      * @param \Closure $kernelClosure
      * @param \eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Configuration\LegacyConfigResolver $legacyConfigResolver
      * @param \eZ\Bundle\EzPublishLegacyBundle\Cache\PersistenceCachePurger $persistenceCachePurger
      * @param \eZ\Publish\Core\MVC\Legacy\Kernel\Loader $kernelFactory
+     * @param \eZ\Bundle\EzPublishLegacyBundle\SetupWizard\ConfigurationDumper $configDumper
+     * @param \eZ\Bundle\EzPublishLegacyBundle\SetupWizard\ConfigurationConverter $configConverter
+     * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
+     * @param \Symfony\Component\HttpKernel\KernelInterface
      */
     public function __construct(
         \Closure $kernelClosure,
         LegacyConfigResolver $legacyConfigResolver,
         PersistenceCachePurger $persistenceCachePurger,
-        Loader $kernelFactory
+        Loader $kernelFactory,
+        ConfigurationDumper $configDumper,
+        ConfigurationConverter $configConverter,
+        RequestStack $requestStack,
+        KernelInterface $kernel
     ) {
         $this->legacyKernelClosure = $kernelClosure;
         $this->legacyConfigResolver = $legacyConfigResolver;
         $this->persistenceCachePurger = $persistenceCachePurger;
         $this->kernelFactory = $kernelFactory;
+        $this->configDumper = $configDumper;
+        $this->configConverter = $configConverter;
+        $this->requestStack = $requestStack;
+        $this->kernel = $kernel;
     }
 
     /**
@@ -89,7 +116,7 @@ public function init()
         $this->kernelFactory->setBuildEventsEnabled(false);
 
         /** @var $request \Symfony\Component\HttpFoundation\ParameterBag */
-        $request = $this->container->get('request_stack')->getCurrentRequest()->request;
+        $request = $this->requestStack->getCurrentRequest()->request;
 
         // inject the extra ezpublish-community folders we want permissions checked for
         switch ($request->get('eZSetup_current_step')) {
@@ -149,12 +176,9 @@ function () {
                     $adminSiteaccess = $request->get('P_site_extra_data_admin_access_type_value-' . $chosenSitePackage);
             }
 
-            /** @var $configurationDumper \eZ\Bundle\EzpublishLegacyBundle\SetupWizard\ConfigurationDumper */
-            $configurationDumper = $this->container->get('ezpublish_legacy.setup_wizard.configuration_dumper');
-            $configurationDumper->addEnvironment($this->container->get('kernel')->getEnvironment());
-            $configurationDumper->dump(
-                $this->container->get('ezpublish_legacy.setup_wizard.configuration_converter')
-                    ->fromLegacy($chosenSitePackage, $adminSiteaccess),
+            $this->configDumper->addEnvironment($this->kernel->getEnvironment());
+            $this->configDumper->dump(
+                $this->configConverter->fromLegacy($chosenSitePackage, $adminSiteaccess),
                 ConfigDumperInterface::OPT_BACKUP_CONFIG
             );
         }

diff --git a/bundle/Resources/config/debug.yml b/bundle/Resources/config/debug.yml
@@ -1,6 +1,7 @@
 services:
     ezpublish_legacy.debug.templates_collector:
         class: eZ\Bundle\EzPublishLegacyBundle\Collector\LegacyTemplatesCollector
+        public: false
         arguments: ["@ezpublish_legacy.kernel"]
         tags:
             -

diff --git a/bundle/Resources/config/fieldtype_services.yml b/bundle/Resources/config/fieldtype_services.yml
@@ -5,3 +5,4 @@ services:
             - "@ezpublish.image_alias.imagine.alias_cleaner"
             - "@ezpublish.core.io.image_fieldtype.legacy_url_redecorator"
         lazy: true
+        public: false
diff --git a/bundle/Resources/config/security.yml b/bundle/Resources/config/security.yml
@@ -1,17 +1,20 @@
 services:
     ezpublish_legacy.security.login_cleanup_listener:
         class: eZ\Publish\Core\MVC\Legacy\Security\Firewall\LoginCleanupListener
+        public: false
         tags:
             - { name: kernel.event_subscriber }
 
     ezpublish_legacy.security_mapper:
         class: eZ\Bundle\EzPublishLegacyBundle\LegacyMapper\Security
+        public: false
         arguments: ["@ezpublish.api.repository", "@ezpublish.config.resolver", "@security.token_storage", "@security.authorization_checker"]
         tags:
             - { name: kernel.event_subscriber }
 
     ezpublish_legacy.security.sso_firewall_listener:
         class: eZ\Publish\Core\MVC\Legacy\Security\Firewall\SSOListener
+        public: false
         abstract: true
         arguments:
             - "@security.token_storage"