Merge branch 'zf2/master' into milestones/autoloading

weierophinney · weierophinney · commit d867a37752d4 · 2010-10-28T13:58:39.000-04:00
- Bring milestones/autoloading branch up-to-date with current master

Conflicts:
	library/Zend/Loader/Autoloader.php
	library/Zend/Loader/PluginLoader.php
	library/Zend/Serializer/Serializer.php
	library/Zend/View/AbstractView.php
	library/Zend/View/View.php
	library/Zend/View/ViewEngine.php
	tests/Zend/Loader/AutoloaderTest.php
	tests/Zend/View/ViewTest.php
diff --git a/src/Adapter.php b/src/Adapter.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Adapter/AbstractAdapter.php b/src/Adapter/AbstractAdapter.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Adapter/Amf0.php b/src/Adapter/Amf0.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,7 +25,7 @@
 namespace Zend\Serializer\Adapter;
 
 use Zend\Serializer\Exception as SerializationException,
-    Zend\Amf\Parser as AMFParser;
+    Zend\Amf\Parser as AmfParser;
 
 /**
  * @uses       Zend\Amf\Parser\Amf0\Deserializer
@@ -41,7 +40,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class AMF0 extends AbstractAdapter
+class Amf0 extends AbstractAdapter
 {
     /**
      * Serialize a PHP value to AMF0 format
@@ -54,8 +53,8 @@ class AMF0 extends AbstractAdapter
     public function serialize($value, array $opts = array())
     {
         try  {
-            $stream     = new AMFParser\OutputStream();
-            $serializer = new AMFParser\Amf0\Serializer($stream);
+            $stream     = new AmfParser\OutputStream();
+            $serializer = new AmfParser\Amf0\Serializer($stream);
             $serializer->writeTypeMarker($value);
             return $stream->getStream();
         } catch (\Exception $e) {
@@ -74,8 +73,8 @@ public function serialize($value, array $opts = array())
     public function unserialize($value, array $opts = array())
     {
         try {
-            $stream       = new AMFParser\InputStream($value);
-            $deserializer = new AMFParser\Amf0\Deserializer($stream);
+            $stream       = new AmfParser\InputStream($value);
+            $deserializer = new AmfParser\Amf0\Deserializer($stream);
             return $deserializer->readTypeMarker();
         } catch (\Exception $e) {
             throw new SerializationException('Unserialization failed by previous error', 0, $e);
diff --git a/src/Adapter/Amf3.php b/src/Adapter/Amf3.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,7 +25,7 @@
 namespace Zend\Serializer\Adapter;
 
 use Zend\Serializer\Exception as SerializationException,
-    Zend\Amf\Parser as AMFParser;
+    Zend\Amf\Parser as AmfParser;
 
 /**
  * @uses       Zend\Amf\Parser\Amf3\Deserializer
@@ -41,7 +40,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class AMF3 extends AbstractAdapter
+class Amf3 extends AbstractAdapter
 {
     /**
      * Serialize a PHP value to AMF3 format
@@ -54,8 +53,8 @@ class AMF3 extends AbstractAdapter
     public function serialize($value, array $opts = array())
     {
         try  {
-            $stream     = new AMFParser\OutputStream();
-            $serializer = new AMFParser\Amf3\Serializer($stream);
+            $stream     = new AmfParser\OutputStream();
+            $serializer = new AmfParser\Amf3\Serializer($stream);
             $serializer->writeTypeMarker($value);
             return $stream->getStream();
         } catch (\Exception $e) {
@@ -74,7 +73,7 @@ public function serialize($value, array $opts = array())
     public function unserialize($value, array $opts = array())
     {
         try {
-            $stream       = new AMFParser\InputStream($value);
+            $stream       = new AmfParser\InputStream($value);
             $deserializer = new AMFParser\Amf3\Deserializer($stream);
             return $deserializer->readTypeMarker();
         } catch (\Exception $e) {
diff --git a/src/Adapter/IgBinary.php b/src/Adapter/IgBinary.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Adapter/Json.php b/src/Adapter/Json.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Adapter/PhpCode.php b/src/Adapter/PhpCode.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Adapter/PhpSerialize.php b/src/Adapter/PhpSerialize.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Adapter/PythonPickle.php b/src/Adapter/PythonPickle.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Adapter/Wddx.php b/src/Adapter/Wddx.php
@@ -17,7 +17,6 @@
  * @subpackage Adapter
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Serializer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Serializer.php b/src/Serializer.php
@@ -16,7 +16,6 @@
  * @package    Zend_Serializer
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/Amf0Test.php b/test/Adapter/Amf0Test.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/Amf3Test.php b/test/Adapter/Amf3Test.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/IgBinaryTest.php b/test/Adapter/IgBinaryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -42,7 +41,11 @@ class IgbinaryTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         if (!extension_loaded('igbinary')) {
-            $this->markTestSkipped('Zend\\Serializer IgBinary needs ext/igbinary');
+            try {
+                new Serializer\Adapter\IgBinary();
+                $this->fail("Zend\\Serializer\\Adapter\\IgBinary needs missing ext/igbinary but did't throw exception");
+            } catch (Serializer\Exception $e) {}
+            $this->markTestSkipped('Zend\\Serializer\\Adapter\\IgBinary needs ext/igbinary');
         }
         $this->_adapter = new Serializer\Adapter\IgBinary();
     }
diff --git a/test/Adapter/JsonTest.php b/test/Adapter/JsonTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/PhpCodeTest.php b/test/Adapter/PhpCodeTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/PhpSerializeTest.php b/test/Adapter/PhpSerializeTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/PythonPickleSerializeProtocol0Test.php b/test/Adapter/PythonPickleSerializeProtocol0Test.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/PythonPickleSerializeProtocol1Test.php b/test/Adapter/PythonPickleSerializeProtocol1Test.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/PythonPickleUnserializeTest.php b/test/Adapter/PythonPickleUnserializeTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Adapter/WddxTest.php b/test/Adapter/WddxTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -42,7 +41,11 @@ class WddxTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         if (!extension_loaded('wddx')) {
-            $this->markTestSkipped('Zend\\Serializer Wddx needs ext/wddx');
+            try {
+                new Serializer\Adapter\Wddx();
+                $this->fail("Zend\\Serializer\\Adapter\\Wddx needs missing ext/wddx but did't throw exception");
+            } catch (Serializer\Exception $e) {}
+            $this->markTestSkipped('Zend\\Serializer\\Adapter\\Wddx needs ext/wddx');
         }
         $this->_adapter = new \Zend\Serializer\Adapter\Wddx();
     }
diff --git a/test/SerializerTest.php b/test/SerializerTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -96,7 +95,7 @@ public function testChangeDefaultAdapterWithString()
 
     public function testChangeDefaultAdapterWithInstance()
     {
-        $newAdapter = new Adapter\PHPSerialize();
+        $newAdapter = new Adapter\PhpSerialize();
 
         Serializer::setDefaultAdapter($newAdapter);
         $this->assertTrue($newAdapter === Serializer::getDefaultAdapter());
diff --git a/test/TestAsset/Dummy.php b/test/TestAsset/Dummy.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
