Changeset 155

Show
Ignore:
Timestamp:
01/25/07 21:53:23 (2 years ago)
Author:
mikey
Message:

fixed a bunch of E_NOTICE errors

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r97 r155  
    179179    public static function has($comment, $annotationName, $target, $targetName) 
    180180    { 
     181        $annotation = null; 
    181182        try { 
    182183            $annotation = self::create($comment, $annotationName, $target, $targetName); 
    183184        } catch (ReflectionException $e) { 
    184185        } 
    185         return ($annotation != null); 
     186         
     187        return (null != $annotation); 
    186188    } 
    187189} 

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

    r135 r155  
    5050        $this->opts = array_merge($this->defaultOpts, $opts); 
    5151 
    52         $this->serializeDispatcher($data, $xmlWriter, $this->opts[self::OPT_ROOT_TAG]); 
     52        $this->serializeDispatcher($data, $xmlWriter, ((isset($this->opts[self::OPT_ROOT_TAG]) == true) ? ($this->opts[self::OPT_ROOT_TAG]) : (null))); 
    5353    } 
    5454 

  • trunk/src/main/php/net/stubbles/xml/stubLibXmlXMLStreamWriter.php

    r129 r155  
    3434        $this->writer = new XMLWriter(); 
    3535        $this->writer->openMemory(); 
    36         $this->writer->startDocument($version, $encoding); 
     36        $this->writer->startDocument($xmlVersion, $encoding); 
    3737        $this->writer->setIndent(false); 
    3838    } 

  • trunk/src/test/php/net/stubbles/events/stubEventDispatcherTestCase.php

    r98 r155  
    259259        $this->eventDispatcher->register($testlistener, 'onCanceledQueuedEvent'); 
    260260        $this->assertNull($testlistener->getEvent()); 
    261         $this->assertEqual(stubEventDispatcher::countQueuedEvents(), 0); 
     261        $this->assertEqual($this->eventDispatcher->countQueuedEvents(), 0); 
    262262    } 
    263263     

  • trunk/src/test/php/net/stubbles/ipo/session/stubPHPSessionTestCase.php

    r154 r155  
    5656        $line; 
    5757        if (headers_sent($file, $line) == true) { 
    58             echo 'Headers already send in ' . $file . ' on line ' . $line; 
     58            echo 'Headers already send in ' . $file . ' on line ' . $line . ', skipped stubPHPSessionTestCase::testRegenerateId()'; 
    5959            return; 
    6060        } 

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

    r98 r155  
    5050        $this->assertTrue($this->stubRefFunction1->equals($stubRefFunction)); 
    5151        $this->assertTrue($stubRefFunction->equals($this->stubRefFunction1)); 
    52         $this->assertFalse($this->stubRefFunction1->equals($this->stubRefClass2)); 
     52        $this->assertFalse($this->stubRefFunction1->equals($this->stubRefFunction2)); 
    5353        $this->assertFalse($this->stubRefFunction1->equals('foo')); 
    5454        $this->assertFalse($this->stubRefFunction2->equals($this->stubRefFunction1)); 
    55         $this->assertFalse($this->stubRefFunction2->equals($stubRefClass1)); 
     55        $this->assertFalse($this->stubRefFunction2->equals($stubRefFunction)); 
    5656    } 
    5757