Fix env variables

Author: papac

.github/workflows/tests.yml

@@ -58,15 +58,10 @@ jobs:
 
       - name: Run test suite
         env:
-          FTP_HOST: localhost
-          FTP_USER: ${{ secrets.FTP_USER }}
-          FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
-          FTP_PORT: ${{ secrets.FTP_PORT }}
-          FTP_ROOT: ${{ secrets.FTP_ROOT }}
-          AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_KEY: ${{ secrets.AWS_KEY }}
+          AWS_SECRET: ${{ secrets.AWS_SECRET }}
           AWS_ENDPOINT: ${{ secrets.AWS_ENDPOINT }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          AWS_REGION: us-east-1
+          AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
         run: ./vendor/bin/phpunit tests --configuration phpunit.dist.xml

docker-compose.yml

@@ -57,8 +57,8 @@ services:
         image: papacdev/vsftpd
         restart: unless-stopped
         ports:
-            - "2021:21"
-            - "2020:20"
+            - "21:21"
+            - "20:20"
             - "12020-12025:12020-12025"
         environment:
             USER: username

tests/Config/stubs/config/storage.php

@@ -26,7 +26,7 @@
             'hostname' => app_env('FTP_HOST', 'localhost'),
             'password' => app_env('FTP_PASSWORD', 'password'),
             'username' => app_env('FTP_USERNAME', 'username'),
-            'port' => app_env('FTP_PORT', 2021),
+            'port' => app_env('FTP_PORT', 21),
             'root' => app_env('FTP_ROOT', '/tmp'), // Start directory
             'tls' => app_env('FTP_SSL', false), // `true` enable the secure connexion.
             'timeout' => app_env('FTP_TIMEOUT', 90) // Temps d'attente de connection