feat: added Symfony DependencyInjection for Configuration class

thorsten · Oct 7, 2024 · b0ebc59 · b0ebc59
1 parent fb9a5d0
commit b0ebc59
Show file tree

Hide file tree

Showing 24 changed files with 67 additions and 46 deletions.
diff --git a/phpmyfaq/404.php b/phpmyfaq/404.php
@@ -15,7 +15,6 @@
  * @since     2019-01-25
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Enums\SessionActionType;
 use phpMyFAQ\Session;
 use phpMyFAQ\Template\TwigWrapper;
@@ -26,7 +25,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/add.php b/phpmyfaq/add.php
@@ -18,7 +18,6 @@
 use phpMyFAQ\Captcha\Captcha;
 use phpMyFAQ\Captcha\Helper\CaptchaHelper;
 use phpMyFAQ\Category;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Enums\Forms\FormIds;
 use phpMyFAQ\Enums\PermissionType;
 use phpMyFAQ\Filter;
@@ -42,7 +41,7 @@
 $request = Request::createFromGlobals();
 $faqSystem = new System();
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/ask.php b/phpmyfaq/ask.php
@@ -17,7 +17,6 @@
 
 use phpMyFAQ\Captcha\Captcha;
 use phpMyFAQ\Captcha\Helper\CaptchaHelper;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Enums\Forms\FormIds;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Forms;
@@ -34,7 +33,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/attachment.php b/phpmyfaq/attachment.php
@@ -17,7 +17,6 @@
 
 use phpMyFAQ\Attachment\AttachmentException;
 use phpMyFAQ\Attachment\AttachmentFactory;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Faq\Permission;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Permission\MediumPermission;
@@ -39,7 +38,7 @@
 
 $attachmentErrors = [];
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $request = Request::createFromGlobals();
 
 // authenticate with session information

diff --git a/phpmyfaq/bookmarks.php b/phpmyfaq/bookmarks.php
@@ -16,7 +16,6 @@
  * @since     2023-07-20
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Template\TwigWrapper;
 use phpMyFAQ\Bookmark;
 use phpMyFAQ\Translation;
@@ -29,7 +28,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 
 if ($user->isLoggedIn()) {

diff --git a/phpmyfaq/contact.php b/phpmyfaq/contact.php
@@ -17,7 +17,6 @@
 
 use phpMyFAQ\Captcha\Captcha;
 use phpMyFAQ\Captcha\Helper\CaptchaHelper;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Session;
 use phpMyFAQ\Template\TwigWrapper;
 use phpMyFAQ\Translation;
@@ -29,7 +28,7 @@
 }
 
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/faq.php b/phpmyfaq/faq.php
@@ -23,7 +23,6 @@
 use phpMyFAQ\Captcha\Captcha;
 use phpMyFAQ\Captcha\Helper\CaptchaHelper;
 use phpMyFAQ\Comments;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Date;
 use phpMyFAQ\Entity\CommentType;
 use phpMyFAQ\Entity\SeoEntity;
@@ -59,7 +58,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 
 $glossary = new Glossary($faqConfig);

diff --git a/phpmyfaq/glossary.php b/phpmyfaq/glossary.php
@@ -15,7 +15,6 @@
  * @since     2012-09-03
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Glossary;
 use phpMyFAQ\Pagination;
@@ -30,7 +29,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/index.php b/phpmyfaq/index.php
@@ -45,6 +45,9 @@
 use phpMyFAQ\User\CurrentUser;
 use phpMyFAQ\User\TwoFactor;
 use phpMyFAQ\User\UserAuthentication;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -66,7 +69,18 @@
 $response = new Response();
 $response->headers->set('Content-Type', 'text/html');
 
-$faqConfig = Configuration::getConfigurationInstance();
+//
+// Service Containers
+//
+$container = new ContainerBuilder();
+$loader = new PhpFileLoader($container, new FileLocator(__DIR__));
+try {
+    $loader->load('src/services.php');
+} catch (\Exception $e) {
+    echo $e->getMessage();
+}
+
+$faqConfig = $container->get('phpmyfaq.configuration');
 
 //
 // Get language (default: english)

diff --git a/phpmyfaq/login.php b/phpmyfaq/login.php
@@ -15,7 +15,6 @@
  * @since     2012-02-12
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Session;
 use phpMyFAQ\Template\TwigWrapper;
 use phpMyFAQ\Translation;
