Changed directory

popov654 · Dec 15, 2023 · 4f3e8d8 · 4f3e8d8
1 parent 267d01d
commit 4f3e8d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,8 @@ RUN --mount=type=bind,source=./composer.json,target=composer.json \
 
 FROM php:8.2-apache as base
 # RUN docker-php-ext-install pdo pdo_mysql
-COPY ./src /var/www/html
+COPY *.php /var/www/html/
+COPY ./src /var/www/html/src
 COPY ./articles /var/www/html/articles
 COPY ./uploads /var/www/html/uploads
 

diff --git a/src/editor.php → editor.php b/src/editor.php → editor.php
@@ -2,7 +2,8 @@
 
 use Diff\ArrayComparer\StrictArrayComparer;
 
-require "controller.php";
+require "vendor/autoload.php";
+require "src/controller.php";
 
 if (!isset($_GET['action'])) {
     $_GET['action'] = 'get';

diff --git a/src/index.php → index.php b/src/index.php → index.php
@@ -1,5 +1,6 @@
 <?php
-    require "controller.php";
+    require "vendor/autoload.php";
+    require "src/controller.php";
 ?>
 <html>
     <head>

diff --git a/src/controller.php b/src/controller.php
@@ -1,7 +1,5 @@
 <?php
 
-require Controller::getRootDirectory() . 'vendor/autoload.php';
-
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\Autolink\AutolinkExtension;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
@@ -18,18 +16,9 @@
 use League\CommonMark\Node\Block\Document;
 
 class Controller {
-    public static function getRootDirectory(): String {
-        if (preg_match("/html$/", getcwd())) {
-            return '';
-        }
-        return '../';
-    }
 
     public static function getArticlesDirectory(): String {
-        if (preg_match("/html$/", getcwd())) {
-            return 'articles/';
-        }
-        return '../articles/';
+        return getcwd() . '/articles/';
     }
 
     public static function getArticlesList(): Array {