removed ContaoFrameworkInterface leftovers

heimrichhannot · Aug 8, 2023 · 128e28f · 128e28f
1 parent ec76f02
commit 128e28f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 47 deletions.
diff --git a/src/Util/Container/ContainerUtil.php b/src/Util/Container/ContainerUtil.php
@@ -9,7 +9,6 @@
 namespace HeimrichHannot\UtilsBundle\Util\Container;
 
 use Contao\CoreBundle\Framework\ContaoFramework;
-use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
 use Contao\CoreBundle\Monolog\ContaoContext;
 use Contao\CoreBundle\Routing\ScopeMatcher;
 use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;
@@ -27,44 +26,15 @@
 
 class ContainerUtil extends AbstractServiceSubscriber
 {
-    /** @var ContaoFramework */
-    protected $framework;
-    /**
-     * @var array
-     */
-    protected $kernelBundles;
-    /**
-     * @var RequestStack
-     */
-    protected $requestStack;
-    /**
-     * @var KernelInterface
-     */
-    protected $kernel;
-    /**
-     * @var ContainerInterface
-     */
-    protected $locator;
-
-    /**
-     * @var Filesystem
-     */
-    protected $filesystem;
-
-    /**
-     * @var ScopeMatcher
-     */
-    private $scopeMatcher;
-
-    public function __construct(ContainerInterface $locator, array $kernelBundles, KernelInterface $kernel, ContaoFrameworkInterface $framework, ScopeMatcher $scopeMatcher, RequestStack $requestStack, Filesystem $filesystem)
+    public function __construct(
+        private ContainerInterface $locator,
+        private array $kernelBundles,
+        private KernelInterface $kernel,
+        private ContaoFramework $framework,
+        private ScopeMatcher $scopeMatcher,
+        private RequestStack $requestStack,
+        private Filesystem $filesystem)
     {
-        $this->scopeMatcher = $scopeMatcher;
-        $this->kernelBundles = $kernelBundles;
-        $this->framework = $framework;
-        $this->requestStack = $requestStack;
-        $this->kernel = $kernel;
-        $this->locator = $locator;
-        $this->filesystem = $filesystem;
     }
 
     /**

diff --git a/src/Util/Model/ModelUtil.php b/src/Util/Model/ModelUtil.php
@@ -10,21 +10,16 @@
 
 use Contao\Controller;
 use Contao\CoreBundle\Framework\ContaoFramework;
-use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
 use Contao\Date;
 use Contao\Model;
 use Contao\Model\Collection;
 
 class ModelUtil
 {
-    /**
-     * @var ContaoFrameworkInterface
-     */
-    protected $framework;
-
-    public function __construct(ContaoFramework $contaoFramework)
+    public function __construct(
+        private ContaoFramework $framework
+    )
     {
-        $this->framework = $contaoFramework;
     }
 
     /**

diff --git a/src/Util/Type/StringUtil.php b/src/Util/Type/StringUtil.php
@@ -8,7 +8,6 @@
 
 namespace HeimrichHannot\UtilsBundle\Util\Type;
 
-use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
 use DOMDocument;
 use DOMNode;
 use DOMText;