diff --git a/composer.json b/composer.json index d4456f324..a5f3aff3f 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "require": "3.4.*" }, "runtime": { - "dotenv_path": "symfony/.env" + "dotenv_path": "resources/symfony/.env" } }, "scripts": { diff --git a/lib/autoload_runtime.php b/lib/autoload_runtime.php index f620a1a7a..6b5344587 100644 --- a/lib/autoload_runtime.php +++ b/lib/autoload_runtime.php @@ -14,7 +14,7 @@ if (!is_object($app)) { $runtime = $_SERVER['APP_RUNTIME'] ?? $_ENV['APP_RUNTIME'] ?? 'Symfony\\Component\\Runtime\\SymfonyRuntime'; $runtime = new $runtime(($_SERVER['APP_RUNTIME_OPTIONS'] ?? $_ENV['APP_RUNTIME_OPTIONS'] ?? []) + [ - 'dotenv_path' => 'symfony/.env', + 'dotenv_path' => 'resources/symfony/.env', 'project_dir' => dirname(__DIR__, 1), ]); diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 301857879..a0090dd55 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -393,6 +393,7 @@ return array( 'Combodo\\iTop\\Controller\\Base\\Layout\\ActivityPanelController' => $baseDir . '/sources/Controller/Base/Layout/ActivityPanelController.php', 'Combodo\\iTop\\Controller\\Base\\Layout\\ObjectController' => $baseDir . '/sources/Controller/Base/Layout/ObjectController.php', 'Combodo\\iTop\\Controller\\Links\\LinkSetController' => $baseDir . '/sources/Controller/Links/LinkSetController.php', + 'Combodo\\iTop\\Controller\\MyController' => $baseDir . '/sources/Controller/MyController.php', 'Combodo\\iTop\\Controller\\Newsroom\\iTopNewsroomController' => $baseDir . '/sources/Controller/Newsroom/iTopNewsroomController.php', 'Combodo\\iTop\\Controller\\Notifications\\ActionController' => $baseDir . '/sources/Controller/Notifications/ActionController.php', 'Combodo\\iTop\\Controller\\Notifications\\NotificationsCenterController' => $baseDir . '/sources/Controller/Notifications/NotificationsCenterController.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 33080132f..3418476c5 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -768,6 +768,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Controller\\Base\\Layout\\ActivityPanelController' => __DIR__ . '/../..' . '/sources/Controller/Base/Layout/ActivityPanelController.php', 'Combodo\\iTop\\Controller\\Base\\Layout\\ObjectController' => __DIR__ . '/../..' . '/sources/Controller/Base/Layout/ObjectController.php', 'Combodo\\iTop\\Controller\\Links\\LinkSetController' => __DIR__ . '/../..' . '/sources/Controller/Links/LinkSetController.php', + 'Combodo\\iTop\\Controller\\MyController' => __DIR__ . '/../..' . '/sources/Controller/MyController.php', 'Combodo\\iTop\\Controller\\Newsroom\\iTopNewsroomController' => __DIR__ . '/../..' . '/sources/Controller/Newsroom/iTopNewsroomController.php', 'Combodo\\iTop\\Controller\\Notifications\\ActionController' => __DIR__ . '/../..' . '/sources/Controller/Notifications/ActionController.php', 'Combodo\\iTop\\Controller\\Notifications\\NotificationsCenterController' => __DIR__ . '/../..' . '/sources/Controller/Notifications/NotificationsCenterController.php', diff --git a/lib/composer/installed.php b/lib/composer/installed.php index 675b1d875..273cb6890 100644 --- a/lib/composer/installed.php +++ b/lib/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'combodo/itop', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => 'dddcb213d11aa68097d1ec9334401cea632ec944', + 'reference' => '6a907f1fedf16e9778b26b6ffee5aaf634e2d50d', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -22,7 +22,7 @@ 'combodo/itop' => array( 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => 'dddcb213d11aa68097d1ec9334401cea632ec944', + 'reference' => '6a907f1fedf16e9778b26b6ffee5aaf634e2d50d', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/symfony/.env b/resources/symfony/.env similarity index 98% rename from symfony/.env rename to resources/symfony/.env index c4cb030ca..6eee6fbbc 100644 --- a/symfony/.env +++ b/resources/symfony/.env @@ -15,6 +15,6 @@ # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration ###> symfony/framework-bundle ### -#APP_ENV=dev +APP_ENV=prod #APP_SECRET=extracted from iTop general configuration in ./symfony/packages/itop_configuration_bridge.php ###< symfony/framework-bundle ### diff --git a/symfony/config/bundles.php b/resources/symfony/config/bundles.php similarity index 100% rename from symfony/config/bundles.php rename to resources/symfony/config/bundles.php diff --git a/symfony/config/packages/cache.yaml b/resources/symfony/config/packages/cache.yaml similarity index 100% rename from symfony/config/packages/cache.yaml rename to resources/symfony/config/packages/cache.yaml diff --git a/symfony/config/packages/debug.yaml b/resources/symfony/config/packages/debug.yaml similarity index 100% rename from symfony/config/packages/debug.yaml rename to resources/symfony/config/packages/debug.yaml diff --git a/symfony/config/packages/framework.yaml b/resources/symfony/config/packages/framework.yaml similarity index 100% rename from symfony/config/packages/framework.yaml rename to resources/symfony/config/packages/framework.yaml diff --git a/symfony/config/packages/itop_configuration_bridge.php b/resources/symfony/config/packages/itop_configuration_bridge.php similarity index 88% rename from symfony/config/packages/itop_configuration_bridge.php rename to resources/symfony/config/packages/itop_configuration_bridge.php index cd3ac74f5..9f0e1dece 100644 --- a/symfony/config/packages/itop_configuration_bridge.php +++ b/resources/symfony/config/packages/itop_configuration_bridge.php @@ -19,8 +19,8 @@ use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -require_once(__DIR__ . '/../../../approot.inc.php'); -require_once(__DIR__ . '/../../../application/startup.inc.php'); +require_once(__DIR__.'/../../../../approot.inc.php'); +require_once(__DIR__.'/../../../../application/startup.inc.php'); return static function (ContainerConfigurator $container) { diff --git a/symfony/config/packages/routing.yaml b/resources/symfony/config/packages/routing.yaml similarity index 100% rename from symfony/config/packages/routing.yaml rename to resources/symfony/config/packages/routing.yaml diff --git a/symfony/config/packages/twig.yaml b/resources/symfony/config/packages/twig.yaml similarity index 100% rename from symfony/config/packages/twig.yaml rename to resources/symfony/config/packages/twig.yaml diff --git a/symfony/config/packages/web_profiler.yaml b/resources/symfony/config/packages/web_profiler.yaml similarity index 100% rename from symfony/config/packages/web_profiler.yaml rename to resources/symfony/config/packages/web_profiler.yaml diff --git a/resources/symfony/config/preload.php b/resources/symfony/config/preload.php new file mode 100644 index 000000000..9ff0d3b16 --- /dev/null +++ b/resources/symfony/config/preload.php @@ -0,0 +1,9 @@ +getProjectDir() . '/symfony/config'; + return $this->getProjectDir() . '/resources/symfony/config'; } public function getCacheDir(): string @@ -46,6 +46,6 @@ class Kernel extends BaseKernel public function getLogDir(): string { - return $this->getProjectDir() . 'log/symfony'; + return $this->getProjectDir() . '/log/symfony'; } } diff --git a/symfony/config/preload.php b/symfony/config/preload.php deleted file mode 100644 index 5ebcdb215..000000000 --- a/symfony/config/preload.php +++ /dev/null @@ -1,5 +0,0 @@ -