graphaware · chvarkov · May 3, 2019
diff --git a/graphaware-mapping.xsd b/graphaware-mapping.xsd
@@ -71,7 +71,7 @@
             <xs:element type="ogm:propertyType" name="property" maxOccurs="unbounded" minOccurs="0"/>
             <xs:element type="ogm:relationshipType" name="relationship" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
-        <xs:attribute type="xs:string" name="label" use="required"/>
+        <xs:attribute type="ogm:labels-list-type" name="labels" use="required"/>
         <xs:attribute type="xs:string" name="entity" use="required"/>
         <xs:attribute type="xs:string" name="repository-class" use="optional"/>
     </xs:complexType>
@@ -82,6 +82,9 @@
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:simpleType name="labels-list-type">
+        <xs:list itemType="xs:string" />
+    </xs:simpleType>
     <xs:complexType name="order-byType">
         <xs:simpleContent>
             <xs:extension base="xs:string">

diff --git a/src/Annotations/Node.php b/src/Annotations/Node.php
@@ -18,9 +18,9 @@
 final class Node implements Entity
 {
     /**
-     * @var string
+     * @var string[]
      */
-    public $label;
+    public $labels;
 
     /**
      * @var string

diff --git a/src/Metadata/ClassMetadata.php b/src/Metadata/ClassMetadata.php
@@ -48,15 +48,15 @@ public function isRelationshipEntity()
     }
 
     /**
-     * @return string
+     * @return string[]
      */
-    public function getLabel()
+    public function getLabels()
     {
         if (!$this->isNodeEntity()) {
             throw new MappingException(sprintf('This class metadata is not for a node entity'));
         }
 
-        return $this->entityAnnotation->label;
+        return $this->entityAnnotation->labels;
     }
 
     /**

diff --git a/src/Metadata/Factory/Annotation/NodeAnnotationMetadataFactory.php b/src/Metadata/Factory/Annotation/NodeAnnotationMetadataFactory.php
@@ -43,7 +43,7 @@ public function create($nodeEntityClass)
         $annotation = $this->reader->getClassAnnotation($reflectionClass, Node::class);
 
         if (null !== $annotation) {
-            return new NodeAnnotationMetadata($annotation->label, $annotation->repository);
+            return new NodeAnnotationMetadata($annotation->labels, $annotation->repository);
         }
 
         throw new MappingException(sprintf('The class "%s" is missing the "%s" annotation', $nodeEntityClass, Node::class));

diff --git a/src/Metadata/Factory/Xml/NodeEntityMetadataFactory.php b/src/Metadata/Factory/Xml/NodeEntityMetadataFactory.php
@@ -59,14 +59,14 @@ public function buildNodeEntityMetadata(\SimpleXMLElement $node, $className)
      */
     private function buildNodeMetadata(\SimpleXMLElement $node, $className)
     {
-        if (!isset($node['label'])) {
+        if (!isset($node['labels'])) {
             throw new MappingException(
                 sprintf('Class "%s" OGM XML node configuration is missing "label" attribute', $className)
             );
         }
 
         return new NodeAnnotationMetadata(
-            (string) $node['label'],
+            \explode(' ',(string) $node['labels']),
             isset($node['repository-class']) ? (string) $node['repository-class'] : null
         );
     }

diff --git a/src/Metadata/NodeAnnotationMetadata.php b/src/Metadata/NodeAnnotationMetadata.php
@@ -14,31 +14,31 @@
 final class NodeAnnotationMetadata
 {
     /**
-     * @var string
+     * @var string[]
      */
-    private $label;
+    private $labels;
 
     /**
      * @var string
      */
     private $customRepository;
 
     /**
-     * @param string      $label
+     * @param string[]    $labels
      * @param string|null $repository
      */
-    public function __construct($label, $repository)
+    public function __construct($labels, $repository)
     {
-        $this->label = $label;
+        $this->labels = $labels;
         $this->customRepository = $repository;
     }
 
     /**
-     * @return string
+     * @return string[]
      */
-    public function getLabel()
+    public function getLabels()
     {
-        return $this->label;
+        return $this->labels;
     }
 
     /**

diff --git a/src/Metadata/NodeEntityMetadata.php b/src/Metadata/NodeEntityMetadata.php
@@ -66,11 +66,11 @@ public function __construct(
     }
 
     /**
-     * @return string
+     * @return string[]
      */
-    public function getLabel()
+    public function getLabels()
     {
-        return $this->nodeAnnotationMetadata->getLabel();
+        return $this->nodeAnnotationMetadata->getLabels();
     }
 
     /**

diff --git a/src/Persister/EntityPersister.php b/src/Persister/EntityPersister.php
@@ -70,7 +70,7 @@ public function getCreateQuery($object)
             }
         }
 
-        $query = sprintf('CREATE (n:%s) SET n += {properties}', $this->classMetadata->getLabel());
+        $query = sprintf('CREATE (n:%s) SET n += {properties}', \implode(':', $this->classMetadata->getLabels()));
         if (!empty($extraLabels)) {
             foreach ($extraLabels as $label) {
                 $query .= ' SET n:'.$label;
@@ -141,8 +141,8 @@ public function getUpdateQuery($object)
      */
     public function refresh($id, $entity)
     {
-        $label = $this->classMetadata->getLabel();
-        $query = sprintf('MATCH (n:%s) WHERE id(n) = {%s} RETURN n', $label, 'id');
+        $label = $this->classMetadata->getLabels();
+        $query = sprintf('MATCH (n:%s) WHERE id(n) = {%s} RETURN n', \implode(':', $label), 'id');
         $result = $this->entityManager->getDatabaseDriver()->run($query, ['id' => $id]);
 
         if ($result->size() > 0) {

diff --git a/src/Persister/FlushOperationProcessor.php b/src/Persister/FlushOperationProcessor.php
@@ -32,7 +32,7 @@ public function processNodesCreationJob(array $nodesScheduledForCreate)
         $byLabelsMap = [];
         foreach ($nodesScheduledForCreate as $node) {
             $metadata = $this->em->getClassMetadataFor(get_class($node));
-            $byLabelsMap[$metadata->getLabel()][] = $node;
+            $byLabelsMap[\implode('`:`', $metadata->getLabels())][] = $node;
         }
 
         return $this->createLabeledNodesCreationStack($byLabelsMap);
@@ -49,7 +49,7 @@ private function createLabeledNodesCreationStack(array $byLabelsMap)
                 $metadata = $this->em->getClassMetadataFor(get_class($entity));
                 $oid = spl_object_hash($entity);
                 $labeledProperties = $metadata->getLabeledPropertiesToBeSet($entity);
-                $lblKey = sprintf('%s_%s', $metadata->getLabel(), implode('_', array_map(function (LabeledPropertyMetadata $labeledPropertyMetadata) {
+                $lblKey = sprintf('%s_%s', \implode(':', $metadata->getLabels()), implode('_', array_map(function (LabeledPropertyMetadata $labeledPropertyMetadata) {
                     return $labeledPropertyMetadata->getLabelName();
                 }, $labeledProperties)));
 

diff --git a/src/Persisters/BasicEntityPersister.php b/src/Persisters/BasicEntityPersister.php
@@ -144,8 +144,8 @@ public function getCountForRelationship($alias, $sourceEntity)
     public function getMatchCypher(array $criteria = [], $orderBy = null, $limit = null, $offset = null)
     {
         $identifier = $this->_classMetadata->getEntityAlias();
-        $classLabel = $this->_classMetadata->getLabel();
-        $cypher = 'MATCH ('.$identifier.':'.$classLabel.') ';
+        $classLabels = $this->_classMetadata->getLabels();
+        $cypher = 'MATCH ('.$identifier.':'.\implode(':', $classLabels).') ';
 
         $filter_cursor = 0;
         $params = [];
@@ -188,7 +188,7 @@ private function getSimpleRelationshipStatement($alias, $sourceEntity)
         $relationshipMeta = $this->_classMetadata->getRelationship($alias);
         $relAlias = $relationshipMeta->getAlias();
         $targetMetadata = $this->_em->getClassMetadataFor($relationshipMeta->getTargetEntity());
-        $targetClassLabel = $targetMetadata->getLabel();
+        $targetClassLabels = $targetMetadata->getLabels();
         $targetAlias = $targetMetadata->getEntityAlias();
         $sourceEntityId = $this->_classMetadata->getIdValue($sourceEntity);
         $relationshipType = $relationshipMeta->getType();
@@ -199,7 +199,7 @@ private function getSimpleRelationshipStatement($alias, $sourceEntity)
         $relPattern = sprintf('%s-[%s:`%s`]-%s', $isIncoming, $relAlias, $relationshipType, $isOutgoing);
 
         $cypher = 'MATCH (n) WHERE id(n) = {id} ';
-        $cypher .= 'MATCH (n)'.$relPattern.'('.$targetAlias.($targetClassLabel != null ? ':' . $targetClassLabel : '').') ';
+        $cypher .= 'MATCH (n)'.$relPattern.'('.$targetAlias.($targetClassLabels != null ? ':' . \implode(':', $targetClassLabels) : '').') ';
         $cypher .= 'RETURN '.$targetAlias;
 
         $params = ['id' => (int) $sourceEntityId];
@@ -237,7 +237,7 @@ private function getSimpleRelationshipCollectionStatement($alias, $sourceEntity)
         $relationshipMeta = $this->_classMetadata->getRelationship($alias);
         $relAlias = $relationshipMeta->getAlias();
         $targetMetadata = $this->_em->getClassMetadataFor($relationshipMeta->getTargetEntity());
-        $targetClassLabel = $targetMetadata->getLabel();
+        $targetClassLabels = $targetMetadata->getLabels();
         $targetAlias = $targetMetadata->getEntityAlias();
         $sourceEntityId = $this->_classMetadata->getIdValue($sourceEntity);
         $relationshipType = $relationshipMeta->getType();
@@ -248,7 +248,7 @@ private function getSimpleRelationshipCollectionStatement($alias, $sourceEntity)
         $relPattern = sprintf('%s-[%s:`%s`]-%s', $isIncoming, $relAlias, $relationshipType, $isOutgoing);
 
         $cypher = 'MATCH (n) WHERE id(n) = {id} ';
-        $cypher .= 'MATCH (n)'.$relPattern.'('.$targetAlias.($targetClassLabel != null ? ':' . $targetClassLabel : '').') ';
+        $cypher .= 'MATCH (n)'.$relPattern.'('.$targetAlias.($targetClassLabels != null ? ':' . \implode(':', $targetClassLabels) : '').') ';
         $cypher .= 'RETURN '.$targetAlias.' AS '.$targetAlias.' ';
 
         if ($relationshipMeta->hasOrderBy()) {
@@ -263,8 +263,8 @@ private function getSimpleRelationshipCollectionStatement($alias, $sourceEntity)
     private function getMatchOneByIdCypher($id)
     {
         $identifier = $this->_classMetadata->getEntityAlias();
-        $label = $this->_classMetadata->getLabel();
-        $cypher = 'MATCH ('.$identifier.':`'.$label.'`) WHERE id('.$identifier.') = {id} RETURN '.$identifier;
+        $labels = $this->_classMetadata->getLabels();
+        $cypher = 'MATCH ('.$identifier.':`'.\implode('`:`', $labels).'`) WHERE id('.$identifier.') = {id} RETURN '.$identifier;
         $params = ['id' => (int) $id];
 
         return Statement::create($cypher, $params);
@@ -274,11 +274,11 @@ private function getDegreeStatement($alias, $sourceEntity)
     {
         $relationshipMeta = $this->_classMetadata->getRelationship($alias);
         $relAlias = $relationshipMeta->getAlias();
-        $targetClassLabel = '';
+        $targetClassLabels = '';
         if ($relationshipMeta->isRelationshipEntity() === false && $relationshipMeta->isTargetEntity() === true) {
             $targetMetadata = $this->_em->getClassMetadataFor($relationshipMeta->getTargetEntity());
-            if ($targetMetadata->getLabel() != null) {
-                $targetClassLabel = ':'.$targetMetadata->getLabel();
+            if ($targetMetadata->getLabels() != null) {
+                $targetClassLabels = ':'. \implode(':', $targetMetadata->getLabels());
             }
         }
         $sourceEntityId = $this->_classMetadata->getIdValue($sourceEntity);
@@ -290,7 +290,7 @@ private function getDegreeStatement($alias, $sourceEntity)
         $relPattern = sprintf('%s-[:`%s`]-%s', $isIncoming, $relationshipType, $isOutgoing);
 
         $cypher  = 'MATCH (n) WHERE id(n) = {id} ';
-        $cypher .= 'RETURN size((n)'.$relPattern.'('.$targetClassLabel.')) ';
+        $cypher .= 'RETURN size((n)'.$relPattern.'('.$targetClassLabels.')) ';
         $cypher .= 'AS '.$alias;
 
         return Statement::create($cypher, ['id' => $sourceEntityId]);

diff --git a/tests/Community/Issue103/Context.php b/tests/Community/Issue103/Context.php
@@ -6,7 +6,7 @@
 use GraphAware\Neo4j\OGM\Annotations as OGM;
 
 /**
- * @OGM\Node(label="Context")
+ * @OGM\Node(labels={"Context"})
  */
 class Context
 {

diff --git a/tests/Community/Issue103/Entity.php b/tests/Community/Issue103/Entity.php
@@ -6,7 +6,7 @@
 use GraphAware\Neo4j\OGM\Annotations as OGM;
 
 /**
- * @OGM\Node(label="Entity")
+ * @OGM\Node(labels={"Entity"})
  */
 class Entity
 {

diff --git a/tests/Community/Issue21/TestUser.php b/tests/Community/Issue21/TestUser.php
@@ -17,7 +17,7 @@
 /**
  * Class TestUser.
  *
- * @OGM\Node(label="TestUser")
+ * @OGM\Node(labels={"TestUser"})
  */
 class TestUser implements \JsonSerializable
 {

diff --git a/tests/Integration/Convert/TimestampConverterIntegrationTest.php b/tests/Integration/Convert/TimestampConverterIntegrationTest.php
@@ -113,7 +113,7 @@ public function testTimestampOnRelationshipEntityIsConverted()
  * Class TimestampConverterEntity
  * @package GraphAware\Neo4j\OGM\Tests\Integration\Convert
  *
- * @OGM\Node(label="Entity")
+ * @OGM\Node(labels={"Entity"})
  */
 class TimestampConverterEntity
 {

diff --git a/tests/Integration/Models/Base/User.php b/tests/Integration/Models/Base/User.php
@@ -16,7 +16,7 @@
 /**
  * Class User.
  *
- * @OGM\Node(label="User")
+ * @OGM\Node(labels={"User"})
  */
 class User
 {

diff --git a/tests/Integration/Models/BooleanLabel/BlogPost.php b/tests/Integration/Models/BooleanLabel/BlogPost.php
@@ -16,7 +16,7 @@
 /**
  * Class BlogPost.
  *
- * @OGM\Node(label="BlogPost")
+ * @OGM\Node(labels={"BlogPost"})
  */
 class BlogPost
 {

diff --git a/tests/Integration/Models/EntityWithSimpleRelationship/Car.php b/tests/Integration/Models/EntityWithSimpleRelationship/Car.php
@@ -16,7 +16,7 @@
 /**
  * Class Car.
  *
- * @OGM\Node(label="Car")
+ * @OGM\Node(labels={"Car"})
  */
 class Car
 {

diff --git a/tests/Integration/Models/EntityWithSimpleRelationship/ModelNumber.php b/tests/Integration/Models/EntityWithSimpleRelationship/ModelNumber.php
@@ -16,7 +16,7 @@
 /**
  * Class ModelNumber.
  *
- * @OGM\Node(label="ModelNumber")
+ * @OGM\Node(labels={"ModelNumber"})
  */
 class ModelNumber
 {

diff --git a/tests/Integration/Models/EntityWithSimpleRelationship/Person.php b/tests/Integration/Models/EntityWithSimpleRelationship/Person.php
@@ -16,7 +16,7 @@
 /**
  * Class Person.
  *
- * @OGM\Node(label="Person")
+ * @OGM\Node(labels={"Person"})
  */
 class Person
 {

diff --git a/tests/Integration/Models/ManyToManyRelationship/Group.php b/tests/Integration/Models/ManyToManyRelationship/Group.php
@@ -17,7 +17,7 @@
 /**
  * Class Group.
  *
- * @OGM\Node(label="Group")
+ * @OGM\Node(labels={"Group"})
  */
 class Group
 {

diff --git a/tests/Integration/Models/ManyToManyRelationship/User.php b/tests/Integration/Models/ManyToManyRelationship/User.php
@@ -17,7 +17,7 @@
 /**
  * Class User.
  *
- * @OGM\Node(label="User")
+ * @OGM\Node(labels={"User"})
  */
 class User
 {

diff --git a/tests/Integration/Models/ManyToOne/Bag.php b/tests/Integration/Models/ManyToOne/Bag.php
@@ -8,7 +8,7 @@
  * Class Bag
  * @package GraphAware\Neo4j\OGM\Tests\Integration\Models\ManyToOne
  *
- * @OGM\Node(label="Bag")
+ * @OGM\Node(labels={"Bag"})
  */
 class Bag
 {

diff --git a/tests/Integration/Models/ManyToOne/Woman.php b/tests/Integration/Models/ManyToOne/Woman.php
@@ -8,7 +8,7 @@
  * Class Woman
  * @package GraphAware\Neo4j\OGM\Tests\Integration\Models\ManyToOne
  *
- * @OGM\Node(label="Woman")
+ * @OGM\Node(labels={"Woman"})
  */
 class Woman
 {

diff --git a/tests/Integration/Models/MoviesDemo/Movie.php b/tests/Integration/Models/MoviesDemo/Movie.php
@@ -17,7 +17,7 @@
 /**
  * Class Movie.
  *
- * @OGM\Node(label="Movie", repository="GraphAware\Neo4j\OGM\Tests\Integration\Repository\MoviesCustomRepository")
+ * @OGM\Node(labels={"Movie"}, repository="GraphAware\Neo4j\OGM\Tests\Integration\Repository\MoviesCustomRepository")
  */
 class Movie
 {

diff --git a/tests/Integration/Models/MoviesDemo/Person.php b/tests/Integration/Models/MoviesDemo/Person.php
@@ -17,7 +17,7 @@
 /**
  * Class Person.
  *
- * @OGM\Node(label="Person")
+ * @OGM\Node(labels={"Person"})
  */
 class Person
 {