Merged Source/Master

zendframework · Mar 13, 2013 · 21a09bf · 21a09bf
commit 21a09bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -35,8 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

diff --git a/test/ImageTest.php b/test/ImageTest.php
@@ -131,6 +131,11 @@ public function testCaptchaImageCleanup()
      */
     public function testCaptchaImageCleanupOnlyCaptchaFilesIdentifiedByTheirSuffix()
     {
+        if (!defined('TESTS_ZEND_CAPTCHA_GC')
+            || !constant('TESTS_ZEND_CAPTCHA_GC')
+        ) {
+            $this->markTestSkipped('Enable TESTS_ZEND_CAPTCHA_GC to run this test');
+        }
         $this->captcha->generate();
         $filename = $this->testDir . "/" . $this->captcha->getId() . ".png";
         $this->assertTrue(file_exists($filename));