Move domain, upgrade symfony

Author: allestuetsmerweh

.env

@@ -0,0 +1,20 @@
+# In all environments, the following files are loaded if they exist,
+# the latter taking precedence over the former:
+#
+#  * .env                contains default values for the environment variables needed by the app
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
+#
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=dev
+APP_SECRET=27ece57ba8aa437809ed5e6ef26e4636
+###< symfony/framework-bundle ###

.github/workflows/ci-prod.yml

@@ -0,0 +1,44 @@
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+name: CI:prod
+jobs:
+
+  deploy-test:
+    name: Deploy to hatt.style
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.2'
+    - name: Get composer cache directory
+      id: composer-cache
+      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: ${{ runner.os }}-composer-
+    - name: Install dependencies
+      run: composer install --no-dev --prefer-dist
+    # - name: Get npm cache directory
+    #   id: npm-cache
+    #   run: |
+    #     echo "::set-output name=dir::$(npm config get cache)"
+    # - uses: actions/cache@v1
+    #   with:
+    #     path: ${{ steps.npm-cache.outputs.dir }}
+    #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+    #     restore-keys: |
+    #       ${{ runner.os }}-node-
+    # - name: Install JavaScript dependencies
+    #   run: npm install
+    - name: Deploy over FTPS
+      env:
+        USERNAME: ${{ secrets.DEPLOY_USERNAME }}
+        PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}
+      run: php ./Deploy.php --target=cyon --environment=prod --username="$USERNAME"

.github/workflows/ci-test.yml .github/workflows/ci-staging.yml

@@ -6,13 +6,13 @@ name: CI:test
 jobs:
 
   deploy-test:
-    name: Deploy to flatastic.hatt.style
+    name: Deploy to hatt.style
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: '8.2'
     - name: Get composer cache directory
       id: composer-cache
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
@@ -40,4 +40,4 @@ jobs:
       env:
         USERNAME: ${{ secrets.DEPLOY_USERNAME }}
         PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}
-      run: php ./Deploy.php --environment=prod --username="$USERNAME"
+      run: php ./Deploy.php --target=cyon --environment=prod --username="$USERNAME"

Deploy.php

@@ -1,19 +1,24 @@
 <?php
 
