From 1ba5c2ebe8c49eff20da6456f168aaff2dfd0e53 Mon Sep 17 00:00:00 2001 From: Jan Zaruba Date: Fri, 12 Jun 2020 17:36:34 +0200 Subject: [PATCH 1/7] compatibility common, persistance --- composer.json | 4 +++- src/Kdyby/Doctrine/DI/OrmExtension.php | 8 ++++---- src/Kdyby/Doctrine/Diagnostics/Panel.php | 2 +- src/Kdyby/Doctrine/Mapping/RuntimeReflectionService.php | 2 +- src/Kdyby/Doctrine/Registry.php | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 88803804..65b371e2 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,9 @@ "require": { "php": "^7.1", "doctrine/orm": "~2.7", - "doctrine/dbal": "~2.9", + "doctrine/dbal": "~2.10", + "doctrine/common": "^3.0", + "doctrine/persistence": "^2.0", "kdyby/console": "^2.7.1", "kdyby/annotations": "^3.0", "kdyby/doctrine-cache": "^3.0", diff --git a/src/Kdyby/Doctrine/DI/OrmExtension.php b/src/Kdyby/Doctrine/DI/OrmExtension.php index daa84659..a22458b3 100644 --- a/src/Kdyby/Doctrine/DI/OrmExtension.php +++ b/src/Kdyby/Doctrine/DI/OrmExtension.php @@ -110,7 +110,7 @@ class OrmExtension extends Nette\DI\CompilerExtension */ public $metadataDriverClasses = [ self::ANNOTATION_DRIVER => Doctrine\ORM\Mapping\Driver\AnnotationDriver::class, - 'static' => Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver::class, + 'static' => Doctrine\Persistence\Mapping\Driver\StaticPHPDriver::class, 'yml' => Doctrine\ORM\Mapping\Driver\YamlDriver::class, 'yaml' => Doctrine\ORM\Mapping\Driver\YamlDriver::class, 'xml' => Doctrine\ORM\Mapping\Driver\XmlDriver::class, @@ -243,7 +243,7 @@ protected function processEntityManager($name, array $defaults) } $metadataDriver = $builder->addDefinition($this->prefix($name . '.metadataDriver')) - ->setClass(Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain::class) + ->setClass(Doctrine\Persistence\Mapping\Driver\MappingDriverChain::class) ->setAutowired(FALSE); /** @var \Nette\DI\ServiceDefinition $metadataDriver */ @@ -618,7 +618,7 @@ protected function processMetadataDriver(Nette\DI\ServiceDefinition $metadataDri $serviceName = $this->prefix($prefix . '.driver.' . str_replace('\\', '_', $namespace) . '.' . str_replace('\\', '_', $impl) . 'Impl'); $this->getContainerBuilder()->addDefinition($serviceName) - ->setClass(Doctrine\Common\Persistence\Mapping\Driver\MappingDriver::class) + ->setClass(Doctrine\Persistence\Mapping\Driver\MappingDriver::class) ->setFactory($driver->getEntity(), $driver->arguments) ->setAutowired(FALSE); @@ -853,7 +853,7 @@ private function isKdybyEventsPresent() private function addCollapsePathsToTracy(Method $init) { $blueScreen = \Tracy\Debugger::class . '::getBlueScreen()'; - $commonDirname = dirname(Nette\Reflection\ClassType::from(Doctrine\Common\Version::class)->getFileName()); + $commonDirname = dirname(Nette\Reflection\ClassType::from(\Doctrine\ORM\Version::class)->getFileName()); $init->addBody($blueScreen . '->collapsePaths[] = ?;', [dirname(Nette\Reflection\ClassType::from(Kdyby\Doctrine\Exception::class)->getFileName())]); $init->addBody($blueScreen . '->collapsePaths[] = ?;', [dirname(dirname(dirname(dirname($commonDirname))))]); // this should be vendor/doctrine diff --git a/src/Kdyby/Doctrine/Diagnostics/Panel.php b/src/Kdyby/Doctrine/Diagnostics/Panel.php index f90da8f8..07a03dd6 100644 --- a/src/Kdyby/Doctrine/Diagnostics/Panel.php +++ b/src/Kdyby/Doctrine/Diagnostics/Panel.php @@ -12,7 +12,7 @@ use Doctrine; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Persistence\Proxy; +use Doctrine\Persistence\Proxy; use Doctrine\Common\Annotations\AnnotationException; use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\Type; diff --git a/src/Kdyby/Doctrine/Mapping/RuntimeReflectionService.php b/src/Kdyby/Doctrine/Mapping/RuntimeReflectionService.php index fece83bc..49b81b82 100644 --- a/src/Kdyby/Doctrine/Mapping/RuntimeReflectionService.php +++ b/src/Kdyby/Doctrine/Mapping/RuntimeReflectionService.php @@ -20,7 +20,7 @@ /** * @author Filip Procházka */ -class RuntimeReflectionService extends Doctrine\Common\Persistence\Mapping\RuntimeReflectionService +class RuntimeReflectionService extends Doctrine\Persistence\Mapping\RuntimeReflectionService { /** diff --git a/src/Kdyby/Doctrine/Registry.php b/src/Kdyby/Doctrine/Registry.php index bb3c0e8a..e8c1398e 100644 --- a/src/Kdyby/Doctrine/Registry.php +++ b/src/Kdyby/Doctrine/Registry.php @@ -10,7 +10,7 @@ namespace Kdyby\Doctrine; -use Doctrine\Common\Persistence\AbstractManagerRegistry; +use Doctrine\Persistence\AbstractManagerRegistry; use Doctrine\ORM\ORMException; use Kdyby; use Nette; From 63a1af61c421de92013a0d4a4fd539cb69e63eeb Mon Sep 17 00:00:00 2001 From: Jan Zaruba Date: Fri, 12 Jun 2020 18:35:08 +0200 Subject: [PATCH 2/7] formating composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 65b371e2..944624ba 100644 --- a/composer.json +++ b/composer.json @@ -19,9 +19,9 @@ "require": { "php": "^7.1", "doctrine/orm": "~2.7", - "doctrine/dbal": "~2.10", + "doctrine/dbal": "~2.10", "doctrine/common": "^3.0", - "doctrine/persistence": "^2.0", + "doctrine/persistence": "^2.0", "kdyby/console": "^2.7.1", "kdyby/annotations": "^3.0", "kdyby/doctrine-cache": "^3.0", From c0df02761178597409d8cce8808dbae9486f3fc7 Mon Sep 17 00:00:00 2001 From: vrestihnat Date: Fri, 12 Jun 2020 18:40:20 +0200 Subject: [PATCH 3/7] formating composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 944624ba..b7afc5b1 100644 --- a/composer.json +++ b/composer.json @@ -19,9 +19,9 @@ "require": { "php": "^7.1", "doctrine/orm": "~2.7", - "doctrine/dbal": "~2.10", - "doctrine/common": "^3.0", - "doctrine/persistence": "^2.0", + "doctrine/dbal": "~2.10", + "doctrine/common": "^3.0", + "doctrine/persistence": "^2.0", "kdyby/console": "^2.7.1", "kdyby/annotations": "^3.0", "kdyby/doctrine-cache": "^3.0", From 252fd48cebef8cc1493349e923aa5ea4256acec7 Mon Sep 17 00:00:00 2001 From: vrestihnat Date: Fri, 12 Jun 2020 18:53:38 +0200 Subject: [PATCH 4/7] update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd7569ae..833ba3ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ addons: - mysql php: - - 7.1 - 7.2 - 7.3 From 8f47567a238a67df43b43b4477e1584a0dfd110e Mon Sep 17 00:00:00 2001 From: vrestihnat Date: Fri, 12 Jun 2020 18:55:39 +0200 Subject: [PATCH 5/7] php 7.1 (EOL) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b7afc5b1..a5cb9a0f 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "issues": "https://github.com/kdyby/doctrine/issues" }, "require": { - "php": "^7.1", + "php": "^7.2", "doctrine/orm": "~2.7", "doctrine/dbal": "~2.10", "doctrine/common": "^3.0", From a27d3936b098034c417f838859fea4c41a3f5272 Mon Sep 17 00:00:00 2001 From: Jan Zaruba Date: Fri, 12 Jun 2020 19:17:27 +0200 Subject: [PATCH 6/7] fixup --- .gitignore | 7 ++++--- docs/en/configuring.md | 2 +- src/Kdyby/Doctrine/Diagnostics/Panel.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7d05333d..fd41427d 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ -vendor -tests/mysql.local.neon -composer.lock +vendor +tests/mysql.local.neon +composer.lock +/nbproject/private/ \ No newline at end of file diff --git a/docs/en/configuring.md b/docs/en/configuring.md index 13c22cab..40737dee 100644 --- a/docs/en/configuring.md +++ b/docs/en/configuring.md @@ -10,7 +10,7 @@ Metadata drivers There are several shortcuts for the driver implementations - `annotations` for `Kdyby\Doctrine\Mapping\AnnotationDriver` -- `static` for `Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver` +- `static` for `Doctrine\Persistence\Mapping\Driver\StaticPHPDriver` - `yaml` for `Doctrine\ORM\Mapping\Driver\YamlDriver` - `xml` for `Doctrine\ORM\Mapping\Driver\XmlDriver` - `db` for `Doctrine\ORM\Mapping\Driver\DatabaseDriver` diff --git a/src/Kdyby/Doctrine/Diagnostics/Panel.php b/src/Kdyby/Doctrine/Diagnostics/Panel.php index 07a03dd6..fe5522e6 100644 --- a/src/Kdyby/Doctrine/Diagnostics/Panel.php +++ b/src/Kdyby/Doctrine/Diagnostics/Panel.php @@ -97,7 +97,7 @@ public function startQuery($sql, array $params = NULL, array $types = NULL) foreach (debug_backtrace(FALSE) as $row) { if (isset($row['file']) && $this->filterTracePaths(realpath($row['file']))) { if (isset($row['class']) && stripos($row['class'], '\\' . Proxy::MARKER) !== FALSE) { - if (!in_array(Doctrine\Common\Persistence\Proxy::class, class_implements($row['class']))) { + if (!in_array(Doctrine\Persistence\Proxy::class, class_implements($row['class']))) { continue; } elseif (isset($row['function']) && $row['function'] === '__load') { From c5e03d0aa78af422e9be9a06d398b4c9c5ea9402 Mon Sep 17 00:00:00 2001 From: vrestihnat Date: Sun, 14 Jun 2020 11:35:55 +0200 Subject: [PATCH 7/7] reset console input options --- src/Kdyby/Doctrine/Console/DbalDelegateCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php b/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php index 2aba7c2d..1434327b 100644 --- a/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php +++ b/src/Kdyby/Doctrine/Console/DbalDelegateCommand.php @@ -52,6 +52,7 @@ protected function wrapCommand($connectionName) */ protected function configure() { + $this->setOptions([]); $this->command = $this->createCommand(); $this->setName($this->command->getName());