Merge branch 'master' of git://github.com/zendframework/zf2

Conflicts: .gitignore
zendframework · Jul 29, 2011 · 6be22d9 · 6be22d9
commit 6be22d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/test/FigletTest.php b/test/FigletTest.php
@@ -87,7 +87,6 @@ public function testCaptchaHasIdAndInput()
     }
 
     /*
-     * @see ZF-8268
      * @group ZF-8268
      */
     public function testLabelIdIsCorrect()
@@ -100,7 +99,7 @@ public function testLabelIdIsCorrect()
         $expect = sprintf('for="comment-%s-input"', $this->element->getName());
         $this->assertRegexp("/<label [^>]*?$expect/", $html, $html);
     }
-    
+
     public function testTimeoutPopulatedByDefault()
     {
         $ttl = $this->captcha->getTimeout();
@@ -269,7 +268,7 @@ public function testIsValidShouldNotRequireValueToBeNestedArray()
         $input = array("id" => $this->captcha->getId(), "input" => $this->captcha->getWord());
         $this->assertTrue($this->element->isValid($input));
     }
-    
+
     /**
      * @group ZF-5728
      */

diff --git a/tools/phptools b/tools/phptools