@@ -26,7 +25,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/news.php b/phpmyfaq/news.php
@@ -20,7 +20,6 @@
 use phpMyFAQ\Captcha\Captcha;
 use phpMyFAQ\Captcha\Helper\CaptchaHelper;
 use phpMyFAQ\Comments;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Date;
 use phpMyFAQ\Entity\CommentType;
 use phpMyFAQ\Enums\PermissionType;
@@ -42,7 +41,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/open-questions.php b/phpmyfaq/open-questions.php
@@ -16,7 +16,6 @@
  */
 
 use phpMyFAQ\Category;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Helper\QuestionHelper;
 use phpMyFAQ\Session;
 use phpMyFAQ\Template\TwigWrapper;
@@ -28,7 +27,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 
 $faqSession = new Session($faqConfig);

diff --git a/phpmyfaq/overview.php b/phpmyfaq/overview.php
@@ -15,7 +15,6 @@
  * @since     2015-09-27
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Helper\FaqHelper;
 use phpMyFAQ\Session;
 use phpMyFAQ\Template\CategoryNameTwigExtension;
@@ -30,7 +29,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/password.php b/phpmyfaq/password.php
@@ -15,7 +15,6 @@
  * @since     2012-03-26
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Session;
 use phpMyFAQ\Template\TwigWrapper;
 
@@ -24,7 +23,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $faqSession = new Session($faqConfig);
 
 $faqSession->userTracking('forgot_password', 0);

diff --git a/phpmyfaq/privacy.php b/phpmyfaq/privacy.php
@@ -15,18 +15,16 @@
  * @since     2023-01-22
  */
 
-use phpMyFAQ\Configuration;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     http_response_code(400);
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 
 $privacyUrl = $faqConfig->get('main.privacyURL');
-
 $redirectUrl = strlen((string) $privacyUrl) > 0 ? $privacyUrl : $faqConfig->get('main.referenceURL');
 
 $response = new RedirectResponse($redirectUrl);

diff --git a/phpmyfaq/register.php b/phpmyfaq/register.php
@@ -18,7 +18,6 @@
 
 use phpMyFAQ\Captcha\Captcha;
 use phpMyFAQ\Captcha\Helper\CaptchaHelper;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Session;
 use phpMyFAQ\Template\TwigWrapper;
 use phpMyFAQ\Translation;
@@ -32,7 +31,7 @@
 }
 
 $request = Request::createFromGlobals();
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/request-removal.php b/phpmyfaq/request-removal.php
@@ -15,7 +15,6 @@
  * @since     2018-02-03
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Session;
 use phpMyFAQ\Session\Token;
 use phpMyFAQ\Template\TwigWrapper;
@@ -26,7 +25,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/search.php b/phpmyfaq/search.php
@@ -16,7 +16,6 @@
  */
 
 use phpMyFAQ\Category;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Faq;
 use phpMyFAQ\Faq\Permission;
 use phpMyFAQ\Filter;
@@ -42,7 +41,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/show.php b/phpmyfaq/show.php
@@ -16,7 +16,6 @@
  */
 
 use phpMyFAQ\Category;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Helper\CategoryHelper;
 use phpMyFAQ\Language\Plurals;
@@ -35,7 +34,7 @@
 
 $request = Request::createFromGlobals();
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/sitemap.php b/phpmyfaq/sitemap.php
@@ -16,7 +16,6 @@
  * @since     2005-08-21
  */
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Session;
 use phpMyFAQ\Sitemap;
@@ -31,7 +30,7 @@
     exit();
 }
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 $user = CurrentUser::getCurrentUser($faqConfig);
 $faqSession = new Session($faqConfig);
 $faqSession->setCurrentUser($user);

diff --git a/phpmyfaq/sitemap.xml.php b/phpmyfaq/sitemap.xml.php
@@ -19,14 +19,13 @@
  */
 
 use phpMyFAQ\Application;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Controller\SitemapController;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 require './src/Bootstrap.php';
 
-$faqConfig = Configuration::getConfigurationInstance();
+$faqConfig = $container->get('phpmyfaq.configuration');
 
 $routes = new RouteCollection();
 $routes->add('public.sitemap.xml', new Route('/sitemap.xml', ['_controller' => [SitemapController::class, 'index']]));