Merge remote-tracking branch 'origin/dev'

AlexanderGW · Sep 6, 2020 · a90149f · a90149f
2 parents 66a3d3f + cc6eb69
commit a90149f
Show file tree

Hide file tree

Showing 75 changed files with 424 additions and 4,494 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
-puphpet/config-custom.yaml
-public/asset
+.idea
+vendor
+src/public/asset
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/composer.json b/composer.json
@@ -1,14 +1,24 @@
 {
-    "name": "alexandergw/deft",
-    "type": "deft-kernel",
-    "require": {
-      "ext-fileinfo": "*",
-      "ext-gd": "*",
-      "ext-json": "*",
-      "php": ">=7.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^8.5",
-        "johnkary/phpunit-speedtrap": "^3.2"
+  "name": "alexandergw/deft",
+  "type": "deft-kernel",
+  "require": {
+    "ext-fileinfo": "*",
+    "ext-gd": "*",
+    "ext-json": "*",
+    "php": ">=5.4"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^8.5",
+    "johnkary/phpunit-speedtrap": "^3.2"
+  },
+  "autoload": {
+    "classmap": [
+      "src/Deft.php"
+    ]
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Deft\\Tests\\": "tests/"
     }
+  }
 }