From 9266905a2bcfac39f1413c48afef13fddde39f04 Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Wed, 15 Nov 2023 14:43:11 +0100 Subject: [PATCH] Consolidate namespaces --- src/DataStructures/StrictList.php | 8 ++++---- src/{Functions => HelperFunction}/throwErrorException.php | 4 ++-- src/{Traits => InterfaceTrait}/ArrayAccess.php | 2 +- src/{Traits => InterfaceTrait}/Countable.php | 2 +- src/{Traits => InterfaceTrait}/Iterator.php | 2 +- src/{Traits => InterfaceTrait}/IteratorAggregate.php | 2 +- src/{Traits => Trait}/Getter.php | 2 +- src/{Traits => Trait}/Setter.php | 2 +- src/{Traits => Trait}/Singleton.php | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename src/{Functions => HelperFunction}/throwErrorException.php (92%) rename src/{Traits => InterfaceTrait}/ArrayAccess.php (98%) rename src/{Traits => InterfaceTrait}/Countable.php (97%) rename src/{Traits => InterfaceTrait}/Iterator.php (98%) rename src/{Traits => InterfaceTrait}/IteratorAggregate.php (97%) rename src/{Traits => Trait}/Getter.php (98%) rename src/{Traits => Trait}/Setter.php (98%) rename src/{Traits => Trait}/Singleton.php (98%) diff --git a/src/DataStructures/StrictList.php b/src/DataStructures/StrictList.php index f5fe13e..a85e59d 100644 --- a/src/DataStructures/StrictList.php +++ b/src/DataStructures/StrictList.php @@ -24,7 +24,7 @@ namespace OCC\Basics\DataStructures; use InvalidArgumentException; use SplDoublyLinkedList; -use OCC\Basics\Traits\Getter; +use OCC\Basics\Trait\Getter; /** * A type-sensitive, taversable List. @@ -44,8 +44,7 @@ class StrictList extends SplDoublyLinkedList /** * Defines the allowed types for items. * - * If empty, all types are allowed. - * Possible values are: + * If empty, all types are allowed. Possible values are: * - "array" * - "bool" * - "callable" @@ -59,6 +58,7 @@ class StrictList extends SplDoublyLinkedList * - "resource" * - "scalar" * - "string" + * * Fully qualified class names (FQCN) can be specified instead of the * generic type "object". */ @@ -141,7 +141,7 @@ class StrictList extends SplDoublyLinkedList /** * Magic getter method for $this->allowedTypes. - * @see OCC\Basics\Traits\Getter + * @see OCC\Basics\Trait\Getter * * @return array The list of allowed item types */ diff --git a/src/Functions/throwErrorException.php b/src/HelperFunction/throwErrorException.php similarity index 92% rename from src/Functions/throwErrorException.php rename to src/HelperFunction/throwErrorException.php index 738a2cb..5f52c75 100644 --- a/src/Functions/throwErrorException.php +++ b/src/HelperFunction/throwErrorException.php @@ -20,14 +20,14 @@ declare(strict_types=1); -namespace OCC\Basics\Functions; +namespace OCC\Basics\HelperFunction; use ErrorException; /** * Converts an internal PHP error into an ErrorException. * - * Usage: set_error_handler('\\OCC\\Basics\\Functions\\throwErrorException'); + * Usage: set_error_handler('\\OCC\\Basics\\HelperFunction\\throwErrorException'); * * @author Sebastian Meyer * @package opencultureconsulting/basics diff --git a/src/Traits/ArrayAccess.php b/src/InterfaceTrait/ArrayAccess.php similarity index 98% rename from src/Traits/ArrayAccess.php rename to src/InterfaceTrait/ArrayAccess.php index 7f0c376..cd941b8 100644 --- a/src/Traits/ArrayAccess.php +++ b/src/InterfaceTrait/ArrayAccess.php @@ -20,7 +20,7 @@ declare(strict_types=1); -namespace OCC\Basics\Traits; +namespace OCC\Basics\InterfaceTrait; /** * A generic implementation of the ArrayAccess interface. diff --git a/src/Traits/Countable.php b/src/InterfaceTrait/Countable.php similarity index 97% rename from src/Traits/Countable.php rename to src/InterfaceTrait/Countable.php index 4c8ed99..8f9e399 100644 --- a/src/Traits/Countable.php +++ b/src/InterfaceTrait/Countable.php @@ -20,7 +20,7 @@ declare(strict_types=1); -namespace OCC\Basics\Traits; +namespace OCC\Basics\InterfaceTrait; /** * A generic implementation of the Countable interface. diff --git a/src/Traits/Iterator.php b/src/InterfaceTrait/Iterator.php similarity index 98% rename from src/Traits/Iterator.php rename to src/InterfaceTrait/Iterator.php index 443f696..038e966 100644 --- a/src/Traits/Iterator.php +++ b/src/InterfaceTrait/Iterator.php @@ -20,7 +20,7 @@ declare(strict_types=1); -namespace OCC\Basics\Traits; +namespace OCC\Basics\InterfaceTrait; /** * A generic implementation of the Iterator interface. diff --git a/src/Traits/IteratorAggregate.php b/src/InterfaceTrait/IteratorAggregate.php similarity index 97% rename from src/Traits/IteratorAggregate.php rename to src/InterfaceTrait/IteratorAggregate.php index e8a96bc..4320088 100644 --- a/src/Traits/IteratorAggregate.php +++ b/src/InterfaceTrait/IteratorAggregate.php @@ -20,7 +20,7 @@ declare(strict_types=1); -namespace OCC\Basics\Traits; +namespace OCC\Basics\InterfaceTrait; use ArrayIterator; diff --git a/src/Traits/Getter.php b/src/Trait/Getter.php similarity index 98% rename from src/Traits/Getter.php rename to src/Trait/Getter.php index dd0a2fa..1a21f84 100644 --- a/src/Traits/Getter.php +++ b/src/Trait/Getter.php @@ -20,7 +20,7 @@ declare(strict_types=1); -namespace OCC\Basics\Traits; +namespace OCC\Basics\Trait; use InvalidArgumentException; diff --git a/src/Traits/Setter.php b/src/Trait/Setter.php similarity index 98% rename from src/Traits/Setter.php rename to src/Trait/Setter.php index a316a34..658204e 100644 --- a/src/Traits/Setter.php +++ b/src/Trait/Setter.php @@ -20,7 +20,7 @@ declare(strict_types=1); -namespace OCC\Basics\Traits; +namespace OCC\Basics\Trait; use InvalidArgumentException; diff --git a/src/Traits/Singleton.php b/src/Trait/Singleton.php similarity index 98% rename from src/Traits/Singleton.php rename to src/Trait/Singleton.php index 9d5cf60..494ce58 100644 --- a/src/Traits/Singleton.php +++ b/src/Trait/Singleton.php @@ -20,7 +20,7 @@ declare(strict_types=1); -namespace OCC\Basics\Traits; +namespace OCC\Basics\Trait; use LogicException;