Merge pull request #1 from WebFiori/dev

Refactoring
WebFiori · Jul 16, 2022 · 8ae72a7 · 8ae72a7
2 parents 8cfc5df + 2d67b81
commit 8ae72a7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -11,6 +11,11 @@
         "collections",
         "data structures"
     ],
+    "autoload" :{
+        "psr-4":{
+            "webfiori\\collections\\":"webfiori\\collections"
+        }
+    },
     "require-dev": {
         "phpunit/phpunit": "^5"
     },

diff --git a/tests/test.php b/tests/test.php
@@ -40,11 +40,12 @@
 }
 define('ROOT', $rootDir);
 //echo 'Root Directory: \''.$rootDir.'\'.'."\n";
-require_once $rootDir.'src'.$DS.'Node.php';
-require_once $rootDir.'src'.$DS.'AbstractCollection.php';
-require_once $rootDir.'src'.$DS.'LinkedList.php';
-require_once $rootDir.'src'.$DS.'Stack.php';
-require_once $rootDir.'src'.$DS.'Queue.php';
-require_once $rootDir.'src'.$DS.'Comparable.php';
+$libDir = $rootDir.'webfiori'.$DS.'collections'.$DS;
+require_once $libDir.'Node.php';
+require_once $libDir.'AbstractCollection.php';
+require_once $libDir.'LinkedList.php';
+require_once $libDir.'Stack.php';
+require_once $libDir.'Queue.php';
+require_once $libDir.'Comparable.php';
 
 require_once $rootDir.'tests'.$DS.'AnyObject.php';
diff --git a/src/AbstractCollection.php → webfiori/collections/AbstractCollection.php b/src/AbstractCollection.php → webfiori/collections/AbstractCollection.php
diff --git a/src/Comparable.php → webfiori/collections/Comparable.php b/src/Comparable.php → webfiori/collections/Comparable.php
diff --git a/src/LinkedList.php → webfiori/collections/LinkedList.php b/src/LinkedList.php → webfiori/collections/LinkedList.php
diff --git a/src/Node.php → webfiori/collections/Node.php b/src/Node.php → webfiori/collections/Node.php
diff --git a/src/Queue.php → webfiori/collections/Queue.php b/src/Queue.php → webfiori/collections/Queue.php
diff --git a/src/Stack.php → webfiori/collections/Stack.php b/src/Stack.php → webfiori/collections/Stack.php