Merge branch 'master' into feature/db-story-35

[zen-35]

Conflicts:
	library/Zend/Db/Sql/Select.php
	tests/Zend/Db/Sql/SelectTest.php

.travis/run-tests.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+travisdir=$(dirname $(readlink /proc/$$/fd/255))
+testdir="$travisdir/../tests"
+testedcomponents=(`cat "$travisdir/tested-components"`)
+result=0
+
+for tested in "${testedcomponents[@]}"
+    do
+        echo "$tested:"
+        phpunit -c $testdir/phpunit.xml $testdir/$tested
+        let "result = $result || $?"
+done
+
+exit $result

.travis/skipped-components

@@ -0,0 +1,9 @@
+Zend/Amf
+Zend/Barcode
+Zend/Date
+Zend/Feed
+Zend/Queue
+Zend/Service
+Zend/Test
+Zend/Translator
+Zend/Wildfire

.travis/tested-components

@@ -0,0 +1,58 @@
+Zend/Acl
+Zend/Authentication
+Zend/Cache
+Zend/Captcha
+Zend/Cloud
+Zend/Code
+Zend/Config
+Zend/Console
+Zend/Crypt
+Zend/Currency
+Zend/Db
+Zend/Di
+Zend/Docbook
+Zend/Dojo
+Zend/Dom
+Zend/EventManager
+Zend/Feed/Reader
+Zend/Feed/Writer
+Zend/File
+Zend/Filter
+Zend/Form
+Zend/GData
+Zend/Http
+Zend/InfoCard
+Zend/Json
+Zend/Ldap
+Zend/Loader
+Zend/Locale
+Zend/Log
+Zend/Mail
+Zend/Markup
+Zend/Measure
+Zend/Memory
+Zend/Mime
+Zend/Module
+Zend/Mvc
+Zend/Navigation
+Zend/OAuth
+Zend/OpenId
+Zend/Paginator
+Zend/Pdf
+Zend/ProgressBar
+Zend/RegistryTest.php
+Zend/Rest
+Zend/Search
+Zend/Serializer
+Zend/Server
+Zend/Session
+Zend/Soap
+Zend/Stdlib
+Zend/Tag
+Zend/Text
+Zend/TimeSync
+Zend/Uri
+Zend/Validator
+Zend/VersionTest.php
+Zend/View
+Zend/XmlRpc

src/Definition/CompilerDefinition.php

@@ -5,6 +5,7 @@
 use Zend\Code\Scanner\DerivedClassScanner,
     Zend\Code\Scanner\AggregateDirectoryScanner,
     Zend\Code\Scanner\DirectoryScanner,
+    Zend\Code\Scanner\FileScanner,
 
     Zend\Di\Definition\Annotation,
     Zend\Code\Annotation\AnnotationManager,
@@ -107,6 +108,19 @@ protected function processClass($class)
             }
         }
 
+        $rTarget = $rClass;
+        $supertypes = array();
+        do {
+            $supertypes = array_merge($supertypes, $rTarget->getInterfaceNames());
+            if (!($rTargetParent = $rTarget->getParentClass())) {
+                break;
+            }
+            $supertypes[] = $rTargetParent->getName();
+            $rTarget = $rTargetParent;
+        } while (true);
+
+        $def['supertypes'] = $supertypes;
+
         if ($def['instantiator'] == null) {
             if ($rClass->isInstantiable()) {
                 $def['instantiator'] = '__construct';
@@ -395,7 +409,7 @@ public function hasClass($class)
      */
     public function getClassSupertypes($class)
     {
-        if (!array_key_exists($class, $this->classes[$class])) {
+        if (!array_key_exists($class, $this->classes)) {
             $this->processClass($class);
         }
         return $this->classes[$class]['supertypes'];

src/Definition/RuntimeDefinition.php

@@ -105,7 +105,7 @@ public function hasClass($class)
      */
     public function getClassSupertypes($class)
     {
-        if (!array_key_exists($class, $this->classes[$class])) {
+        if (!array_key_exists($class, $this->classes)) {
             $this->processClass($class);
         }
         return $this->classes[$class]['supertypes'];

test/Definition/CompilerDefinitionTest.php

@@ -4,6 +4,7 @@
 
 use Zend\Di\Definition\CompilerDefinition,
     Zend\Code\Scanner\DirectoryScanner,
+    Zend\Code\Scanner\FileScanner,
     PHPUnit_Framework_TestCase as TestCase;
 
 class CompilerDefinitionTest extends TestCase
@@ -42,4 +43,40 @@ public function testCompilerCompilesAgainstConstructorInjectionAssets()
             $definition->getMethodParameters('ZendTest\Di\TestAsset\CompilerClasses\C', 'setB')
         );
     }
+
+    public function testCompilerSupertypes()
+    {
+        $definition = new CompilerDefinition;
+        $definition->addDirectory(__DIR__ . '/../TestAsset/CompilerClasses');
+        $definition->compile();
+        $this->assertCount(0, $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\C'));
+        $this->assertCount(1, $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\D'));
+        $this->assertCount(2, $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\D'));
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\D', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
+    }
+
+    public function testCompilerDirectoryScannerAndFileScanner()
+    {
+        $definition = new CompilerDefinition;
+        $definition->addDirectoryScanner(new DirectoryScanner(__DIR__ . '/../TestAsset/CompilerClasses'));
+        $definition->addCodeScannerFile(new FileScanner(__DIR__ . '/../TestAsset/CompilerClasses/A.php'));
+        $definition->compile();
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\D'));
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\D', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
+    }
+
+    public function testCompilerFileScanner()
+    {
+        $definition = new CompilerDefinition;
+        $definition->addCodeScannerFile(new FileScanner(__DIR__ . '/../TestAsset/CompilerClasses/C.php'));
+        $definition->addCodeScannerFile(new FileScanner(__DIR__ . '/../TestAsset/CompilerClasses/D.php'));
+        $definition->addCodeScannerFile(new FileScanner(__DIR__ . '/../TestAsset/CompilerClasses/E.php'));
+        $definition->compile();
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\D'));
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
+        $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\D', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
+    }
 }

test/TestAsset/CompilerClasses/E.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace ZendTest\Di\TestAsset\CompilerClasses;
+
+class E extends D
+{
+
+}