diff --git a/app/modules/web/Controllers/BootstrapController.php b/app/modules/web/Controllers/BootstrapController.php index 874b8a67..431d8fd7 100644 --- a/app/modules/web/Controllers/BootstrapController.php +++ b/app/modules/web/Controllers/BootstrapController.php @@ -82,7 +82,7 @@ final class BootstrapController extends SimpleControllerBase */ private function getJsLang() { - return require CONFIG_PATH . DIRECTORY_SEPARATOR . 'strings.js.inc'; + return require RESOURCES_PATH . DIRECTORY_SEPARATOR . 'strings.js.inc'; } /** diff --git a/app/modules/web/Controllers/ResourceController.php b/app/modules/web/Controllers/ResourceController.php index 400bcd4f..1479eab6 100644 --- a/app/modules/web/Controllers/ResourceController.php +++ b/app/modules/web/Controllers/ResourceController.php @@ -37,7 +37,7 @@ final class ResourceController extends SimpleControllerBase /** * @var Minify */ - protected $minify; + private $minify; /** * Returns CSS resources @@ -126,8 +126,6 @@ final class ResourceController extends SimpleControllerBase /** * @throws SPException - * @throws \DI\DependencyException - * @throws \DI\NotFoundException */ protected function initialize() { diff --git a/app/config/actions.xml b/app/resources/actions.xml similarity index 100% rename from app/config/actions.xml rename to app/resources/actions.xml diff --git a/app/config/mime.xml b/app/resources/mime.xml similarity index 100% rename from app/config/mime.xml rename to app/resources/mime.xml diff --git a/app/config/strings.js.inc b/app/resources/strings.js.inc similarity index 100% rename from app/config/strings.js.inc rename to app/resources/strings.js.inc diff --git a/lib/Base.php b/lib/Base.php index 8e2343c0..fc7fe986 100644 --- a/lib/Base.php +++ b/lib/Base.php @@ -35,11 +35,12 @@ define('APP_PATH', APP_ROOT . DIRECTORY_SEPARATOR . 'app'); // Please, notice that this file should be outside the webserver root. You can move it and then update this path define('CONFIG_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'config'); +define('RESOURCES_PATH', APP_PATH . DIRECTORY_SEPARATOR . 'resources'); // Setup config files define('CONFIG_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'config.xml'); -define('ACTIONS_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'actions.xml'); -define('MIMETYPES_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'mime.xml'); +define('ACTIONS_FILE', RESOURCES_PATH . DIRECTORY_SEPARATOR . 'actions.xml'); +define('MIMETYPES_FILE', RESOURCES_PATH . DIRECTORY_SEPARATOR . 'mime.xml'); define('OLD_CONFIG_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'config.php'); define('LOG_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . 'syspass.log'); define('LOCK_FILE', CONFIG_PATH . DIRECTORY_SEPARATOR . '.lock'); diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php index d030a709..f5850a01 100644 --- a/lib/SP/Services/Install/Installer.php +++ b/lib/SP/Services/Install/Installer.php @@ -57,7 +57,7 @@ final class Installer extends Service */ const VERSION = [3, 0, 0]; const VERSION_TEXT = '3.0-rc1'; - const BUILD = 18111202; + const BUILD = 18111203; /** * @var DatabaseSetupInterface diff --git a/tests/SP/Storage/ArchiveHandlerTest.php b/tests/SP/Storage/ArchiveHandlerTest.php index 814a549b..918cb49a 100644 --- a/tests/SP/Storage/ArchiveHandlerTest.php +++ b/tests/SP/Storage/ArchiveHandlerTest.php @@ -46,7 +46,7 @@ class ArchiveHandlerTest extends TestCase $archive = TMP_DIR . DIRECTORY_SEPARATOR . 'test_archive_file'; $handler = new ArchiveHandler($archive, new PhpExtensionChecker()); - $handler->compressFile(RESOURCE_DIR . DIRECTORY_SEPARATOR . 'config.xml'); + $handler->compressFile(RESOURCE_DIR . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config.xml'); $this->assertFileExists($archive . ArchiveHandler::COMPRESS_EXTENSION); }