Merge branch '2.0'

Author: sebastianbergmann

src/Framework/MockObject/Generator.php

@@ -547,6 +547,8 @@ public function generateClassFromWsdl($wsdlFile, $className, array $methods = ar
             $_methods = array_unique($client->__getFunctions());
             unset($client);
 
+            sort($_methods);
+
             $templateDir    = dirname(__FILE__) . DIRECTORY_SEPARATOR .
                               'Generator' . DIRECTORY_SEPARATOR;
             $methodTemplate = new Text_Template(

tests/MockObject/wsdl_class.phpt

@@ -23,15 +23,15 @@ class GoogleSearch extends \SoapClient
         parent::__construct('%s/GoogleSearch.wsdl', $options);
     }
 
-    public function doGetCachedPage($key, $url)
+    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
     {
     }
 
-    public function doSpellingSuggestion($key, $phrase)
+    public function doGetCachedPage($key, $url)
     {
     }
 
-    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
+    public function doSpellingSuggestion($key, $phrase)
     {
     }
 }

tests/MockObject/wsdl_class_namespace.phpt

@@ -25,15 +25,15 @@ class GoogleSearch extends \SoapClient
         parent::__construct('%s/GoogleSearch.wsdl', $options);
     }
 
-    public function doGetCachedPage($key, $url)
+    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
     {
     }
 
-    public function doSpellingSuggestion($key, $phrase)
+    public function doGetCachedPage($key, $url)
     {
     }
 
-    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
+    public function doSpellingSuggestion($key, $phrase)
     {
     }
 }