adjust deps and tests

heimrichhannot · Oct 31, 2023 · e4db28b · e4db28b
1 parent 2864908
commit e4db28b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "composer-runtime-api": "^2.0",
     "contao/core-bundle": "^4.13 || ^5.0",
     "heimrichhannot/contao-encore-contracts": "^1.0",
-    "heimrichhannot/contao-multi-column-editor-bundle": "^1.0 || ^2.0",
+    "heimrichhannot/contao-multi-column-editor-bundle": "^2.0",
     "heimrichhannot/contao-utils-bundle": "^2.231.0 || 3.0.0-beta",
     "symfony/cache": "^5.4 || ^6.0",
     "symfony/config": "^5.4 || ^6.0",
@@ -33,8 +33,7 @@
     "symfony/translation": "^5.4 || ^6.0",
     "symfony/translation-contracts": "^1.1.6 || ^2.0 || ^3.0",
     "symfony/webpack-encore-bundle": "^1.0 || ^2.0",
-    "twig/twig": "^1.38.3 || ^2.7 || ^3.0",
-    "webmozart/path-util": "^2.3"
+    "twig/twig": "^1.38.3 || ^2.7 || ^3.0"
   },
   "require-dev": {
     "contao/test-case": "^4.0",

diff --git a/src/DependencyInjection/EncoreExtension.php b/src/DependencyInjection/EncoreExtension.php
@@ -10,13 +10,12 @@
 
 use Composer\InstalledVersions;
 use HeimrichHannot\EncoreBundle\Exception\FeatureNotSupportedException;
-use HeimrichHannot\EncoreBundle\Helper\ArrayHelper;
 use HeimrichHannot\EncoreContracts\EncoreExtensionInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Filesystem\Path;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Webmozart\PathUtil\Path;
 
 class EncoreExtension extends Extension implements PrependExtensionInterface
 {

diff --git a/src/Helper/ConfigurationHelper.php b/src/Helper/ConfigurationHelper.php
@@ -14,10 +14,10 @@
 use Contao\PageModel;
 use HeimrichHannot\EncoreBundle\Event\EncoreEnabledEvent;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Filesystem\Path;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use Webmozart\PathUtil\Path;
 
 class ConfigurationHelper
 {

diff --git a/tests/Asset/PageEntrypointsTest.php b/tests/Asset/PageEntrypointsTest.php
@@ -22,6 +22,8 @@
 
 class PageEntrypointsTest extends ContaoTestCase
 {
+    use ModelMockTrait;
+
     private ModelUtil|MockObject $containerUtilMock;
     private Utils|MockObject $utilsMock;
 
@@ -33,14 +35,8 @@ protected function setUp(): void
         $this->utilsMock->method('model')->willReturn($this->containerUtilMock);
     }
 
-    use ModelMockTrait;
-
-
-
     public function createTestInstance(array $parameter = [])
     {
-        $container = $parameter['container'] ?? $this->getContainerWithContaoConfiguration();
-
         if (isset($parameter['frontendAsset'])) {
             $frontendAsset = $parameter['frontendAsset'];
         } else {
@@ -74,7 +70,7 @@ function (&$item, $key) {
             }
         }
 
-        return new PageEntrypoints($container, $frontendAsset, $entryCollection, $utils);
+        return new PageEntrypoints($frontendAsset, $entryCollection, $utils);
     }
 
     public function entryPointProvider()