moved other utils classes

heimrichhannot · Oct 29, 2023 · 6669d3e · 6669d3e
1 parent 35b6725
commit 6669d3e
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 32 deletions.
diff --git a/src/Util/Ui/AccordionUtil.php → src/Util/AccordionUtil.php b/src/Util/Ui/AccordionUtil.php → src/Util/AccordionUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\Ui;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 use Contao\ContentModel;
 use Contao\CoreBundle\Framework\ContaoFramework;

diff --git a/src/Util/Type/ArrayUtil.php → src/Util/ArrayUtil.php b/src/Util/Type/ArrayUtil.php → src/Util/ArrayUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\Type;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 class ArrayUtil
 {

diff --git a/src/Util/Locale/LocaleUtil.php → src/Util/LocaleUtil.php b/src/Util/Locale/LocaleUtil.php → src/Util/LocaleUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\Locale;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 class LocaleUtil
 {

diff --git a/src/Util/Request/RequestUtil.php → src/Util/RequestUtil.php b/src/Util/Request/RequestUtil.php → src/Util/RequestUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\Request;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 use Contao\CoreBundle\Controller\ContentElement\AbstractContentElementController;
 use Contao\CoreBundle\Framework\ContaoFramework;

diff --git a/src/Util/Routing/RoutingUtil.php → src/Util/RoutingUtil.php b/src/Util/Routing/RoutingUtil.php → src/Util/RoutingUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\Routing;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 use Contao\CoreBundle\Csrf\ContaoCsrfTokenManager;
 use HeimrichHannot\UtilsBundle\Util\AbstractServiceSubscriber;

diff --git a/src/Util/Type/StringUtil.php → src/Util/StringUtil.php b/src/Util/Type/StringUtil.php → src/Util/StringUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\Type;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 use DOMDocument;
 use DOMNode;

diff --git a/src/Util/Request/UrlUtil.php → src/Util/UrlUtil.php b/src/Util/Request/UrlUtil.php → src/Util/UrlUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\Request;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 use HeimrichHannot\UtilsBundle\Exception\InvalidUrlException;
 use Symfony\Component\HttpFoundation\RequestStack;

diff --git a/src/Util/UserUtil/UserUtil.php → src/Util/UserUtil.php b/src/Util/UserUtil/UserUtil.php → src/Util/UserUtil.php
@@ -6,7 +6,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace HeimrichHannot\UtilsBundle\Util\UserUtil;
+namespace HeimrichHannot\UtilsBundle\Util;
 
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\Date;

diff --git a/src/Util/Utils.php b/src/Util/Utils.php
@@ -11,14 +11,14 @@
 use HeimrichHannot\UtilsBundle\Util\DatabaseUtil;
 use HeimrichHannot\UtilsBundle\Util\DcaUtil;
 use HeimrichHannot\UtilsBundle\Util\HtmlUtil;
-use HeimrichHannot\UtilsBundle\Util\Locale\LocaleUtil;
-use HeimrichHannot\UtilsBundle\Util\Request\RequestUtil;
-use HeimrichHannot\UtilsBundle\Util\Request\UrlUtil;
-use HeimrichHannot\UtilsBundle\Util\Routing\RoutingUtil;
-use HeimrichHannot\UtilsBundle\Util\Type\ArrayUtil;
-use HeimrichHannot\UtilsBundle\Util\Type\StringUtil;
-use HeimrichHannot\UtilsBundle\Util\Ui\AccordionUtil;
-use HeimrichHannot\UtilsBundle\Util\UserUtil\UserUtil;
+use HeimrichHannot\UtilsBundle\Util\LocaleUtil;
+use HeimrichHannot\UtilsBundle\Util\RequestUtil;
+use HeimrichHannot\UtilsBundle\Util\UrlUtil;
+use HeimrichHannot\UtilsBundle\Util\RoutingUtil;
+use HeimrichHannot\UtilsBundle\Util\ArrayUtil;
+use HeimrichHannot\UtilsBundle\Util\StringUtil;
+use HeimrichHannot\UtilsBundle\Util\AccordionUtil;
+use HeimrichHannot\UtilsBundle\Util\UserUtil;
 use Psr\Container\ContainerInterface;
 
 class Utils extends AbstractServiceSubscriber

diff --git a/tests/Util/Locale/LocaleUtilTest.php b/tests/Util/Locale/LocaleUtilTest.php
@@ -9,7 +9,7 @@
 namespace HeimrichHannot\UtilsBundle\Tests\Util\Locale;
 
 use Contao\TestCase\ContaoTestCase;
-use HeimrichHannot\UtilsBundle\Util\Locale\LocaleUtil;
+use HeimrichHannot\UtilsBundle\Util\LocaleUtil;
 
 class LocaleUtilTest extends ContaoTestCase
 {

diff --git a/tests/Util/Request/RequestUtilTest.php b/tests/Util/Request/RequestUtilTest.php
@@ -13,7 +13,7 @@
 use HeimrichHannot\TestUtilitiesBundle\Mock\ModelMockTrait;
 use HeimrichHannot\UtilsBundle\Tests\AbstractUtilsTestCase;
 use HeimrichHannot\UtilsBundle\Util\ModelUtil;
-use HeimrichHannot\UtilsBundle\Util\Request\RequestUtil;
+use HeimrichHannot\UtilsBundle\Util\RequestUtil;
 use PHPUnit\Framework\MockObject\MockBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;

diff --git a/tests/Util/Request/UrlUtilTest.php b/tests/Util/Request/UrlUtilTest.php
@@ -10,7 +10,7 @@
 
 use HeimrichHannot\UtilsBundle\Exception\InvalidUrlException;
 use HeimrichHannot\UtilsBundle\Tests\AbstractUtilsTestCase;
-use HeimrichHannot\UtilsBundle\Util\Request\UrlUtil;
+use HeimrichHannot\UtilsBundle\Util\UrlUtil;
 use PHPUnit\Framework\MockObject\MockBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;

diff --git a/tests/Util/Routing/RoutingUtilTest.php b/tests/Util/Routing/RoutingUtilTest.php
@@ -10,7 +10,7 @@
 
 use Contao\CoreBundle\Csrf\ContaoCsrfTokenManager;
 use HeimrichHannot\UtilsBundle\Tests\AbstractUtilsTestCase;
-use HeimrichHannot\UtilsBundle\Util\Routing\RoutingUtil;
+use HeimrichHannot\UtilsBundle\Util\RoutingUtil;
 use PHPUnit\Framework\MockObject\MockBuilder;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/tests/Util/Type/ArrayUtilTest.php b/tests/Util/Type/ArrayUtilTest.php
@@ -9,7 +9,7 @@
 namespace HeimrichHannot\UtilsBundle\Tests\Util\Type;
 
 use HeimrichHannot\UtilsBundle\Tests\AbstractUtilsTestCase;
-use HeimrichHannot\UtilsBundle\Util\Type\ArrayUtil;
+use HeimrichHannot\UtilsBundle\Util\ArrayUtil;
 use PHPUnit\Framework\MockObject\MockBuilder;
 
 class ArrayUtilTest extends AbstractUtilsTestCase

diff --git a/tests/Util/Type/StringUtilTest.php b/tests/Util/Type/StringUtilTest.php
@@ -9,7 +9,7 @@
 namespace HeimrichHannot\UtilsBundle\Tests\Util\Type;
 
 use Contao\TestCase\ContaoTestCase;
-use HeimrichHannot\UtilsBundle\Util\Type\StringUtil;
+use HeimrichHannot\UtilsBundle\Util\StringUtil;
 
 class StringUtilTest extends ContaoTestCase
 {

diff --git a/tests/Util/Ui/AccordionUtilTest.php b/tests/Util/Ui/AccordionUtilTest.php
@@ -12,7 +12,7 @@
 use Contao\Model\Collection;
 use HeimrichHannot\TestUtilitiesBundle\Mock\ModelMockTrait;
 use HeimrichHannot\UtilsBundle\Tests\AbstractUtilsTestCase;
-use HeimrichHannot\UtilsBundle\Util\Ui\AccordionUtil;
+use HeimrichHannot\UtilsBundle\Util\AccordionUtil;
 use PHPUnit\Framework\MockObject\MockBuilder;
 
 class AccordionUtilTest extends AbstractUtilsTestCase

diff --git a/tests/Util/UserUtil/UserUtilTest.php b/tests/Util/UserUtil/UserUtilTest.php
@@ -18,7 +18,7 @@
 use HeimrichHannot\UtilsBundle\Util\DatabaseUtil\CreateWhereForSerializedBlobResult;
 use HeimrichHannot\UtilsBundle\Util\DatabaseUtil;
 use HeimrichHannot\UtilsBundle\Util\ModelUtil;
-use HeimrichHannot\UtilsBundle\Util\UserUtil\UserUtil;
+use HeimrichHannot\UtilsBundle\Util\UserUtil;
 use PHPUnit\Framework\MockObject\MockBuilder;
 
 class UserUtilTest extends AbstractUtilsTestCase

diff --git a/tests/Util/UtilsTest.php b/tests/Util/UtilsTest.php
@@ -14,15 +14,15 @@
 use HeimrichHannot\UtilsBundle\Util\DatabaseUtil;
 use HeimrichHannot\UtilsBundle\Util\DcaUtil;
 use HeimrichHannot\UtilsBundle\Util\HtmlUtil;
-use HeimrichHannot\UtilsBundle\Util\Locale\LocaleUtil;
+use HeimrichHannot\UtilsBundle\Util\LocaleUtil;
 use HeimrichHannot\UtilsBundle\Util\ModelUtil;
-use HeimrichHannot\UtilsBundle\Util\Request\RequestUtil;
-use HeimrichHannot\UtilsBundle\Util\Request\UrlUtil;
-use HeimrichHannot\UtilsBundle\Util\Routing\RoutingUtil;
-use HeimrichHannot\UtilsBundle\Util\Type\ArrayUtil;
-use HeimrichHannot\UtilsBundle\Util\Type\StringUtil;
-use HeimrichHannot\UtilsBundle\Util\Ui\AccordionUtil;
-use HeimrichHannot\UtilsBundle\Util\UserUtil\UserUtil;
+use HeimrichHannot\UtilsBundle\Util\RequestUtil;
+use HeimrichHannot\UtilsBundle\Util\UrlUtil;
+use HeimrichHannot\UtilsBundle\Util\RoutingUtil;
+use HeimrichHannot\UtilsBundle\Util\ArrayUtil;
+use HeimrichHannot\UtilsBundle\Util\StringUtil;
+use HeimrichHannot\UtilsBundle\Util\AccordionUtil;
+use HeimrichHannot\UtilsBundle\Util\UserUtil;
 use HeimrichHannot\UtilsBundle\Util\Utils;
 use Symfony\Component\DependencyInjection\ServiceLocator;