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

…e_interfaces
zendframework · May 31, 2012 · 7645850 · 7645850
commit 7645850
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-travisdir=$(dirname $(readlink /proc/$$/fd/255))
+travisdir=$(dirname "$0")
 testdir="$travisdir/../tests"
 testedcomponents=(`cat "$travisdir/tested-components"`)
 result=0

diff --git a/.travis/skipped-components b/.travis/skipped-components
@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

diff --git a/.travis/tested-components b/.travis/tested-components
@@ -22,17 +22,19 @@ Zend/Form
 Zend/GData
 Zend/Http
 Zend/InfoCard
+Zend/InputFilter
 Zend/Json
 Zend/Ldap
 Zend/Loader
 Zend/Locale
 Zend/Log
 Zend/Mail
 Zend/Markup
+Zend/Math
 Zend/Measure
 Zend/Memory
 Zend/Mime
-Zend/Module
+Zend/ModuleManager
 Zend/Mvc
 Zend/Navigation
 Zend/OAuth

diff --git a/src/Container.php b/src/Container.php
@@ -367,7 +367,7 @@ public function __call($method, $arguments)
         throw new Exception\BadMethodCallException(
             sprintf(
                 'Bad method call: Unknown method %s::%s',
-                get_class($this),
+                get_called_class(),
                 $method
             )
         );

diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -1142,7 +1142,7 @@ public function toArray()
             'privilege' => $this->getPrivilege(),
             'active'    => $this->isActive(),
             'visible'   => $this->isVisible(),
-            'type'      => get_class($this),
+            'type'      => get_called_class(),
             'pages'     => parent::toArray(),
         ));
     }