Fix loading forwarding and oauth configs

Author: williamdes

config/bootstrap.php

@@ -96,6 +96,22 @@
     Configure::load('app_local', 'default');
 }
 
+/*
+ * Load a local configuration file to provide more configurations.
+ * Notice: For security reasons forwarding.php **should not** be included in your git repo.
+ */
+if (file_exists(CONFIG . 'forwarding.php')) {
+    Configure::load('forwarding', 'default');
+}
+
+/*
+ * Load a local configuration file to provide more configurations.
+ * Notice: For security reasons oauth.php **should not** be included in your git repo.
+ */
+if (file_exists(CONFIG . 'oauth.php')) {
+    Configure::load('oauth', 'default');
+}
+
 /*
  * When debug = true the metadata cache should only last for a short time.
  */

config/forwarding_example.php

@@ -6,18 +6,13 @@
  * Configures forwarding reports to Sentry
  */
 
-namespace App\Config;
-
-use Cake\Core\Configure;
-
-Configure::write('Forwarding.Sentry', [
-    'base_url' => 'https://sentry.domain.tld',// Without the last /
-    'project_id' => 2,// Settings > Security headers (can be found in the URL: api/{project_id}/security)
-    'key' => 'xxxxxxxxxxxxxxxxxx',// Settings > Security headers
-    'secret' => 'xxxxxxxxxxxxxxxxxxxx',// Settings > Client Keys > DSN (deprecated, use password value of the http basic auth)
-    // Used to send user feedback
-    'dsn_url' => 'https://[email protected]/{project_id}',// Settings > Client Keys > DSN
-]);
-
-// Remove this line or the forwarding will be disabled
-Configure::write('Forwarding.Sentry', null);
+return [
+    'Forwarding.Sentry' => [
+        'base_url' => 'https://sentry.domain.tld',// Without the last /
+        'project_id' => 2,// Settings > Security headers (can be found in the URL: api/{project_id}/security)
+        'key' => 'xxxxxxxxxxxxxxxxxx',// Settings > Security headers
+        'secret' => 'xxxxxxxxxxxxxxxxxxxx',// Settings > Client Keys > DSN (deprecated, use password value of the http basic auth)
+        // Used to send user feedback
+        'dsn_url' => 'https://[email protected]/{project_id}',// Settings > Client Keys > DSN
+    ],
+];

config/oauth_example.php

@@ -1,24 +1,26 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Configures github application details for authentication. You can get them
  * from the application configuration page on github.
  */
 
-namespace App\Config;
+return [
+    'GithubConfig' => [
+        'client_id' => '<application-client-id>',
+        'client_secret' => '<application-client-secret>',
+    ],
 
-use Cake\Core\Configure;
+    /**
+     * Configures the github repo to check commit access for
+     */
+    'GithubRepoPath' => 'phpmyadmin/phpmyadmin',
 
-Configure::write('GithubConfig', [
-    'client_id' => '<application-client-id>',
-    'client_secret' => '<application-client-secret>',
-]);
+    /**
+     * Access token for syncing Github issue states
+     */
+    'GithubAccessToken' => '<access-token>',
 
-/**
- * Configures the github repo to check commit access for
- */
-Configure::write('GithubRepoPath', 'phpmyadmin/phpmyadmin');
-
-/**
- * Access token for syncing Github issue states
- */
-Configure::write('GithubAccessToken', '<access-token>');
+];