From 1ba873986ceaf85a0a75a6704b3e291146168ab7 Mon Sep 17 00:00:00 2001
From: "a.shamavov" <a.shamavov@iqdev.digital>
Date: Wed, 17 Apr 2024 12:33:40 +0500
Subject: [PATCH] fix
---
compose.override.yaml | 19 ------------------
compose.yaml | 26 ------------------------
src/Controller/HomeController.php | 5 ++---
src/Service/FileUploader.php | 33 -------------------------------
4 files changed, 2 insertions(+), 81 deletions(-)
delete mode 100644 compose.override.yaml
delete mode 100644 compose.yaml
delete mode 100644 src/Service/FileUploader.php
diff --git a/compose.override.yaml b/compose.override.yaml
deleted file mode 100644
index 4ddb3ff..0000000
--- a/compose.override.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '3'
-
-services:
-###> doctrine/doctrine-bundle ###
- database:
- ports:
- - "5432"
-###< doctrine/doctrine-bundle ###
-
-###> symfony/mailer ###
- mailer:
- image: axllent/mailpit
- ports:
- - "1025"
- - "8025"
- environment:
- MP_SMTP_AUTH_ACCEPT_ANY: 1
- MP_SMTP_AUTH_ALLOW_INSECURE: 1
-###< symfony/mailer ###
diff --git a/compose.yaml b/compose.yaml
deleted file mode 100644
index dd791d9..0000000
--- a/compose.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: '3'
-
-services:
-###> doctrine/doctrine-bundle ###
- database:
- image: postgres:${POSTGRES_VERSION:-16}-alpine
- environment:
- POSTGRES_DB: ${POSTGRES_DB:-app}
- # You should definitely change the password in production
- POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-!ChangeMe!}
- POSTGRES_USER: ${POSTGRES_USER:-app}
- healthcheck:
- test: ["CMD", "pg_isready"]
- timeout: 5s
- retries: 5
- start_period: 60s
- volumes:
- - database_data:/var/lib/postgresql/data:rw
- # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
- # - ./docker/db/data:/var/lib/postgresql/data:rw
-###< doctrine/doctrine-bundle ###
-
-volumes:
-###> doctrine/doctrine-bundle ###
- database_data:
-###< doctrine/doctrine-bundle ###
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index 96a7ab2..dae67e7 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -96,11 +96,10 @@ class HomeController extends AbstractController
}
#[Route('/readLogFile', name: 'readLogFile')]
- public function readLogFile(Request $request, FileUploader $fileUploader): Response
+ public function readLogFile(Request $request): Response
{
$file = $request->files->get('file');
- $fileName = $fileUploader->upload($file);
- $text = $this->functions->readLogFile($fileName);
+ $text = $this->functions->readLogFile($file);
$response = new JsonResponse($text);
$response->setEncodingOptions(JSON_UNESCAPED_UNICODE);
return $response;
diff --git a/src/Service/FileUploader.php b/src/Service/FileUploader.php
deleted file mode 100644
index 8bd280f..0000000
--- a/src/Service/FileUploader.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use Symfony\Component\HttpFoundation\File\Exception\FileException;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-class FileUploader
-{
- private $targetDirectory;
-
- public function __construct($targetDirectory)
- {
- $this->targetDirectory = $targetDirectory;
- }
-
- public function upload(UploadedFile $file)
- {
- $fileName = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME) .'.'. $file->guessExtension();
- try {
- $file->move($this->getTargetDirectory(), $fileName);
- } catch (FileException $e) {
- throw new FileException($e->getMessage());
- }
-
- return $this->getTargetDirectory() . $fileName;
- }
-
- public function getTargetDirectory()
- {
- return $this->targetDirectory;
- }
-}
\ No newline at end of file
--
GitLab