Merge pull request pacificsec#1 from godsgood33/master

Problem with autoloader
godsgood33 · Jan 25, 2018 · 9b4f6bc · 9b4f6bc
2 parents 7741676 + acdb3be
commit 9b4f6bc
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+/.settings/
+/.buildpath
+/.project
+/vendor/
+/composer.lock
diff --git a/autoload.php b/autoload.php
diff --git a/composer.json b/composer.json
@@ -1,22 +1,26 @@
 {
-    "name": "pacificsec/cpe",
-    "type": "library",
-    "description": "CPE: Common Platform Enumeration for PHP",
-    "keywords": ["cpe", "cve", "security", "pacificsec"],
-    "homepage": "https://github.com/pacificsec/cpe",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Antonio Franco",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "PacificSec\\CPE\\": "."
-        }
-    }
+	"name" : "pacificsec/cpe",
+	"type" : "library",
+	"description" : "CPE: Common Platform Enumeration for PHP",
+	"keywords" : [
+		"cpe",
+		"cve",
+		"security",
+		"pacificsec"
+	],
+	"homepage" : "https://github.com/pacificsec/cpe",
+	"license" : "MIT",
+	"authors" : [{
+			"name" : "Antonio Franco",
+			"email" : "[email protected]"
+		}
+	],
+	"require" : {
+		"php" : ">=5.3.0"
+	},
+	"autoload" : {
+		"psr-4" : {
+			"PacificSec\\CPE\\" : "src"
+		}
+	}
 }
diff --git a/Common/LogicalValue.php → src/Common/LogicalValue.php b/Common/LogicalValue.php → src/Common/LogicalValue.php
diff --git a/Common/Utilities.php → src/Common/Utilities.php b/Common/Utilities.php → src/Common/Utilities.php
diff --git a/Common/WellFormedName.php → src/Common/WellFormedName.php b/Common/WellFormedName.php → src/Common/WellFormedName.php
diff --git a/Matching/CPENameMatcher.php → src/Matching/CPENameMatcher.php b/Matching/CPENameMatcher.php → src/Matching/CPENameMatcher.php
diff --git a/Matching/Relation.php → src/Matching/Relation.php b/Matching/Relation.php → src/Matching/Relation.php
diff --git a/Naming/CPENameBinder.php → src/Naming/CPENameBinder.php b/Naming/CPENameBinder.php → src/Naming/CPENameBinder.php
diff --git a/Naming/CPENameUnbinder.php → src/Naming/CPENameUnbinder.php b/Naming/CPENameUnbinder.php → src/Naming/CPENameUnbinder.php