Refactor: env (#170)

* Update .gitignore and composer.json for environment configuration

* fix test

* use dev

---------

Co-authored-by: Tatevik <tatevikg1@gmail.com>

Author: TatevikGr

.github/workflows/ci.yml

@@ -73,6 +73,7 @@ jobs:
           export PHPLIST_DATABASE_PASSWORD=${{ env.DB_PASSWORD }}
           export PHPLIST_DATABASE_PORT=${{ job.services.mysql.ports['3306'] }}
           export PHPLIST_DATABASE_HOST=127.0.0.1
+          export PHPLIST_DATABASE_PATH=
           vendor/bin/phpunit tests/Integration/
         continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
       - name: Running static analysis

.gitignore

@@ -15,3 +15,5 @@
 /var/
 /vendor/
 .phpunit.result.cache
+.env
+.env.dist

composer.json

@@ -42,7 +42,7 @@
     },
     "require": {
         "php": "^8.1",
-        "phplist/core": "dev-main",
+        "phplist/core": "dev-dev",
         "friendsofsymfony/rest-bundle": "*",
         "symfony/test-pack": "^1.0",
         "symfony/process": "^6.4",
@@ -85,6 +85,7 @@
             "PhpList\\Core\\Composer\\ScriptHandler::createGeneralConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration",
+            "PhpList\\Core\\Composer\\ScriptHandler::createDotenvConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::clearAllCaches"
         ],

phpunit.xml.dist

@@ -5,10 +5,11 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1"/>
         <server name="KERNEL_CLASS" value="PhpList\Core\Core\ApplicationKernel"/>
+        <server name="APP_ENV" value="test" force="true"/>
     </php>
 </phpunit>

tests/Integration/Common/Routing/RoutingTest.php

@@ -16,7 +16,7 @@ class RoutingTest extends WebTestCase
     public function testRootUrlHasHtmlContentType()
     {
         $client = self::createClient();
-        $client->request('get', '/api/v2');
+        $client->request('GET', '/api/v2', server: ['HTTP_ACCEPT' => 'text/html']);
 
         $response = $client->getResponse();
 

tests/Integration/Composer/ScriptsTest.php

@@ -29,9 +29,7 @@ private function getAbsolutePublicDirectoryPath(): string
     public static function publicDirectoryFilesDataProvider(): array
     {
         return [
-            'production entry point' => ['app.php'],
-            'development entry point' => ['app_dev.php'],
-            'testing entry point' => ['app_test.php'],
+            'entry point' => ['index.php'],
             '.htaccess' => ['.htaccess'],
         ];
     }

tests/bootstrap.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+if (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
+}