Merge branch 'zf2phpunit35' of http://github.com/billkarwin/zf2 into …

…merges/karwin-phpunit35

Conflicts:
	library/Zend/Filter/Encrypt/Openssl.php
	library/Zend/Service/Akismet/Akismet.php
	library/Zend/Service/Amazon/Amazon.php
	library/Zend/Service/Amazon/Exception.php
	library/Zend/Service/Amazon/Query.php
	library/Zend/Service/Audioscrobbler/Audioscrobbler.php
	library/Zend/Service/SlideShare/Exception.php
	tests/Zend/Layout/FunctionalTest.php
	tests/Zend/Markup/ParserIntegrityTest.php
	tests/Zend/Server/ReflectionTest.php
	tests/Zend/Service/Akismet/AkismetTest.php
	tests/Zend/Service/Audioscrobbler/AlbumDataTest.php
	tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php
	tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php
	tests/Zend/Tag/ItemListTest.php
	tests/Zend/Tag/ItemTest.php
	tests/Zend/Text/MultiByteTest.php
	tests/Zend/Text/TableTest.php
	tests/Zend/Translate/Adapter/XmlTmTest.php
	tests/Zend/Validator/BarcodeTest.php
	tests/Zend/Validator/CallbackTest.php
	tests/Zend/Validator/File/FilesSizeTest.php
	tests/Zend/Validator/File/ImageSizeTest.php
	tests/Zend/Validator/File/SizeTest.php
	tests/Zend/Validator/File/UploadTest.php
	tests/Zend/Validator/File/WordCountTest.php
	tests/Zend/Validator/IbanTest.php
	tests/Zend/Validator/MessageTest.php
	tests/Zend/Validator/PostCodeTest.php
	tests/Zend/Validator/RegexTest.php
	tests/Zend/Validator/ValidateTest.php

test/NavigationTest.php

@@ -25,11 +25,6 @@
 namespace ZendTest\Navigation;
 use Zend\Navigation\Page;
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_NavigationTest::main');
-}
-
-
 /**
  * Zend_Navigation
  */
@@ -60,16 +55,6 @@ protected function tearDown()
         $this->_navigation = null;
         parent::tearDown();
     }
-    /**
-     * Runs the test methods of this class.
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        $suite  = new \PHPUnit_Framework_TestSuite("Zend_NavigationTest");
-        $result = \PHPUnit_TextUI_TestRunner::run($suite);
-    }
 
     /**
      * Testing that navigation order is done correctly
@@ -96,4 +81,4 @@ public function testNavigationArraySortsCorrectly()
         $this->assertEquals('page2', $pages[2]['uri']);
     }
 
-}
+}