Migrate project to Symfony (#21)

* Migrate project from Silex to Symfony * Update to Symfony 7.0.8 * Update to Symfony 7.1.1 * Reference Silex old version in readme * Update to Symfony 7.1.2
romibuzi · Jun 29, 2024 · a88aaf3 · a88aaf3
1 parent ebac238
commit a88aaf3
Show file tree

Hide file tree

Showing 95 changed files with 6,118 additions and 3,117 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,5 @@
+APP_ENV=prod
+APP_SECRET=s3creT
+
+AWS_REGION=eu-west-1
+AWS_ACCOUNT=XXX
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.4', '8.2']
+        php: ['8.2', '8.3']
 
     steps:
     - uses: actions/checkout@v3
@@ -29,8 +29,8 @@ jobs:
     - name: Validate composer.json and composer.lock
       run: composer validate --strict
 
-    - name: Copy example config
-      run: cp app/config.php.dist app/config.php
+    - name: Copy .env.example
+      run: cp .env.example .env
 
     - name: Install dependencies
       run: make install-dev

diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,21 @@
-bin/
-vendor/
+.env
 
-# local specific config
+# old local specific config
 app/config.php
 
-var/majordome.db
+###> symfony/framework-bundle ###
+bin/*
+!bin/console
 
-var/logs/*
-!var/logs/.gitkeep
+/var/
+/vendor/
+###< symfony/framework-bundle ###
 
-var/code-coverage
+###> phpunit/phpunit ###
+.phpunit.cache
+.phpunit.result.cache
+###< phpunit/phpunit ###
+
+###> squizlabs/php_codesniffer ###
+/.phpcs-cache
+###< squizlabs/php_codesniffer ###
diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,25 @@
 FROM php:8.2-cli
 
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
 RUN apt-get update
 
 RUN apt-get -y install libzip-dev sqlite3
 
 RUN docker-php-ext-install zip
 
-RUN curl -sS https://getcomposer.org/installer -o composer-setup.php 
+RUN curl -sS https://getcomposer.org/installer -o composer-setup.php
 
 RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer -y
 
 WORKDIR /opt/majordome
 
 COPY . .
 
-RUN make install
+RUN make install-dev
+
+RUN make install-db
 
-CMD ["php", "-S", "0.0.0.0:8080", "-t", "web/"]
+CMD ["php", "-S", "0.0.0.0:8080", "-t", "public/"]
 
 EXPOSE 8080
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Romain Ardiet
+Copyright (c) 2024 Romain Ardiet
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -1,6 +1,14 @@
 HOST=127.0.0.1
 PORT=8080
 
+ifdef AWS_ACCESS_KEY_ID
+AWS_ACCESS_ARG=-e AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID)
+endif
+
+ifdef AWS_SECRET_ACCESS_KEY
+AWS_SECRET_ARG=-e AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY)
+endif
+
 help:
 	@echo "    install"
 	@echo "        Install dependencies via composer."
@@ -20,43 +28,45 @@ help:
 	@echo "        Run Majordome web interface through docker."
 
 install:
-	composer install --no-dev
+	APP_ENV=prod composer install --no-dev
 
 install-dev:
-	composer install
+	APP_ENV=dev composer install
+
+install-db:
+	php bin/console doctrine:database:create --no-interaction
+	php bin/console doctrine:migrations:migrate --no-interaction
 
 test:
 	bin/phpcs
 	bin/phpunit
 
 run:
-	app/console majordome:run-aws
+	bin/console majordome:run-aws
 
 run-web:
-	php -S $(HOST):$(PORT) -t web/
+	php -S $(HOST):$(PORT) -t public/
 
 docker-build:
 	docker build --rm -t majordome:latest .
-
-ifdef AWS_ACCESS_KEY_ID
-AWS_ACCESS_ARG=-e AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID)
-endif
-
-ifdef AWS_SECRET_ACCESS_KEY
-AWS_SECRET_ARG=-e AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY)
-endif
+	if [ ! -f var/majordome_dev.db ]; then \
+	mkdir -p var/; \
+	docker create --name majordome-db majordome:latest; \
+	docker cp majordome-db:/opt/majordome/var/majordome_dev.db var/majordome_dev.db; \
+	docker rm -f majordome-db; \
+fi
 
 docker-run:
 	docker run --rm \
 	$(AWS_ACCESS_ARG) $(AWS_SECRET_ARG) \
-	--mount type=bind,source=${PWD}/app/config.php,target=/opt/majordome/app/config.php \
+	--mount type=bind,source=${PWD}/.env,target=/opt/majordome/.env \
 	-v ${PWD}/var/:/opt/majordome/var/ \
 	-v ${HOME}/.aws:/root/.aws:ro \
-	-it --entrypoint app/console \
+	-it --entrypoint bin/console \
 	majordome:latest majordome:run-aws
 
 docker-run-web:
 	docker run --rm \
-	--mount type=bind,source=${PWD}/app/config.php,target=/opt/majordome/app/config.php \
+	--mount type=bind,source=${PWD}/.env,target=/opt/majordome/.env \
 	-v ${PWD}/var/:/opt/majordome/var/ \
 	-p 8080:8080 majordome:latest
diff --git a/README.md b/README.md
diff --git a/app/app.php b/app/app.php
diff --git a/app/config.php.dist b/app/config.php.dist
diff --git a/app/console b/app/console
diff --git a/app/routing.php b/app/routing.php
diff --git a/app/schema.sql b/app/schema.sql
diff --git a/bin/console b/bin/console
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+
+use Majordome\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+
+if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
+    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
+}
+
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+
+return function (array $context) {
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+
+    return new Application($kernel);
+};