annotations

Author: mrsuh

README.md

@@ -24,20 +24,20 @@ require 'vendor/autoload.php';
 
 use ODM\DBAL;
 use ODM\Document\Document;
-use ODM\DocumentMapper\DocumentManagerFactory;
+use ODM\DocumentManager\DocumentManagerFactory;
 
 /**
- * @ODM\Mapping\Annotator\Collection(name="alphabet")
+ * @Collection(name="alphabet")
  */
 class Alphabet extends Document {
 
     /**
-     * @ODM\Mapping\Annotator\Field(name="language", type="string")
+     * @Field(name="language", type="string")
      */
     private $language;
 
     /**
-     * @ODM\Mapping\Annotator\Field(name="words", type="Tests\Word[]")
+     * @Field(name="words", type="Tests\Word[]")
      */
     private $words;
 
@@ -91,7 +91,7 @@ class Alphabet extends Document {
 class Word {
 
     /**
-     * @ODM\Mapping\Annotator\Field(name="name", type="string")
+     * @Field(name="name", type="string")
      */
     private $name;
 

src/Document/Document.php

@@ -5,9 +5,9 @@
 class Document
 {
     /**
-     * @ODM\Mapping\Annotator\Field(name="_id", type="string")
+     * @Field(name="_id", type="string")
      */
-    private $id;
+    protected $id;
 
     /**
      * @return mixed

src/Mapping/Annotator/Annotator.php

@@ -38,7 +38,7 @@ public function __construct(Metadata $metadata)
         $this->parseCollection($metadata->getReflectionClass());
 
         foreach($metadata->getReflectionProperties() as $property) {
-            $this->parseFields($property);
+            $this->parseField($property);
         }
     }
 
@@ -48,7 +48,7 @@ public function __construct(Metadata $metadata)
      */
     private function parseCollection(\ReflectionClass $reflection_class)
     {
-        $pattern = '/@' . preg_quote(Collection::class) . '\((.*)\)/';
+        $pattern = '/@Collection\((.*)\)/';
         preg_match($pattern, $reflection_class->getDocComment(), $matches);
 
         $doc = array_key_exists(1, $matches) ? $matches[1] : '';
@@ -64,9 +64,9 @@ private function parseCollection(\ReflectionClass $reflection_class)
      * @param \ReflectionProperty $reflection_property
      * @return bool
      */
-    private function parseFields(\ReflectionProperty $reflection_property)
+    private function parseField(\ReflectionProperty $reflection_property)
     {
-        $pattern = '/@' . preg_quote(Field::class) . '\((.*)\)/';
+        $pattern = '/@Field\((.*)\)/';
         preg_match($pattern, $reflection_property->getDocComment(), $matches);
 
         $doc = array_key_exists(1, $matches) ? $matches[1] : '';

src/Mapping/Annotator/Collection.php

@@ -137,6 +137,9 @@ public function objectToArray($obj)
     private function typeCast(string $type, $value, int $to)
     {
         switch ($type) {
+            case 'bool':
+                $value = (bool)$value;
+                break;
             case 'integer':
                 $value = (integer)$value;
                 break;