#6: migrate Zend_Amf_Parse_Amf0_Deserializer

fproject/Zend/Amf/Request.php

@@ -19,15 +19,13 @@
  * @version    $Id$
  */
 
-/** @see Zend_Amf_Parse_Amf0_Deserializer */
-require_once 'Zend/Amf/Parse/Amf0/Deserializer.php';
-
 use fproject\amf\value\messaging\AbstractMessage;
 use fproject\amf\value\MessageHeader;
 use fproject\amf\AmfException;
 use fproject\amf\value\MessageBody;
 use fproject\amf\parse\InputStream;
 use fproject\amf\Constants;
+use fproject\amf\parse\Amf0Deserializer;
 
 /**
  * Handle the incoming AMF request by deserializing the data to php object
@@ -66,7 +64,7 @@ class Zend_Amf_Request
     protected $_inputStream;
 
     /**
-     * @var Zend_Amf_Parse_AMF0_Deserializer
+     * @var Amf0Deserializer
      */
     protected $_deserializer;
 
@@ -85,7 +83,7 @@ class Zend_Amf_Request
     public function initialize($request)
     {
         $this->_inputStream  = new InputStream($request);
-        $this->_deserializer = new Zend_Amf_Parse_Amf0_Deserializer($this->_inputStream);
+        $this->_deserializer = new Amf0Deserializer($this->_inputStream);
         $this->readMessage($this->_inputStream);
         return $this;
     }

fproject/Zend/Amf/Parse/Amf0/Deserializer.php → fproject/amf/parse/Amf0Deserializer.php

@@ -1,42 +1,35 @@
 <?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
+///////////////////////////////////////////////////////////////////////////////
+//
+// © Copyright f-project.net 2010-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace fproject\amf\parse;
 
 use fproject\common\utils\XmlSecurity;
 use fproject\amf\value\messaging\ArrayCollection;
-use fproject\amf\parse\Deserializer;
 use fproject\amf\Constants;
 
 /**
  * Read an AMF0 input stream and convert it into PHP data types
  *
  * @todo       Implement Typed Object Class Mapping
  * @todo       Class could be implemented as Factory Class with each data type it's own class
- * @package    Zend_Amf
- * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Amf_Parse_Amf0_Deserializer extends Deserializer
+class Amf0Deserializer extends Deserializer
 {
     /**
      * An array of objects used for recursively deserializing an object.