migrate from plural to singular names in namespaces

krlv · krlv · commit 5ef71b014fdd · 2019-10-07T20:11:06.000-07:00
diff --git a/src/Algorithm/Search/BidirectionalSearch.php b/src/Algorithm/Search/BidirectionalSearch.php
@@ -28,7 +28,7 @@
 
 
 use doganoo\PHPAlgorithms\Datastructure\Graph\Graph\Node;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 
 /**
  * TODO implement AbstractGraphSearch
diff --git a/src/Algorithm/Sorting/TopologicalSort.php b/src/Algorithm/Sorting/TopologicalSort.php
@@ -31,7 +31,7 @@
 use doganoo\PHPAlgorithms\Common\Interfaces\IGraphSortable;
 use doganoo\PHPAlgorithms\Datastructure\Graph\Graph\DirectedGraph;
 use doganoo\PHPAlgorithms\Datastructure\Graph\Graph\Node;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 use doganoo\PHPAlgorithms\Datastructure\Stackqueue\Stack;
 
 /**
diff --git a/src/Algorithm/Various/Converter.php b/src/Algorithm/Various/Converter.php
@@ -26,7 +26,7 @@
 
 namespace doganoo\PHPAlgorithms\Algorithm\Various;
 
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 use doganoo\PHPAlgorithms\Datastructure\Table\HashTable;
 
 /**
diff --git a/src/Algorithm/Various/Misc.php b/src/Algorithm/Various/Misc.php
@@ -28,7 +28,7 @@
 
 use doganoo\PHPAlgorithms\Common\Exception\IndexOutOfBoundsException;
 use doganoo\PHPAlgorithms\Common\Util\Comparator;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 
 
 /**
diff --git a/src/Common/Abstracts/AbstractGraph.php b/src/Common/Abstracts/AbstractGraph.php
@@ -34,7 +34,7 @@
 use doganoo\PHPAlgorithms\Common\Interfaces\IComparable;
 use doganoo\PHPAlgorithms\Common\Util\Comparator;
 use doganoo\PHPAlgorithms\Datastructure\Graph\Graph\Node;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 use doganoo\PHPAlgorithms\Datastructure\Stackqueue\Queue;
 use doganoo\PHPAlgorithms\Datastructure\Table\HashTable;
 use JsonSerializable;
diff --git a/src/Common/Abstracts/AbstractGraphSearch.php b/src/Common/Abstracts/AbstractGraphSearch.php
@@ -27,7 +27,7 @@
 namespace doganoo\PHPAlgorithms\Common\Abstracts;
 
 use doganoo\PHPAlgorithms\Datastructure\Graph\Graph\Node;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 use function is_callable;
 
 /**
diff --git a/src/Datastructure/Graph/Graph/DirectedGraph.php b/src/Datastructure/Graph/Graph/DirectedGraph.php
@@ -27,7 +27,7 @@
 namespace doganoo\PHPAlgorithms\Datastructure\Graph\Graph;
 
 use doganoo\PHPAlgorithms\Common\Abstracts\AbstractGraph;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 
 /**
  * Class Graph
diff --git a/src/Datastructure/Graph/Graph/Node.php b/src/Datastructure/Graph/Graph/Node.php
@@ -28,7 +28,7 @@
 
 use doganoo\PHPAlgorithms\Common\Interfaces\INode;
 use doganoo\PHPAlgorithms\Common\Util\Comparator;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 
 /**
  * Class Node
diff --git a/src/Datastructure/Graph/Tree/Tree/Node.php b/src/Datastructure/Graph/Tree/Tree/Node.php
@@ -28,7 +28,7 @@
 
 use doganoo\PHPAlgorithms\Common\Interfaces\INode;
 use doganoo\PHPAlgorithms\Common\Util\Comparator;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 
 /**
  * Class Node
diff --git a/src/Datastructure/Lists/ArrayList/ArrayList.php b/src/Datastructure/Lists/ArrayList/ArrayList.php
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists;
+namespace doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList;
 
 use ArrayIterator;
 use doganoo\PHPAlgorithms\Algorithm\Sorting\TimSort;
@@ -56,7 +56,7 @@
  *
  * see here: https://gist.github.com/wwsun/71ebbaded68930884746
  *
- * @package doganoo\PHPAlgorithms\Lists\ArrayLists
+ * @package doganoo\PHPAlgorithms\Lists\ArrayList
  */
 class ArrayList implements IteratorAggregate, JsonSerializable, IComparable {
 
diff --git a/src/Datastructure/Lists/ArrayList/StringBuilder.php b/src/Datastructure/Lists/ArrayList/StringBuilder.php
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists;
+namespace doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList;
 
 use doganoo\PHPAlgorithms\Common\Exception\IndexOutOfBoundsException;
 use doganoo\PHPAlgorithms\Datastructure\Stackqueue\Queue;
@@ -36,7 +36,7 @@
 /**
  * Class StringBuilder
  *
- * @package doganoo\PHPAlgorithms\Lists\ArrayLists
+ * @package doganoo\PHPAlgorithms\Lists\ArrayList
  */
 class StringBuilder {
     /** @var ArrayList $arrayList */
diff --git a/src/Datastructure/Lists/LinkedList/DoublyLinkedList.php b/src/Datastructure/Lists/LinkedList/DoublyLinkedList.php
@@ -24,15 +24,15 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithms\Datastructure\Lists\LinkedLists;
+namespace doganoo\PHPAlgorithms\Datastructure\Lists\LinkedList;
 
 use doganoo\PHPAlgorithms\Common\Abstracts\AbstractLinkedList;
 use doganoo\PHPAlgorithms\Datastructure\Lists\Node;
 
 /**
  * Class DoublyLinkedList
  *
- * @package doganoo\PHPAlgorithms\LinkedLists
+ * @package doganoo\PHPAlgorithms\LinkedList
  */
 class DoublyLinkedList extends AbstractLinkedList {
 
diff --git a/src/Datastructure/Lists/LinkedList/SinglyLinkedList.php b/src/Datastructure/Lists/LinkedList/SinglyLinkedList.php
@@ -24,15 +24,15 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithms\Datastructure\Lists\LinkedLists;
+namespace doganoo\PHPAlgorithms\Datastructure\Lists\LinkedList;
 
 use doganoo\PHPAlgorithms\Common\Abstracts\AbstractLinkedList;
 use doganoo\PHPAlgorithms\Datastructure\Lists\Node;
 
 /**
  * Class SinglyLinkedList
  *
- * @package doganoo\PHPAlgorithms\LinkedLists
+ * @package doganoo\PHPAlgorithms\LinkedList
  */
 class SinglyLinkedList extends AbstractLinkedList {
 
diff --git a/src/Datastructure/Map/Map.php b/src/Datastructure/Map/Map.php
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithms\Datastructure\Maps;
+namespace doganoo\PHPAlgorithms\Datastructure\Map;
 
 use doganoo\PHPAlgorithms\Common\Util\Comparator;
 use function array_fill;
@@ -35,7 +35,7 @@
 /**
  * Class Map
  *
- * @package doganoo\PHPAlgorithms\Datastructure\maps
+ * @package doganoo\PHPAlgorithms\Datastructure\Map
  */
 class Map {
 
diff --git a/src/Datastructure/Set/HashSet.php b/src/Datastructure/Set/HashSet.php
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithms\Datastructure\Sets;
+namespace doganoo\PHPAlgorithms\Datastructure\Set;
 
 use doganoo\PHPAlgorithms\Common\Abstracts\AbstractSet;
 use doganoo\PHPAlgorithms\Common\Exception\InvalidKeyTypeException;
@@ -37,7 +37,7 @@
 /**
  * Class HashSet
  *
- * @package doganoo\PHPAlgorithms\Datastructure\Sets
+ * @package doganoo\PHPAlgorithms\Datastructure\Set
  */
 class HashSet extends AbstractSet implements ISet {
 
diff --git a/src/Datastructure/Stackqueue/StackSet.php b/src/Datastructure/Stackqueue/StackSet.php
@@ -29,7 +29,7 @@
 use doganoo\PHPAlgorithms\Common\Exception\IndexOutOfBoundsException;
 use doganoo\PHPAlgorithms\Common\Interfaces\IComparable;
 use doganoo\PHPAlgorithms\Common\Util\Comparator;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 use JsonSerializable;
 
 /**
diff --git a/src/Datastructure/Table/HashTable.php b/src/Datastructure/Table/HashTable.php
@@ -31,7 +31,7 @@
 use doganoo\PHPAlgorithms\Common\Exception\InvalidKeyTypeException;
 use doganoo\PHPAlgorithms\Common\Exception\UnsupportedKeyTypeException;
 use doganoo\PHPAlgorithms\Common\Util\MapUtil;
-use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedLists\SinglyLinkedList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedList\SinglyLinkedList;
 use doganoo\PHPAlgorithms\Datastructure\Lists\Node;
 use JsonSerializable;
 
diff --git a/tests/Comparator/ComparatorTest.php b/tests/Comparator/ComparatorTest.php
@@ -28,7 +28,7 @@
 
 use doganoo\PHPAlgorithms\Common\Util\Comparator;
 use doganoo\PHPAlgorithms\Datastructure\Graph\Graph\Node;
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 use PHPUnit\Framework\TestCase;
 
 class ComparatorTest extends TestCase {
diff --git a/tests/Lists/ArrayLists/ArrayListTest.php b/tests/Lists/ArrayLists/ArrayListTest.php
@@ -26,7 +26,7 @@
 
 namespace doganoo\PHPAlgorithmsTest\Lists\ArrayLists;
 
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\ArrayList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\ArrayList;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
diff --git a/tests/Lists/ArrayLists/StringBuilderTest.php b/tests/Lists/ArrayLists/StringBuilderTest.php
@@ -26,7 +26,7 @@
 
 namespace doganoo\PHPAlgorithmsTest\Lists\ArrayLists;
 
-use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists\StringBuilder;
+use doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList\StringBuilder;
 use PHPUnit\Framework\TestCase;
 
 class StringBuilderTest extends TestCase {
diff --git a/tests/Lists/LinkedLists/SinglyLinkedListTest.php b/tests/Lists/LinkedLists/SinglyLinkedListTest.php
@@ -26,7 +26,7 @@
 
 namespace doganoo\PHPAlgorithmsTest\Lists\LinkedLists;
 
-use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedLists\SinglyLinkedList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedList\SinglyLinkedList;
 use doganoo\PHPAlgorithmsTest\Util\LinkedListUtil;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Map/NodeTest.php b/tests/Map/NodeTest.php
@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithmsTest\Maps;
+namespace doganoo\PHPAlgorithmsTest\Map;
 
 use doganoo\PHPAlgorithms\Datastructure\Lists\Node;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Set/HashSetTest.php b/tests/Set/HashSetTest.php
@@ -24,11 +24,11 @@
  * SOFTWARE.
  */
 
-namespace doganoo\PHPAlgorithmsTest\Sets;
+namespace doganoo\PHPAlgorithmsTest\Set;
 
 use doganoo\PHPAlgorithms\common\Exception\InvalidKeyTypeException;
 use doganoo\PHPAlgorithms\Common\Exception\UnsupportedKeyTypeException;
-use doganoo\PHPAlgorithms\Datastructure\Sets\HashSet;
+use doganoo\PHPAlgorithms\Datastructure\Set\HashSet;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Util/LinkedListUtil.php b/tests/Util/LinkedListUtil.php
@@ -26,8 +26,8 @@
 
 namespace doganoo\PHPAlgorithmsTest\Util;
 
-use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedLists\DoublyLinkedList;
-use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedLists\SinglyLinkedList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedList\DoublyLinkedList;
+use doganoo\PHPAlgorithms\Datastructure\Lists\LinkedList\SinglyLinkedList;
 use doganoo\PHPAlgorithms\Datastructure\Lists\Node;
 use stdClass;
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`* SOFTWARE.`
`25`	`25`	`*/`
`26`	`26`
`27`		`-namespace doganoo\PHPAlgorithms\Datastructure\Lists\ArrayLists;`
	`27`	`+namespace doganoo\PHPAlgorithms\Datastructure\Lists\ArrayList;`
`28`	`28`
`29`	`29`	`use ArrayIterator;`
`30`	`30`	`use doganoo\PHPAlgorithms\Algorithm\Sorting\TimSort;`
`@@ -56,7 +56,7 @@`
`56`	`56`	`*`
`57`	`57`	`* see here: https://gist.github.com/wwsun/71ebbaded68930884746`
`58`	`58`	`*`
`59`		`- * @package doganoo\PHPAlgorithms\Lists\ArrayLists`
	`59`	`+ * @package doganoo\PHPAlgorithms\Lists\ArrayList`
`60`	`60`	`*/`
`61`	`61`	`class ArrayList implements IteratorAggregate, JsonSerializable, IComparable {`
`62`	`62`