chore: restructure application structure

szvsky · szvsky · commit 3e3d59db6d40 · 2024-09-22T17:22:24.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,19 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+charset = utf-8
+end_of_line = LF
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.md]
+max_line_length = 80
+
+[COMMIT_EDITMSG]
+max_line_length = 0
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,13 @@
-*.json    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.lock    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+* text=auto eol=lf
+
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
+/.editorconfig export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/tests export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,7 @@
 composer.lock
 composer.phar
 vendor/
+
+# php-cs-fixer
+.php-cs-fixer.cache
+.php-cs-fixer.php
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,18 +1,21 @@
 <?php
 
-use PhpCsFixer\Config;
-use PhpCsFixer\Finder;
+/*
+ * This file is part of the sxbrsky/aether.
+ *
+ * Copyright (C) 2024 Dominik Szamburski
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
 
-$finder = Finder::create()
-  ->in([
-    __DIR__ . '/lib',
-    __DIR__ . '/tests',
-  ])
+$finder = PhpCsFixer\Finder::create()
   ->name('*.php')
   ->ignoreDotFiles(TRUE)
   ->ignoreVCS(TRUE);
 
-return (new Config())
+$config = new PhpCsFixer\Config();
+$config->setFinder($finder)
   ->setRules([
     '@PSR12' => TRUE,
     'array_syntax' => ['syntax' => 'short'],
@@ -51,6 +54,6 @@
       'keep_multiple_spaces_after_comma' => TRUE,
     ],
     'single_trait_insert_per_statement' => TRUE,
-  ])
-  ->setFinder($finder);
+  ]);
 
+return $config;
diff --git a/composer.json b/composer.json
@@ -7,16 +7,22 @@
     "source": "https://github.com/sxbrsky/aether"
   },
   "require": {
-    "aether/core": "self.version"
+    "php": ">=8.2"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3.64",
+    "phpstan/phpstan": "^1.12",
+    "phpunit/phpunit": "^11.3"
   },
-  "repositories": [
-    {
-      "type": "path",
-      "url": "app/core"
-    }
-  ],
   "minimum-stability": "dev",
   "prefer-stable": true,
+  "autoload": {
+    "Aether\\Framework\\": "system/Framework"
+  },
+  "autoload-dev": {
+    "Aehger\\Tests\\PHPStan\\": "dev/phpstan/",
+    "Aether\\Tests\\Unit\\": "dev/tests/unit/"
+  },
   "config": {
     "platform": {
       "php": "8.3.0"
diff --git a/core/.gitignore b/core/.gitignore
diff --git a/core/composer.json b/core/composer.json
diff --git a/core/phpstan.neon.dist b/core/phpstan.neon.dist
diff --git a/dev/phpstan/phpstan.neon.dist b/dev/phpstan/phpstan.neon.dist
@@ -0,0 +1,13 @@
+parameters:
+    fileExtensions:
+        - php
+        - dist
+
+    excludePaths:
+        - */vendor/
+
+    level: max
+    inferPrivatePropertyTypeFromConstructor: true
+    reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
+
diff --git a/dev/tests/bootstrap.php b/dev/tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php declare(strict_types=1);
+
+require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/dev/tests/unit/.gitignore b/dev/tests/unit/.gitignore
@@ -0,0 +1 @@
+phpunit.xml
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+         bootstrap="../bootstrap.php"
+         executionOrder="depends,defects"
+         shortenArraysForExportThreshold="10"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
+         failOnRisky="true"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="unit tests">
+            <directory>../../../app/modules/*/*/Tests</directory>
+            <directory>./Framework</directory>
+        </testsuite>
+    </testsuites>
+
+    <source ignoreIndirectDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>../../../app/modules/*</directory>
+            <directory>../../../system/*</directory>
+        </include>
+    </source>
+</phpunit>
diff --git a/public/index.php b/public/index.php
@@ -0,0 +1,10 @@
+<?php
+
+/*
+ * This file is part of the sxbrsky/aether.
+ *
+ * Copyright (C) 2024 Dominik Szamburski
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
diff --git a/web/index.php b/web/index.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php declare(strict_types=1);`
	`2`	`+`
	`3`	`+require_once __DIR__ . '/../../vendor/autoload.php';`