From 1926773937a1178d4c9849bb34868ec7050b8354 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Sun, 5 Oct 2014 20:35:30 +0200 Subject: [PATCH] Removed unused use statements and added a missing one --- lib/Gedmo/Mapping/Annotation/ReferenceMany.php | 2 -- lib/Gedmo/Mapping/Annotation/ReferenceManyEmbed.php | 2 -- lib/Gedmo/Mapping/Annotation/ReferenceOne.php | 2 -- lib/Gedmo/ReferenceIntegrity/Mapping/Driver/Annotation.php | 1 - lib/Gedmo/Translatable/Entity/Translation.php | 2 +- lib/Gedmo/Translatable/Mapping/Event/Adapter/ORM.php | 2 +- .../MongoDB/Repository/MaterializedPathRepository.php | 7 +++---- lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php | 1 - lib/Gedmo/Tree/Entity/Repository/NestedTreeRepository.php | 2 +- lib/Gedmo/Tree/Strategy/ORM/Nested.php | 1 - 10 files changed, 6 insertions(+), 16 deletions(-) diff --git a/lib/Gedmo/Mapping/Annotation/ReferenceMany.php b/lib/Gedmo/Mapping/Annotation/ReferenceMany.php index e7412aaa27..3eaa17c023 100644 --- a/lib/Gedmo/Mapping/Annotation/ReferenceMany.php +++ b/lib/Gedmo/Mapping/Annotation/ReferenceMany.php @@ -2,8 +2,6 @@ namespace Gedmo\Mapping\Annotation; -use Doctrine\Common\Annotations\Annotation; - /** * Reference annotation for ORM -> ODM references extension * to be user like "@ReferenceMany(type="entity", class="MyEntity", identifier="entity_id")" diff --git a/lib/Gedmo/Mapping/Annotation/ReferenceManyEmbed.php b/lib/Gedmo/Mapping/Annotation/ReferenceManyEmbed.php index c3bd473e53..a432b12915 100644 --- a/lib/Gedmo/Mapping/Annotation/ReferenceManyEmbed.php +++ b/lib/Gedmo/Mapping/Annotation/ReferenceManyEmbed.php @@ -2,8 +2,6 @@ namespace Gedmo\Mapping\Annotation; -use Doctrine\Common\Annotations\Annotation; - /** * @Annotation */ diff --git a/lib/Gedmo/Mapping/Annotation/ReferenceOne.php b/lib/Gedmo/Mapping/Annotation/ReferenceOne.php index 869c78ef06..ddc7563b67 100644 --- a/lib/Gedmo/Mapping/Annotation/ReferenceOne.php +++ b/lib/Gedmo/Mapping/Annotation/ReferenceOne.php @@ -2,8 +2,6 @@ namespace Gedmo\Mapping\Annotation; -use Doctrine\Common\Annotations\Annotation; - /** * Reference annotation for ORM -> ODM references extension * to be user like "@ReferenceOne(type="entity", class="MyEntity", identifier="entity_id")" diff --git a/lib/Gedmo/ReferenceIntegrity/Mapping/Driver/Annotation.php b/lib/Gedmo/ReferenceIntegrity/Mapping/Driver/Annotation.php index b50ce52db1..72730bdbac 100644 --- a/lib/Gedmo/ReferenceIntegrity/Mapping/Driver/Annotation.php +++ b/lib/Gedmo/ReferenceIntegrity/Mapping/Driver/Annotation.php @@ -4,7 +4,6 @@ use Gedmo\Mapping\Driver\AbstractAnnotationDriver; use Gedmo\Exception\InvalidMappingException; -use Gedmo\Mapping\Annotation\ReferenceIntegrityAction; use Gedmo\ReferenceIntegrity\Mapping\Validator; /** diff --git a/lib/Gedmo/Translatable/Entity/Translation.php b/lib/Gedmo/Translatable/Entity/Translation.php index ef476b1781..68ba447604 100644 --- a/lib/Gedmo/Translatable/Entity/Translation.php +++ b/lib/Gedmo/Translatable/Entity/Translation.php @@ -12,7 +12,7 @@ * * @Table( * name="ext_translations", - * indexes={@index(name="translations_lookup_idx", columns={ + * indexes={@Index(name="translations_lookup_idx", columns={ * "locale", "object_class", "foreign_key" * })}, * uniqueConstraints={@UniqueConstraint(name="lookup_unique_idx", columns={ diff --git a/lib/Gedmo/Translatable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Translatable/Mapping/Event/Adapter/ORM.php index c220629e34..25afebf0e7 100644 --- a/lib/Gedmo/Translatable/Mapping/Event/Adapter/ORM.php +++ b/lib/Gedmo/Translatable/Mapping/Event/Adapter/ORM.php @@ -2,8 +2,8 @@ namespace Gedmo\Translatable\Mapping\Event\Adapter; +use Doctrine\Common\Proxy\Proxy; use Doctrine\DBAL\Types\Type; -use Doctrine\ORM\Query; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM; use Gedmo\Translatable\Mapping\Event\TranslatableAdapter; diff --git a/lib/Gedmo/Tree/Document/MongoDB/Repository/MaterializedPathRepository.php b/lib/Gedmo/Tree/Document/MongoDB/Repository/MaterializedPathRepository.php index 1c01c23e39..c4d8059faa 100644 --- a/lib/Gedmo/Tree/Document/MongoDB/Repository/MaterializedPathRepository.php +++ b/lib/Gedmo/Tree/Document/MongoDB/Repository/MaterializedPathRepository.php @@ -4,7 +4,6 @@ use Gedmo\Exception\InvalidArgumentException; use Gedmo\Tree\Strategy; -use Gedmo\Tree\Strategy\ODM\MongoDB\MaterializedPath; use Gedmo\Tool\Wrapper\MongoDocumentWrapper; /** @@ -21,7 +20,7 @@ class MaterializedPathRepository extends AbstractTreeRepository /** * Get tree query builder * - * @param object Root node + * @param object $rootNode * * @return \Doctrine\ODM\MongoDB\Query\Builder */ @@ -33,7 +32,7 @@ public function getTreeQueryBuilder($rootNode = null) /** * Get tree query * - * @param object Root node + * @param object $rootNode * * @return \Doctrine\ODM\MongoDB\Query\Query */ @@ -45,7 +44,7 @@ public function getTreeQuery($rootNode = null) /** * Get tree * - * @param object Root node + * @param object $rootNode * * @return \Doctrine\ODM\MongoDB\Cursor */ diff --git a/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php b/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php index 1f36d80a3a..0d5a7df82d 100644 --- a/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php +++ b/lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php @@ -6,7 +6,6 @@ use Doctrine\ORM\Query; use Gedmo\Tree\Entity\MappedSuperclass\AbstractClosure; use Gedmo\Tree\Strategy; -use Gedmo\Tree\Strategy\ORM\Closure; use Gedmo\Tool\Wrapper\EntityWrapper; /** diff --git a/lib/Gedmo/Tree/Entity/Repository/NestedTreeRepository.php b/lib/Gedmo/Tree/Entity/Repository/NestedTreeRepository.php index 4becb7693f..13be544d1f 100644 --- a/lib/Gedmo/Tree/Entity/Repository/NestedTreeRepository.php +++ b/lib/Gedmo/Tree/Entity/Repository/NestedTreeRepository.php @@ -759,7 +759,7 @@ public function removeFromTree($node) public function reorder($node, $sortByField = null, $direction = 'ASC', $verify = true) { $meta = $this->getClassMetadata(); - if ($node instanceof $meta->name || $node == null) { + if ($node instanceof $meta->name || $node === null) { $config = $this->listener->getConfiguration($this->_em, $meta->name); if ($verify && is_array($this->verify())) { return false; diff --git a/lib/Gedmo/Tree/Strategy/ORM/Nested.php b/lib/Gedmo/Tree/Strategy/ORM/Nested.php index 19a25c8273..3b16c1266a 100644 --- a/lib/Gedmo/Tree/Strategy/ORM/Nested.php +++ b/lib/Gedmo/Tree/Strategy/ORM/Nested.php @@ -8,7 +8,6 @@ use Gedmo\Tree\Strategy; use Doctrine\ORM\EntityManager; use Gedmo\Tree\TreeListener; -use Doctrine\ORM\Query; use Gedmo\Mapping\Event\AdapterInterface; /**