Author: thaberkern Date: 2010-01-11 11:50:18 +0100 (Mon, 11 Jan 2010) New Revision: 26472
Modified: plugins/sfAmfPlugin/README plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Const.php plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Deserializer.php plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Serializer.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AbstractMessage.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AcknowledgeMessage.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/CommandMessage.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Const.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Deserializer.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/ErrorMessage.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/RemotingMessage.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Serializer.php plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Wrapper.php plugins/sfAmfPlugin/lib/SabreAMF/ArrayCollection.php plugins/sfAmfPlugin/lib/SabreAMF/ByteArray.php plugins/sfAmfPlugin/lib/SabreAMF/CallbackServer.php plugins/sfAmfPlugin/lib/SabreAMF/ClassMapper.php plugins/sfAmfPlugin/lib/SabreAMF/ClassNotFoundException.php plugins/sfAmfPlugin/lib/SabreAMF/Client.php plugins/sfAmfPlugin/lib/SabreAMF/Const.php plugins/sfAmfPlugin/lib/SabreAMF/Deserializer.php plugins/sfAmfPlugin/lib/SabreAMF/DetailException.php plugins/sfAmfPlugin/lib/SabreAMF/Externalized.php plugins/sfAmfPlugin/lib/SabreAMF/ITypedObject.php plugins/sfAmfPlugin/lib/SabreAMF/InputStream.php plugins/sfAmfPlugin/lib/SabreAMF/Message.php plugins/sfAmfPlugin/lib/SabreAMF/OutputStream.php plugins/sfAmfPlugin/lib/SabreAMF/RecordSet.php plugins/sfAmfPlugin/lib/SabreAMF/Serializer.php plugins/sfAmfPlugin/lib/SabreAMF/Server.php plugins/sfAmfPlugin/lib/SabreAMF/TypedObject.php plugins/sfAmfPlugin/lib/SabreAMF/UndefinedMethodException.php plugins/sfAmfPlugin/package.xml Log: [sfAmfPlugin] Updated SabreAmf, Added SF 1.3 and 1.4 Support to package.xml Modified: plugins/sfAmfPlugin/README =================================================================== --- plugins/sfAmfPlugin/README 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/README 2010-01-11 10:50:18 UTC (rev 26472) @@ -79,6 +79,18 @@ But how is this service called from client side? We need an URL to do so. For symfony this means you need a module and an action. The following listing shows you how an AMF action should look like: +The preferred way is to use the plugin amf gateway module. For that just enable the module in the settings.yml +of your application: + + [yaml] + enabled_modules: [default, amfgateway] + +In this case you use the following URL for your Flex services calls: + + http://host/amfgateway/service + +Alternativly you can create your own module and action: + [php] public function executeAmf() { $this->setLayout(false); @@ -86,7 +98,7 @@ return sfView::NONE; } -Alternativly you can use this: +And last but not least, this is possible too: [php] public function executeAmf() { @@ -200,7 +212,15 @@ Changelog --------- - + * 1.5.0 (01-11-2010) + * Added Support for Symfony 1.3 and 1.4 + * Updated to most current development version of SabreAMF + + * 1.4.2 (08-05-2009) + * Changed error_handler behaviour + * Improved Doctrine Adapters, so they handle relations better + * Updated SabreAmf to current version + * Added default module for AMF-Gateway * 1.4.1 (07-01-2009) * Fixing typos in handleRequest funtion (thanks to Daniel Holmes for spotting this) * 1.4.0 (06-29-2009) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Const.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Const.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Const.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -5,7 +5,7 @@ * * @package SabreAMF * @subpackage AMF0 - * @version $Id: Const.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Const.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Deserializer.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Deserializer.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Deserializer.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -12,7 +12,7 @@ * * @package SabreAMF * @subpackage AMF0 - * @version $Id: Deserializer.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Deserializer.php 249 2009-10-01 14:30:31Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) @@ -200,8 +200,8 @@ $isMapped = false; - if ($classname = $this->getLocalClassName($classname)) { - $rObject = new $classname(); + if ($localClassname = $this->getLocalClassName($classname)) { + $rObject = new $localClassname(); $isMapped = true; } else { $rObject = new SabreAMF_TypedObject($classname,null); Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Serializer.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Serializer.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF0/Serializer.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -12,7 +12,7 @@ * * @package SabreAMF * @subpackage AMF0 - * @version $Id: Serializer.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Serializer.php 245 2009-09-22 19:09:50Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) @@ -54,20 +54,11 @@ // Checking if its an array if (!$type && is_array($data)) { - - // Looping through the array to see if there are any - // non-numeric keys - foreach(array_keys($data) as $key) { - if (!is_numeric($key)) { - // There's a non-numeric key.. we'll make it a mixed - // array - $type = SabreAMF_AMF0_Const::DT_MIXEDARRAY; - break; - } - } - - // Pure array - if (!$type) $type = SabreAMF_AMF0_Const::DT_ARRAY; + if ( $this->isPureArray( $data ) ) { + $type = SabreAMF_AMF0_Const::DT_ARRAY; + } else { + $type = SabreAMF_AMF0_Const::DT_MIXEDARRAY; + } } // Its an object @@ -149,8 +140,11 @@ $last = key($data); $this->stream->writeLong($last+1); for($i=0;$i<=$last;$i++) { - $item = isset($data[$i])?$data[$i]:NULL; - $this->writeAMFData($item); + if (isset($data[$i])) { + $this->writeAMFData($data[$i]); + } else { + $this->stream->writeByte(SabreAMF_AMF0_Const::DT_UNDEFINED); + } } } Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AbstractMessage.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AbstractMessage.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AbstractMessage.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_AMF3_AbstractMessage * * @package - * @version $Id: AbstractMessage.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: AbstractMessage.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AcknowledgeMessage.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AcknowledgeMessage.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/AcknowledgeMessage.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * @uses SabreAMF_AMF3_AbstractMessage * @package SabreAMF * @subpackage AMF3 - * @version $Id: AcknowledgeMessage.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: AcknowledgeMessage.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/CommandMessage.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/CommandMessage.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/CommandMessage.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * @uses SabreAMF * @uses _AMF3_AbstractMessage * @package - * @version $Id: CommandMessage.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: CommandMessage.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Const.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Const.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Const.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -5,7 +5,7 @@ * * @package SabreAMF * @subpackage AMF3 - * @version $Id: Const.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Const.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Deserializer.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Deserializer.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Deserializer.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -12,7 +12,7 @@ * * @package SabreAMF * @subpackage AMF3 - * @version $Id: Deserializer.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Deserializer.php 236 2009-08-21 17:54:38Z [email protected] $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @author Karl von Randow http://xk72.com/ @@ -362,10 +362,13 @@ // if int and has the sign bit set // Check if the integer is an int // and is signed - if (($int & 0x18000000) != 0) { + if (($int & 0x18000000) == 0x18000000) { $int ^= 0x1fffffff; $int *= -1; $int -= 1; + } else if (($int & 0x10000000) == 0x10000000) { + // remove the signed flag + $int &= 0x0fffffff; } return $int; Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/ErrorMessage.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/ErrorMessage.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/ErrorMessage.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * @uses SabreAMF_AMF3_ErrorMessage * @package SabreAMF * @subpackage AMF3 - * @version $Id: ErrorMessage.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: ErrorMessage.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/RemotingMessage.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/RemotingMessage.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/RemotingMessage.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * @uses SabreAMF_AM3_AbstractMessage * @package SabreAMF * @subpackage AMF3 - * @version $Id: RemotingMessage.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: RemotingMessage.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Serializer.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Serializer.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Serializer.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -11,7 +11,7 @@ * * @package SabreAMF * @subpackage AMF3 - * @version $Id: Serializer.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Serializer.php 245 2009-09-22 19:09:50Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @author Karl von Randow http://xk72.com/ @@ -233,32 +233,28 @@ */ public function writeArray(array $arr) { - end($arr); + //Check if this is an associative array or not. + if ( $this->isPureArray( $arr ) ) { + // Writing the length for the numeric keys in the array + $arrLen = count($arr); + $arrId = ($arrLen << 1) | 0x01; + + $this->writeInt($arrId); + $this->writeString(''); + + foreach($arr as $v) { + $this->writeAMFData($v); + } - // We need to split up strings an numeric array keys - $num = array(); - $string = array(); - foreach($arr as $k=>$v) { - if (is_int($k)) $num[] = $v; else $string[$k] = $v; - } + } else { + $this->writeInt(1); + foreach($arr as $key=>$value) { + $this->writeString($key); + $this->writeAMFData($value); + } + $this->writeString(''); - unset($arr); - - // Writing the length for the numeric keys in the array - $arrLen = count($num); - $arrId = ($arrLen << 1) | 0x01; - - $this->writeInt($arrId); - - foreach($string as $key=>$v) { - $this->writeString($key); - $this->writeAMFData($v); } - $this->writeString(""); - - foreach($num as $v) { - $this->writeAMFData($v); - } } @@ -277,5 +273,3 @@ } } - - Modified: plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Wrapper.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Wrapper.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/AMF3/Wrapper.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -5,7 +5,7 @@ * * @package SabreAMF * @subpackage AMF3 - * @version $Id: Wrapper.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Wrapper.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/ArrayCollection.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/ArrayCollection.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/ArrayCollection.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -11,7 +11,7 @@ * @uses IteratorAggregate * @uses ArrayAccess * @uses Countable - * @version $Id: ArrayCollection.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: ArrayCollection.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2007-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl) * @license licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/ByteArray.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/ByteArray.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/ByteArray.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_ByteArray * * @package SabreAMF - * @version $Id: ByteArray.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: ByteArray.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl) * @license licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/CallbackServer.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/CallbackServer.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/CallbackServer.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -18,7 +18,7 @@ * Also, the response to the ping message will be done for you. * * @package SabreAMF - * @version $Id: CallbackServer.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: CallbackServer.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/ClassMapper.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/ClassMapper.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/ClassMapper.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_ClassMapper * * @package SabreAMF - * @version $Id: ClassMapper.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: ClassMapper.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/ClassNotFoundException.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/ClassNotFoundException.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/ClassNotFoundException.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_ClassNotFoundException * * @package SabreAMF - * @version $Id: ClassNotFoundException.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: ClassNotFoundException.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @author Renaun Erickson (http://renaun.com/blog) Modified: plugins/sfAmfPlugin/lib/SabreAMF/Client.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/Client.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/Client.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -15,7 +15,7 @@ * It sends AMF0 encoded data by default. Change the encoding to AMF3 with setEncoding. sendRequest calls the actual service * * @package SabreAMF - * @version $Id: Client.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Client.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License Modified: plugins/sfAmfPlugin/lib/SabreAMF/Const.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/Const.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/Const.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * SabreAMF global constants * * @package SabreAMF - * @version $Id: Const.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Const.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/Deserializer.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/Deserializer.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/Deserializer.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_Deserializer * * @package SabreAMF - * @version $Id: Deserializer.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Deserializer.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/DetailException.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/DetailException.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/DetailException.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_Exception * * @package SabreAMF - * @version $Id: DetailException.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: DetailException.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl) * @author Renaun Erickson (http://renaun.com/blog) Modified: plugins/sfAmfPlugin/lib/SabreAMF/Externalized.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/Externalized.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/Externalized.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -5,7 +5,7 @@ * Don't forget to map the object using the classmapper * * @package SabreAMF - * @version $Id: Externalized.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Externalized.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2007-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl) * @license licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/ITypedObject.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/ITypedObject.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/ITypedObject.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * This interface can be used to encode your data with a specified classname. The result will be that the flash/flex client will transform the data to an object of the specified classname * * @package SabreAMF - * @version $Id: ITypedObject.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: ITypedObject.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/InputStream.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/InputStream.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/InputStream.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * This is the InputStream class. You construct it with binary data and it can read doubles, longs, ints, bytes, etc. while maintaining the cursor position * * @package SabreAMF - * @version $Id: InputStream.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: InputStream.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/Message.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/Message.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/Message.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -11,7 +11,7 @@ * The Message class encapsulates either an entire request package or an entire result package; including an AMF enveloppe * * @package SabreAMF - * @version $Id: Message.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Message.php 246 2009-09-23 19:29:23Z mike.benoit $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) @@ -154,7 +154,14 @@ $body['data'] = $body['data']->getData(); $this->encoding = SabreAMF_Const::AMF3; } else if (is_array($body['data']) && isset($body['data'][0]) && is_object($body['data'][0]) && $body['data'][0] instanceof SabreAMF_AMF3_Wrapper) { - $body['data'] = $body['data'][0]->getData(); + + if ( defined('SABREAMF_AMF3_PRESERVE_ARGUMENTS') ) { + $body['data'][0] = $body['data'][0]->getData(); + } else { + $body['data'] = $body['data'][0]->getData(); + + } + $this->encoding = SabreAMF_Const::AMF3; } Modified: plugins/sfAmfPlugin/lib/SabreAMF/OutputStream.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/OutputStream.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/OutputStream.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * This class provides methods to encode bytes, longs, strings, int's etc. to a binary format * * @package SabreAMF - * @version $Id: OutputStream.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: OutputStream.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/RecordSet.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/RecordSet.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/RecordSet.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -8,7 +8,7 @@ * @uses SabreAMF_ITypedObject * @uses Countable * @package SabreAMF - * @version $Id: RecordSet.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: RecordSet.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/Serializer.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/Serializer.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/Serializer.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_Serializer * * @package SabreAMF - * @version $Id: Serializer.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Serializer.php 248 2009-09-24 19:09:23Z mike.benoit $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) @@ -72,6 +72,24 @@ } + /** + * Checks wether the provided array has string keys and if it's not sparse. + * + * @param array $arr + * @return bool + */ + protected function isPureArray(array $array ) { + $i=0; + foreach($array as $k=>$v) { + if ( $k !== $i ) { + return false; + } + $i++; + } + + return true; + } + } Modified: plugins/sfAmfPlugin/lib/SabreAMF/Server.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/Server.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/Server.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -13,7 +13,7 @@ * This is the AMF0/AMF3 Server class. Use this class to construct a gateway for clients to connect to * * @package SabreAMF - * @version $Id: Server.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: Server.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/TypedObject.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/TypedObject.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/TypedObject.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -6,7 +6,7 @@ * SabreAMF_TypedObject * * @package SabreAMF - * @version $Id: TypedObject.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: TypedObject.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @licence http://www.freebsd.org/copyright/license.html BSD License (4 Clause) Modified: plugins/sfAmfPlugin/lib/SabreAMF/UndefinedMethodException.php =================================================================== --- plugins/sfAmfPlugin/lib/SabreAMF/UndefinedMethodException.php 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/lib/SabreAMF/UndefinedMethodException.php 2010-01-11 10:50:18 UTC (rev 26472) @@ -4,7 +4,7 @@ * SabreAMF_UndefinedMethodException * * @package SabreAMF - * @version $Id: UndefinedMethodException.php 62 2009-08-04 14:48:16Z thaberkern $ + * @version $Id: UndefinedMethodException.php 233 2009-06-27 23:10:34Z evertpot $ * @copyright Copyright (C) 2006-2009 Rooftop Solutions. All rights reserved. * @author Evert Pot (http://www.rooftopsolutions.nl/) * @author Renaun Erickson (http://renaun.com/blog) Modified: plugins/sfAmfPlugin/package.xml =================================================================== --- plugins/sfAmfPlugin/package.xml 2010-01-11 07:38:45 UTC (rev 26471) +++ plugins/sfAmfPlugin/package.xml 2010-01-11 10:50:18 UTC (rev 26472) @@ -10,9 +10,9 @@ <email>[email protected]</email> <active>yes</active> </lead> - <date>2009-07-01</date> + <date>2009-08-05</date> <version> - <release>1.4.1</release> + <release>1.4.2</release> <api>1.0.0</api> </version> <stability> @@ -103,8 +103,24 @@ </dependencies> <phprelease/> <changelog> - <release> + <release> <version> + <release>1.4.2</release> + <api>1.0.0</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2009-08-05</date> + <license>MIT License</license> + <notes>* Changed error_handler behaviour + * Improved Doctrine Adapters, so they handle relations better + * Updated SabreAmf to current version + * Added default module for AMF-Gateway</notes> + </release> + <release> + <version> <release>1.4.1</release> <api>1.0.0</api> </version>
-- You received this message because you are subscribed to the Google Groups "symfony SVN" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/symfony-svn?hl=en.
