Merge pull request #135 from getherbie/2.x-develop

2.x develop

.gitignore

@@ -6,7 +6,6 @@
 /website/vendor
 
 # composer lock files
-/composer.lock
 /website/composer.lock
 
 # site folder

composer.json

@@ -31,6 +31,7 @@
         "psr/log": "^1.1",
         "psr/simple-cache": "^1.0",
         "symfony/console": "^5.0",
+        "symfony/finder": "5.4",
         "symfony/yaml": "^5.4",
         "twig/twig": "^3.4"
     },
@@ -45,7 +46,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "website\\site\\": "website/site",
+            "herbie\\website\\site\\": "website/site",
             "herbie\\tests\\": "tests"
         }
     },
@@ -62,7 +63,7 @@
         "getherbie/plugin-simplesearch": "dev-master",
         "guzzlehttp/psr7": "^2.4",
         "laminas/laminas-diactoros": "^2.24",
-        "netcarver/textile": "^3.7",
+        "netcarver/textile": "^4.0",
         "nyholm/psr7": "^1.5",
         "nyholm/psr7-server": "^1.0",
         "phpstan/phpstan": "^1.8",