exception: move to Exception namespace & PSR-4 structure (BC break!)

.phpstan.neon

@@ -17,6 +17,9 @@ parameters:
 	treatPhpDocTypesAsCertain: false
 	ignoreErrors:
 		- '#Call to static method Tester\\Assert::type\(\).+will always evaluate to true\.#'
+		-
+			message: '~.*~'
+			path: "src/compatibility.php"
 
 services:
 	-

composer.json

@@ -49,9 +49,7 @@
 		"psr-4": {
 			"Nextras\\Orm\\": "src/"
 		},
-		"classmap": [
-			"src/exceptions.php"
-		]
+		"files": ["src/compatibility.php"]
 	},
 	"autoload-dev": {
 		"classmap": [

doc/model.texy

@@ -60,7 +60,7 @@ $model->refreshAll();
 // $book is updated with the latest data from database
 \--
 
-Also, some entities may be changed but not persisted. Calling `refreshAll()` in such case will throw an `Nextras\Orm\InvalidStateException` exception. You may allow data override by passing `true` argument to the method.
+Also, some entities may be changed but not persisted. Calling `refreshAll()` in such case will throw an `Nextras\Orm\Exception\InvalidStateException` exception. You may allow data override by passing `true` argument to the method.
 
 /--php
 $book = $model->books->getById(1);

src/Bridges/NetteDI/DIRepositoryFinder.php

@@ -6,7 +6,7 @@
 use Nette\DI\ContainerBuilder;
 use Nette\DI\Definitions\FactoryDefinition;
 use Nette\DI\Definitions\ServiceDefinition;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 use Nextras\Orm\Repository\IRepository;
 
 

src/Bridges/NetteDI/OrmExtension.php

@@ -9,7 +9,7 @@
 use Nextras\Dbal\IConnection;
 use Nextras\Orm\Entity\Reflection\IMetadataParserFactory;
 use Nextras\Orm\Entity\Reflection\MetadataParser;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 use Nextras\Orm\Mapper\Dbal\DbalMapperCoordinator;
 use Nextras\Orm\Model\MetadataStorage;
 use Nextras\Orm\Model\Model;

src/Bridges/NetteDI/PhpDocRepositoryFinder.php

@@ -5,10 +5,10 @@
 
 use Nette\DI\ContainerBuilder;
 use Nette\Utils\Reflection;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
+use Nextras\Orm\Exception\RuntimeException;
 use Nextras\Orm\Model\Model;
 use Nextras\Orm\Repository\IRepository;
-use Nextras\Orm\RuntimeException;
 use ReflectionClass;
 
 

src/Collection/ArrayCollection.php

@@ -10,10 +10,10 @@
 use Nextras\Orm\Collection\Helpers\ArrayCollectionHelper;
 use Nextras\Orm\Collection\Helpers\FetchPairsHelper;
 use Nextras\Orm\Entity\IEntity;
-use Nextras\Orm\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\MemberAccessException;
+use Nextras\Orm\Exception\NoResultException;
 use Nextras\Orm\Mapper\IRelationshipMapper;
-use Nextras\Orm\MemberAccessException;
-use Nextras\Orm\NoResultException;
 use Nextras\Orm\Repository\IRepository;
 use function array_values;
 

src/Collection/DbalCollection.php

@@ -9,10 +9,10 @@
 use Nextras\Orm\Collection\Helpers\DbalQueryBuilderHelper;
 use Nextras\Orm\Collection\Helpers\FetchPairsHelper;
 use Nextras\Orm\Entity\IEntity;
+use Nextras\Orm\Exception\MemberAccessException;
+use Nextras\Orm\Exception\NoResultException;
 use Nextras\Orm\Mapper\Dbal\DbalMapper;
 use Nextras\Orm\Mapper\IRelationshipMapper;
-use Nextras\Orm\MemberAccessException;
-use Nextras\Orm\NoResultException;
 use function count;
 use function is_array;
 

src/Collection/EmptyCollection.php

@@ -6,8 +6,8 @@
 use EmptyIterator;
 use Iterator;
 use Nextras\Orm\Entity\IEntity;
+use Nextras\Orm\Exception\NoResultException;
 use Nextras\Orm\Mapper\IRelationshipMapper;
-use Nextras\Orm\NoResultException;
 
 
 class EmptyCollection implements ICollection

src/Collection/EntityIterator.php

@@ -8,7 +8,7 @@
 use Nette\Utils\Arrays;
 use Nextras\Orm\Entity\IEntity;
 use Nextras\Orm\Entity\IEntityHasPreloadContainer;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 
 
 /**

src/Collection/Functions/BaseAggregateFunction.php

@@ -8,7 +8,7 @@
 use Nextras\Orm\Collection\Helpers\DbalExpressionResult;
 use Nextras\Orm\Collection\Helpers\DbalQueryBuilderHelper;
 use Nextras\Orm\Entity\IEntity;
-use Nextras\Orm\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidArgumentException;
 use function assert;
 use function count;
 use function is_array;

src/Collection/Functions/CompareLikeFunction.php

@@ -10,7 +10,7 @@
 use Nextras\Orm\Collection\Helpers\DbalExpressionResult;
 use Nextras\Orm\Collection\Helpers\DbalQueryBuilderHelper;
 use Nextras\Orm\Entity\IEntity;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 use function preg_quote;
 use function str_replace;
 

src/Collection/HasManyCollection.php

@@ -6,9 +6,9 @@
 use Iterator;
 use Nextras\Orm\Collection\Helpers\FetchPairsHelper;
 use Nextras\Orm\Entity\IEntity;
+use Nextras\Orm\Exception\MemberAccessException;
+use Nextras\Orm\Exception\NoResultException;
 use Nextras\Orm\Mapper\IRelationshipMapper;
-use Nextras\Orm\MemberAccessException;
-use Nextras\Orm\NoResultException;
 use Nextras\Orm\Repository\IRepository;
 use function array_map;
 use function count;

src/Collection/Helpers/ArrayCollectionHelper.php

@@ -14,9 +14,8 @@
 use Nextras\Orm\Entity\Reflection\EntityMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyRelationshipMetadata;
-use Nextras\Orm\InvalidArgumentException;
-use Nextras\Orm\InvalidStateException;
-use Nextras\Orm\Mapper\IMapper;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidStateException;
 use Nextras\Orm\Repository\IRepository;
 use function array_map;
 use function array_shift;

src/Collection/Helpers/ConditionParser.php

@@ -11,8 +11,8 @@
 use Nextras\Orm\Collection\Functions\CompareSmallerThanEqualsFunction;
 use Nextras\Orm\Collection\Functions\CompareSmallerThanFunction;
 use Nextras\Orm\Entity\IEntity;
-use Nextras\Orm\InvalidArgumentException;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidStateException;
 use function array_shift;
 use function explode;
 use function is_subclass_of;

src/Collection/Helpers/DbalQueryBuilderHelper.php

@@ -12,11 +12,11 @@
 use Nextras\Orm\Entity\Reflection\EntityMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyRelationshipMetadata as Relationship;
-use Nextras\Orm\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\NotSupportedException;
 use Nextras\Orm\Mapper\Dbal\Conventions\IConventions;
 use Nextras\Orm\Mapper\Dbal\DbalMapper;
 use Nextras\Orm\Model\IModel;
-use Nextras\Orm\NotSupportedException;
 use Nextras\Orm\Repository\IRepository;
 use function array_map;
 use function array_merge;

src/Collection/Helpers/FetchPairsHelper.php

@@ -6,8 +6,8 @@
 use Nextras\Dbal\Utils\DateTimeImmutable;
 use Nextras\Orm\Entity\Embeddable\IEmbeddable;
 use Nextras\Orm\Entity\IEntity;
-use Nextras\Orm\InvalidArgumentException;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidStateException;
 use Traversable;
 use function array_shift;
 use function assert;

src/Collection/ICollection.php

@@ -9,8 +9,8 @@
 use Nextras\Orm\Collection\Functions\ConjunctionOperatorFunction;
 use Nextras\Orm\Collection\Functions\DisjunctionOperatorFunction;
 use Nextras\Orm\Entity\IEntity;
+use Nextras\Orm\Exception\NoResultException;
 use Nextras\Orm\Mapper\IRelationshipMapper;
-use Nextras\Orm\NoResultException;
 
 
 /**

src/Collection/MultiEntityIterator.php

@@ -8,7 +8,7 @@
 use Nette\Utils\Arrays;
 use Nextras\Orm\Entity\IEntity;
 use Nextras\Orm\Entity\IEntityHasPreloadContainer;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 
 
 /**

src/Entity/AbstractEntity.php

@@ -6,10 +6,10 @@
 use Nextras\Orm\Entity\Embeddable\EmbeddableContainer;
 use Nextras\Orm\Entity\Reflection\EntityMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
-use Nextras\Orm\InvalidArgumentException;
-use Nextras\Orm\InvalidStateException;
-use Nextras\Orm\LogicException;
-use Nextras\Orm\NullValueException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidStateException;
+use Nextras\Orm\Exception\LogicException;
+use Nextras\Orm\Exception\NullValueException;
 use Nextras\Orm\Relationships\IRelationshipCollection;
 use Nextras\Orm\Relationships\IRelationshipContainer;
 use Nextras\Orm\Repository\IRepository;

src/Entity/Embeddable/Embeddable.php

@@ -9,10 +9,10 @@
 use Nextras\Orm\Entity\IProperty;
 use Nextras\Orm\Entity\IPropertyContainer;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
-use Nextras\Orm\InvalidArgumentException;
-use Nextras\Orm\InvalidStateException;
-use Nextras\Orm\LogicException;
-use Nextras\Orm\NotSupportedException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidStateException;
+use Nextras\Orm\Exception\LogicException;
+use Nextras\Orm\Exception\NotSupportedException;
 use function assert;
 use function call_user_func;
 use function count;

src/Entity/Embeddable/EmbeddableContainer.php

@@ -8,9 +8,9 @@
 use Nextras\Orm\Entity\IEntityAwareProperty;
 use Nextras\Orm\Entity\IPropertyContainer;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
-use Nextras\Orm\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\NullValueException;
 use Nextras\Orm\Model\MetadataStorage;
-use Nextras\Orm\NullValueException;
 use ReflectionClass;
 use function array_filter;
 use function assert;

src/Entity/Entity.php

@@ -4,7 +4,7 @@
 
 
 use Nextras\Orm\Collection\IEntityPreloadContainer;
-use Nextras\Orm\NotSupportedException;
+use Nextras\Orm\Exception\NotSupportedException;
 
 
 class Entity extends AbstractEntity implements IEntityHasPreloadContainer

src/Entity/ImmutableDataTrait.php

@@ -5,8 +5,8 @@
 
 use Nextras\Orm\Entity\Reflection\EntityMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
-use Nextras\Orm\InvalidArgumentException;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidStateException;
 use Nextras\Orm\Model\MetadataStorage;
 
 

src/Entity/Reflection/EntityMetadata.php

@@ -5,7 +5,7 @@
 
 use Nette\SmartObject;
 use Nextras\Orm\Entity\Helpers\Typos;
-use Nextras\Orm\InvalidArgumentException;
+use Nextras\Orm\Exception\InvalidArgumentException;
 
 
 /**

src/Entity/Reflection/InvalidModifierDefinitionException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Nextras\Orm\Entity\Reflection;
+
+
+use Nextras\Orm\Exception;
+
+
+class InvalidModifierDefinitionException extends Exception\InvalidArgumentException
+{
+}

src/Entity/Reflection/MetadataParser.php

@@ -10,9 +10,8 @@
 use Nextras\Orm\Entity\Embeddable\IEmbeddable;
 use Nextras\Orm\Entity\IEntity;
 use Nextras\Orm\Entity\IProperty;
-use Nextras\Orm\InvalidModifierDefinitionException;
-use Nextras\Orm\InvalidStateException;
-use Nextras\Orm\NotSupportedException;
+use Nextras\Orm\Exception\InvalidStateException;
+use Nextras\Orm\Exception\NotSupportedException;
 use Nextras\Orm\Relationships\HasMany;
 use Nextras\Orm\Relationships\ManyHasMany;
 use Nextras\Orm\Relationships\ManyHasOne;

src/Entity/Reflection/MetadataValidator.php

@@ -3,7 +3,7 @@
 namespace Nextras\Orm\Entity\Reflection;
 
 
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 use Nextras\Orm\Model\IRepositoryLoader;
 
 

src/Entity/Reflection/ModifierParser.php

@@ -8,8 +8,7 @@
 use Nette\Tokenizer\Token;
 use Nette\Tokenizer\Tokenizer;
 use Nette\Utils\Reflection;
-use Nextras\Orm\InvalidModifierDefinitionException;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 use ReflectionClass;
 
 

src/Entity/Reflection/PropertyMetadata.php

@@ -15,7 +15,7 @@
 use DateTimeZone;
 use Nette\SmartObject;
 use Nextras\Orm\Entity\IProperty;
-use Nextras\Orm\InvalidStateException;
+use Nextras\Orm\Exception\InvalidStateException;
 
 
 class PropertyMetadata

src/Exception/IOException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Nextras\Orm\Exception;
+
+
+class IOException extends RuntimeException
+{
+}

src/Exception/InvalidArgumentException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Nextras\Orm\Exception;
+
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}

src/Exception/InvalidStateException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Nextras\Orm\Exception;
+
+
+class InvalidStateException extends RuntimeException
+{
+}

src/Exception/LogicException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Nextras\Orm\Exception;
+
+
+class LogicException extends \LogicException
+{
+}

src/Exception/MemberAccessException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Nextras\Orm\Exception;
+
+
+class MemberAccessException extends LogicException
+{
+}

src/NoResultException.php → src/Exception/NoResultException.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Nextras\Orm;
+namespace Nextras\Orm\Exception;
 
 
 class NoResultException extends RuntimeException

src/Exception/NotImplementedException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Nextras\Orm\Exception;
+
+
+class NotImplementedException extends LogicException
+{
+}

src/Exception/NotSupportedException.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Nextras\Orm\Exception;
+
+
+class NotSupportedException extends LogicException
+{
+}