#6 migrate Autoloader

fproject · May 2, 2016 · 70ff280 · 70ff280
1 parent 2ada650
commit 70ff280
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/fproject/amf/Server.php b/fproject/amf/Server.php
@@ -40,8 +40,7 @@
 use fproject\amf\auth\AuthResult;
 
 /**
- * An AMF gateway server implementation to allow the connection of the Adobe Flash Player to
- * Zend Framework
+ * An AMF gateway server implementation to allow the connection of the Adobe Flash Player/Adobe AIR to PHP server sites
  *
  * @todo       Make the reflection methods cache and autoload.
  */

diff --git a/fproject/amf/loader/Autoloader.php b/fproject/amf/loader/Autoloader.php
@@ -55,8 +55,8 @@ class Autoloader
      * @var array Supported namespaces 'Zend' and 'ZendX' by default.
      */
     protected $_namespaces = array(
-        'Zend_'  => true,
-        'ZendX_' => true,
+        //'Zend_'  => true,
+        //'ZendX_' => true,
     );
 
     /**

diff --git a/fproject/amf/parse/AbstractParser.php b/fproject/amf/parse/AbstractParser.php
@@ -27,7 +27,7 @@ abstract class AbstractParser
      * @param array $params
      * @throws \fproject\amf\AmfException
      */
-    protected function throwZendException($message, $params=[])
+    protected function throwAmfException($message, $params=[])
     {
         for($i=0; $i<count($params); $i++)
         {

diff --git a/fproject/amf/parse/Amf3Deserializer.php b/fproject/amf/parse/Amf3Deserializer.php
@@ -101,7 +101,7 @@ public function readTypeMarker($typeMarker = null)
                 return $this->readVector($typeMarker);
             //case Constants::AMF3_DICTIONARY:
             default:
-                $this->throwZendException('Unsupported type marker: {0}',[$typeMarker]);
+                $this->throwAmfException('Unsupported type marker: {0}',[$typeMarker]);
                 return 0;//To avoid PHP warning
         }
     }
@@ -176,7 +176,7 @@ public function readString()
             // reference string
             $stringReference = $stringReference >> 1;
             if ($stringReference >= count($this->_referenceStrings)) {
-                $this->throwZendException('Undefined string reference: {0}',[$stringReference]);
+                $this->throwAmfException('Undefined string reference: {0}',[$stringReference]);
             }
             // reference string found
             return $this->_referenceStrings[$stringReference];
@@ -295,7 +295,7 @@ public function readVector($type)
                 return $this->readObjectVector($len, $fixed);
             default:
                 // Unknown vector type tag {type}
-                $this->throwZendException('Undefined vector type: {0}',[$type]);
+                $this->throwAmfException('Undefined vector type: {0}',[$type]);
         }
 
         return $this->readNumericVector($len, $fixed, $eltSize, $numberFormat);
@@ -496,7 +496,7 @@ protected function createObjectInstance($className)
             else
             {
                 //user defined typed object
-                $this->throwZendException('Typed object not found: {0}',[$className]);
+                $this->throwAmfException('Typed object not found: {0}',[$className]);
             }
         }
         return ['object' => $returnObject, 'className' => $className];
@@ -556,7 +556,7 @@ private function getReferenceObject($refMarker)
         if (($refMarker & 0x01) == 0) {
             $refMarker = $refMarker >> 1;
             if ($refMarker>=count($this->_referenceObjects)) {
-                $this->throwZendException('Undefined object reference: {0}',[$refMarker]);
+                $this->throwAmfException('Undefined object reference: {0}',[$refMarker]);
             }
             return $this->_referenceObjects[$refMarker];
         }

diff --git a/fproject/amf/parse/Amf3Serializer.php b/fproject/amf/parse/Amf3Serializer.php
@@ -408,7 +408,7 @@ public function writeVector(&$array, $markerType, $vectorInfo)
                 return $this->writeObjectVector($array, $len, $vectorInfo['elementType']);
             default:
                 // Unknown vector type tag {type}
-                $this->throwZendException('Undefined vector type: {0}',[$markerType]);
+                $this->throwAmfException('Undefined vector type: {0}',[$markerType]);
         }
 
         $this->writeNumericVector($array, $len, $numberFormat);

diff --git a/fproject/amf/parse/InputStream.php b/fproject/amf/parse/InputStream.php
@@ -25,7 +25,7 @@
  * InputStream is used to iterate at a binary level through the AMF request.
  *
  * InputStream extends BinaryStream as eventually BinaryStream could be placed
- * outside of Zend_Amf in order to allow other packages to use the class.
+ * outside of PHP AMF in order to allow other packages to use the class.
  *
  */
 class InputStream extends BinaryStream

diff --git a/fproject/amf/parse/OutputStream.php b/fproject/amf/parse/OutputStream.php
@@ -25,7 +25,7 @@
  * Iterate at a binary level through the AMF response
  *
  * OutputStream extends BinaryStream as eventually BinaryStream could be placed
- * outside of Zend_Amf in order to allow other packages to use the class.
+ * outside of PHP AMF in order to allow other packages to use the class.
  *
  */
 class OutputStream extends BinaryStream