insert local config file path to config file page

plugins/Diagnostics/Controller.php

@@ -9,6 +9,7 @@
 
 namespace Piwik\Plugins\Diagnostics;
 
+use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Plugin\SettingsProvider;
 
@@ -39,6 +40,7 @@ public function configfile()
 
         return $this->renderTemplate('configfile', array(
             'allConfigValues' => $configValues,
+            'configFilePath' => Config::getInstance()->getLocalPath(),
         ));
     }
 

plugins/Diagnostics/templates/configfile.twig

@@ -8,5 +8,6 @@
 <div
     vue-entry="Diagnostics.ConfigFile"
     all-config-values="{{ allConfigValues|json_encode }}"
+    config-file-path="{{ configFilePath|json_encode }}"
 ></div>
 {% endblock %}

plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue

@@ -90,6 +90,10 @@ export default defineComponent({
       type: Object,
       required: true,
     },
+    configFilePath: {
+      type: String,
+      required: true,
+    },
   },
   components: {
     ContentBlock,
@@ -147,7 +151,7 @@ export default defineComponent({
     configFileIntro() {
       return translate(
         'Diagnostics_ConfigFileIntroduction',
-        '<code>"config/config.ini.php"</code>',
+        `<code>"${Matomo.helper.htmlEntities(this.configFilePath)}"</code>`,
       );
     },
   },

tests/PHPUnit/proxy/includes.php

@@ -1,8 +1,7 @@
 <?php
 
 if (!defined('PIWIK_INCLUDE_PATH')) {
-    // NOTE: PIWIK_INCLUDE_PATH must end in '/' or some parts of matomo will break
-    define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . '/../../..') . '/');
+    define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . '/../../..'));
 }
 
 if (!defined('PIWIK_USER_PATH')) {
@@ -14,7 +13,7 @@
 
 $GLOBALS['MATOMO_PLUGIN_DIRS'] = array(
     array(
-        'pluginsPathAbsolute' => realpath(PIWIK_INCLUDE_PATH . 'tests/resources/custompluginsdir'),
+        'pluginsPathAbsolute' => realpath(PIWIK_INCLUDE_PATH . '/tests/resources/custompluginsdir'),
         'webrootDirRelativeToMatomo' => '../../resources/custompluginsdir'
     ),
 );

tests/PHPUnit/proxy/nodispatchnotinstalled.php

@@ -12,9 +12,9 @@
 
 require realpath(dirname(__FILE__)) . "/includes.php";
 $testEnvironment = new TestingEnvironmentVariables();
-$testEnvironment->configFileLocal = PIWIK_INCLUDE_PATH . "tmp/test.config.ini.php";
+$testEnvironment->configFileLocal = PIWIK_INCLUDE_PATH . "/tmp/test.config.ini.php";
 $testEnvironment->save();
 
 Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator($testEnvironment));
 
-include PIWIK_INCLUDE_PATH . '/index.php';
+include PIWIK_INCLUDE_PATH . '/index.php';