Merge branch 'main' of https://github.com/cyklokoalicia/OpenSourceBik…

…eShare into code_style

.env

@@ -0,0 +1,2 @@
+APP_ENV=dev
+APP_DEBUG=true

common.php

@@ -15,13 +15,17 @@
 use BikeShare\Sms\SmsSenderInterface;
 use BikeShare\SmsConnector\SmsConnectorInterface;
 use BikeShare\User\User;
+use Symfony\Component\Dotenv\Dotenv;
 
-\Symfony\Component\ErrorHandler\Debug::enable();
+$dotenv = new Dotenv();
+$dotenv->loadEnv(__DIR__.'/.env', null, 'dev', ['test'], true);
 
-$kernel = new Kernel('dev', true);
+$kernel = new Kernel($_ENV['APP_ENV'], (bool) $_ENV['APP_DEBUG']);
 $kernel->boot();
 
 $logger = $kernel->getContainer()->get('logger');
+Monolog\ErrorHandler::register($logger);
+
 $configuration = $kernel->getContainer()->get(Configuration::class);
 $sms = $kernel->getContainer()->get(SmsConnectorInterface::class);
 $db = $kernel->getContainer()->get(DbInterface::class);

composer.json

@@ -37,7 +37,8 @@
     "symfony/monolog-bundle": "^3.10",
     "symfony/console": "^5.4",
     "symfony/runtime": "^5.4",
-    "symfony/twig-bundle": "^5.4"
+    "symfony/twig-bundle": "^5.4",
+    "symfony/dotenv": "^5.4"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "^3.10|^4.0",

config/services.php

@@ -22,6 +22,7 @@
 use BikeShare\SmsConnector\SmsConnectorFactory;
 use BikeShare\SmsConnector\SmsConnectorInterface;
 use PHPMailer\PHPMailer\PHPMailer;
+use Symfony\Component\Dotenv\Command\DotenvDumpCommand;
 
 return static function (ContainerConfigurator $container): void {
     $services = $container->services();
@@ -32,7 +33,13 @@
     $services->instanceof(MailSenderInterface::class)->tag('mailSender');
     $services->instanceof(SmsConnectorInterface::class)->tag('smsConnector');
 
-    $services->alias('logger','monolog.logger');
+    $services->alias('logger', 'monolog.logger');
+
+    $services->set(DotenvDumpCommand::class)
+        ->args([
+            param('kernel.project_dir') . '/.env',
+            param('kernel.environment'),
+        ]);
 
     $services->set(Configuration::class)
         ->args([__DIR__ . '/../config.php']);

src/App/Kernel.php

@@ -11,12 +11,22 @@
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 
 class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
 
+    public function boot()
+    {
+        if ($this->debug) {
+            Debug::enable();
+        }
+
+        parent::boot();
+    }
+
     protected function configureContainer(ContainerConfigurator $container): void
     {
         $configDir = $this->getConfigDir();

src/SmsConnector/AbstractConnector.php

@@ -36,7 +36,10 @@ public function __construct(
         $debugMode = false
     ) {
         $this->debugMode = $debugMode;
-        $connectorConfig = json_decode($configuration->get('connectors')['config'][static::getType()] ?? '[]', true) ?? [];
+        $connectorConfig = json_decode(
+            $configuration->get('connectors')['config'][static::getType()] ?? '[]',
+            true
+        ) ?? [];
         $this->checkConfig($connectorConfig);
     }