From c1f31672ed2e453622357650f4f42182f8ed09ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Bere=C5=88?= Date: Mon, 24 Mar 2014 18:14:21 +0100 Subject: [PATCH 01/15] Update TranslationWalker.php MySQL cats fix for issues: https://github.com/Atlantic18/DoctrineExtensions/issues/1011 https://github.com/Atlantic18/DoctrineExtensions/issues/1024 --- lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php b/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php index f4b8eb552a..d0a9373502 100644 --- a/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php +++ b/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php @@ -317,7 +317,9 @@ private function prepareTranslatedComponents() // Treat translation as original field type $fieldMapping = $meta->getFieldMapping($field); - if (!in_array($fieldMapping["type"], array("datetime", "datetimetz", "date", "time"))) { + if ((($this->platform instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) && + in_array($fieldMapping["type"], array("decimal"))) || + !in_array($fieldMapping["type"], array("datetime", "datetimetz", "date", "time"))) { $type = Type::getType($fieldMapping["type"]); $substituteField = 'CAST(' . $substituteField . ' AS ' . $type->getSQLDeclaration($fieldMapping, $this->platform) . ')'; } From 5b17b77c0675b7cde523583f52fc159dd90e3fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Bere=C5=88?= Date: Mon, 24 Mar 2014 19:35:26 +0100 Subject: [PATCH 02/15] Update TranslationWalker.php fixed condidtion --- lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php b/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php index d0a9373502..e849c0b559 100644 --- a/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php +++ b/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php @@ -319,7 +319,8 @@ private function prepareTranslatedComponents() $fieldMapping = $meta->getFieldMapping($field); if ((($this->platform instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) && in_array($fieldMapping["type"], array("decimal"))) || - !in_array($fieldMapping["type"], array("datetime", "datetimetz", "date", "time"))) { + (!($this->platform instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) && + !in_array($fieldMapping["type"], array("datetime", "datetimetz", "date", "time")))) { $type = Type::getType($fieldMapping["type"]); $substituteField = 'CAST(' . $substituteField . ' AS ' . $type->getSQLDeclaration($fieldMapping, $this->platform) . ')'; } From e5f5b4c80ec936ddd36c08c9ce1d0309c25caaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Bere=C5=88?= Date: Tue, 25 Mar 2014 14:18:25 +0100 Subject: [PATCH 03/15] Update PersonalTranslationTest.php updated test after MySQL cast fix --- tests/Gedmo/Translatable/PersonalTranslationTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Gedmo/Translatable/PersonalTranslationTest.php b/tests/Gedmo/Translatable/PersonalTranslationTest.php index b3b2270709..ce88029dda 100644 --- a/tests/Gedmo/Translatable/PersonalTranslationTest.php +++ b/tests/Gedmo/Translatable/PersonalTranslationTest.php @@ -217,7 +217,7 @@ function shouldBeAbleToUseTranslationQueryHint() $this->assertEquals('lt', $result[0]['title']); $sqlQueriesExecuted = $this->queryAnalyzer->getExecutedQueries(); $this->assertCount(1, $sqlQueriesExecuted); - $this->assertEquals("SELECT CAST(t1_.content AS VARCHAR(128)) AS title0 FROM Article a0_ LEFT JOIN article_translations t1_ ON t1_.locale = 'lt' AND t1_.field = 'title' AND t1_.object_id = a0_.id", $sqlQueriesExecuted[0]); + $this->assertEquals("SELECT t1_.content AS title0 FROM Article a0_ LEFT JOIN article_translations t1_ ON t1_.locale = 'lt' AND t1_.field = 'title' AND t1_.object_id = a0_.id", $sqlQueriesExecuted[0]); } private function populate() From aa42703d83dd10ff367fe27cd282dff88ca000d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Bere=C5=88?= Date: Tue, 25 Mar 2014 15:35:13 +0100 Subject: [PATCH 04/15] Revert "Update PersonalTranslationTest.php" This reverts commit e5f5b4c80ec936ddd36c08c9ce1d0309c25caaf1. --- tests/Gedmo/Translatable/PersonalTranslationTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Gedmo/Translatable/PersonalTranslationTest.php b/tests/Gedmo/Translatable/PersonalTranslationTest.php index ce88029dda..b3b2270709 100644 --- a/tests/Gedmo/Translatable/PersonalTranslationTest.php +++ b/tests/Gedmo/Translatable/PersonalTranslationTest.php @@ -217,7 +217,7 @@ function shouldBeAbleToUseTranslationQueryHint() $this->assertEquals('lt', $result[0]['title']); $sqlQueriesExecuted = $this->queryAnalyzer->getExecutedQueries(); $this->assertCount(1, $sqlQueriesExecuted); - $this->assertEquals("SELECT t1_.content AS title0 FROM Article a0_ LEFT JOIN article_translations t1_ ON t1_.locale = 'lt' AND t1_.field = 'title' AND t1_.object_id = a0_.id", $sqlQueriesExecuted[0]); + $this->assertEquals("SELECT CAST(t1_.content AS VARCHAR(128)) AS title0 FROM Article a0_ LEFT JOIN article_translations t1_ ON t1_.locale = 'lt' AND t1_.field = 'title' AND t1_.object_id = a0_.id", $sqlQueriesExecuted[0]); } private function populate() From 1dc1e7418b147e3760c155bd8b22e067dbe677d1 Mon Sep 17 00:00:00 2001 From: Frantisek Troster Date: Thu, 27 Mar 2014 16:45:55 +0100 Subject: [PATCH 05/15] Travis email notifications for A18 developers --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c507c83c48..334e801110 100755 --- a/.travis.yml +++ b/.travis.yml @@ -16,3 +16,4 @@ script: phpunit --coverage-text -c tests/ notifications: email: - gediminas.morkevicius@gmail.com + - developers@atlantic18.com From 5260d9ff456e018883bbac13047c1e58ba9cd1cd Mon Sep 17 00:00:00 2001 From: prophet777 Date: Thu, 3 Apr 2014 11:28:19 +0200 Subject: [PATCH 06/15] Remove unsed code --- lib/Gedmo/Translatable/TranslatableListener.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/Gedmo/Translatable/TranslatableListener.php b/lib/Gedmo/Translatable/TranslatableListener.php index 4495516f5f..437f545289 100644 --- a/lib/Gedmo/Translatable/TranslatableListener.php +++ b/lib/Gedmo/Translatable/TranslatableListener.php @@ -7,9 +7,6 @@ use Gedmo\Tool\Wrapper\AbstractWrapper; use Gedmo\Mapping\MappedEventSubscriber; use Gedmo\Translatable\Mapping\Event\TranslatableAdapter; -use Gedmo\Translatable\Entity\MappedSuperclass\AbstractPersonalTranslation; -use Gedmo\Translatable\Entity\MappedSuperclass\AbstractTranslation; - /** * The translation listener handles the generation and * loading of translations for entities which implements From 741cee65b1a706001212a964ae647800d5aa65b5 Mon Sep 17 00:00:00 2001 From: David McKay Date: Tue, 8 Apr 2014 17:58:23 +0100 Subject: [PATCH 07/15] Perform apostrophe purge before converting none-word characters to hyphens --- lib/Gedmo/Sluggable/Util/Urlizer.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Gedmo/Sluggable/Util/Urlizer.php b/lib/Gedmo/Sluggable/Util/Urlizer.php index 19430dcb8e..97d57e538d 100644 --- a/lib/Gedmo/Sluggable/Util/Urlizer.php +++ b/lib/Gedmo/Sluggable/Util/Urlizer.php @@ -405,6 +405,11 @@ private static function postProcessText($text, $separator) $text = strtolower($text); } + // Should remove apostrophes prior to none-word characters, + // as replacing with hyphens isn't ideal. + // Consider: Bon Jovi's Tour Cancelled (bon-jovi-s-tour-cancelled) + $text = preg_replace("/'/", '', $text); + // Remove all none word characters $text = preg_replace('/\W/', ' ', $text); From f53872c383fdd67b2cbd40f3a19ea2b945957fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Aub=C3=A9?= Date: Tue, 8 Apr 2014 15:36:43 -0400 Subject: [PATCH 08/15] Update uploadable.md Fix a typo in the yaml mapping --- doc/uploadable.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/uploadable.md b/doc/uploadable.md index 7893e9e13a..c924a3106f 100644 --- a/doc/uploadable.md +++ b/doc/uploadable.md @@ -247,7 +247,7 @@ Entity\File: type: string gedmo: - uploadableFilePath - path: + name: type: string gedmo: - uploadableFileName From b8909219f0bd23fc0e3267cbc8264b7f1ec98cb5 Mon Sep 17 00:00:00 2001 From: boda Date: Sun, 20 Apr 2014 19:15:45 +0300 Subject: [PATCH 09/15] Fix updating uploadable entity: correct file path in pendingFileRemovals if config['filePathField'] is not set --- lib/Gedmo/Uploadable/UploadableListener.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Gedmo/Uploadable/UploadableListener.php b/lib/Gedmo/Uploadable/UploadableListener.php index b74eb2f7ef..c59020a1f7 100644 --- a/lib/Gedmo/Uploadable/UploadableListener.php +++ b/lib/Gedmo/Uploadable/UploadableListener.php @@ -308,7 +308,9 @@ public function processFile(AdapterInterface $ea, $object, $action) if ($config['filePathField']) { $this->pendingFileRemovals[] = $this->getFilePathFieldValue($meta, $config, $object); } else { - $this->pendingFileRemovals[] = $this->getFileNameFieldValue($meta, $config, $object); + $path = $this->getPath($meta, $config, $object); + $fileName = $this->getFileNameFieldValue($meta, $config, $object); + $this->pendingFileRemovals[] = $path . DIRECTORY_SEPARATOR . $fileName; } } From 1e6ca3f942515e099aab938c4b41f620d1b45d60 Mon Sep 17 00:00:00 2001 From: Paul Jacobse Date: Thu, 1 May 2014 12:15:28 +0200 Subject: [PATCH 10/15] Clear the wrapper cache after the flush event is done --- lib/Gedmo/Sluggable/SluggableListener.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Gedmo/Sluggable/SluggableListener.php b/lib/Gedmo/Sluggable/SluggableListener.php index f496f28f9a..002f223387 100644 --- a/lib/Gedmo/Sluggable/SluggableListener.php +++ b/lib/Gedmo/Sluggable/SluggableListener.php @@ -6,6 +6,7 @@ use Gedmo\Mapping\MappedEventSubscriber; use Gedmo\Sluggable\Mapping\Event\SluggableAdapter; use Doctrine\Common\Persistence\ObjectManager; +use Gedmo\Tool\Wrapper\AbstractWrapper; /** * The SluggableListener handles the generation of slugs @@ -224,6 +225,8 @@ public function onFlush(EventArgs $args) } $this->manageFiltersAfterGeneration($om); + + AbstractWrapper::clear(); } /** From 377b222dee35d111d32d737e451b121b5452052d Mon Sep 17 00:00:00 2001 From: Robin Hallabro Date: Fri, 2 May 2014 19:09:29 +0200 Subject: [PATCH 11/15] Remove unneeded namespace includes --- lib/Gedmo/Blameable/BlameableListener.php | 2 -- lib/Gedmo/Blameable/Mapping/Event/Adapter/ORM.php | 1 - lib/Gedmo/Mapping/Driver/AbstractAnnotationDriver.php | 1 - lib/Gedmo/Mapping/ExtensionMetadataFactory.php | 1 - lib/Gedmo/Mapping/MappedEventSubscriber.php | 1 - lib/Gedmo/References/Mapping/Event/Adapter/ODM.php | 2 -- lib/Gedmo/References/Mapping/Event/Adapter/ORM.php | 1 - lib/Gedmo/References/Mapping/Event/ReferencesAdapter.php | 1 - lib/Gedmo/References/ReferencesListener.php | 5 ----- lib/Gedmo/SoftDeleteable/Mapping/Event/Adapter/ORM.php | 1 - .../SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php | 3 --- lib/Gedmo/Sortable/Mapping/Event/Adapter/ODM.php | 1 - lib/Gedmo/Sortable/Mapping/Event/Adapter/ORM.php | 1 - lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php | 1 - .../Translatable/Query/TreeWalker/TranslationWalker.php | 1 - lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php | 1 - lib/Gedmo/Tree/Mapping/Event/Adapter/ODM.php | 3 --- lib/Gedmo/Tree/Mapping/Event/Adapter/ORM.php | 3 --- lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php | 3 --- lib/Gedmo/Tree/Strategy/ORM/Closure.php | 1 - lib/Gedmo/Tree/Strategy/ORM/MaterializedPath.php | 2 -- lib/Gedmo/Tree/Strategy/ORM/Nested.php | 2 -- tests/Gedmo/Blameable/ProtectedPropertySupperclassTest.php | 2 -- tests/Gedmo/Mapping/ExtensionODMTest.php | 1 - tests/Gedmo/Mapping/ExtensionORMTest.php | 1 - tests/Gedmo/Mapping/MultiManagerMappingTest.php | 1 - .../ReferenceIntegrity/ReferenceIntegrityDocumentTest.php | 1 - tests/Gedmo/References/Fixture/ODM/MongoDB/Metadata.php | 1 - tests/Gedmo/References/Fixture/ORM/Category.php | 1 - tests/Gedmo/References/ReferencesListenerTest.php | 1 - tests/Gedmo/Sluggable/Fixture/Inheritance2/Vehicle.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue104/Bus.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue104/Car.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue827/Article.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue827/Category.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue827/Comment.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue827/Post.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue939/Article.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue939/Category.php | 1 - tests/Gedmo/Sluggable/Fixture/Issue939/SluggableListener.php | 2 -- tests/Gedmo/Sluggable/Fixture/MappedSuperclass/Car.php | 1 - tests/Gedmo/SoftDeleteable/Fixture/Entity/Child.php | 2 -- tests/Gedmo/SoftDeleteable/Fixture/Entity/MegaPage.php | 1 - tests/Gedmo/SoftDeleteable/Fixture/Entity/OtherComment.php | 1 - tests/Gedmo/SoftDeleteable/HardRelationTest.php | 1 - tests/Gedmo/Sortable/Fixture/Category.php | 1 - tests/Gedmo/Sortable/Fixture/Paper.php | 1 - .../Gedmo/Timestampable/ProtectedPropertySupperclassTest.php | 1 - tests/Gedmo/Tool/BaseTestCaseMongoODM.php | 1 - tests/Gedmo/Tool/BaseTestCaseOM.php | 3 --- tests/Gedmo/Tool/BaseTestCaseORM.php | 1 - tests/Gedmo/Translatable/PersonalTranslationTest.php | 1 - tests/Gedmo/Translatable/TranslatableTest.php | 3 --- tests/Gedmo/Tree/ClosureTreeTest.php | 1 - tests/Gedmo/Tree/Fixture/Closure/News.php | 1 - tests/Gedmo/Tree/Fixture/MPCategory.php | 1 - tests/Gedmo/Tree/Fixture/MPCategoryWithTrimmedSeparator.php | 1 - tests/Gedmo/Tree/InMemoryUpdatesTest.php | 1 - .../Gedmo/Tree/MaterializedPathODMMongoDBRepositoryTest.php | 1 - tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php | 2 -- .../Gedmo/Tree/MaterializedPathODMMongoDBTreeLockingTest.php | 2 -- tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php | 1 - tests/Gedmo/Tree/MultInheritanceWithJoinedTableTest.php | 1 - tests/Gedmo/Tree/MultiInheritanceTest.php | 2 -- tests/Gedmo/Tree/MultiInheritanceWithSingleTableTest.php | 1 - tests/Gedmo/Tree/NestedTreeRootTest.php | 1 - tests/Gedmo/Tree/TreeTest.php | 1 - tests/Gedmo/Uploadable/FileInfo/FileInfoArrayTest.php | 2 -- tests/Gedmo/Uploadable/Fixture/Entity/Article.php | 1 - tests/Gedmo/Uploadable/Fixture/Entity/File.php | 1 - tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumber.php | 1 - .../Uploadable/Fixture/Entity/FileAppendNumberRelative.php | 1 - .../Gedmo/Uploadable/Fixture/Entity/FileWithAllowedTypes.php | 1 - .../Uploadable/Fixture/Entity/FileWithAlphanumericName.php | 1 - .../Fixture/Entity/FileWithCustomFilenameGenerator.php | 1 - .../Uploadable/Fixture/Entity/FileWithDisallowedTypes.php | 1 - tests/Gedmo/Uploadable/Fixture/Entity/FileWithMaxSize.php | 1 - tests/Gedmo/Uploadable/Fixture/Entity/FileWithSha1Name.php | 1 - tests/Gedmo/Uploadable/Fixture/Entity/FileWithoutPath.php | 1 - tests/Gedmo/Uploadable/Mapping/ValidatorTest.php | 2 -- 80 files changed, 108 deletions(-) diff --git a/lib/Gedmo/Blameable/BlameableListener.php b/lib/Gedmo/Blameable/BlameableListener.php index c2c9ef20d9..10256fd1a7 100644 --- a/lib/Gedmo/Blameable/BlameableListener.php +++ b/lib/Gedmo/Blameable/BlameableListener.php @@ -2,10 +2,8 @@ namespace Gedmo\Blameable; -use Doctrine\Common\EventArgs; use Doctrine\Common\NotifyPropertyChanged; use Gedmo\Exception\InvalidArgumentException; -use Gedmo\Mapping\MappedEventSubscriber; use Gedmo\Timestampable\TimestampableListener; use Gedmo\Blameable\Mapping\Event\BlameableAdapter; diff --git a/lib/Gedmo/Blameable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Blameable/Mapping/Event/Adapter/ORM.php index 5ef93294d2..b14cb00ac0 100644 --- a/lib/Gedmo/Blameable/Mapping/Event/Adapter/ORM.php +++ b/lib/Gedmo/Blameable/Mapping/Event/Adapter/ORM.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM; use Gedmo\Blameable\Mapping\Event\BlameableAdapter; -use Gedmo\Exception\InvalidArgumentException; /** * Doctrine event adapter for ORM adapted diff --git a/lib/Gedmo/Mapping/Driver/AbstractAnnotationDriver.php b/lib/Gedmo/Mapping/Driver/AbstractAnnotationDriver.php index 872cba7718..1efb3b8d14 100644 --- a/lib/Gedmo/Mapping/Driver/AbstractAnnotationDriver.php +++ b/lib/Gedmo/Mapping/Driver/AbstractAnnotationDriver.php @@ -2,7 +2,6 @@ namespace Gedmo\Mapping\Driver; -use Gedmo\Mapping\Driver\AnnotationDriverInterface; use Doctrine\Common\Persistence\Mapping\ClassMetadata; /** diff --git a/lib/Gedmo/Mapping/ExtensionMetadataFactory.php b/lib/Gedmo/Mapping/ExtensionMetadataFactory.php index 7522887c52..9239cfbea8 100644 --- a/lib/Gedmo/Mapping/ExtensionMetadataFactory.php +++ b/lib/Gedmo/Mapping/ExtensionMetadataFactory.php @@ -10,7 +10,6 @@ use Doctrine\Common\Version as CommonLibVer; use Gedmo\Mapping\Driver\File as FileDriver; use Gedmo\Mapping\Driver\AnnotationDriverInterface; -use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory; /** * The extension metadata factory is responsible for extension driver diff --git a/lib/Gedmo/Mapping/MappedEventSubscriber.php b/lib/Gedmo/Mapping/MappedEventSubscriber.php index 74d572c469..1e6b55ad9a 100644 --- a/lib/Gedmo/Mapping/MappedEventSubscriber.php +++ b/lib/Gedmo/Mapping/MappedEventSubscriber.php @@ -5,7 +5,6 @@ use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\Annotations\CachedReader; use Doctrine\Common\Cache\ArrayCache; -use Gedmo\Mapping\ExtensionMetadataFactory; use Doctrine\Common\EventSubscriber; use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\EventArgs; diff --git a/lib/Gedmo/References/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/References/Mapping/Event/Adapter/ODM.php index 37834657e6..61fd6d914b 100644 --- a/lib/Gedmo/References/Mapping/Event/Adapter/ODM.php +++ b/lib/Gedmo/References/Mapping/Event/Adapter/ODM.php @@ -2,12 +2,10 @@ namespace Gedmo\References\Mapping\Event\Adapter; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Proxy\Proxy as MongoDBProxy; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Proxy\Proxy as ORMProxy; -use Gedmo\Exception\InvalidArgumentException; use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM; use Gedmo\References\Mapping\Event\ReferencesAdapter; diff --git a/lib/Gedmo/References/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/References/Mapping/Event/Adapter/ORM.php index dab21ac48b..615b0d8ee4 100644 --- a/lib/Gedmo/References/Mapping/Event/Adapter/ORM.php +++ b/lib/Gedmo/References/Mapping/Event/Adapter/ORM.php @@ -2,7 +2,6 @@ namespace Gedmo\References\Mapping\Event\Adapter; -use Doctrine\Common\Persistence\ObjectManager; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Proxy\Proxy as MongoDBProxy; use Doctrine\ORM\EntityManager; diff --git a/lib/Gedmo/References/Mapping/Event/ReferencesAdapter.php b/lib/Gedmo/References/Mapping/Event/ReferencesAdapter.php index ac8c0ebbf2..7bb95d5250 100644 --- a/lib/Gedmo/References/Mapping/Event/ReferencesAdapter.php +++ b/lib/Gedmo/References/Mapping/Event/ReferencesAdapter.php @@ -2,7 +2,6 @@ namespace Gedmo\References\Mapping\Event; -use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\Common\Persistence\ObjectManager; use Gedmo\Mapping\Event\AdapterInterface; diff --git a/lib/Gedmo/References/ReferencesListener.php b/lib/Gedmo/References/ReferencesListener.php index f139b65123..a1035f71df 100644 --- a/lib/Gedmo/References/ReferencesListener.php +++ b/lib/Gedmo/References/ReferencesListener.php @@ -4,11 +4,6 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\EventArgs; -use Doctrine\ORM\Mapping\ClassMetadata as ORMClassMetadata; -use Doctrine\ORM\EntityManager; -use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\ClassMetadata as MongoDBClassMetadata; -use Gedmo\Exception\InvalidArgumentException; use Gedmo\Mapping\MappedEventSubscriber; /** diff --git a/lib/Gedmo/SoftDeleteable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/SoftDeleteable/Mapping/Event/Adapter/ORM.php index 9557119b3b..dc50d2e015 100644 --- a/lib/Gedmo/SoftDeleteable/Mapping/Event/Adapter/ORM.php +++ b/lib/Gedmo/SoftDeleteable/Mapping/Event/Adapter/ORM.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM; use Gedmo\SoftDeleteable\Mapping\Event\SoftDeleteableAdapter; -use Gedmo\Exception\InvalidArgumentException; /** * Doctrine event adapter for ORM adapted diff --git a/lib/Gedmo/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php b/lib/Gedmo/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php index cf2a6a1b8c..dcb5823c15 100644 --- a/lib/Gedmo/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php +++ b/lib/Gedmo/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php @@ -5,10 +5,7 @@ use Doctrine\ORM\Query\SqlWalker; use Doctrine\ORM\Query\AST\DeleteStatement; use Doctrine\ORM\Query\AST\DeleteClause; -use Doctrine\ORM\Query\AST\UpdateClause; -use Doctrine\ORM\Query\AST\UpdateItem; use Doctrine\ORM\Query\Exec\SingleTableDeleteUpdateExecutor; -use Doctrine\ORM\Query\AST\PathExpression; use Gedmo\SoftDeleteable\SoftDeleteableListener; use Gedmo\SoftDeleteable\Query\TreeWalker\Exec\MultiTableDeleteExecutor; diff --git a/lib/Gedmo/Sortable/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/Sortable/Mapping/Event/Adapter/ODM.php index 77c7d18037..6f95130b93 100644 --- a/lib/Gedmo/Sortable/Mapping/Event/Adapter/ODM.php +++ b/lib/Gedmo/Sortable/Mapping/Event/Adapter/ODM.php @@ -3,7 +3,6 @@ namespace Gedmo\Sortable\Mapping\Event\Adapter; use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM; -use Doctrine\ODM\MongoDB\Cursor; use Gedmo\Sortable\Mapping\Event\SortableAdapter; /** diff --git a/lib/Gedmo/Sortable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Sortable/Mapping/Event/Adapter/ORM.php index aa9e5ae19e..757cff40dd 100644 --- a/lib/Gedmo/Sortable/Mapping/Event/Adapter/ORM.php +++ b/lib/Gedmo/Sortable/Mapping/Event/Adapter/ORM.php @@ -3,7 +3,6 @@ namespace Gedmo\Sortable\Mapping\Event\Adapter; use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM; -use Doctrine\ORM\Query; use Gedmo\Sortable\Mapping\Event\SortableAdapter; /** diff --git a/lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php index 47275c603d..b6eda157f5 100644 --- a/lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php +++ b/lib/Gedmo/Translatable/Mapping/Event/Adapter/ODM.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM; use Gedmo\Tool\Wrapper\AbstractWrapper; -use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo; use Doctrine\ODM\MongoDB\Cursor; use Gedmo\Translatable\Mapping\Event\TranslatableAdapter; diff --git a/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php b/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php index e849c0b559..f880b8ca99 100644 --- a/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php +++ b/lib/Gedmo/Translatable/Query/TreeWalker/TranslationWalker.php @@ -7,7 +7,6 @@ use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Query; use Doctrine\ORM\Query\SqlWalker; -use Doctrine\ORM\Query\TreeWalkerAdapter; use Doctrine\ORM\Query\AST\SelectStatement; use Doctrine\ORM\Query\Exec\SingleSelectExecutor; use Doctrine\ORM\Query\AST\RangeVariableDeclaration; diff --git a/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php b/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php index adc533d8fb..1d56903bb1 100644 --- a/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php +++ b/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php @@ -7,7 +7,6 @@ use Gedmo\Tree\Strategy; use Gedmo\Tree\Strategy\ORM\Closure; use Gedmo\Tool\Wrapper\EntityWrapper; -use Doctrine\ORM\Proxy\Proxy; /** * The ClosureTreeRepository has some useful functions diff --git a/lib/Gedmo/Tree/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/Tree/Mapping/Event/Adapter/ODM.php index 555735223a..b90c7d0004 100644 --- a/lib/Gedmo/Tree/Mapping/Event/Adapter/ODM.php +++ b/lib/Gedmo/Tree/Mapping/Event/Adapter/ODM.php @@ -3,9 +3,6 @@ namespace Gedmo\Tree\Mapping\Event\Adapter; use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM; -use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\ClassMetadataInfo; -use Doctrine\ODM\MongoDB\Cursor; use Gedmo\Tree\Mapping\Event\TreeAdapter; /** diff --git a/lib/Gedmo/Tree/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Tree/Mapping/Event/Adapter/ORM.php index 60c3dfef77..5cd1553103 100644 --- a/lib/Gedmo/Tree/Mapping/Event/Adapter/ORM.php +++ b/lib/Gedmo/Tree/Mapping/Event/Adapter/ORM.php @@ -3,9 +3,6 @@ namespace Gedmo\Tree\Mapping\Event\Adapter; use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM; -use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Mapping\ClassMetadataInfo; -use Doctrine\ORM\Query; use Gedmo\Tree\Mapping\Event\TreeAdapter; /** diff --git a/lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php b/lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php index 9cd8b9bb8a..fb388cba32 100644 --- a/lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php +++ b/lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php @@ -3,10 +3,7 @@ namespace Gedmo\Tree\Strategy; use Gedmo\Tree\Strategy; -use Doctrine\ORM\EntityManager; use Gedmo\Tree\TreeListener; -use Doctrine\ORM\Mapping\ClassMetadataInfo; -use Doctrine\ORM\Query; use Doctrine\Common\Persistence\ObjectManager; use Gedmo\Mapping\Event\AdapterInterface; use Gedmo\Exception\RuntimeException; diff --git a/lib/Gedmo/Tree/Strategy/ORM/Closure.php b/lib/Gedmo/Tree/Strategy/ORM/Closure.php index 478d30b16f..e35d11ef90 100644 --- a/lib/Gedmo/Tree/Strategy/ORM/Closure.php +++ b/lib/Gedmo/Tree/Strategy/ORM/Closure.php @@ -4,7 +4,6 @@ use Doctrine\DBAL\Connection; use Doctrine\ORM\Version; -use Doctrine\ORM\Proxy\Proxy; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\Common\Persistence\ObjectManager; diff --git a/lib/Gedmo/Tree/Strategy/ORM/MaterializedPath.php b/lib/Gedmo/Tree/Strategy/ORM/MaterializedPath.php index 959cd0d334..c7b25bbb63 100644 --- a/lib/Gedmo/Tree/Strategy/ORM/MaterializedPath.php +++ b/lib/Gedmo/Tree/Strategy/ORM/MaterializedPath.php @@ -3,8 +3,6 @@ namespace Gedmo\Tree\Strategy\ORM; use Gedmo\Tree\Strategy\AbstractMaterializedPath; -use Doctrine\Common\Persistence\ObjectManager; -use Gedmo\Mapping\Event\AdapterInterface; use Gedmo\Tool\Wrapper\AbstractWrapper; /** diff --git a/lib/Gedmo/Tree/Strategy/ORM/Nested.php b/lib/Gedmo/Tree/Strategy/ORM/Nested.php index 9fb9ddceb7..253380a1cd 100644 --- a/lib/Gedmo/Tree/Strategy/ORM/Nested.php +++ b/lib/Gedmo/Tree/Strategy/ORM/Nested.php @@ -4,12 +4,10 @@ use Gedmo\Exception\UnexpectedValueException; use Doctrine\ORM\Proxy\Proxy; -use Gedmo\Tool\Wrapper\EntityWrapper; use Gedmo\Tool\Wrapper\AbstractWrapper; use Gedmo\Tree\Strategy; use Doctrine\ORM\EntityManager; use Gedmo\Tree\TreeListener; -use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Query; use Gedmo\Mapping\Event\AdapterInterface; diff --git a/tests/Gedmo/Blameable/ProtectedPropertySupperclassTest.php b/tests/Gedmo/Blameable/ProtectedPropertySupperclassTest.php index 5179736e59..f6058d5e2b 100644 --- a/tests/Gedmo/Blameable/ProtectedPropertySupperclassTest.php +++ b/tests/Gedmo/Blameable/ProtectedPropertySupperclassTest.php @@ -5,8 +5,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; use Gedmo\Translatable\TranslatableListener; -use Gedmo\Blameable\BlameableListener; -use Doctrine\Common\Util\Debug; use Blameable\Fixture\Entity\SupperClassExtension; /** diff --git a/tests/Gedmo/Mapping/ExtensionODMTest.php b/tests/Gedmo/Mapping/ExtensionODMTest.php index c784989414..cc8170eb3e 100644 --- a/tests/Gedmo/Mapping/ExtensionODMTest.php +++ b/tests/Gedmo/Mapping/ExtensionODMTest.php @@ -5,7 +5,6 @@ use Tool\BaseTestCaseMongoODM; use Doctrine\Common\EventManager; use Gedmo\Mapping\Mock\Extension\Encoder\EncoderListener; -use Gedmo\Mapping\ExtensionMetadataFactory; use Doctrine\ODM\MongoDB\Event\LoadClassMetadataEventArgs; use Mapping\Fixture\Document\User; diff --git a/tests/Gedmo/Mapping/ExtensionORMTest.php b/tests/Gedmo/Mapping/ExtensionORMTest.php index f43f74bea3..ccce03b20e 100644 --- a/tests/Gedmo/Mapping/ExtensionORMTest.php +++ b/tests/Gedmo/Mapping/ExtensionORMTest.php @@ -5,7 +5,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; use Gedmo\Mapping\Mock\Extension\Encoder\EncoderListener; -use Gedmo\Mapping\ExtensionMetadataFactory; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Mapping\Fixture\User; diff --git a/tests/Gedmo/Mapping/MultiManagerMappingTest.php b/tests/Gedmo/Mapping/MultiManagerMappingTest.php index 98d2fe1c27..e98614888e 100644 --- a/tests/Gedmo/Mapping/MultiManagerMappingTest.php +++ b/tests/Gedmo/Mapping/MultiManagerMappingTest.php @@ -6,7 +6,6 @@ use Doctrine\ORM\Mapping\Driver\DriverChain; use Doctrine\ORM\Mapping\Driver\YamlDriver; use Doctrine\ORM\Mapping\Driver\AnnotationDriver; -use Gedmo\Mapping\ExtensionMetadataFactory; use Tool\BaseTestCaseOM; /** diff --git a/tests/Gedmo/ReferenceIntegrity/ReferenceIntegrityDocumentTest.php b/tests/Gedmo/ReferenceIntegrity/ReferenceIntegrityDocumentTest.php index 91449e4cf9..b0bf6e422f 100644 --- a/tests/Gedmo/ReferenceIntegrity/ReferenceIntegrityDocumentTest.php +++ b/tests/Gedmo/ReferenceIntegrity/ReferenceIntegrityDocumentTest.php @@ -3,7 +3,6 @@ namespace Gedmo\ReferenceIntegrity; use Doctrine\Common\EventManager; -use Gedmo\ReferenceIntegrity\ReferenceIntegrityListener; use Tool\BaseTestCaseMongoODM; /** diff --git a/tests/Gedmo/References/Fixture/ODM/MongoDB/Metadata.php b/tests/Gedmo/References/Fixture/ODM/MongoDB/Metadata.php index dd18ab85f1..6aadd021cb 100644 --- a/tests/Gedmo/References/Fixture/ODM/MongoDB/Metadata.php +++ b/tests/Gedmo/References/Fixture/ODM/MongoDB/Metadata.php @@ -2,7 +2,6 @@ namespace References\Fixture\ODM\MongoDB; -use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Gedmo\Mapping\Annotation as Gedmo; use References\Fixture\ORM\Category; diff --git a/tests/Gedmo/References/Fixture/ORM/Category.php b/tests/Gedmo/References/Fixture/ORM/Category.php index bbf1e1e0cb..8d60e7829c 100644 --- a/tests/Gedmo/References/Fixture/ORM/Category.php +++ b/tests/Gedmo/References/Fixture/ORM/Category.php @@ -5,7 +5,6 @@ use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; use References\Fixture\ODM\MongoDB\Product; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/References/ReferencesListenerTest.php b/tests/Gedmo/References/ReferencesListenerTest.php index db37e47134..8b3170ec4f 100644 --- a/tests/Gedmo/References/ReferencesListenerTest.php +++ b/tests/Gedmo/References/ReferencesListenerTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver as MongoDBAnnotationDriver; -use Doctrine\ODM\MongoDB\Configuration; use Doctrine\ORM\Mapping\Driver\AnnotationDriver as ORMAnnotationDriver; use References\Fixture\ODM\MongoDB\Product; use References\Fixture\ODM\MongoDB\Metadata; diff --git a/tests/Gedmo/Sluggable/Fixture/Inheritance2/Vehicle.php b/tests/Gedmo/Sluggable/Fixture/Inheritance2/Vehicle.php index 11e1cbf193..f224b461ae 100644 --- a/tests/Gedmo/Sluggable/Fixture/Inheritance2/Vehicle.php +++ b/tests/Gedmo/Sluggable/Fixture/Inheritance2/Vehicle.php @@ -3,7 +3,6 @@ namespace Sluggable\Fixture\Inheritance2; use Doctrine\ORM\Mapping as ORM; -use Gedmo\Mapping\Annotation as Gedmo; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue104/Bus.php b/tests/Gedmo/Sluggable/Fixture/Issue104/Bus.php index 85d3764129..fe2ef5e43c 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue104/Bus.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue104/Bus.php @@ -3,7 +3,6 @@ namespace Sluggable\Fixture\Issue104; use Doctrine\ORM\Mapping as ORM; -use Gedmo\Mapping\Annotation as Gedmo; /** * @ORM\MappedSuperclass diff --git a/tests/Gedmo/Sluggable/Fixture/Issue104/Car.php b/tests/Gedmo/Sluggable/Fixture/Issue104/Car.php index 2630350463..95211d5be6 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue104/Car.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue104/Car.php @@ -3,7 +3,6 @@ namespace Sluggable\Fixture\Issue104; use Doctrine\ORM\Mapping as ORM; -use Gedmo\Mapping\Annotation as Gedmo; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue827/Article.php b/tests/Gedmo/Sluggable/Fixture/Issue827/Article.php index d9d684a264..0b47c2a1bc 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue827/Article.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue827/Article.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Sluggable\Fixture\Issue827\Category; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue827/Category.php b/tests/Gedmo/Sluggable/Fixture/Issue827/Category.php index 767070d112..ccc026bca1 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue827/Category.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue827/Category.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Sluggable\Fixture\Issue827\Article; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue827/Comment.php b/tests/Gedmo/Sluggable/Fixture/Issue827/Comment.php index 6b3549a12a..823cc55c22 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue827/Comment.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue827/Comment.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Sluggable\Fixture\Issue827\Post; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue827/Post.php b/tests/Gedmo/Sluggable/Fixture/Issue827/Post.php index 6267b40636..f18e38c622 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue827/Post.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue827/Post.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Sluggable\Fixture\Issue827\Comment; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue939/Article.php b/tests/Gedmo/Sluggable/Fixture/Issue939/Article.php index 18b1aa1cb1..6a061b1873 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue939/Article.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue939/Article.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Sluggable\Fixture\Issue939\Category; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue939/Category.php b/tests/Gedmo/Sluggable/Fixture/Issue939/Category.php index 26dd5e9570..c0602162e1 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue939/Category.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue939/Category.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Sluggable\Fixture\Issue939\Article; /** * @ORM\Entity diff --git a/tests/Gedmo/Sluggable/Fixture/Issue939/SluggableListener.php b/tests/Gedmo/Sluggable/Fixture/Issue939/SluggableListener.php index 3ab0118fea..85affb872e 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue939/SluggableListener.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue939/SluggableListener.php @@ -3,8 +3,6 @@ namespace Sluggable\Fixture\Issue939; use Gedmo\Sluggable\SluggableListener as BaseSluggableListener; -use Gedmo\Sluggable\Mapping\Event\SluggableAdapter; -use Sluggable\Fixture\Issue939\Category; class SluggableListener extends BaseSluggableListener { diff --git a/tests/Gedmo/Sluggable/Fixture/MappedSuperclass/Car.php b/tests/Gedmo/Sluggable/Fixture/MappedSuperclass/Car.php index c8f7cd9c79..9e48c9925e 100644 --- a/tests/Gedmo/Sluggable/Fixture/MappedSuperclass/Car.php +++ b/tests/Gedmo/Sluggable/Fixture/MappedSuperclass/Car.php @@ -3,7 +3,6 @@ namespace Sluggable\Fixture\MappedSuperclass; use Doctrine\ORM\Mapping as ORM; -use Gedmo\Mapping\Annotation as Gedmo; /** * @ORM\Entity diff --git a/tests/Gedmo/SoftDeleteable/Fixture/Entity/Child.php b/tests/Gedmo/SoftDeleteable/Fixture/Entity/Child.php index 361349fef4..142da7e0b9 100644 --- a/tests/Gedmo/SoftDeleteable/Fixture/Entity/Child.php +++ b/tests/Gedmo/SoftDeleteable/Fixture/Entity/Child.php @@ -2,9 +2,7 @@ namespace SoftDeleteable\Fixture\Entity; -use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/SoftDeleteable/Fixture/Entity/MegaPage.php b/tests/Gedmo/SoftDeleteable/Fixture/Entity/MegaPage.php index 1131d573a3..baa6970d7e 100644 --- a/tests/Gedmo/SoftDeleteable/Fixture/Entity/MegaPage.php +++ b/tests/Gedmo/SoftDeleteable/Fixture/Entity/MegaPage.php @@ -3,7 +3,6 @@ namespace SoftDeleteable\Fixture\Entity; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/SoftDeleteable/Fixture/Entity/OtherComment.php b/tests/Gedmo/SoftDeleteable/Fixture/Entity/OtherComment.php index af53e076df..d6c2c99f86 100644 --- a/tests/Gedmo/SoftDeleteable/Fixture/Entity/OtherComment.php +++ b/tests/Gedmo/SoftDeleteable/Fixture/Entity/OtherComment.php @@ -2,7 +2,6 @@ namespace SoftDeleteable\Fixture\Entity; -use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Gedmo/SoftDeleteable/HardRelationTest.php b/tests/Gedmo/SoftDeleteable/HardRelationTest.php index 96f7b77645..4fdc7fa3d4 100644 --- a/tests/Gedmo/SoftDeleteable/HardRelationTest.php +++ b/tests/Gedmo/SoftDeleteable/HardRelationTest.php @@ -6,7 +6,6 @@ use Doctrine\Common\EventManager; use SoftDeleteable\Fixture\Entity\Person; use SoftDeleteable\Fixture\Entity\Address; -use Gedmo\SoftDeleteable\SoftDeleteableListener; class HardRelationTest extends BaseTestCaseORM { diff --git a/tests/Gedmo/Sortable/Fixture/Category.php b/tests/Gedmo/Sortable/Fixture/Category.php index b5471ee01c..f273442f1d 100644 --- a/tests/Gedmo/Sortable/Fixture/Category.php +++ b/tests/Gedmo/Sortable/Fixture/Category.php @@ -2,7 +2,6 @@ namespace Sortable\Fixture; -use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; diff --git a/tests/Gedmo/Sortable/Fixture/Paper.php b/tests/Gedmo/Sortable/Fixture/Paper.php index a2e8a1e5cb..41391c4fcc 100644 --- a/tests/Gedmo/Sortable/Fixture/Paper.php +++ b/tests/Gedmo/Sortable/Fixture/Paper.php @@ -2,7 +2,6 @@ namespace Sortable\Fixture; -use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; diff --git a/tests/Gedmo/Timestampable/ProtectedPropertySupperclassTest.php b/tests/Gedmo/Timestampable/ProtectedPropertySupperclassTest.php index a5d8ad7287..37a0b382d5 100644 --- a/tests/Gedmo/Timestampable/ProtectedPropertySupperclassTest.php +++ b/tests/Gedmo/Timestampable/ProtectedPropertySupperclassTest.php @@ -6,7 +6,6 @@ use Tool\BaseTestCaseORM; use Gedmo\Translatable\TranslatableListener; use Gedmo\Timestampable\TimestampableListener; -use Doctrine\Common\Util\Debug; use Timestampable\Fixture\SupperClassExtension; /** diff --git a/tests/Gedmo/Tool/BaseTestCaseMongoODM.php b/tests/Gedmo/Tool/BaseTestCaseMongoODM.php index 7ce16ebf41..96b2ee2b33 100644 --- a/tests/Gedmo/Tool/BaseTestCaseMongoODM.php +++ b/tests/Gedmo/Tool/BaseTestCaseMongoODM.php @@ -2,7 +2,6 @@ namespace Tool; -use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\Common\EventManager; diff --git a/tests/Gedmo/Tool/BaseTestCaseOM.php b/tests/Gedmo/Tool/BaseTestCaseOM.php index 929c421a6c..9beec770d5 100644 --- a/tests/Gedmo/Tool/BaseTestCaseOM.php +++ b/tests/Gedmo/Tool/BaseTestCaseOM.php @@ -3,18 +3,15 @@ namespace Tool; // common -use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\EventManager; use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; // orm specific use Doctrine\ORM\Mapping\DefaultQuoteStrategy; use Doctrine\ORM\Mapping\DefaultNamingStrategy; -use Doctrine\ORM\Mapping\Driver\Driver as MappingDriverORM; use Doctrine\ORM\Mapping\Driver\AnnotationDriver as AnnotationDriverORM; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Tools\SchemaTool; // odm specific -use Doctrine\ODM\MongoDB\Mapping\Driver\Driver as MappingDriverODM; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver as AnnotationDriverODM; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\MongoDB\Connection; diff --git a/tests/Gedmo/Tool/BaseTestCaseORM.php b/tests/Gedmo/Tool/BaseTestCaseORM.php index 3b3b04953b..701c4d68df 100644 --- a/tests/Gedmo/Tool/BaseTestCaseORM.php +++ b/tests/Gedmo/Tool/BaseTestCaseORM.php @@ -3,7 +3,6 @@ namespace Tool; use Gedmo\Tool\Logging\DBAL\QueryAnalyzer; -use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ORM\Mapping\Driver\AnnotationDriver; use Doctrine\ORM\EntityManager; use Doctrine\Common\EventManager; diff --git a/tests/Gedmo/Translatable/PersonalTranslationTest.php b/tests/Gedmo/Translatable/PersonalTranslationTest.php index b3b2270709..1c8c26daab 100644 --- a/tests/Gedmo/Translatable/PersonalTranslationTest.php +++ b/tests/Gedmo/Translatable/PersonalTranslationTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Doctrine\ORM\Query; -use Gedmo\Translatable\TranslatableListener; use Gedmo\Translatable\Query\TreeWalker\TranslationWalker; use Tool\BaseTestCaseORM; use Translatable\Fixture\Personal\Article; diff --git a/tests/Gedmo/Translatable/TranslatableTest.php b/tests/Gedmo/Translatable/TranslatableTest.php index 7c259c2450..0f71ec6223 100644 --- a/tests/Gedmo/Translatable/TranslatableTest.php +++ b/tests/Gedmo/Translatable/TranslatableTest.php @@ -2,9 +2,6 @@ namespace Gedmo\Translatable; -use Doctrine\ORM\Mapping\Driver\DriverChain; -use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver; -use Doctrine\ORM\Mapping\Driver\AnnotationDriver; use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; use Translatable\Fixture\Article; diff --git a/tests/Gedmo/Tree/ClosureTreeTest.php b/tests/Gedmo/Tree/ClosureTreeTest.php index 63edba7c66..036119a3d1 100644 --- a/tests/Gedmo/Tree/ClosureTreeTest.php +++ b/tests/Gedmo/Tree/ClosureTreeTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Doctrine\Common\Util\Debug; use Tree\Fixture\Closure\Category; use Tree\Fixture\Closure\News; use Tree\Fixture\Closure\CategoryClosure; diff --git a/tests/Gedmo/Tree/Fixture/Closure/News.php b/tests/Gedmo/Tree/Fixture/Closure/News.php index fa945b6c11..65e097ef03 100644 --- a/tests/Gedmo/Tree/Fixture/Closure/News.php +++ b/tests/Gedmo/Tree/Fixture/Closure/News.php @@ -7,7 +7,6 @@ namespace Tree\Fixture\Closure; -use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; /** diff --git a/tests/Gedmo/Tree/Fixture/MPCategory.php b/tests/Gedmo/Tree/Fixture/MPCategory.php index d4d37872de..e83345ba66 100644 --- a/tests/Gedmo/Tree/Fixture/MPCategory.php +++ b/tests/Gedmo/Tree/Fixture/MPCategory.php @@ -2,7 +2,6 @@ namespace Tree\Fixture; -use Gedmo\Tree\Node as NodeInterface; use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; diff --git a/tests/Gedmo/Tree/Fixture/MPCategoryWithTrimmedSeparator.php b/tests/Gedmo/Tree/Fixture/MPCategoryWithTrimmedSeparator.php index 95b90cf7fd..34f47b2048 100644 --- a/tests/Gedmo/Tree/Fixture/MPCategoryWithTrimmedSeparator.php +++ b/tests/Gedmo/Tree/Fixture/MPCategoryWithTrimmedSeparator.php @@ -2,7 +2,6 @@ namespace Tree\Fixture; -use Gedmo\Tree\Node as NodeInterface; use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; diff --git a/tests/Gedmo/Tree/InMemoryUpdatesTest.php b/tests/Gedmo/Tree/InMemoryUpdatesTest.php index 67dffbc028..0454c51884 100644 --- a/tests/Gedmo/Tree/InMemoryUpdatesTest.php +++ b/tests/Gedmo/Tree/InMemoryUpdatesTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Doctrine\Common\Util\Debug; use Tree\Fixture\Category; /** diff --git a/tests/Gedmo/Tree/MaterializedPathODMMongoDBRepositoryTest.php b/tests/Gedmo/Tree/MaterializedPathODMMongoDBRepositoryTest.php index 11fcd88fed..a6e36ad873 100644 --- a/tests/Gedmo/Tree/MaterializedPathODMMongoDBRepositoryTest.php +++ b/tests/Gedmo/Tree/MaterializedPathODMMongoDBRepositoryTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseMongoODM; -use Tree\Fixture\RootCategory; /** * These are tests for Tree behavior diff --git a/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php b/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php index 46aa37e099..45219e9510 100644 --- a/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php +++ b/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php @@ -4,8 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseMongoODM; -use Doctrine\Common\Util\Debug; -use Tree\Fixture\RootCategory; /** * These are tests for Tree behavior diff --git a/tests/Gedmo/Tree/MaterializedPathODMMongoDBTreeLockingTest.php b/tests/Gedmo/Tree/MaterializedPathODMMongoDBTreeLockingTest.php index 2756d0670d..92898c96a2 100644 --- a/tests/Gedmo/Tree/MaterializedPathODMMongoDBTreeLockingTest.php +++ b/tests/Gedmo/Tree/MaterializedPathODMMongoDBTreeLockingTest.php @@ -4,8 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseMongoODM; -use Doctrine\Common\Util\Debug; -use Tree\Fixture\RootCategory; use Tree\Fixture\Mock\TreeListenerMock; /** diff --git a/tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php b/tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php index 9a9e01a24e..54fa64d469 100644 --- a/tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php +++ b/tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Tree\Fixture\RootCategory; /** * These are tests for Tree behavior diff --git a/tests/Gedmo/Tree/MultInheritanceWithJoinedTableTest.php b/tests/Gedmo/Tree/MultInheritanceWithJoinedTableTest.php index 80cb617ec5..d29a2a2701 100644 --- a/tests/Gedmo/Tree/MultInheritanceWithJoinedTableTest.php +++ b/tests/Gedmo/Tree/MultInheritanceWithJoinedTableTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Doctrine\Common\Util\Debug; /** * These are tests for Tree behavior diff --git a/tests/Gedmo/Tree/MultiInheritanceTest.php b/tests/Gedmo/Tree/MultiInheritanceTest.php index 06a46277f2..5ef4d67f78 100644 --- a/tests/Gedmo/Tree/MultiInheritanceTest.php +++ b/tests/Gedmo/Tree/MultiInheritanceTest.php @@ -2,9 +2,7 @@ namespace Gedmo\Tree; -use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Doctrine\Common\Util\Debug; /** * These are tests for Tree behavior diff --git a/tests/Gedmo/Tree/MultiInheritanceWithSingleTableTest.php b/tests/Gedmo/Tree/MultiInheritanceWithSingleTableTest.php index 1d6c58dd30..7c77a90cab 100644 --- a/tests/Gedmo/Tree/MultiInheritanceWithSingleTableTest.php +++ b/tests/Gedmo/Tree/MultiInheritanceWithSingleTableTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Doctrine\Common\Util\Debug; use Tree\Fixture\Transport\Car; use Tree\Fixture\Transport\Bus; use Tree\Fixture\Transport\Vehicle; diff --git a/tests/Gedmo/Tree/NestedTreeRootTest.php b/tests/Gedmo/Tree/NestedTreeRootTest.php index 92fb431c1e..8499a969c9 100644 --- a/tests/Gedmo/Tree/NestedTreeRootTest.php +++ b/tests/Gedmo/Tree/NestedTreeRootTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Doctrine\Common\Util\Debug; use Tree\Fixture\RootCategory; /** diff --git a/tests/Gedmo/Tree/TreeTest.php b/tests/Gedmo/Tree/TreeTest.php index 52f6125ee3..b4711d4eab 100644 --- a/tests/Gedmo/Tree/TreeTest.php +++ b/tests/Gedmo/Tree/TreeTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\EventManager; use Tool\BaseTestCaseORM; -use Doctrine\Common\Util\Debug; use Tree\Fixture\Category; use Tree\Fixture\CategoryUuid; diff --git a/tests/Gedmo/Uploadable/FileInfo/FileInfoArrayTest.php b/tests/Gedmo/Uploadable/FileInfo/FileInfoArrayTest.php index e4015d54dc..8ce64e3748 100644 --- a/tests/Gedmo/Uploadable/FileInfo/FileInfoArrayTest.php +++ b/tests/Gedmo/Uploadable/FileInfo/FileInfoArrayTest.php @@ -2,8 +2,6 @@ namespace Gedmo\Uploadable\FileInfo; -use Gedmo\Uploadable\FileInfo\FileInfoArray; - /** * These are tests for the FileInfoArray class of the Uploadable behavior * diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/Article.php b/tests/Gedmo/Uploadable/Fixture/Entity/Article.php index 25afb8d685..cde4100369 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/Article.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/Article.php @@ -2,7 +2,6 @@ namespace Uploadable\Fixture\Entity; -use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/File.php b/tests/Gedmo/Uploadable/Fixture/Entity/File.php index f8650fa808..11583aa727 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/File.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/File.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumber.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumber.php index b051bf59aa..e7db552459 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumber.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumber.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumberRelative.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumberRelative.php index 7bc3c81be6..703bdc17e1 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumberRelative.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileAppendNumberRelative.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAllowedTypes.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAllowedTypes.php index b449cb8307..8faf71619e 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAllowedTypes.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAllowedTypes.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAlphanumericName.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAlphanumericName.php index 5a0c2adda0..ea542a662d 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAlphanumericName.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithAlphanumericName.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithCustomFilenameGenerator.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithCustomFilenameGenerator.php index ed4d7e1e86..84c91e5147 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithCustomFilenameGenerator.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithCustomFilenameGenerator.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithDisallowedTypes.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithDisallowedTypes.php index 7f44477e91..189ffc0bfa 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithDisallowedTypes.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithDisallowedTypes.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithMaxSize.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithMaxSize.php index afad7f57e3..588f7697e2 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithMaxSize.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithMaxSize.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithSha1Name.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithSha1Name.php index b135030d3b..a6f6b9ccf3 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithSha1Name.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithSha1Name.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithoutPath.php b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithoutPath.php index 2c59fe0a1b..34fd972166 100644 --- a/tests/Gedmo/Uploadable/Fixture/Entity/FileWithoutPath.php +++ b/tests/Gedmo/Uploadable/Fixture/Entity/FileWithoutPath.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; -use Doctrine\Common\Collections\ArrayCollection; /** * @ORM\Entity diff --git a/tests/Gedmo/Uploadable/Mapping/ValidatorTest.php b/tests/Gedmo/Uploadable/Mapping/ValidatorTest.php index 6d2206c6ec..7ade32cd9c 100644 --- a/tests/Gedmo/Uploadable/Mapping/ValidatorTest.php +++ b/tests/Gedmo/Uploadable/Mapping/ValidatorTest.php @@ -2,8 +2,6 @@ namespace Gedmo\Uploadable\Mapping; -use Gedmo\Uploadable\Mapping\Validator; - /** * These are tests for the Mapping Validator of the Uploadable behavior * From 35ca7fd6de445a50e1311e8944f54743e3fc8629 Mon Sep 17 00:00:00 2001 From: "Besnik Br." Date: Sun, 4 May 2014 15:22:30 +0200 Subject: [PATCH 12/15] Update Sluggable.php added missing comma --- lib/Gedmo/Sluggable/Sluggable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Gedmo/Sluggable/Sluggable.php b/lib/Gedmo/Sluggable/Sluggable.php index 0098018dc6..25c925ff5f 100644 --- a/lib/Gedmo/Sluggable/Sluggable.php +++ b/lib/Gedmo/Sluggable/Sluggable.php @@ -33,7 +33,7 @@ interface Sluggable * * example: * - * @gedmo:Slug(style="camel", separator="_", prefix="", suffix="" updatable=false, unique=false) + * @gedmo:Slug(style="camel", separator="_", prefix="", suffix="", updatable=false, unique=false) * @Column(type="string", length=64) * $property */ From ecf70f0d9ed5eba70681e146d7926183b6f28598 Mon Sep 17 00:00:00 2001 From: Alexander Miehe Date: Thu, 8 May 2014 21:25:56 +0200 Subject: [PATCH 13/15] Fixed failing test for blameable --- lib/Gedmo/Blameable/BlameableListener.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Gedmo/Blameable/BlameableListener.php b/lib/Gedmo/Blameable/BlameableListener.php index 10256fd1a7..ace2c7ecb7 100644 --- a/lib/Gedmo/Blameable/BlameableListener.php +++ b/lib/Gedmo/Blameable/BlameableListener.php @@ -81,6 +81,10 @@ protected function updateField($object, $ea, $meta, $field) $oldValue = $property->getValue($object); $newValue = $this->getUserValue($meta, $field); + //if blame is reference, persist object + if ($meta->hasAssociation($field)) { + $ea->getObjectManager()->persist($newValue); + } $property->setValue($object, $newValue); if ($object instanceof NotifyPropertyChanged) { $uow = $ea->getObjectManager()->getUnitOfWork(); From a3d80be09e47f97678c45b994eb5c58fb2e7954f Mon Sep 17 00:00:00 2001 From: Marc Neuhaus Date: Fri, 6 Jun 2014 10:52:02 +0200 Subject: [PATCH 14/15] Add @var annotations to the Traits for TYPO3.Flow support The TYPO3.Flow Frameworks relies heavily on @var annotation in Entities to properly handle them. This commit adds those @var annotations to the DoctrineExtension Traits to be compatible with TYPO3.Flow --- lib/Gedmo/Blameable/Traits/BlameableDocument.php | 2 ++ lib/Gedmo/Blameable/Traits/BlameableEntity.php | 2 ++ lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php | 2 ++ lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php | 2 ++ lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php | 1 + lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php | 1 + lib/Gedmo/Timestampable/Traits/TimestampableDocument.php | 2 ++ lib/Gedmo/Timestampable/Traits/TimestampableEntity.php | 2 ++ lib/Gedmo/Tree/Traits/NestedSetEntity.php | 4 ++++ 9 files changed, 18 insertions(+) diff --git a/lib/Gedmo/Blameable/Traits/BlameableDocument.php b/lib/Gedmo/Blameable/Traits/BlameableDocument.php index 8920f6d65b..070ba27051 100644 --- a/lib/Gedmo/Blameable/Traits/BlameableDocument.php +++ b/lib/Gedmo/Blameable/Traits/BlameableDocument.php @@ -11,12 +11,14 @@ trait BlameableDocument { /** + * @var string * @Gedmo\Blameable(on="create") * @ODM\String */ private $createdBy; /** + * @var string * @Gedmo\Blameable(on="update") * @ODM\String */ diff --git a/lib/Gedmo/Blameable/Traits/BlameableEntity.php b/lib/Gedmo/Blameable/Traits/BlameableEntity.php index c31157eb14..1f02280cd3 100644 --- a/lib/Gedmo/Blameable/Traits/BlameableEntity.php +++ b/lib/Gedmo/Blameable/Traits/BlameableEntity.php @@ -11,12 +11,14 @@ trait BlameableEntity { /** + * @var string * @Gedmo\Blameable(on="create") * @ORM\Column(type="string", nullable=true) */ private $createdBy; /** + * @var string * @Gedmo\Blameable(on="update") * @ORM\Column(type="string", nullable=true) */ diff --git a/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php b/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php index 8235da9ebd..ca0ece6d1a 100644 --- a/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php +++ b/lib/Gedmo/IpTraceable/Traits/IpTraceableDocument.php @@ -11,12 +11,14 @@ trait IpTraceableDocument { /** + * @var string * @Gedmo\IpTraceable(on="create") * @ODM\String */ private $createdFromIp; /** + * @var string * @Gedmo\IpTraceable(on="update") * @ODM\String */ diff --git a/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php b/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php index e666aa3700..02f70aa26a 100644 --- a/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php +++ b/lib/Gedmo/IpTraceable/Traits/IpTraceableEntity.php @@ -11,12 +11,14 @@ trait IpTraceableEntity { /** + * @var string * @Gedmo\IpTraceable(on="create") * @ORM\Column(type="string", length=45, nullable=true) */ protected $createdFromIp; /** + * @var string * @Gedmo\IpTraceable(on="update") * @ORM\Column(type="string", length=45, nullable=true) */ diff --git a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php index 27559181b2..8492b98675 100755 --- a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php +++ b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableDocument.php @@ -11,6 +11,7 @@ trait SoftDeleteableDocument { /** + * @var \DateTime * @ODM\Date */ protected $deletedAt; diff --git a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php index cc618e8ee4..7534e38ab2 100755 --- a/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php +++ b/lib/Gedmo/SoftDeleteable/Traits/SoftDeleteableEntity.php @@ -11,6 +11,7 @@ trait SoftDeleteableEntity { /** + * @var \DateTime * @ORM\Column(type="datetime", nullable=true) */ protected $deletedAt; diff --git a/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php b/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php index 60da33ab16..222628ac90 100644 --- a/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php +++ b/lib/Gedmo/Timestampable/Traits/TimestampableDocument.php @@ -11,12 +11,14 @@ trait TimestampableDocument { /** + * @var \DateTime * @Gedmo\Timestampable(on="create") * @ODM\Date */ private $createdAt; /** + * @var \DateTime * @Gedmo\Timestampable(on="update") * @ODM\Date */ diff --git a/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php b/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php index e98fafc6a9..19cb51bb2d 100644 --- a/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php +++ b/lib/Gedmo/Timestampable/Traits/TimestampableEntity.php @@ -11,12 +11,14 @@ trait TimestampableEntity { /** + * @var \DateTime * @Gedmo\Timestampable(on="create") * @ORM\Column(type="datetime") */ protected $createdAt; /** + * @var \DateTime * @Gedmo\Timestampable(on="update") * @ORM\Column(type="datetime") */ diff --git a/lib/Gedmo/Tree/Traits/NestedSetEntity.php b/lib/Gedmo/Tree/Traits/NestedSetEntity.php index 19eaec1c51..10e7469d25 100644 --- a/lib/Gedmo/Tree/Traits/NestedSetEntity.php +++ b/lib/Gedmo/Tree/Traits/NestedSetEntity.php @@ -12,24 +12,28 @@ trait NestedSetEntity { /** + * @var integer * @Gedmo\TreeRoot * @ORM\Column(name="root", type="integer", nullable=true) */ private $root; /** + * @var integer * @Gedmo\TreeLevel * @ORM\Column(name="lvl", type="integer") */ private $level; /** + * @var integer * @Gedmo\TreeLeft * @ORM\Column(name="lft", type="integer") */ private $left; /** + * @var integer * @Gedmo\TreeRight * @ORM\Column(name="rgt", type="integer") */ From cd721cc4566f211d2d52fb5d0c63e68014d4499f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Ro=C3=9Fkamp?= Date: Fri, 6 Jun 2014 18:25:43 +0200 Subject: [PATCH 15/15] Added inheritance mapping support in uploadable entities for the YAML driver --- lib/Gedmo/Uploadable/Mapping/Driver/Yaml.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Gedmo/Uploadable/Mapping/Driver/Yaml.php b/lib/Gedmo/Uploadable/Mapping/Driver/Yaml.php index 78e4a603c9..c139e4011c 100644 --- a/lib/Gedmo/Uploadable/Mapping/Driver/Yaml.php +++ b/lib/Gedmo/Uploadable/Mapping/Driver/Yaml.php @@ -30,7 +30,12 @@ class Yaml extends File implements Driver */ public function readExtendedMetadata($meta, array &$config) { - $mapping = $this->_getMapping($meta->name); + $mapping = array(); + $parents = array_reverse($meta->parentClasses); + foreach ($parents as $parent) { + $mapping = array_merge_recursive($mapping, $this->_getMapping($parent)); + } + $mapping = array_merge_recursive($mapping, $this->_getMapping($meta->name)); if (isset($mapping['gedmo'])) { $classMapping = $mapping['gedmo'];