From 5f25937c2f02c4ec7d71831c0b59a13fb8bcc7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondr=CC=8Cej=20Pech?= Date: Wed, 24 Mar 2021 11:21:01 +0100 Subject: [PATCH] Replace Kdyby\StrictObject for Nette\SmartObject --- composer.json | 8 ++++---- src/Kdyby/Doctrine/Connection.php | 2 +- src/Kdyby/Doctrine/Console/ColoredSqlOutput.php | 2 +- src/Kdyby/Doctrine/Console/DbalDelegateCommand.php | 2 +- src/Kdyby/Doctrine/Console/OrmDelegateCommand.php | 2 +- .../Diagnostics/EntityManagerUnitOfWorkSnapshotPanel.php | 2 +- src/Kdyby/Doctrine/Diagnostics/FileLogger.php | 2 +- src/Kdyby/Doctrine/Diagnostics/Panel.php | 2 +- .../Doctrine/Diagnostics/SimpleParameterFormatter.php | 2 +- src/Kdyby/Doctrine/EntityManager.php | 2 +- src/Kdyby/Doctrine/Mapping/EntityListenerResolver.php | 2 +- src/Kdyby/Doctrine/NativeQueryBuilder.php | 2 +- src/Kdyby/Doctrine/Proxy/ProxyAutoloader.php | 2 +- src/Kdyby/Doctrine/QueryBuilder.php | 2 +- src/Kdyby/Doctrine/Registry.php | 2 +- src/Kdyby/Doctrine/RepositoryFactory.php | 2 +- src/Kdyby/Doctrine/ResultSet.php | 2 +- src/Kdyby/Doctrine/Tools/CacheCleaner.php | 2 +- src/Kdyby/Doctrine/Tools/NonLockingUniqueInserter.php | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 88803804..57572069 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ }, "require": { "php": "^7.1", - "doctrine/orm": "~2.7", - "doctrine/dbal": "~2.9", + "doctrine/orm": "^2.6.3", + "doctrine/dbal": "^2.9.2", + "doctrine/common":"^2.13.1", "kdyby/console": "^2.7.1", "kdyby/annotations": "^3.0", "kdyby/doctrine-cache": "^3.0", - "kdyby/strict-objects": "^2.0", "nette/di": "^3.0", - "nette/utils": "^3.0", + "nette/utils": "~3.1.0", "nette/finder": "^2.5" }, "suggest": { diff --git a/src/Kdyby/Doctrine/Connection.php b/src/Kdyby/Doctrine/Connection.php index 47751ff5..1ec96ab5 100644 --- a/src/Kdyby/Doctrine/Connection.php +++ b/src/Kdyby/Doctrine/Connection.php @@ -27,7 +27,7 @@ class Connection extends Doctrine\DBAL\Connection { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var bool diff --git a/src/Kdyby/Doctrine/Console/ColoredSqlOutput.php b/src/Kdyby/Doctrine/Console/ColoredSqlOutput.php index 0a1c3c3a..5d8f4d17 100644 --- a/src/Kdyby/Doctrine/Console/ColoredSqlOutput.php +++ b/src/Kdyby/Doctrine/Console/ColoredSqlOutput.php @@ -23,7 +23,7 @@ class ColoredSqlOutput implements OutputInterface { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var \Symfony\Component\Console\Output\OutputInterface diff --git a/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php b/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php index 2aba7c2d..93da8038 100644 --- a/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php +++ b/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php @@ -24,7 +24,7 @@ abstract class DbalDelegateCommand extends Command { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var \Symfony\Component\Console\Command\Command diff --git a/src/Kdyby/Doctrine/Console/OrmDelegateCommand.php b/src/Kdyby/Doctrine/Console/OrmDelegateCommand.php index 00bf7dc0..1c3c5114 100644 --- a/src/Kdyby/Doctrine/Console/OrmDelegateCommand.php +++ b/src/Kdyby/Doctrine/Console/OrmDelegateCommand.php @@ -24,7 +24,7 @@ abstract class OrmDelegateCommand extends Command { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var \Symfony\Component\Console\Command\Command diff --git a/src/Kdyby/Doctrine/Diagnostics/EntityManagerUnitOfWorkSnapshotPanel.php b/src/Kdyby/Doctrine/Diagnostics/EntityManagerUnitOfWorkSnapshotPanel.php index f4b94bd9..d5415a79 100644 --- a/src/Kdyby/Doctrine/Diagnostics/EntityManagerUnitOfWorkSnapshotPanel.php +++ b/src/Kdyby/Doctrine/Diagnostics/EntityManagerUnitOfWorkSnapshotPanel.php @@ -24,7 +24,7 @@ class EntityManagerUnitOfWorkSnapshotPanel { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var \Doctrine\ORM\EntityManager diff --git a/src/Kdyby/Doctrine/Diagnostics/FileLogger.php b/src/Kdyby/Doctrine/Diagnostics/FileLogger.php index 1ff3f915..23947867 100644 --- a/src/Kdyby/Doctrine/Diagnostics/FileLogger.php +++ b/src/Kdyby/Doctrine/Diagnostics/FileLogger.php @@ -23,7 +23,7 @@ class FileLogger implements SQLLogger { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var string diff --git a/src/Kdyby/Doctrine/Diagnostics/Panel.php b/src/Kdyby/Doctrine/Diagnostics/Panel.php index f90da8f8..428aa2ca 100644 --- a/src/Kdyby/Doctrine/Diagnostics/Panel.php +++ b/src/Kdyby/Doctrine/Diagnostics/Panel.php @@ -38,7 +38,7 @@ class Panel implements IBarPanel, Doctrine\DBAL\Logging\SQLLogger { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var float logged time diff --git a/src/Kdyby/Doctrine/Diagnostics/SimpleParameterFormatter.php b/src/Kdyby/Doctrine/Diagnostics/SimpleParameterFormatter.php index 3bea8e47..565168ec 100644 --- a/src/Kdyby/Doctrine/Diagnostics/SimpleParameterFormatter.php +++ b/src/Kdyby/Doctrine/Diagnostics/SimpleParameterFormatter.php @@ -21,7 +21,7 @@ class SimpleParameterFormatter { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @param mixed $param diff --git a/src/Kdyby/Doctrine/EntityManager.php b/src/Kdyby/Doctrine/EntityManager.php index 63372755..969176ba 100644 --- a/src/Kdyby/Doctrine/EntityManager.php +++ b/src/Kdyby/Doctrine/EntityManager.php @@ -34,7 +34,7 @@ class EntityManager extends Doctrine\ORM\EntityManager implements Persistence\QueryExecutor, Persistence\Queryable { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var NonLockingUniqueInserter diff --git a/src/Kdyby/Doctrine/Mapping/EntityListenerResolver.php b/src/Kdyby/Doctrine/Mapping/EntityListenerResolver.php index 05b325a5..cdb06bcf 100644 --- a/src/Kdyby/Doctrine/Mapping/EntityListenerResolver.php +++ b/src/Kdyby/Doctrine/Mapping/EntityListenerResolver.php @@ -10,7 +10,7 @@ class EntityListenerResolver implements \Doctrine\ORM\Mapping\EntityListenerResolver { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var \Nette\DI\Container diff --git a/src/Kdyby/Doctrine/NativeQueryBuilder.php b/src/Kdyby/Doctrine/NativeQueryBuilder.php index 5cb1e08a..11047a9a 100644 --- a/src/Kdyby/Doctrine/NativeQueryBuilder.php +++ b/src/Kdyby/Doctrine/NativeQueryBuilder.php @@ -38,7 +38,7 @@ class NativeQueryBuilder extends Doctrine\DBAL\Query\QueryBuilder { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var Mapping\ResultSetMappingBuilder diff --git a/src/Kdyby/Doctrine/Proxy/ProxyAutoloader.php b/src/Kdyby/Doctrine/Proxy/ProxyAutoloader.php index 1f332993..41df5e10 100644 --- a/src/Kdyby/Doctrine/Proxy/ProxyAutoloader.php +++ b/src/Kdyby/Doctrine/Proxy/ProxyAutoloader.php @@ -21,7 +21,7 @@ class ProxyAutoloader { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var string diff --git a/src/Kdyby/Doctrine/QueryBuilder.php b/src/Kdyby/Doctrine/QueryBuilder.php index 649d4e21..da5e7a86 100644 --- a/src/Kdyby/Doctrine/QueryBuilder.php +++ b/src/Kdyby/Doctrine/QueryBuilder.php @@ -30,7 +30,7 @@ class QueryBuilder extends Doctrine\ORM\QueryBuilder implements \IteratorAggregate { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var array diff --git a/src/Kdyby/Doctrine/Registry.php b/src/Kdyby/Doctrine/Registry.php index bb3c0e8a..123f4455 100644 --- a/src/Kdyby/Doctrine/Registry.php +++ b/src/Kdyby/Doctrine/Registry.php @@ -30,7 +30,7 @@ class Registry extends AbstractManagerRegistry { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var Nette\DI\Container diff --git a/src/Kdyby/Doctrine/RepositoryFactory.php b/src/Kdyby/Doctrine/RepositoryFactory.php index 2b9a6d5a..0043a98d 100644 --- a/src/Kdyby/Doctrine/RepositoryFactory.php +++ b/src/Kdyby/Doctrine/RepositoryFactory.php @@ -23,7 +23,7 @@ class RepositoryFactory implements Doctrine\ORM\Repository\RepositoryFactory { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var Nette\DI\Container diff --git a/src/Kdyby/Doctrine/ResultSet.php b/src/Kdyby/Doctrine/ResultSet.php index 72cb74c0..61291e90 100644 --- a/src/Kdyby/Doctrine/ResultSet.php +++ b/src/Kdyby/Doctrine/ResultSet.php @@ -46,7 +46,7 @@ class ResultSet implements \Countable, \IteratorAggregate { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var int|NULL diff --git a/src/Kdyby/Doctrine/Tools/CacheCleaner.php b/src/Kdyby/Doctrine/Tools/CacheCleaner.php index e60b791a..b6752d09 100644 --- a/src/Kdyby/Doctrine/Tools/CacheCleaner.php +++ b/src/Kdyby/Doctrine/Tools/CacheCleaner.php @@ -24,7 +24,7 @@ class CacheCleaner { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var \Doctrine\ORM\EntityManager diff --git a/src/Kdyby/Doctrine/Tools/NonLockingUniqueInserter.php b/src/Kdyby/Doctrine/Tools/NonLockingUniqueInserter.php index 7cedcf14..d485c3e7 100644 --- a/src/Kdyby/Doctrine/Tools/NonLockingUniqueInserter.php +++ b/src/Kdyby/Doctrine/Tools/NonLockingUniqueInserter.php @@ -32,7 +32,7 @@ class NonLockingUniqueInserter { - use \Kdyby\StrictObjects\Scream; + use \Nette\SmartObject; /** * @var \Kdyby\Doctrine\EntityManager