updated composer.json, reverted change from 1.0.13, updated test

heimrichhannot · Jan 10, 2019 · 0f42e31 · 0f42e31
1 parent 1613572
commit 0f42e31
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.2.0] - 2019-01-10
+
+### Changed
+- now replaces multi column editor bundle
+- reverted change from 1.0.13
+- removed symfony 3 dependency
+
 ## [1.1.0] - 2018-12-11
 
 ### Removed

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     {
       "name": "Heimrich & Hannot",
       "email": "digitales@heimrich-hannot.de",
-      "homepage": "http://www.heimrich-hannot.de",
+      "homepage": "https://www.heimrich-hannot.de",
       "role": "Developer"
     }
   ],
@@ -26,19 +26,18 @@
   "require": {
     "php": "^7.1",
     "contao/core-bundle": "^4.4",
-    "symfony/framework-bundle": "^3.4",
     "heimrichhannot/contao-utils-bundle": "^2.0",
     "heimrichhannot/contao-ajax-bundle": "^1.0"
   },
   "require-dev": {
-    "contao/test-case": "^1.1",
+    "contao/test-case": "1.1.*",
     "contao/manager-plugin": "^2.0",
     "friendsofphp/php-cs-fixer": "^2.2",
     "phpunit/phpunit": ">=6.0 <6.5",
     "php-http/guzzle6-adapter": "^1.1",
     "php-http/message-factory": "^1.0.2",
     "php-coveralls/php-coveralls": "^2.0",
-    "symfony/phpunit-bridge": "^3.2"
+    "symfony/phpunit-bridge": "^4.2"
   },
   "autoload": {
     "psr-4": {
@@ -68,5 +67,8 @@
   },
   "suggest": {
     "heimrichhannot/contao-encore-bundle": "Provide webpack encore asset support."
+  },
+  "replace": {
+    "heimrichhannot/contao-multi_column_editor": "*"
   }
 }
diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Controller/AjaxController.php b/src/Controller/AjaxController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/DependencyInjection/HeimrichHannotContaoMultiColumnEditorExtension.php b/src/DependencyInjection/HeimrichHannotContaoMultiColumnEditorExtension.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/EventListener/HookListener.php b/src/EventListener/HookListener.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Form/FormMultiColumnEditor.php b/src/Form/FormMultiColumnEditor.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/HeimrichHannotContaoMultiColumnEditorBundle.php b/src/HeimrichHannotContaoMultiColumnEditorBundle.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Widget/MultiColumnEditor.php b/src/Widget/MultiColumnEditor.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */
@@ -16,7 +16,7 @@
 use Contao\Widget;
 use HeimrichHannot\MultiColumnEditorBundle\Controller\AjaxController;
 
-class MultiColumnEditor extends \Contao\Widget
+class MultiColumnEditor extends Widget
 {
     const ACTION_ADD_ROW = 'addRow';
     const ACTION_DELETE_ROW = 'deleteRow';
@@ -86,13 +86,10 @@ public function generate()
     }
 
     /**
-     * @param string        $strEditorTemplate
-     * @param string        $strTable
-     * @param string        $strFieldName
-     * @param mixed         $varValue
-     * @param DataContainer $objDc
-     * @param array|null    $arrDca
-     * @param array         $arrErrors
+     * @throws \Psr\Cache\InvalidArgumentException
+     * @throws \Twig_Error_Loader
+     * @throws \Twig_Error_Runtime
+     * @throws \Twig_Error_Syntax
      *
      * @return string
      */
@@ -209,10 +206,10 @@ public function generateEditorForm(): string
         $data['editorFormAction'] = System::getContainer()->get('request_stack')->getMasterRequest()->getRequestUri();
         $data['rows'] = $this->generateRows($intRowCount, $arrDca, $strTable, $objDc, $arrValues, $arrErrors, $strFieldName);
 
-        return Controller::replaceInsertTags(System::getContainer()->get('twig')->render(
+        return System::getContainer()->get('twig')->render(
             System::getContainer()->get('huh.utils.template')->getTemplate($this->getEditorTemplate()),
             $data
-        ));
+        );
     }
 
     /**

diff --git a/tests/Controller/AjaxControllerTest.php b/tests/Controller/AjaxControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */
@@ -35,6 +35,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -123,18 +124,23 @@ public function setUp(): void
 
         $GLOBALS['TL_FFL']['hidden'] = 'Contao\FormHidden';
 
-        $this->container->set('huh.utils.container', new ContainerUtil($this->framework));
-
         $this->kernel = $this->createMock(Kernel::class);
         $this->kernel->method('getContainer')->willReturn($this->container);
 
+        $fileLocator = new FileLocator($this->kernel);
+
+        $backendMatcher = new RequestMatcher('/contao', 'test.com', null, ['192.168.1.0']);
+        $frontendMatcher = new RequestMatcher('/index', 'test.com', null, ['192.168.1.0']);
+        $scopeMatcher = new ScopeMatcher($backendMatcher, $frontendMatcher);
+        $this->container->set('huh.utils.container', new ContainerUtil($this->framework, $fileLocator, $scopeMatcher));
+
         $this->container->set('kernel', $this->kernel);
 
         $this->container->set('huh.ajax.action', new AjaxActionManager());
         $this->container->set('huh.ajax', new AjaxManager());
         $this->container->set('huh.utils.url', new UrlUtil($this->framework));
-        $this->container->set('huh.utils.form', new FormUtil($this->framework));
-        $this->container->set('huh.utils.template', new TemplateUtil($this->framework));
+        $this->container->set('huh.utils.form', new FormUtil($this->container, $this->framework));
+        $this->container->set('huh.utils.template', new TemplateUtil($this->framework, $this->kernel));
 
         $twig = $this->createMock('Twig_Environment');
 
@@ -167,7 +173,9 @@ public function testCanBeInstantiated()
         $this->container->set('request_stack', new RequestStack());
         System::setContainer($this->container);
 
-        $extension = new AjaxController(new MultiColumnEditor(['strTable' => 'tl_test', 'strField' => 'test']));
+        $multicolumnMock = $this->createMock(MultiColumnEditor::class);
+
+        $extension = new AjaxController($multicolumnMock);
         $this->assertInstanceOf('HeimrichHannot\MultiColumnEditorBundle\Controller\AjaxController', $extension);
     }
 

diff --git a/tests/DependencyInjection/HeimrichHannotContaoMultiColumnEditorExtensionTest.php b/tests/DependencyInjection/HeimrichHannotContaoMultiColumnEditorExtensionTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/EventListener/HookListenerTest.php b/tests/EventListener/HookListenerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/HeimrichHannotContaoMultiColumnEditorBundleTest.php b/tests/HeimrichHannotContaoMultiColumnEditorBundleTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/Plugin/PluginTest.php b/tests/Plugin/PluginTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2018 Heimrich & Hannot GmbH
+ * Copyright (c) 2019 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */