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/FigletTest.php

@@ -258,8 +258,3 @@ protected function _equalAgainstFile($output, $file)
         $this->assertEquals($compareString, $output);
     }
 }
-
-// Call Zend_Text_FigletTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Text_FigletTest::main") {
-    \Zend_Text_FigletTest::main();
-}

test/MultiByteTest.php

@@ -35,7 +35,6 @@
  */
 class MultiByteTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Standard cut tests
      */

test/TableTest.php

@@ -36,7 +36,6 @@
  */
 class TableTest extends \PHPUnit_Framework_TestCase
 {
-
     public function tearDown()
     {
         Table\Table::setInputCharset('utf-8');
@@ -429,8 +428,3 @@ public function testDecoratorAscii()
         $this->assertEquals($chars, '+++-++++|++');
     }
 }
-
-// Call Zend_Text_TableTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Text_TableTest::main") {
-    \Zend_Text_TableTest::main();
-}