Merge 5a3d9e7 into e448283

zendframework · Jul 1, 2013 · 3d8bcab · 3d8bcab
2 parents e448283 + 5a3d9e7
commit 3d8bcab
Show file tree

Hide file tree

Showing 130 changed files with 5,157 additions and 1,967 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1 @@
+src_dir: library
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,9 @@ before_install:
 script:
  - ant travis -keep-going
 
+after_script:
+  - php vendor/bin/coveralls
+
 notifications:
   irc: "irc.freenode.org#zftalk.dev"
   email: false
diff --git a/README.md b/README.md
@@ -1,17 +1,21 @@
-### Welcome to the *Zend Framework 2.2* Release!
+### Welcome to the *Zend Framework 2.3* Release!
 
-Master: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=master)](http://travis-ci.org/zendframework/zf2)
-Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=develop)](http://travis-ci.org/zendframework/zf2)
+Master:
+[![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=master)](http://travis-ci.org/zendframework/zf2)
+[![Coverage Status](https://coveralls.io/repos/zendframework/zf2/badge.png?branch=master)](https://coveralls.io/r/zendframework/zf2)
+Develop:
+[![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=develop)](http://travis-ci.org/zendframework/zf2)
+[![Coverage Status](https://coveralls.io/repos/zendframework/zf2/badge.png?branch=develop)](https://coveralls.io/r/zendframework/zf2)
 
 ## RELEASE INFORMATION
 
-*Zend Framework 2.2.2dev*
+*Zend Framework 2.3.0dev*
 
-This is the second maintenance release for the 2.2 series.
+This is the third minor (feature) release for the version 2 series.
 
 DD MMM YYYY
 
-### UPDATES IN 2.2.2
+### UPDATES IN 2.3.0
 
 Please see [CHANGELOG.md](CHANGELOG.md).
 

diff --git a/build.xml b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="ZF2" default="build">
-    <target name="travis" depends="tests-parallel,show-test-results" />
+    <target name="travis" depends="tests-parallel,merge-clover,show-test-results" />
 
     <target name="clean" description="Cleanup build artifacts">
         <delete dir="${basedir}/build"/>
@@ -9,6 +9,8 @@
     <target name="prepare" depends="clean" description="Prepare for build">
         <mkdir dir="${basedir}/build/test-results"/>
         <mkdir dir="${basedir}/build/cs-results"/>
+        <mkdir dir="${basedir}/build/coverage"/>
+        <mkdir dir="${basedir}/build/logs"/>
     </target>
 
     <target name="get-cs-fixer" depends="clean" description="Get coding standards fixer">
@@ -24,14 +26,30 @@
                 <arg value="--version" />
             </exec>
             <exec executable="composer" failonerror="true">
-                <env key="COMPOSER_ROOT_VERSION" value="dev-master"/>
+                <env key="COMPOSER_ROOT_VERSION" value="dev-develop"/>
                 <arg value="install" />
                 <arg value="--dev" />
                 <arg value="--prefer-source" />
             </exec>
         </sequential>
     </target>
 
+    <target name="merge-clover" description="Merges the individual clover reports of each component into a single clover.xml">
+        <sequential>
+            <exec executable="php" failonerror="true">
+                <arg value="-d" />
+                <arg value="memory_limit=-1" />
+                <arg value="vendor/bin/phpcov.php" />
+                <arg value="--merge" />
+                <arg value="--clover" />
+                <arg value="${basedir}/build/logs/clover.xml" />
+                <arg value="--whitelist" />
+                <arg value="${basedir}/library" />
+                <arg value="${basedir}/build/coverage" />
+            </exec>
+        </sequential>
+    </target>
+
     <target
         name="tests-parallel"
         depends="prepare,composer-install,get-cs-fixer"
@@ -119,6 +137,8 @@
             >
                 <arg value="-c" />
                 <arg value="${basedir}/tests/phpunit.xml.dist" />
+                <arg value="--coverage-php" />
+                <arg value="${basedir}/build/coverage/coverage-@{component}.cov" />
                 <arg value="${basedir}/tests/ZendTest/@{component}" />
             </exec>
         </sequential>

diff --git a/composer.json b/composer.json
@@ -8,6 +8,27 @@
     ],
     "homepage": "http://framework.zend.com/",
     "license": "BSD-3-Clause",
+    "repositories": [
+        {
+            "type": "package",
+            "package": {
+                "name": "sebastianbergmann/phpcov",
+                "version": "1.1.0",
+                "dist": {
+                    "url": "https://github.com/sebastianbergmann/phpcov/archive/1.1.0.zip",
+                    "type": "zip"
+                },
+                "source": {
+                    "url": "https://github.com/sebastianbergmann/phpcov.git",
+                    "type": "git",
+                    "reference": "1.1.0"
+                },
+                "bin": [
+                    "phpcov.php"
+                ]
+            }
+        }
+    ],
     "require": {
         "php": ">=5.3.3"
     },
@@ -16,7 +37,9 @@
         "ircmaxell/random-lib": "dev-master",
         "ircmaxell/security-lib": "dev-master",
         "ocramius/proxy-manager": "0.4.*",
-        "phpunit/PHPUnit": "3.7.*"
+        "phpunit/PHPUnit": "3.7.*",
+        "satooshi/php-coveralls": "dev-master",
+        "sebastianbergmann/phpcov": "1.1.0"
     },
     "suggest": {
         "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",

diff --git a/library/Zend/Authentication/composer.json b/library/Zend/Authentication/composer.json
@@ -16,11 +16,23 @@
         "php": ">=5.3.3",
         "zendframework/zend-stdlib": "self.version"
     },
+    "require-dev": {
+        "zendframework/zend-db": "self.version",
+        "zendframework/zend-crypt": "self.version",
+        "zendframework/zend-http": "self.version",
+        "zendframework/zend-ldap": "self.version",
+        "zendframework/zend-session": "self.version",
+        "zendframework/zend-validator": "self.version",
+        "zendframework/zend-uri": "self.version"
+    },
     "suggest": {
         "zendframework/zend-db": "Zend\\Db component",
         "zendframework/zend-crypt": "Zend\\Crypt component",
+        "zendframework/zend-http": "Zend\\Http component",
+        "zendframework/zend-ldap": "Zend\\Ldap component",
+        "zendframework/zend-session": "Zend\\Session component",
         "zendframework/zend-uri": "Zend\\Uri component",
-        "zendframework/zend-session": "Zend\\Session component"
+        "zendframework/zend-validator": "Zend\\Validator component"
     },
     "extra": {
         "branch-alias": {

diff --git a/library/Zend/Barcode/composer.json b/library/Zend/Barcode/composer.json
@@ -17,9 +17,12 @@
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {
+        "zendframework/zend-servicemanager": "self.version",
+        "zendframework/zend-validator": "self.version",
         "zendframework/zendpdf": "*"
     },
     "suggest": {
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
         "zendframework/zend-validator": "Zend\\Validator component",
         "zendframework/zendpdf": "ZendPdf component"
     },