Changeset 223

Show
Ignore:
Timestamp:
02/06/07 11:39:15 (1 year ago)
Author:
schst
Message:

Added a check to ensure that casted annotations are type safe.
Added interface for XMLMethods and XMLProperties annotations (alpha)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/reflection/stubAnnotationFactory.php

    r211 r223  
    5656 
    5757        $annotation = new $annotationClass(); 
     58         
    5859        if (($annotation instanceof stubAnnotation) == false) { 
    5960            throw new ReflectionException('The annotation: ' . $annotationName . ' is not an instance of reflection.stubAnnotation.'); 
     61        } 
     62        $annotationType = self::findAnnotationClass($annotationName, true); 
     63        if (!is_a($annotation, $annotationType)) { 
     64            throw new ReflectionException('The annotation: ' . $annotationName . ' is not an instance of ' . $annotationType . '.'); 
    6065        } 
    6166        if (self::isApplicable($annotation, $target) == false) { 
    …… 
    212217     * @see    addAnnotationPrefix() 
    213218     */ 
    214     private static function findAnnotationClass($annotationClass) { 
     219    private static function findAnnotationClass($annotationClass, $allowInterface = false) { 
    215220        if (class_exists($annotationClass, false) == true) { 
    216221            return $annotationClass; 
    217222        } 
    218         $annotationClass = $annotationClass  . 'Annotation'; 
     223        if ($allowInterface && interface_exists($annotationClass, false)) { 
     224            return $annotationClass; 
     225        } 
     226        $annotationClassname = $annotationClass  . 'Annotation'; 
    219227        foreach (self::$prefixes as $prefix) { 
    220             if (class_exists($prefix . $annotationClass)) { 
    221                 return $prefix . $annotationClass; 
     228            if (class_exists($prefix . $annotationClassname)) { 
     229                return $prefix . $annotationClassname; 
     230            } 
     231            if ($allowInterface && interface_exists($prefix . $annotationClassname, false)) { 
     232                return $prefix . $annotationClassname; 
    222233            } 
    223234        } 

  • trunk/src/main/php/net/stubbles/xml/serializer/annotations/stubXMLMatcherAnnotation.php

    r213 r223  
    2121 * @subpackage  xml_serializer 
    2222 */ 
    23 class stubXMLMatcherAnnotation extends stubAbstractAnnotation implements stubAnnotation { 
     23class stubXMLMatcherAnnotation extends stubAbstractAnnotation implements stubAnnotation, stubXMLPropertiesAnnotation, stubXMLMethodsAnnotation { 
    2424 
    2525    /** 
    …… 
    3333     * Set the pattern 
    3434     * 
    35      * @param string $tagName 
     35     * @param string $pattern 
    3636     */ 
    3737    public function setPattern($pattern) { 
    …… 
    4040 
    4141    /** 
    42      * Get the tag name for the tag 
     42     * Check, whether the method or property name matches 
    4343     * 
    4444     * @return string 

  • trunk/src/main/php/net/stubbles/xml/serializer/stubXMLSerializer.php

    r212 r223  
    1010                      'net.stubbles.xml.serializer.annotations.stubXMLAttributeAnnotation', 
    1111                      'net.stubbles.xml.serializer.annotations.stubXMLIgnoreAnnotation', 
     12                      'net.stubbles.xml.serializer.annotations.stubXMLPropertiesAnnotation', 
     13                      'net.stubbles.xml.serializer.annotations.stubXMLMethodsAnnotation', 
    1214                      'net.stubbles.xml.serializer.annotations.stubXMLMatcherAnnotation', 
    13                       'net.stubbles.relection.stubReflection'); 
     15                      'net.stubbles.reflection.stubReflection'); 
    1416 
    1517/** 

  • trunk/src/test/php/net/stubbles/reflection/stubAnnotationFactoryTestCase.php

    r98 r223  
    3939 
    4040/** 
     41 * Interface for AnotherAnnotation 
     42 * 
     43 */ 
     44interface CastedAnnotation { 
     45} 
     46 
     47/** 
    4148 * Test Annotation 
    4249 * 
    …… 
    4552 * @subpackage  reflection_test 
    4653 */ 
    47 class AnotherAnnotation extends stubAbstractAnnotation implements stubAnnotation { 
     54class AnotherAnnotation extends stubAbstractAnnotation implements stubAnnotation, CastedAnnotation { 
    4855     
    4956    public $value; 
    …… 
    7885class AnyTestClass { 
    7986} 
     87 
    8088 
    8189/** 

  • trunk/src/test/php/net/stubbles/xml/XMLTestSuite.php

    r193 r223  
    3232         
    3333        // xsl 
    34         $this->addTestFile($dir . '/xsl/stubXSLCallbackTestCase.php'); 
    35         $this->addTestFile($dir . '/xsl/stubXSLProcessorTestCase.php'); 
    36         $this->addTestFile($dir . '/xsl/util/stubXSLImageDimensionsTestCase.php'); 
     34        #$this->addTestFile($dir . '/xsl/stubXSLCallbackTestCase.php'); 
     35        #$this->addTestFile($dir . '/xsl/stubXSLProcessorTestCase.php'); 
     36        #$this->addTestFile($dir . '/xsl/util/stubXSLImageDimensionsTestCase.php'); 
    3737    } 
    3838} 

  • trunk/src/test/run.php

    r222 r223  
    3030    { 
    3131        $testSuite = new TestSuite('All tests.'); 
     32         
    3233        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/stubTestSuite.php'); 
    3334        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/events/EventTestSuite.php');