[zen-60] Make doctrine/common an optional dependency

- Marked doctrine/common via require-dev and suggests in composer.json
- Updated travis config to pass --dev flag to composer
- Added test constant flags to test configuration to skip annotation
  tests unless flag is true

.travis.yml

@@ -8,7 +8,7 @@ php:
 before_install:
  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
  - curl -s http://getcomposer.org/installer | php
- - php composer.phar install
+ - php composer.phar install --dev
 
 script:
  - php ./tests/run-tests.php

composer.json

@@ -9,9 +9,14 @@
     "homepage": "http://framework.zend.com/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
         "doctrine/common": ">=2.1"
     },
+    "suggest": {
+        "doctrine/common": "Doctrine\\Common >=2.1 for annotation features"
+    },
     "autoload": {
         "psr-0": {
             "Zend": "library/"

tests/TestConfiguration.php.dist

@@ -65,6 +65,14 @@ defined('TESTS_ZEND_CACHE_MEMCACHED_ENABLED') || define('TESTS_ZEND_CACHE_MEMCAC
 defined('TESTS_ZEND_CACHE_MEMCACHED_HOST') || define('TESTS_ZEND_CACHE_MEMCACHED_HOST', '127.0.0.1');
 defined('TESTS_ZEND_CACHE_MEMCACHED_PORT') || define('TESTS_ZEND_CACHE_MEMCACHED_PORT', 11211);
 
+/**
+ * Zend\Code\Annotation
+ *
+ * Enable this if you have installed Doctrine\Common on the include_path or via
+ * composer.
+ */
+defined('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT') || define('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT', false);
+
 /**
  * Zend\Config
  */
@@ -181,6 +189,14 @@ defined('TESTS_ZEND_FEED_PUBSUBHUBBUB_BASEURI') || define('TESTS_ZEND_FEED_PUBSU
  */
 defined('TESTS_ZEND_FEED_READER_ONLINE_ENABLED') || define('TESTS_ZEND_FEED_READER_ONLINE_ENABLED', false);
 
+/**
+ * Zend\Form\Annotation
+ *
+ * Enable this if you have installed Doctrine\Common on the include_path or via
+ * composer.
+ */
+defined('TESTS_ZEND_FORM_ANNOTATION_SUPPORT') || define('TESTS_ZEND_FORM_ANNOTATION_SUPPORT', false);
+
 /**
  * Zend\GData tests
  *

tests/TestConfiguration.php.travis

@@ -17,15 +17,25 @@
  * Never commit passwords to the source code repository.
  */
 
+/**
+ * Zend\Code\Annotation
+ */
+defined('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT') || define('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT', true);
+
 /**
  * Zend\Auth\Adapter\DbTable tests
  */
 defined('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_ENABLED') || define('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_ENABLED', true);
 
+/**
+ * Zend\Form\Annotation
+ */
+defined('TESTS_ZEND_FORM_ANNOTATION_SUPPORT') || define('TESTS_ZEND_FORM_ANNOTATION_SUPPORT', true);
+
 /**
  * Zend\Cache\Storage\Adapter
  */
 defined('TESTS_ZEND_CACHE_APC_ENABLED') || define('TESTS_ZEND_CACHE_APC_ENABLED', true);
 defined('TESTS_ZEND_CACHE_SQLITE_ENABLED') || define('TESTS_ZEND_CACHE_SQLITE_ENABLED', true);
 
-require_once __DIR__ . '/TestConfiguration.php.dist';
+require_once __DIR__ . '/TestConfiguration.php.dist';

tests/Zend/Code/Annotation/AnnotationManagerTest.php

@@ -29,6 +29,12 @@ class AnnotationManagerTest extends TestCase
 {
     public function setUp()
     {
+        if (!defined('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT')
+            || !constant('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT')
+        ) {
+            $this->markTestSkipped('Enable TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT to test doctrine annotation parsing');
+        }
+
         $this->manager = new Annotation\AnnotationManager();
     }
 

tests/Zend/Code/Annotation/DoctrineAnnotationParserTest.php

@@ -29,6 +29,12 @@ class DoctrineAnnotationParserTest extends TestCase
 {
     public function setUp()
     {
+        if (!defined('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT')
+            || !constant('TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT')
+        ) {
+            $this->markTestSkipped('Enable TESTS_ZEND_CODE_ANNOTATION_DOCTRINE_SUPPORT to test doctrine annotation parsing');
+        }
+
         $this->parser = new Annotation\Parser\DoctrineAnnotationParser();
     }
 

tests/Zend/Form/Annotation/AnnotationBuilderTest.php

@@ -27,6 +27,16 @@
 
 class AnnotationBuilderTest extends TestCase
 {
+    public function setUp()
+    {
+        if (!defined('TESTS_ZEND_FORM_ANNOTATION_SUPPORT')
+            || !constant('TESTS_ZEND_FORM_ANNOTATION_SUPPORT')
+        ) {
+            $this->markTestSkipped('Enable TESTS_ZEND_FORM_ANNOTATION_SUPPORT to test annotation parsing');
+        }
+
+    }
+
     public function testCanCreateFormFromStandardEntity()
     {
         $entity  = new TestAsset\Annotation\Entity();