From b389b658f727c2b28b60b2676d3f7a964ef01bc5 Mon Sep 17 00:00:00 2001
From: Mateusz Charytoniuk <mateusz.charytoniuk@protonmail.com>
Date: Tue, 24 Oct 2023 20:14:02 +0200
Subject: [PATCH] chore: remove unused settings from the static pages config
---
config.ini.example | 2 --
phpunit.xml | 20 +++++++++++++++++++
.../StaticPageConfigurationProvider.php | 3 ---
src/StaticPageConfiguration.php | 4 ----
tmuxinator.example.yml | 14 +++++++++++++
5 files changed, 34 insertions(+), 9 deletions(-)
create mode 100644 phpunit.xml
create mode 100644 tmuxinator.example.yml
diff --git a/config.ini.example b/config.ini.example
index 46c16694..744c26da 100644
--- a/config.ini.example
+++ b/config.ini.example
@@ -41,8 +41,6 @@ esbuild_metafile = esbuild-meta-docs.json
input_directory = docs
output_directory = docs/build
sitemap = docs/build/sitemap.xml
-globals[discord] = https://discord.gg/kysUzFqSCK
-globals[github] = https://github.com/distantmagic/resonance
[swoole]
host = 127.0.0.1
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 00000000..fcf0695d
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+ bootstrap="vendor/autoload.php"
+ colors="true"
+ displayDetailsOnTestsThatTriggerWarnings="true"
+>
+ <testsuites>
+ <testsuite name="Unit">
+ <directory suffix="Test.php">src</directory>
+ </testsuite>
+ </testsuites>
+ <source>
+ <include>
+ <directory suffix=".php">src</directory>
+ </include>
+ </source>
+ <php>
+ <!-- <env name="DB_CONNECTION" value="sqlite" /> -->
+ </php>
+</phpunit>
diff --git a/src/SingletonProvider/ConfigurationProvider/StaticPageConfigurationProvider.php b/src/SingletonProvider/ConfigurationProvider/StaticPageConfigurationProvider.php
index aa6b1eb9..f12cb316 100644
--- a/src/SingletonProvider/ConfigurationProvider/StaticPageConfigurationProvider.php
+++ b/src/SingletonProvider/ConfigurationProvider/StaticPageConfigurationProvider.php
@@ -15,7 +15,6 @@ use Nette\Schema\Schema;
* @template-extends ConfigurationProvider<StaticPageConfiguration, object{
* base_url: string,
* esbuild_metafile: string,
- * globals: array<string,string>,
* input_directory: string,
* output_directory: string,
* sitemap: string,
@@ -34,7 +33,6 @@ final readonly class StaticPageConfigurationProvider extends ConfigurationProvid
return Expect::structure([
'base_url' => Expect::string()->min(1)->required(),
'esbuild_metafile' => Expect::string()->min(1)->required(),
- 'globals' => Expect::arrayOf(Expect::string()->min(1))->default([]),
'input_directory' => Expect::string()->min(1)->required(),
'output_directory' => Expect::string()->min(1)->required(),
'sitemap' => Expect::string()->min(1)->required(),
@@ -46,7 +44,6 @@ final readonly class StaticPageConfigurationProvider extends ConfigurationProvid
return new StaticPageConfiguration(
baseUrl: $validatedData->base_url,
esbuildMetafile: DM_ROOT.'/'.$validatedData->esbuild_metafile,
- globals: new Map($validatedData->globals),
inputDirectory: DM_ROOT.'/'.$validatedData->input_directory,
outputDirectory: DM_ROOT.'/'.$validatedData->output_directory,
sitemap: DM_ROOT.'/'.$validatedData->sitemap,
diff --git a/src/StaticPageConfiguration.php b/src/StaticPageConfiguration.php
index 57f19447..dbd96532 100644
--- a/src/StaticPageConfiguration.php
+++ b/src/StaticPageConfiguration.php
@@ -8,11 +8,7 @@ use Ds\Map;
readonly class StaticPageConfiguration
{
- /**
- * @param Map<string,string> $globals
- */
public function __construct(
- public Map $globals,
public string $baseUrl,
public string $esbuildMetafile,
public string $inputDirectory,
diff --git a/tmuxinator.example.yml b/tmuxinator.example.yml
new file mode 100644
index 00000000..d96f9cc2
--- /dev/null
+++ b/tmuxinator.example.yml
@@ -0,0 +1,14 @@
+name: distantmagic
+root: ~/workspace/distantmagic/resonance
+
+on_project_start:
+ - make node_modules
+ - make vendor
+ - make ssg
+
+windows:
+ - "esbuild.watch": make esbuild.watch
+ - "eslint.watch": make eslint.watch
+ - "psalm.watch": make psalm.watch
+ - "tsc.watch": make tsc.watch
+ - "shell": git status
--
GitLab