Make both TypeAnnotation and VarAnnotation classes available

Author: Alexander Obuhovich

src/annotations/AnnotationManager.php

@@ -92,7 +92,7 @@ class AnnotationManager
         'type'           => 'mindplay\annotations\standard\TypeAnnotation',
         'usage'          => 'mindplay\annotations\UsageAnnotation',
         'uses'           => false,
-        'var'            => 'mindplay\annotations\standard\TypeAnnotation',
+        'var'            => 'mindplay\annotations\standard\VarAnnotation',
         'version'        => false,
     );
 

src/annotations/standard/TypeAnnotation.php

@@ -13,89 +13,10 @@
 
 namespace mindplay\annotations\standard;
 
-use mindplay\annotations\Annotation;
-use mindplay\annotations\AnnotationException;
-use mindplay\annotations\AnnotationFile;
-use mindplay\annotations\IAnnotationFileAware;
-use mindplay\annotations\IAnnotationParser;
-
 /**
  * Specifies the required data-type of a property.
- *
- * @usage('property'=>true, 'inherited'=>true)
  */
-class TypeAnnotation extends Annotation implements IAnnotationParser, IAnnotationFileAware
+class TypeAnnotation extends VarAnnotation
 {
-    /**
-     * @var string Specifies the type of value (e.g. for validation, for
-     * parsing or conversion purposes; case insensitive)
-     *
-     * The following type-names are recommended:
-     *
-     *   bool
-     *   int
-     *   float
-     *   string
-     *   mixed
-     *   object
-     *   resource
-     *   array
-     *   callback (e.g. array($object|$class, $method') or 'function-name')
-     *
-     * The following aliases are also acceptable:
-     *
-     *   number (float)
-     *   res (resource)
-     *   boolean (bool)
-     *   integer (int)
-     *   double (float)
-     */
-    public $type;
-
-    /**
-     * Annotation file.
-     *
-     * @var AnnotationFile
-     */
-    protected $file;
-
-    /**
-     * Parse the standard PHP-DOC annotation
-     * @param string $value
-     * @return array
-     */
-    public static function parseAnnotation($value)
-    {
-        $parts = explode(' ', trim($value), 2);
-
-        return array('type' => array_shift($parts));
-    }
-
-    /**
-     * Initialize the annotation.
-     */
-    public function initAnnotation(array $properties)
-    {
-        $this->map($properties, array('type'));
-
-        parent::initAnnotation($properties);
-
-        if (!isset($this->type)) {
-            throw new AnnotationException('TypeAnnotation requires a type property');
-        }
-
-        $this->type = $this->file->resolveType($this->type);
-    }
 
-    /**
-     * Provides information about file, that contains this annotation.
-     *
-     * @param AnnotationFile $file Annotation file.
-     *
-     * @return void
-     */
-    public function setAnnotationFile(AnnotationFile $file)
-    {
-        $this->file = $file;
-    }
 }

src/annotations/standard/VarAnnotation.php

@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * This file is part of the php-annotation framework.
+ *
+ * (c) Rasmus Schultz <[email protected]>
+ *
+ * This software is licensed under the GNU LGPL license
+ * for more information, please see:
+ *
+ * <https://github.com/mindplay-dk/php-annotations>
+ */
+
+namespace mindplay\annotations\standard;
+
+use mindplay\annotations\Annotation;
+use mindplay\annotations\AnnotationException;
+use mindplay\annotations\AnnotationFile;
+use mindplay\annotations\IAnnotationFileAware;
+use mindplay\annotations\IAnnotationParser;
+
+/**
+ * Specifies the required data-type of a property.
+ *
+ * @usage('property'=>true, 'inherited'=>true)
+ */
+class VarAnnotation extends Annotation implements IAnnotationParser, IAnnotationFileAware
+{
+    /**
+     * @var string Specifies the type of value (e.g. for validation, for
+     * parsing or conversion purposes; case insensitive)
+     *
+     * The following type-names are recommended:
+     *
+     *   bool
+     *   int
+     *   float
+     *   string
+     *   mixed
+     *   object
+     *   resource
+     *   array
+     *   callback (e.g. array($object|$class, $method') or 'function-name')
+     *
+     * The following aliases are also acceptable:
+     *
+     *   number (float)
+     *   res (resource)
+     *   boolean (bool)
+     *   integer (int)
+     *   double (float)
+     */
+    public $type;
+
+    /**
+     * Annotation file.
+     *
+     * @var AnnotationFile
+     */
+    protected $file;
+
+    /**
+     * Parse the standard PHP-DOC annotation
+     * @param string $value
+     * @return array
+     */
+    public static function parseAnnotation($value)
+    {
+        $parts = explode(' ', trim($value), 2);
+
+        return array('type' => array_shift($parts));
+    }
+
+    /**
+     * Initialize the annotation.
+     */
+    public function initAnnotation(array $properties)
+    {
+        $this->map($properties, array('type'));
+
+        parent::initAnnotation($properties);
+
+        if (!isset($this->type)) {
+            throw new AnnotationException(basename(__CLASS__).' requires a type property');
+        }
+
+        $this->type = $this->file->resolveType($this->type);
+    }
+
+    /**
+     * Provides information about file, that contains this annotation.
+     *
+     * @param AnnotationFile $file Annotation file.
+     *
+     * @return void
+     */
+    public function setAnnotationFile(AnnotationFile $file)
+    {
+        $this->file = $file;
+    }
+}