+use League\Flysystem\Filesystem;
+use League\Flysystem\Ftp\FtpAdapter;
+use League\Flysystem\Ftp\FtpConnectionOptions;
+use Monolog\Handler\ErrorLogHandler;
+use Monolog\Logger;
 use PhpDeploy\AbstractDefaultDeploy;
 
 require_once __DIR__.'/vendor/autoload.php';
 
 class Deploy extends AbstractDefaultDeploy {
-    protected function populateFolder() {
+    protected function populateFolder(): void {
         $fs = new Symfony\Component\Filesystem\Filesystem();
 
         $build_folder_path = $this->getLocalBuildFolderPath();
         $fs->mirror(__DIR__, $build_folder_path);
     }
 
-    protected function getFlysystemFilesystem() {
-        $options = League\Flysystem\Ftp\FtpConnectionOptions::fromArray([
+    protected function getFlysystemFilesystem(): Filesystem {
+        $options = FtpConnectionOptions::fromArray([
             'host' => 's007.cyon.net', // required
             'root' => '/', // required
             'username' => $this->username, // required
@@ -22,30 +27,47 @@ protected function getFlysystemFilesystem() {
             'ssl' => true,
             'timeout' => 90,
         ]);
-        $adapter = new League\Flysystem\Ftp\FtpAdapter($options);
-        return new League\Flysystem\Filesystem($adapter);
+        $adapter = new FtpAdapter($options);
+        return new Filesystem($adapter);
     }
 
-    public function getRemotePublicPath() {
-        return 'public';
+    public function getRemotePublicPath(): string {
+        return 'public_html/deploy.hatt.style';
     }
 
-    public function getRemotePublicUrl() {
-        return "https://flatastic.hatt.style";
+    public function getRemotePublicUrl(): string {
+        return "https://deploy.hatt.style";
     }
 
-    public function getRemotePrivatePath() {
-        return 'private';
+    public function getRemotePrivatePath(): string {
+        return 'private_files';
     }
 
-    public function install($public_path) {
+    /** @return array<string, string> */
+    public function install(string $public_path): array {
+        $getPublicPathForSubdomain = function (string $subdomain) use ($public_path): string {
+            return str_replace($this->getRemotePublicPath(), "public_html/{$subdomain}", $public_path);
+        };
+
+        // hatt.style
+        $base_public = $getPublicPathForSubdomain('hatt.style');
+        $this->installForSubdomain($base_public);
+
+        // flatastic.hatt.style
+        $flatastic_public = $getPublicPathForSubdomain('flatastic.hatt.style');
+        $this->installForSubdomain($flatastic_public);
+
+        return [];
+    }
+
+    protected function installForSubdomain(string $public_path): void {
         $fs = new Symfony\Component\Filesystem\Filesystem();
-        $fs->mirror(__DIR__.'/public', $public_path, null, ['delete' => true]);
+        $fs->copy(__DIR__.'/public/.htaccess', "{$public_path}/.htaccess", true);
         $index_path = "{$public_path}/index.php";
-        $index_contents = file_get_contents($index_path);
+        $index_contents = file_get_contents(__DIR__.'/public/index.php');
         $updated_index_contents = str_replace(
             "require_once dirname(__DIR__).'/vendor/autoload_runtime.php';",
-            "require_once dirname(__DIR__).'/private/deploy/live/vendor/autoload_runtime.php';",
+            "require_once __DIR__.'/../../private_files/deploy/live/vendor/autoload_runtime.php';",
             $index_contents,
         );
         unlink($index_path);
@@ -55,5 +77,8 @@ public function install($public_path) {
 
 if (isset($_SERVER['argv'])) {
     $deploy = new Deploy();
+    $logger = new Logger('deploy');
+    $logger->pushHandler(new ErrorLogHandler());
+    $deploy->setLogger($logger);
     $deploy->cli();
 }

README.md

@@ -1,2 +1,3 @@
-# flatastic.hatt.style
-API to use flatastic app with home assistant
+# hatt.style
+
+All my hobby projects

bin/console

@@ -4,6 +4,10 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
+if (!is_dir(dirname(__DIR__).'/vendor')) {
+    throw new LogicException('Dependencies are missing. Try running "composer install".');
+}
+
 if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
     throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "allestuetsmerweh/flatastic.hatt.style",
+    "name": "allestuetsmerweh/hatt.style",
     "type": "project",
     "license": "MIT",
     "authors": [
@@ -11,21 +11,21 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.0.2",
+        "php": ">=8.2",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "allestuetsmerweh/php-deploy": "^1.0",
-        "league/flysystem": "^2.3",
-        "league/flysystem-ftp": "^2.3",
+        "allestuetsmerweh/php-deploy": "^2.7",
+        "league/flysystem": "^3.29",
+        "league/flysystem-ftp": "^3.29",
         "symfony/apache-pack": "^1.0",
-        "symfony/console": "6.0.*",
-        "symfony/dotenv": "6.0.*",
+        "symfony/console": "7.1.*",
+        "symfony/dotenv": "7.1.*",
         "symfony/flex": "^2",
-        "symfony/framework-bundle": "6.0.*",
-        "symfony/http-client": "6.0.*",
+        "symfony/framework-bundle": "7.1.*",
+        "symfony/http-client": "7.1.*",
         "symfony/monolog-bundle": "^3.8",
-        "symfony/runtime": "6.0.*",
-        "symfony/yaml": "6.0.*"
+        "symfony/runtime": "7.1.*",
+        "symfony/yaml": "7.1.*"
     },
     "config": {
         "allow-plugins": {
@@ -75,7 +75,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "6.0.*"
+            "require": "7.1.*"
         }
     }
 }