Fix rebase issue

diff --git a/application/front/controller/admin/ServerController.php b/application/front/controller/admin/ServerController.php
index 85654a4358979e6890a94774ab8324fa038f7d29..bfc99422e7fbdf90bc689f929ca0b648dc7fcc89 100644 (file)
--- a/application/front/controller/admin/ServerController.php
+++ b/application/front/controller/admin/ServerController.php
@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace Shaarli\Front\Controller\Admin;
 
-use Shaarli\ApplicationUtils;
-use Shaarli\FileUtils;
+use Shaarli\Helper\ApplicationUtils;
+use Shaarli\Helper\FileUtils;
 use Slim\Http\Request;
 use Slim\Http\Response;
 

diff --git a/application/helper/FileUtils.php b/application/helper/FileUtils.php
index 2d50d8504af1b68ed975e62dcab390b2caa0f49c..2eac079306dfbf6c99f1bee2e666b8a866f467dd 100644 (file)
--- a/application/helper/FileUtils.php
+++ b/application/helper/FileUtils.php
@@ -133,7 +133,7 @@ class FileUtils
      */
     public static function isPathInShaarliFolder(string $path): bool
     {
-        $rootDirectory = dirname(dirname(__FILE__));
+        $rootDirectory = dirname(dirname(dirname(__FILE__)));
 
         return strpos(realpath($path), $rootDirectory) !== false;
     }

diff --git a/tests/helper/FileUtilsTest.php b/tests/helper/FileUtilsTest.php
index 948e46d1a404971addb7a658d199707a9f9d4783..8035f79cff3f94ca320c23bba6a756864618a455 100644 (file)
--- a/tests/helper/FileUtilsTest.php
+++ b/tests/helper/FileUtilsTest.php
@@ -4,6 +4,7 @@ namespace Shaarli\Helper;
 
 use Exception;
 use Shaarli\Exceptions\IOException;
+use Shaarli\TestCase;
 
 /**
  * Class FileUtilsTest