Merge pull request #138 from 8fold/uri-interface

re-engineer: Next major

.gitignore

@@ -9,6 +9,6 @@ yarn-error.log
 .DS_Store
 .nova
 
-site-static-html/
+site-static-html/public/
 
 !site-dynamic-php/public/.gitignore

README.md

@@ -1,4 +1,5 @@
 https://www.conventionalcommits.org/en/v1.0.0/
+https://chris.beams.io/posts/git-commit/
 
 The code found here is able to generate the same (or really close to it) site using multiple styles. Each style is held inside a directory; the names start with "Site." Each style has an associated read me file (listed in order of creation):
 
@@ -95,7 +96,7 @@ This frees me up a great deal to move about the cabin as I see fit.
 
 ### Analysis
 
-General performance statistics and experiments can be found on [joshbruce.com](/web-development/site-stats).
+General performance statistics and experiments can be found on [joshbruce.com](/web-development/site-stats/).
 
 ## Testing can't push to main
 

amos

@@ -5,12 +5,12 @@ require __DIR__.'/vendor/autoload.php';
 
 use Symfony\Component\Console\Application;
 
-use JoshBruce\Site\SiteDynamic\Generator as DynamicGenerator;
-use JoshBruce\Site\SiteStatic\Generator as StaticGenerator;
+// use JoshBruce\Site\SiteDynamic\Generator as DynamicGenerator;
+use JoshBruce\SiteStatic\Generator as StaticGenerator;
 
 $application = new Application();
 
-$application->add(new DynamicGenerator());
+// $application->add(new DynamicGenerator());
 
 $application->add(new StaticGenerator());
 

composer.json

@@ -2,12 +2,14 @@
   "authors": [],
   "autoload": {
     "psr-4": {
-      "JoshBruce\\Site\\": "./src"
+      "JoshBruce\\SiteDynamic\\": "./site-dynamic-php/src",
+      "JoshBruce\\SiteStatic\\": "./site-static-html/src"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "JoshBruce\\Site\\Tests\\": "./tests"
+      "JoshBruce\\SiteDynamic\\Tests\\": "./site-dynamic-php/tests",
+      "JoshBruce\\SiteStatic\\Tests\\": "./site-static-html/tests"
     }
   },
   "config": {
@@ -19,7 +21,7 @@
   "prefer-stable": true,
   "require-dev": {
     "squizlabs/php_codesniffer": "^3.6",
-    "phpstan/phpstan": "^1.1.2",
+    "phpstan/phpstan": "^1.2.0",
     "pestphp/pest": "^1.20"
   },
   "require": {
@@ -45,7 +47,7 @@
       "@stan",
       "@test"
     ],
-    "style": "./vendor/bin/phpcs --standard=phpcs.xml -p ./src",
+    "style": "./vendor/bin/phpcs --standard=phpcs.xml",
     "stan": "./vendor/bin/phpstan analyze",
     "test": "./vendor/bin/pest"
   },